Changeset f265927 in sasview

Timestamp:

Apr 14, 2010 12:10:48 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:

c5874f2

Parents:

1f811dd

Message:

mask feature added

File:

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

DataLoader/manipulations.py

@@ -85 +85 @@
     q_data = numpy.sqrt(qx_data*qx_data+qy_data*qy_data)
     if data2d.err_data == None or numpy.any(data2d.err_data<=0): 
-        new_err_data = numpy.sqrt(numpy.fabs(new_data))
+        new_err_data = numpy.sqrt(numpy.abs(new_data))
     else:
         new_err_data = data2d.err_data.flatten()
@@ -827 +827 @@
         return self._agv(data2D, 'q2')
 
+class Ringcut(object):
+    """
+        Defines a ring on a 2D data set.
+        The ring is defined by r_min, r_max, and
+        the position of the center of the ring.
+        
+        The data returned is the region inside the ring
+        
+        Phi_min and phi_max should be defined between 0 and 2*pi 
+        in anti-clockwise starting from the x- axis on the left-hand side
+    """
+    def __init__(self, r_min=0, r_max=0, center_x=0, center_y=0 ):
+        # Minimum radius
+        self.r_min = r_min
+        # Maximum radius
+        self.r_max = r_max
+        # Center of the ring in x
+        self.center_x = center_x
+        # Center of the ring in y
+        self.center_y = center_y
+
+        
+    def __call__(self, data2D):
+        """
+            Apply the ring to the data set.
+            Returns the angular distribution for a given q range
+            
+            @param data2D: Data2D object
+            @return: index array in the range
+        """
+        if data2D.__class__.__name__ not in ["Data2D", "plottable_2D"]:
+            raise RuntimeError, "Ring cut only take plottable_2D objects"
+
+        # Get data
+        qx_data = data2D.qx_data 
+        qy_data = data2D.qy_data
+        mask = data2D.mask
+        q_data = numpy.sqrt(qx_data*qx_data+qy_data*qy_data)
+        #q_data_max = numpy.max(q_data)
+
+        # check whether or not the data point is inside ROI
+        out = (self.r_min <= q_data) & (self.r_max >= q_data)
+
+        return (out)
+        
+
 class Boxcut(object):
     """
@@ -865 +911 @@
         qx_data = data2D.qx_data
         qy_data = data2D.qy_data
+        mask = data2D.mask
         
         # check whether or not the data point is inside ROI
-        outx = [self.x_min <= qx_data & self.x_max > qx_data]
-        outy = [self.y_min <= qy_data & self.y_max > qy_data]
+        outx = (self.x_min <= qx_data) & (self.x_max > qx_data)
+        outy = (self.y_min <= qy_data) & (self.y_max > qy_data)
 
         return (outx & outy)
@@ -887 +934 @@
     def __call__(self, data2D):
         """
-           Perform sector averaging.
+           Find a rectangular 2D region of interest.
             
            @param data2D: Data2D object
@@ -913 +960 @@
 
         # get phi from data
-        phi_data = numpy.arctan2(qy_data, qy_data)
+        phi_data = numpy.arctan2(qy_data, qx_data)
+        
+        # Get the min and max into the region: -pi <= phi < Pi
+        phi_min_major = flip_phi(self.phi_min+Pi)-Pi
+        phi_max_major = flip_phi(self.phi_max+Pi)-Pi  
         # check for major sector
-        if self.phi_min > self.phi_max:
-            out_major = (self.phi_min <= phi_data) or (self.phi_max > phi_data)
+        if phi_min_major > phi_max_major:
+            out_major = (phi_min_major <= phi_data) + (phi_max_major > phi_data)
         else:
-            out_major = (self.phi_min <= phi_data) & (self.phi_max > phi_data)
-            
+            out_major = (phi_min_major <= phi_data) & (phi_max_major > phi_data)
+          
         # minor sector
         # Get the min and max into the region: -pi <= phi < Pi
@@ -927 +978 @@
         # check for minor sector
         if phi_min_minor > phi_max_minor:
-            out_minor= (phi_min_minor <= phi_data) or (phi_max_minor> phi_data) 
+            out_minor= (phi_min_minor <= phi_data) + (phi_max_minor>= phi_data) 
         else:
-            out_minor = (phi_min_minor <= phi_data) & (phi_max_minor > phi_data) 
+            out_minor = (phi_min_minor <= phi_data) & (phi_max_minor >= phi_data) 
         out = out_major + out_minor
-
+        
         return out