Changeset 342dc442 in sasview

Timestamp:

Oct 3, 2011 12:15:03 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3fb5e68

Parents:

63dc6e5

Message:

"fixed problem not updating weight on smear

Location:

fittingview/src/sans/perspectives/fitting

Files:

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

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -2170 +2170 @@
         """
         self.weightbt_string = event.GetEventObject().GetLabelText()
+        # compute weight for the current data
+        from .utils import get_weight
+        flag_weight = self.get_weight_flag()
+        weight = get_weight(data=self.data, 
+                            is2d=self._is_2D(), 
+                            flag=flag_weight)
+        self._manager.set_fit_weight(uid=self.uid, 
+                                     flag=flag_weight, 
+                                     is2d=self._is_2D(), 
+                                     fid=None)
     
     def onPinholeSmear(self, event):
@@ -2592 +2602 @@
         self.sizer_set_smearer.Layout()
         self.Layout()
+        
+        # compute weight for the current data
+        from .utils import get_weight
+        flag_weight = self.get_weight_flag()
+        weight = get_weight(data=self.data, 
+                            is2d=self._is_2D(), 
+                            flag=flag_weight)
+        self._manager.set_fit_weight(uid=self.uid, 
+                                     flag=flag_weight, 
+                                     is2d=self._is_2D(), 
+                                     fid=None)
+        
         ## set smearing value whether or not the data contain the smearing info
         self._manager.set_smearer(uid=self.uid, smearer=temp_smearer,

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -620 +620 @@
             ## redraw the model with data smeared
             smear = self.page_finder[uid].get_smearer(fid=fid)
+
+            # compute weight for the current data
+            weight = self.page_finder[uid].get_weight(fid=fid)
+
             self.draw_model(model=model, data=data, page_id=uid, smearer=smear,
                 enable1D=enable1D, enable2D=enable2D,
-                qmin=qmin, qmax=qmax, weight=None)
+                qmin=qmin, qmax=qmax, weight=weight)
             self._mac_sleep(0.2)