Changeset 33477fd in sasview

Timestamp:

Jan 19, 2012 10:08:03 AM (12 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:

2b4c8ca

Parents:

3c07598

Message:

fixed custom smear without data

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (4 diffs)

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

@@ -202 +202 @@
             else:
                 self._create_default_1d_data()
+            if self.model != None:
+                if not self.data.is_data:
+                    self._manager.page_finder[self.uid].set_fit_data(data=[self.data])
+            self.on_smear_helper(update=True)
+            self.state.enable_smearer=  self.enable_smearer.GetValue()
+            self.state.disable_smearer=self.disable_smearer.GetValue()
+            self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
+            self.state.slit_smearer = self.slit_smearer.GetValue()
         
     def _create_default_1d_data(self):
@@ -1456 +1464 @@
             else:
                 #self.btFit.Enable(True)
-                if is_2Ddata  and not self.batch_on: 
+                if is_2Ddata  and self.data.is_data and not self.batch_on: 
                     self.btEditMask.Enable(True)
             if is_modified and self.fitrange:
@@ -1482 +1490 @@
         ##So make sure that update param values on_Fit.
         #self._undo.Enable(True)
-        if self.model !=None:           
+        if self.model !=None:   
+            if self.Npts_total.GetValue() != self.Npts_fit.GetValue():
+                if not self.data.is_data:
+                    self._manager.page_finder[self.uid].set_fit_data(data=\
+                                                                    [self.data])      
             ##Check the values
             self._check_value_enter( self.fittable_param ,is_modified)
@@ -1554 +1566 @@
         else:
             #self.btFit.Enable(True)
-            if self._is_2D() and  self.data != None and not self.batch_on:
+            if self._is_2D() and  self.data.is_data and not self.batch_on:
                 self.btEditMask.Enable(True)
 
@@ -1562 +1574 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
         
-        self.save_current_state()
+        try:
+            self.save_current_state()
+        except:
+            pass
    
         return flag                           

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

@@ -1443 +1443 @@
         msg= ""
         wx.PostEvent(self.parent.parent, StatusEvent(status = msg ))
+        # For theory mode
+        if not self.data.is_data:
+            self.create_default_data()
         # Flag to register when a parameter has changed.
         is_modified = False
@@ -2580 +2583 @@
                             "Smear: %s"%msg))
             return
-        
         # Need update param values
         self._update_paramv_on_fit()
-        
+        temp_smearer = self.on_smear_helper()            
+        
+        self.sizer_set_smearer.Layout()
+        self.Layout()
+        self._set_weight()
+        
+        ## set smearing value whether or not the data contain the smearing info
+        wx.CallAfter(self._manager.set_smearer, uid=self.uid, smearer=temp_smearer,
+                                  fid=self.data.id,
+                        qmin=float(self.qmin_x),
+                        qmax=float(self.qmax_x),
+                        enable_smearer=not self.disable_smearer.GetValue(),
+                         draw=True) 
+        
+        self.state.enable_smearer=  self.enable_smearer.GetValue()
+        self.state.disable_smearer=self.disable_smearer.GetValue()
+        self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
+        self.state.slit_smearer = self.slit_smearer.GetValue()
+        
+    def on_smear_helper(self, update=False):
+        """
+        Help for onSmear
+        
+        :param update: force or not to update
+        """
+        self._get_smear_info()
         temp_smearer = None
-        self._get_smear_info()
-        
         #renew smear sizer
         if self.smear_type != None:
@@ -2594 +2619 @@
 
         self._hide_all_smear_info()
-        
         data = copy.deepcopy(self.data)
+        
         # make sure once more if it is smearer
         temp_smearer = smear_selection(data, self.model)
-        if self.current_smearer != temp_smearer:
+        if self.current_smearer != temp_smearer or update:
             self.current_smearer = temp_smearer
         if self.enable_smearer.GetValue():
             if hasattr(self.data,"dxl"):
-                
                 msg= ": Resolution smearing parameters"
             if hasattr(self.data,"dxw"):
@@ -2623 +2647 @@
         elif self.slit_smearer.GetValue():
             self.onSlitSmear(None)
-            
         self._show_smear_sizer()
         
-        self.sizer_set_smearer.Layout()
-        self.Layout()
-        self._set_weight()
-        
-        ## set smearing value whether or not the data contain the smearing info
-        wx.CallAfter(self._manager.set_smearer, uid=self.uid, smearer=temp_smearer,
-                                  fid=self.data.id,
-                        qmin=float(self.qmin_x),
-                        qmax=float(self.qmax_x),
-                        enable_smearer=not self.disable_smearer.GetValue(),
-                         draw=True) 
-        
-        self.state.enable_smearer=  self.enable_smearer.GetValue()
-        self.state.disable_smearer=self.disable_smearer.GetValue()
-        self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
-        self.state.slit_smearer = self.slit_smearer.GetValue()
-      
+        return temp_smearer
+    
     def on_complete_chisqr(self, event):  
         """