Changeset 64017a8 in sasview for theoryview/perspectives/theory

Timestamp:

Mar 30, 2010 7:36:49 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:

6e93a02

Parents:

9bd6c13c

Message:

fixed the bug: Errors on theory panel when changing # of points w/ 2D plot

Location:

theoryview/perspectives/theory

Files:

• model_thread.py (modified) (4 diffs)
• theory.py (modified) (1 diff)

theoryview/perspectives/theory/model_thread.py

@@ -47 +47 @@
         
         if self.data != None:
+            self.I_data = self.data.data
             self.qx_data = self.data.qx_data
             self.qy_data = self.data.qy_data
@@ -67 +68 @@
             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)
             
@@ -78 +81 @@
         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
@@ -86 +89 @@
 
         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 
 

theoryview/perspectives/theory/theory.py

@@ -367 +367 @@
         
         # max and min taking account of the bin sizes
-        theory.xmin= xmin - xstep/2
-        theory.xmax= xmax + xstep/2
-        theory.ymin= ymin - ystep/2
-        theory.ymax= ymax + ystep/2
+        theory.xmin= xmin 
+        theory.xmax= xmax 
+        theory.ymin= ymin
+        theory.ymax= ymax 
         theory.group_id ="Model"
         theory.id ="Model"