Changeset 9e8c150 in sasview

Timestamp:

May 17, 2010 5:21:22 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:

61cada5

Parents:

4708f3a

Message:

For 2D,instead of setting err = 1 when error =0 , removed the points from fitting

Files:

• park_integration/AbstractFitEngine.py (modified) (2 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -288 +288 @@
         else:
             self.res_err_data = copy.deepcopy(self.err_data)
-        self.res_err_data[self.res_err_data==0]=1
+        #self.res_err_data[self.res_err_data==0]=1
         
         self.radius= numpy.sqrt(self.qx_data**2 + self.qy_data**2)
@@ -319 +319 @@
         self.index_model = (self.index_model) &(self.mask)
         self.index_model = (self.index_model) & (numpy.isfinite(self.data))
-        
+        self.index_model = (self.index_model) & (self.res_err_data!=0)
     def getFitRange(self):
         """

sansview/perspectives/fitting/fitting.py

@@ -1324 +1324 @@
         if data.__class__.__name__ =="Data2D":
             if index == None: index = numpy.ones(len(data.data),ntype=bool)
+            index = index & (data.err_data !=0 )   # get rid of zero error points
             fn = data.data[index] 
             gn = self.theory_data.data[index]