Changeset 4fbc93e in sasview for sansview

Timestamp:

May 11, 2010 11:51:05 AM (15 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:

46fe6a6

Parents:

f72333f

Message:

Fixed minor bug on pinhol acc. cb

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -1063 +1063 @@
         self.fitrange = True
         is_modified = False
-        is_2Ddata = False
-
-        # check if 2d data
-        if self.data.__class__.__name__ =="Data2D":
-            is_2Ddata = True
-        
+
+        wx.PostEvent(self.manager.parent, StatusEvent(status=" \
+        updating ... ",type="update"))
+
         ##So make sure that update param values on_Fit.
         #self._undo.Enable(True)
@@ -1101 +1099 @@
                         self.manager.set_smearer_nodraw(smearer=temp_smearer, qmin= float(self.qmin_x),
                                                  qmax= float(self.qmax_x))
-                elif not is_2Ddata:
+                elif not self._is_2D():
                     self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
                                                  qmax= float(self.qmax_x))
@@ -1107 +1105 @@
                     self.Npts_fit.SetValue(str(len(self.data.x[index_data==True])))
                     flag = True
-                if is_2Ddata:
+                if self._is_2D():
                     # only 2D case set mask   
                     flag = self._validate_Npts()
@@ -1119 +1117 @@
         if not self.fitrange:
             #self.btFit.Disable()
-            if is_2Ddata:self.btEditMask.Disable()
+            if self._is_2D():self.btEditMask.Disable()
         else:
             #self.btFit.Enable(True)
-            if is_2Ddata:self.btEditMask.Enable(True)
+            if self._is_2D():self.btEditMask.Enable(True)
 
         

sansview/perspectives/fitting/fitpage.py

@@ -24 +24 @@
 _DATA_BOX_WIDTH = 300
 SMEAR_SIZE_L = 0.005
-SMEAR_SIZE_H = 0.01
+SMEAR_SIZE_H = 0.006
 
 import basepage
@@ -883 +883 @@
         #get event object
         tcrtl= event.GetEventObject()
-
+        wx.PostEvent(self.manager.parent, StatusEvent(status=" \
+                                updating ... ",type="update"))
         #Clear msg if previously shown.
         msg= ""
@@ -1214 +1215 @@
         """
         #event.Skip()
-        accuracy = event.GetEventObject()
-        
-        self.smear2d_accuracy = accuracy.GetValue()
+        
+        # Check if the accuracy is same as before
+        # Mac does not get the GetEventObject; use the line below
+        #self.smear2d_accuracy = event.GetEventObject().GetValue()
+        self.smear2d_accuracy = self.smear_accuracy.GetValue()
         if self.pinhole_smearer.GetValue():
             self.onPinholeSmear(event=None)
-        
-        else:    self.onSmear(event=None)
-        if self.current_smearer !=None:
+        else:    
+            self.onSmear(event=None)
+            if self.current_smearer != None:
                 self.current_smearer.set_accuracy(accuracy = self.smear2d_accuracy)
+               
         event.Skip()
+        
     def _onMask(self, event):     
         """
@@ -1528 +1533 @@
             Create a custom pinhole smear object that will change the way residuals
             are compute when fitting
+            @ accuracy: given by strings'High','Med', 'Low' FOR 2d,  None for 1D
         """
 
@@ -1658 +1664 @@
                 else: data.dx[data.dx==0] = self.dx_max          
             self.current_smearer = smear_selection(data)
+            # 2D need to set accuracy
+            if self._is_2D(): 
+                self.current_smearer.set_accuracy(accuracy = self.smear2d_accuracy)
 
         if msg != None:
@@ -1666 +1675 @@
         ## set smearing value whether or not the data contain the smearing info
         self.manager.set_smearer(smearer=self.current_smearer, qmin= float(self.qmin_x),qmax= float(self.qmax_x))
- 
         return msg