Changeset 43e685d in sasview for sansview

Timestamp:

Mar 17, 2010 3:26: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:

90e5ca1

Parents:

c6f95bb

Message:

Made sure that if I ==None the I point is not taken account into the calculation.

File:

• sansview/perspectives/fitting/model_thread.py (modified) (4 diffs)

sansview/perspectives/fitting/model_thread.py

@@ -48 +48 @@
         
         if self.data != None:
+            self.I_data = self.data.data
             self.qx_data = self.data.qx_data
             self.qy_data = self.data.qy_data
@@ -68 +69 @@
             self.qy_data = new_ybin
             self.qx_data = new_xbin
+            # fake data
+            self.I_data = numpy.ones(len(self.qx_data))
            
             self.mask = numpy.ones(len(self.qx_data),dtype=bool)
@@ -74 +77 @@
         radius= numpy.sqrt( self.qx_data*self.qx_data + self.qy_data*self.qy_data )
         index_data= (self.qmin<= radius)&(self.mask)
-        
+
         # For theory, qmax is based on 1d qmax 
         # so that must be mulitified by sqrt(2) to get actual max for 2d
         index_model = ((self.qmin <= radius)&(radius<= self.qmax))
         self.mask = (index_model)&(self.mask)
-        
+        self.mask = (self.mask)&(numpy.isfinite(self.I_data))
         if self.data ==None:
             # Only qmin value will be consider for the detector
@@ -87 +90 @@
 
         output = numpy.zeros(len(self.mask))
+        
+        # output default is None
+        # This method is to distinguish between masked point and data point = 0.
+        output = output/output
+        # set value for self.mask==True, else still None to Plottools
         output[self.mask] = value