Changeset 36bc34e in sasview

Timestamp:

Apr 14, 2010 12:47:55 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:

19403da

Parents:

6318298

Message:

fixed 2D fit problem

File:

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

park_integration/AbstractFitEngine.py

@@ -283 +283 @@
         ## new error image for fitting purpose
         if self.err_data== None or self.err_data ==[]:
-            self.res_err_data= numpy.zeros(len(self.data))
+            self.res_err_data= numpy.ones(len(self.data))
         else:
             self.res_err_data = copy.deepcopy(self.err_data)
-        self.res_err_data[self.res_err_data==0]=numpy.sqrt(self.data[self.res_err_data==0])
+        self.res_err_data[self.res_err_data==0]=1
         
         self.radius= numpy.sqrt(self.qx_data**2 + self.qy_data**2)
@@ -292 +292 @@
         # 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)
+        self.index_model = (self.index_model) & (self.mask)
+        self.index_model = (self.index_model) & (numpy.isfinite(self.data))
            
     def setFitRange(self,qmin=None,qmax=None):
@@ -304 +305 @@
         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)
-        
+        self.index_model = (self.index_model) &(self.mask)
+        self.index_model = (self.index_model) & (numpy.isfinite(self.data))
         
     def getFitRange(self):
@@ -318 +319 @@
         """        
         # 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]
+        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]
         return res