Changeset 8ba103f in sasview

Timestamp:

Apr 17, 2009 12:21:13 PM (16 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:

5ee2306

Parents:

c16557c

Message:

fixed circular average bug

File:

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

DataLoader/manipulations.py

@@ -167 +167 @@
                     err_y[i_q] += frac * frac * data2D.err_data[j][i] * data2D.err_data[j][i]
                 y_counts[i_q]  += frac
-
+                
         # Average the sums
         for i in range(nbins):
@@ -378 +378 @@
         det_dist    = data2D.detector[0].distance
         wavelength  = data2D.source.wavelength
-        center_x    = data2D.detector[0].beam_center.x/pixel_width_x
-        center_y    = data2D.detector[0].beam_center.y/pixel_width_y
+        center_x    = data2D.detector[0].beam_center.x/pixel_width_x+0.5
+        center_y    = data2D.detector[0].beam_center.y/pixel_width_y+0.5
         
         # Find out the maximum Q range
-        xwidth = numpy.size(data2D.data,1)*pixel_width_x
+        xwidth = (numpy.size(data2D.data,1))*pixel_width_x
         dx_max = xwidth - data2D.detector[0].beam_center.x
         if xwidth-dx_max>dx_max:
             dx_max = xwidth-dx_max
             
-        ywidth = numpy.size(data2D.data,0)*pixel_width_y
+        ywidth = (numpy.size(data2D.data,0))*pixel_width_y
         dy_max = ywidth - data2D.detector[0].beam_center.y
         if ywidth-dy_max>dy_max:
@@ -441 +441 @@
 
                 i_q = int(math.ceil((q_value-self.r_min)/self.bin_width)) - 1
-            
+                if q_value > qmax or q_value < self.r_min:
+                    continue
+                    
                 x[i_q]          = q_value
                 y[i_q]         += frac * data2D.data[j][i]
@@ -449 +451 @@
                     err_y[i_q] += frac * frac * data2D.err_data[j][i] * data2D.err_data[j][i]
                 y_counts[i_q]  += frac
-        
+                
         # Average the sums
+        nzero = 0
         for i in range(nbins):
             if y_counts[i]>0:
                 err_y[i] = math.sqrt(err_y[i])/y_counts[i]
                 y[i]     = y[i]/y_counts[i]
-        
-        return Data1D(x=x, y=y, dy=err_y)
+            else:
+                nzero += 1
+        ## Get rid of NULL points        
+        tx  = numpy.zeros(nbins-nzero)
+        ty  = numpy.zeros(nbins-nzero)
+        terr_y = numpy.zeros(nbins-nzero)
+        j=0
+        for i in range(nbins):
+            if err_y[i] != 0 :
+                tx[j]  = x[i]
+                ty[j]  = y[i]
+                terr_y[j] = err_y[i]
+                j+=1
+                
+        return Data1D(x=tx, y=ty, dy=terr_y)
     
 
@@ -480 +496 @@
         self.center_y = center_y
         # Number of angular bins
-        self.nbins_phi = nbins_phi
+        self.nbins_phi = nbins
         
     def __call__(self, data2D):
@@ -856 +872 @@
                     self.phi_max=self.phi_max+2*math.pi
                 
-                #In case of two ROI (symmetric major and minor regions)(for 'q2')
+                #In case of two ROI (symmetric major and minor wings)(for 'q2')
                 if run.lower()=='q2':
                     if ((self.phi_max>=0 and self.phi_max<math.pi)and (self.phi_min>=0 and self.phi_min<math.pi)):
@@ -904 +920 @@
             qmax=temp
         #Beam center is already corrected, but the calculation below assumed it was not.
-        # Thus Beam center shifted back to uncorrected value. ToDo: cleanup this codes.
+        # Thus Beam center shifted back to uncorrected value. ToDo: cleanup the mess.
         center_x=center_x+0.5 
         center_y=center_y+0.5