Changeset 83195f7 in sasview

Timestamp:

Mar 12, 2010 12:58:44 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:

7e99f5c

Parents:

20b6760

Message:

updated according to the changes in 2d inputs

File:

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

park_integration/AbstractFitEngine.py

@@ -257 +257 @@
             or with vectors.
         """
-        self.x_bins_array = []
-        self.y_bins_array = []
         self.res_err_image=[]
         self.index_model=[]
@@ -265 +263 @@
         self.set_data(sans_data2d )
         
-        
     def set_data(self, sans_data2d, qmin=None, qmax=None ):
         """
-            Determine the correct x_bin and y_bin to fit
-        """
-        self.x_bins_array= numpy.reshape(sans_data2d.x_bins,
-                                         [1,len(sans_data2d.x_bins)])
-        self.y_bins_array = numpy.reshape(sans_data2d.y_bins,
-                                          [len(sans_data2d.y_bins),1])
-        
-        x_max = max(sans_data2d.xmin, sans_data2d.xmax)
-        y_max = max(sans_data2d.ymin, sans_data2d.ymax)
+            Determine the correct qx_data and qy_data within range to fit
+        """
+        self.data     = sans_data2d.data
+        self.err_data = sans_data2d.err_data
+        self.qx_data = sans_data2d.qx_data
+        self.qy_data = sans_data2d.qy_data
+        self.mask       = sans_data2d.mask
+
+        x_max = max(math.fabs(sans_data2d.xmin), math.fabs(sans_data2d.xmax))
+        y_max = max(math.fabs(sans_data2d.ymin), math.fabs(sans_data2d.ymax))
         
         ## fitting range
@@ -285 +283 @@
         ## new error image for fitting purpose
         if self.err_data== None or self.err_data ==[]:
-            self.res_err_data= numpy.zeros(len(self.y_bins),len(self.x_bins))
+            self.res_err_data= numpy.zeros(len(self.data))
         else:
             self.res_err_data = copy.deepcopy(self.err_data)
-        self.res_err_data[self.res_err_data==0]=1
-        
-        self.radius= numpy.sqrt(self.x_bins_array**2 + self.y_bins_array**2)
-        self.index_model = (self.qmin <= self.radius)&(self.radius<= self.qmax)
-       
-       
+        self.res_err_data[self.res_err_data==0]=numpy.sqrt(self.data[self.res_err_data==0])
+        
+        self.radius= numpy.sqrt(self.qx_data**2 + self.qy_data**2)
+        
+        # Note: mask = True: for MASK while mask = False for NOT to mask
+        self.index_model = ((self.qmin <= self.radius)&(self.radius<= self.qmax))
+        self.mask = (self.index_model) & (self.mask)
+           
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
@@ -301 +301 @@
             self.qmin = qmin            
         if qmax!=None:
-            self.qmax= qmax
-            
-        self.radius= numpy.sqrt(self.x_bins_array**2 + self.y_bins_array**2)
-        self.index_model = (self.qmin <= self.radius)&(self.radius<= self.qmax)
+            self.qmax= qmax        
+        self.radius= numpy.sqrt(self.qx_data**2 + self.qy_data**2)
+        self.index_model = ((self.qmin <= self.radius)&(self.radius<= self.qmax))
+        self.mask = (self.index_model) &(self.mask)
+        
         
     def getFitRange(self):
@@ -313 +314 @@
      
     def residuals(self, fn): 
-        
-        res=self.index_model*(self.data - fn([self.x_bins_array,
-                             self.y_bins_array]))/self.res_err_data
-        return res.ravel() 
+        """
+            @return the residuals
+        """        
+        # use only the data point within ROI range
+        res=(self.data[self.mask] - fn([self.qx_data[self.mask],
+                             self.qy_data[self.mask]]))/self.res_err_data[self.mask]
+        return res