Changeset 8f12385 in sasview

Timestamp:

Mar 29, 2011 4:57:49 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:

ddeeb02

Parents:

21969a4a

Message:

included mask in masked circular average in 2D

File:

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

DataLoader/manipulations.py

@@ -418 +418 @@
         self.bin_width = bin_width
 
-    def __call__(self, data2D):
+    def __call__(self, data2D, ismask=False):
         """
         Perform circular averaging on the data
@@ -431 +431 @@
         qx_data = data2D.qx_data[numpy.isfinite(data2D.data)]
         err_data = data2D.err_data[numpy.isfinite(data2D.data)]
+        mask_data = data2D.mask[numpy.isfinite(data2D.data)]
         
         dq_data = None
@@ -489 +490 @@
         y_counts = numpy.zeros(nbins)
 
-        for npt in range(len(data)):          
+        for npt in range(len(data)):   
+            
+            if ismask and not mask_data[npt]:
+                continue   
+            
             frac = 0
             
@@ -540 +545 @@
         x    = x / y_counts
         idx = (numpy.isfinite(y)) & (numpy.isfinite(x)) 
+        
         if err_x != None:
             d_x = err_x[idx] / y_counts[idx]