Changeset be36447 in sasview for src

Timestamp:

Feb 27, 2017 9:58:22 AM (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:

27ba79c

Parents:

cb05bfd

Message:

Set dxl & dxw values when sending data to fitting and small cleanup of redundant code. Check if model is set before evalDistribution.

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (1 diff)
• sasgui/perspectives/fitting/fitpage.py (modified) (4 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -108 +108 @@
         q_calc = self.resolution.q_calc
         iq_calc = numpy.empty_like(q_calc)
-        if start > 0:
+        if start > 0 and self.model is not None:
             iq_calc[:start] = self.model.evalDistribution(q_calc[:start])
-        if end+1 < len(q_calc):
+        if end+1 < len(q_calc) and self.model is not None:
             iq_calc[end+1:] = self.model.evalDistribution(q_calc[end+1:])
         iq_calc[start:end+1] = iq_in[first_bin:last_bin+1]

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

@@ -164 +164 @@
         On_select_data
         """
-        if event is None and self.dataSource.GetCount() > 0:
-            data = self.dataSource.GetClientData(0)
-            self.set_data(data)
+        pos = 0
+        if event is not None:
+            pos = self.dataSource.GetSelection()
         elif self.dataSource.GetCount() > 0:
-            pos = self.dataSource.GetSelection()
             data = self.dataSource.GetClientData(pos)
             self.set_data(data)
@@ -256 +255 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onWeighting,
                   id=self.dI_idata.GetId())
-        self.dI_didata.SetValue(True)
+        self.dI_noweight.SetValue(True)
         # add 4 types of weighting to the sizer
         sizer_weighting.Add(self.dI_noweight, 0, wx.LEFT, 10)
@@ -266 +265 @@
         sizer_weighting.Add(self.dI_idata)
         sizer_weighting.Add((10, 10))
-        self.dI_noweight.Enable(False)
+        self.dI_noweight.Enable(True)
         self.dI_didata.Enable(False)
         self.dI_sqrdata.Enable(False)
@@ -1627 +1626 @@
         elif data.dxl is not None or data.dxw is not None:
             self.smear_type = "Slit"
-            if data.dxl is not None and not numpy.all(data.dxl, 0):
+            if data.dxl is not None and numpy.all(data.dxl, 0):
                 self.dq_l = data.dxl[0]
-            if data.dxw is not None and not numpy.all(data.dxw, 0):
+            if data.dxw is not None and numpy.all(data.dxw, 0):
                 self.dq_r = data.dxw[0]
         # return self.smear_type,self.dq_l,self.dq_r