Changeset 2f569b3 in sasview

Timestamp:

Jan 25, 2010 1:12:40 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:

3c67340

Parents:

bb0b12c

Message:

fixed one bug from last commit

File:

• DataLoader/manipulations.py (modified) (6 diffs)

DataLoader/manipulations.py

@@ -472 +472 @@
                        
                         i_q = int(math.floor((q_value-self.r_min)/self.bin_width)) #- 1    
+
                         if q_value > qmax or q_value < self.r_min:
-                            continue
-                        #print q_value  
+                            continue  
                                                 
                         x[i_q]         += q_value
@@ -769 +769 @@
         x        = numpy.zeros(self.nbins)
         x_counts = numpy.zeros(self.nbins)
-        y_err    = numpy.zeros(self.nbins)
-        
-        
-        center_x=center_x
-        center_y=center_y    
+        y_err    = numpy.zeros(self.nbins)       
         
         # This If finds qmax within ROI defined by sector lines
@@ -782 +778 @@
             for j in range(numpy.size(data,0)):
                 #number of sub-bin: default = 2 (ie., 1 bin: no sub-bin)
-                nsubbins = 2
+                nsubbins = 1
 
                 #Sub divide one pixel into nine sub-pixels only for the pixels where the qmax or qmin line crosses over.
@@ -854 +850 @@
             for j in range(numpy.size(data,0)):
                 #number of sub-bin: default = 1 (ie., 1 bin: no sub-bin)
-                nsubbins = 2
+                nsubbins = 1
 
                 #if is_intercept(self.r_max, q_00, q_01, q_10, q_11) \
@@ -955 +951 @@
                         # Check which type of averaging we need
                         if run.lower()=='phi': 
-                            i_bin = int(math.ceil(self.nbins*(phi_value-self.phi_min)/(self.phi_max-self.phi_min))) - 1
+                            i_bin = int(math.floor(self.nbins*(phi_value-self.phi_min)/(self.phi_max-self.phi_min)))
                         else:
                             # If we don't need this pixel, skip the rest of the work
@@ -962 +958 @@
                             # the ring defined by q_min/q_max rather than the complete
                             # pixel 
-                            i_bin = int(math.ceil(self.nbins*(q_value-qmin)/(qmax-qmin))) - 1
-                                   
+                            i_bin = int(math.floor(self.nbins*(q_value-qmin)/(qmax-qmin)))
+                            
+                        #Make sure that no out of bound happens
+                        #This is needed because of a numerical error in math.ceil().
+                        if i_bin >= self.nbins:
+                            i_bin = self.nbins - 1
+                        elif i_bin < 0:
+                            i_bin = 0
+                                  
                         try:
                             y[i_bin] += frac * data[j][i]