Changeset 3fb5e68 in sasview

Timestamp:

Oct 3, 2011 12:57:12 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:

68a921f

Parents:

342dc442

Message:

fix for 1d/2d theory w/smearer

Location:

fittingview/src/sans/perspectives/fitting

Files:

• fitpage.py (modified) (4 diffs)
• fitproblem.py (modified) (1 diff)

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

@@ -1243 +1243 @@
     
             # more disables for 2D
-            #self._set_smear_buttons()
+            self._set_smear_buttons()
             
             try:
@@ -2170 +2170 @@
         """
         self.weightbt_string = event.GetEventObject().GetLabelText()
+        self._set_weight()
+        
+    def _set_weight(self, is_2D=None):
+        """
+        Set weight in fit problem
+        """
         # compute weight for the current data
         from .utils import get_weight
         flag_weight = self.get_weight_flag()
+        if is_2D == None:
+            is_2D = self._is_2D()
         weight = get_weight(data=self.data, 
-                            is2d=self._is_2D(), 
+                            is2d=is_2D, 
                             flag=flag_weight)
         self._manager.set_fit_weight(uid=self.uid, 
                                      flag=flag_weight, 
-                                     is2d=self._is_2D(), 
+                                     is2d=is_2D, 
                                      fid=None)
     
@@ -2602 +2610 @@
         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)
+        self._set_weight()
         
         ## set smearing value whether or not the data contain the smearing info
@@ -3174 +3172 @@
             self.enable2D = False
         self.create_default_data()
+        self._manager.store_data(self.uid, data_list=[self.data])
+
         self.set_model_param_sizer(self.model)
         self._set_sizer_dispersion()  
+        self._set_weight(is_2D= self.enable2D)
         self._set_smear_buttons()
         self._draw_model()

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

@@ -566 +566 @@
         :param data: list of data selected
         """
+        self.original_data = None
+        self.fit_data = None
         # original data: should not be modified
         self.original_data = copy.deepcopy(data)