Changeset 51a71a3 in sasview for sansview/perspectives/fitting/model_thread.py

Timestamp:

Apr 14, 2010 12:29:30 PM (14 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:

6318298

Parents:

c5874f2

Message:

added masking feature for 2D

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -81 +81 @@
         # 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))
+        index_model = (index_model)&(self.mask)
+        index_model = (index_model)&(numpy.isfinite(self.I_data))
         if self.data ==None:
             # Only qmin value will be consider for the detector
-            self.mask = index_data  
+            index_model = index_data  
              
-        value = self.model.evalDistribution([self.qx_data[self.mask],self.qy_data[self.mask]] )
+        value = self.model.evalDistribution([self.qx_data[index_model],self.qy_data[index_model]] )
 
-        output = numpy.zeros(len(self.mask))
+        output = numpy.zeros(len(self.qx_data))
         
         # output default is None
@@ -95 +95 @@
         output = output/output
         # set value for self.mask==True, else still None to Plottools
-        output[self.mask] = value 
-
+        output[index_model] = value 
         elapsed = time.time()-self.starttime
         self.complete( image = output,