Changeset c2a8523 in sasview

Timestamp:

Jan 15, 2009 2:44:25 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:

4853c04

Parents:

3bae6c8

Message:

Calculate correct number of bins for 1d plot after 2D sector averaging

File:

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

DataLoader/manipulations.py

@@ -633 +633 @@
     return None
     
-
+#This class can be removed.
 class _Sectorold:
     """
@@ -804 +804 @@
         y_err    = numpy.zeros(self.nbins)
         
+        # This If finds qmax within ROI defined by sector lines
+        if run.lower()=='q2'or run.lower()=='q':            
+            tempq=0 #to find qmax within ROI
+            for i in range(numpy.size(data,1)):  
+                dx = pixel_width_x*(i+0.5 - center_x)                  
+                for j in range(numpy.size(data,0)):
+                    
+                    dy = pixel_width_y*(j+0.5 - center_y)
+                    q_value = get_q(dx, dy, det_dist, wavelength)
+                    # Compute phi and check whether it's within the limits
+                    phi_value=math.atan2(dy,dx)+math.pi
+                    if self.phi_max>2*math.pi:
+                        self.phi_max=self.phi_max-2*math.pi
+                    if self.phi_min<0:
+                        self.phi_max=self.phi_max+2*math.pi
+                
+                    #In case of two ROI (symmetric major and minor regions)(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)):
+                            temp_max=self.phi_max+math.pi
+                            temp_min=self.phi_min+math.pi
+                        else:
+                            temp_max=self.phi_max
+                            temp_min=self.phi_min
+                       
+                        if ((temp_max>=math.pi and temp_max<2*math.pi)and (temp_min>=math.pi and temp_min<2*math.pi)):
+                            if (phi_value<temp_min  or phi_value>temp_max):
+                                if (phi_value<temp_min-math.pi  or phi_value>temp_max-math.pi):
+                                    continue
+                        if (self.phi_max<self.phi_min):
+                            tmp_max=self.phi_max+math.pi
+                            tmp_min=self.phi_min-math.pi
+                        else:
+                            tmp_max=self.phi_max
+                            tmp_min=self.phi_min
+                        if (tmp_min<math.pi and tmp_max>math.pi):
+                            if((phi_value>tmp_max and phi_value<tmp_min+math.pi)or (phi_value>tmp_max-math.pi and phi_value<tmp_min)):
+                                continue
+                    #In case of one ROI (major only)(i.e.,for 'q' and 'phi')
+                    else: 
+                        if (self.phi_max>=self.phi_min):
+                            if (phi_value<self.phi_min  or phi_value>self.phi_max):
+                                continue
+                        else:
+                            if (phi_value<self.phi_min and phi_value>self.phi_max):
+                                continue                      
+                    if tempq<q_value:
+                        tempq=q_value
+            qmax=tempq                                            
+        print "qmax=",qmax       
+                
         for i in range(numpy.size(data,1)):
             dx = pixel_width_x*(i+0.5 - center_x)
@@ -827 +878 @@
                 q_11 = get_q(maxx, maxy, det_dist, wavelength)
                 
-                # Look for intercept between each side of the pixel
-                # and the constant-q ring for qmax
-                frac_max = get_pixel_fraction(qmax, q_00, q_01, q_10, q_11)
-                
-                # Look for intercept between each side of the pixel
-                # and the constant-q ring for qmin
-                frac_min = get_pixel_fraction(qmin, q_00, q_01, q_10, q_11)
-                
-                # We are interested in the region between qmin and qmax
-                # therefore the fraction of the surface of the pixel
-                # that we will use to calculate the number of counts to 
-                # include is given by:
-                
-                frac = frac_max - frac_min
-
                 # Compute phi and check whether it's within the limits
                 phi_value=math.atan2(dy,dx)+math.pi
@@ -848 +884 @@
                 if self.phi_min<0:
                     self.phi_max=self.phi_max+2*math.pi
-
-                #In case of two ROI (symetric major and minor regions)(for 'q2')
+                    
+                # Look for intercept between each side of the pixel
+                # and the constant-q ring for qmax
+                frac_max = get_pixel_fraction(qmax, q_00, q_01, q_10, q_11)
+                
+                # Look for intercept between each side of the pixel
+                # and the constant-q ring for qmin
+                frac_min = get_pixel_fraction(qmin, q_00, q_01, q_10, q_11)
+                
+                # We are interested in the region between qmin and qmax
+                # therefore the fraction of the surface of the pixel
+                # that we will use to calculate the number of counts to 
+                # include is given by:
+                
+                frac = frac_max - frac_min
+
+                #In case of two ROI (symmetric major and minor regions)(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)):
@@ -871 +922 @@
                         if((phi_value>tmp_max and phi_value<tmp_min+math.pi)or (phi_value>tmp_max-math.pi and phi_value<tmp_min)):
                             continue
-                #In case of one ROI (major only)(for 'q' and 'phi')
+                #In case of one ROI (major only)(i.e.,for 'q' and 'phi')
                 else: 
                     if (self.phi_max>=self.phi_min):
@@ -889 +940 @@
                     # the ring defined by q_min/q_max rather than the complete
                     # pixel 
-                    if q_value<self.r_min or q_value>self.r_max:
+                    if q_value<qmin or q_value>qmax:
                         continue
-                    i_bin = int(math.ceil(self.nbins*(q_value-self.r_min)/(self.r_max-self.r_min))) - 1
-            
+                    i_bin = int(math.ceil(self.nbins*(q_value-qmin)/(qmax-qmin))) - 1
+                           
                 try:
                     y[i_bin] += frac * data[j][i]
@@ -913 +964 @@
                 x[i] = (self.phi_max-self.phi_min)/self.nbins*(1.0*i + 0.5)+self.phi_min
             else:
-                x[i] = (self.r_max-self.r_min)/self.nbins*(1.0*i + 0.5)+self.r_min
+                x[i] = (qmax-qmin)/self.nbins*(1.0*i + 0.5)+qmin
             
         return Data1D(x=x, y=y, dy=y_err)
@@ -977 +1028 @@
 
     
-    r = SectorQ(r_min=.005, r_max=.01, phi_min=0.0, phi_max=math.pi/2.0)
+    r = SectorQ(r_min=.000001, r_max=.01, phi_min=0.0, phi_max=math.pi/2.0)
     o = r(d)