Changeset e0d9ed2 in sasview

Timestamp:

Nov 4, 2016 9:42:34 AM (8 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

012e397

Parents:

d99f008

Message:

Skipping one smearing set up to avoid double Iq evaluation/compilation

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitting.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -1205 +1205 @@
                     self._keep.Enable(not self.batch_on)
                     self._set_save_flag(True)
-                    self._set_smear(self.data)
+            #Setting smearing for cases with and without data.
+            self._set_smear(self.data)
 
             # more disables for 2D
@@ -1212 +1213 @@
             try:
                 # update smearer sizer
-                self.onSmear(None)
+                #This call for smearing set up caused double evaluation of
+                #I(q) and double compilation as results
+                #self.onSmear(None)
                 temp_smear = None
                 if not self.disable_smearer.GetValue():

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -864 +864 @@
                 enable1D=enable1D, enable2D=enable2D,
                 qmin=qmin, qmax=qmax, weight=weight)
-            # Replacing self._mac_sleep(0.2) with time.sleep(0.2) to prevent
-            # _handle error on Windows. It fixes the bug but doesn't resolve
-            # underlying issue of calling this code twice (threading related)
-            # Wojtek P., Nov 3 2016
-            time.sleep(0.2)
 
     def _mac_sleep(self, sec=0.2):