Changeset f72333f in sasview for park_integration

Timestamp:

May 10, 2010 6:50:05 PM (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:

4fbc93e

Parents:

2d409fa

Message:

Plugged in 2D smear: traditional over-sampling method

File:

• park_integration/AbstractFitEngine.py (modified) (3 diffs)

park_integration/AbstractFitEngine.py

@@ -261 +261 @@
         self.qmin= None
         self.qmax= None
+        self.smearer = None
         self.set_data(sans_data2d )
+
         
     def set_data(self, sans_data2d, qmin=None, qmax=None ):
@@ -294 +296 @@
         self.index_model = (self.index_model) & (self.mask)
         self.index_model = (self.index_model) & (numpy.isfinite(self.data))
-           
+        
+    def set_smearer(self,smearer):  
+        """
+            Set smearer
+        """
+        if smearer == None:
+            return
+        self.smearer = smearer
+        self.smearer.set_index(self.index_model)
+        self.smearer.get_data()
+
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
@@ -317 +329 @@
         """
             @return the residuals
-        """        
+        """ 
+        if self.smearer != None:
+            fn.set_index(self.index_model)
+            # Get necessary data from self.data and set the data for smearing
+            fn.get_data()
+
+            gn = fn.get_value()  
+        else:
+            gn = fn([self.qx_data[self.index_model],self.qy_data[self.index_model]])
         # use only the data point within ROI range
-        res=(self.data[self.index_model] - fn([self.qx_data[self.index_model],
-                             self.qy_data[self.index_model]]))/self.res_err_data[self.index_model]
+        res=(self.data[self.index_model] - gn)/self.res_err_data[self.index_model]
         return res