Changeset f867cd9 in sasview for sansview/perspectives

Timestamp:

Dec 17, 2010 5:26:52 PM (14 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:

7342634

Parents:

0d8c8d7

Message:

fixed the edge problem in Q(pinhole) smearer

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (7 diffs)

sansview/perspectives/fitting/basepage.py

@@ -1085 +1085 @@
         if self.data !=None:
             from DataLoader.qsmearing import smear_selection
-            self.smearer= smear_selection(self.data)
+            self.smearer= smear_selection(self.data, self.model)
         self.enable2D= state.enable2D
         self.engine_type = state.engine_type

sansview/perspectives/fitting/fitpage.py

@@ -56 +56 @@
             self.structurebox.Disable()
         else:
-            self.smearer = smear_selection(self.data)
+            self.smearer = smear_selection(self.data, self.model)
             if self.smearer ==None:
                 self.enable_smearer.Disable()
@@ -340 +340 @@
         
         # get smear_selection
-        self.current_smearer= smear_selection( self.data )
+        self.current_smearer= smear_selection( self.data, self.model )
 
         # Show only the relevant smear messages, etc
@@ -874 +874 @@
       
         if self.model != None:
+            temp_smear= None
+            self.onSmear(None)
+            self.smearer.set_model(self.model)
             try:
-                temp_smear= None
+                
                 if self.enable_smearer.GetValue():
                     temp_smear= self.smearer
@@ -1363 +1366 @@
             self.structurebox.Disable()
         else:
-            self.smearer = smear_selection( self.data )
+            self.smearer = smear_selection(self.data, self.model)
             self.disable_smearer.SetValue(True)
             if self.smearer == None:
@@ -1761 +1764 @@
                 if self._is_2D(): data.dqy_data[data.dqy_data==0] = self.dx_max
                 else: data.dx[data.dx==0] = self.dx_max          
-            self.current_smearer = smear_selection(data)
+            self.current_smearer = smear_selection(data, self.model)
             # 2D need to set accuracy
             if self._is_2D(): 
@@ -1940 +1943 @@
                 self.smear_slit_width.SetBackgroundColour(wx.WHITE)
               
-        self.current_smearer = smear_selection(data)
+        self.current_smearer = smear_selection(data, self.model)
         #temp_smearer = self.current_smearer
         ## set smearing value whether or not the data contain the smearing info
@@ -2001 +2004 @@
         data = copy.deepcopy(self.data)
         # make sure once more if it is smearer
-        self.current_smearer = smear_selection(data)
+        self.current_smearer = smear_selection(data, self.model)
         
         if self.enable_smearer.GetValue():