Changes in / [a97aebd:8fa3fb8] in sasview

Location:

src/sas/sasgui/perspectives/fitting

Files:

• fitpage.py (modified) (6 diffs)
• model_thread.py (modified) (1 diff)

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

@@ -164 +164 @@
         On_select_data
         """
-        if self.dataSource.GetCount() > 0:
-            pos = self.dataSource.GetSelection() if event is not None else 0
+        if event is None and self.dataSource.GetCount() > 0:
+            data = self.dataSource.GetClientData(0)
+            self.set_data(data)
+        elif self.dataSource.GetCount() > 0:
+            pos = self.dataSource.GetSelection()
             data = self.dataSource.GetClientData(pos)
             self.set_data(data)
@@ -253 +256 @@
         self.Bind(wx.EVT_RADIOBUTTON, self.onWeighting,
                   id=self.dI_idata.GetId())
-        self.dI_noweight.SetValue(True)
+        self.dI_didata.SetValue(True)
         # add 4 types of weighting to the sizer
         sizer_weighting.Add(self.dI_noweight, 0, wx.LEFT, 10)
@@ -263 +266 @@
         sizer_weighting.Add(self.dI_idata)
         sizer_weighting.Add((10, 10))
-        self.dI_noweight.Enable(True)
+        self.dI_noweight.Enable(False)
         self.dI_didata.Enable(False)
         self.dI_sqrdata.Enable(False)
@@ -1268 +1271 @@
             if copy_flag:
                 self.get_paste_params(copy_flag)
-            wx.CallAfter(self._onDraw, None)
+                wx.CallAfter(self._onDraw, None)
 
         else:
@@ -1624 +1627 @@
         elif data.dxl is not None or data.dxw is not None:
             self.smear_type = "Slit"
-            if data.dxl is not None and numpy.all(data.dxl, 0):
+            if data.dxl is not None and not numpy.all(data.dxl, 0):
                 self.dq_l = data.dxl[0]
-            if data.dxw is not None and numpy.all(data.dxw, 0):
+            if data.dxw is not None and not numpy.all(data.dxw, 0):
                 self.dq_r = data.dxw[0]
         # return self.smear_type,self.dq_l,self.dq_r
@@ -2013 +2016 @@
             self.EditMask_title.Disable()
 
-        self.on_smear_helper()
+        self.onSmear(event=None)
         self.on_set_focus(None)
         self.Refresh()

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

@@ -177 +177 @@
             unsmeared_output = numpy.zeros((len(self.data.x)))
             unsmeared_output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
-            self.smearer.model = self.model
             output = self.smearer(unsmeared_output, first_bin, last_bin)