Changeset 3d55219 in sasview

Timestamp:

Feb 22, 2017 3:29:41 PM (8 years ago)

Author:

krzywon

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:

9525358

Parents:

03137f1

Message:

Check for slit smearing as well as pinhole, more pythonic truth checking and moved smearing to after dI is set. #844

File:

• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (2 diffs)

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

@@ -1941 +1941 @@
                 self.pinhole_smearer.Enable(True)
                 self.default_mask = copy.deepcopy(self.data.mask)
-                if self.data.err_data is None \
-                        or numpy.all(err == 1 for err in self.data.err_data) \
-                        or not numpy.any(self.data.err_data):
+                if self.data.err_data is not None \
+                        and numpy.any(self.data.err_data):
                     di_flag = True
-                if self.data.dqx is None \
-                        or numpy.all(err == 1 for err in self.data.dqx) \
-                        or not numpy.any(self.data.dqx):
+                if self.data.dqx_data is not None \
+                        and numpy.any(self.data.dqx_data):
                     dq_flag = True
             else:
                 self.slit_smearer.Enable(True)
                 self.pinhole_smearer.Enable(True)
-                if self.data.dy is None \
-                        or numpy.all(self.data.dy == 1) \
-                        or not numpy.any(self.data.dy):
+                if self.data.dy is not None and numpy.any(self.data.dy):
                     di_flag = True
-                if self.data.dx is None \
-                        or numpy.all(self.data.dx == 1) \
-                        or not numpy.any(self.data.dx):
+                if self.data.dx is not None and numpy.any(self.data.dx):
                     dq_flag = True
+                elif self.data.dxl is not None and numpy.any(self.data.dxl):
+                    dq_flag = True
 
             if dq_flag:
+                self.enable_smearer.Enable(True)
+                self.enable_smearer.SetValue(True)
+                self.disable_smearer.SetValue(False)
+            else:
                 self.enable_smearer.Disable()
                 self.disable_smearer.Enable(True)
                 self.disable_smearer.SetValue(True)
+
+            if di_flag:
+                self.dI_didata.Enable(True)
+                self.dI_didata.SetValue(True)
+                self.weightbt_string = self.dI_didata.GetLabelText()
             else:
-                self.enable_smearer.Enable(True)
-                self.enable_smearer.SetValue(True)
-                self.disable_smearer.SetValue(False)
-            self.onSmear(event=None)
-
-            if di_flag:
                 self.dI_didata.Enable(False)
                 self.dI_noweight.SetValue(True)
                 self.weightbt_string = self.dI_noweight.GetLabelText()
-            else:
-                self.dI_didata.Enable(True)
-                self.dI_didata.SetValue(True)
-                self.weightbt_string = self.dI_didata.GetLabelText()
 
             # Enable weighting radio buttons
@@ -2021 +2016 @@
             self.EditMask_title.Disable()
 
+        self.onSmear(event=None)
         self.on_set_focus(None)
         self.Refresh()