Changeset f02a0c6 in sasview for src/sas/sascalc/dataloader

Timestamp:

Jan 3, 2018 9:43:28 AM (7 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

db5196d

Parents:

e3133dc

Message:

Extend nan removal to 2D data.

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (5 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -180 +180 @@
                 if data.dlam is not None:
                     data.dlam = self._reorder_1d_array(data.dlam, ind)
-                data = self._remove_nans_in_1d_data(data)
+                data = self._remove_nans_in_data(data)
                 if len(data.x) > 0:
                     data.xmin = np.min(data.x)
@@ -199 +199 @@
 
     @staticmethod
-    def _remove_nans_in_1d_data(data):
+    def _remove_nans_in_data(data):
         """
         Remove data points where nan is loaded
@@ -205 +205 @@
         :return: data with mask=0 for any value of nan in data .x, .y, .dx, .dy
         """
-        mask = np.ones(len(data.x))
-        data_list = [data.x, data.y, data.dx, data.dy, data.dxl, data.dxw]
+        if isinstance(data, Data1D):
+            mask = np.ones(data.x.shape)
+            data_list = [data.x, data.y, data.dx, data.dy, data.dxl, data.dxw]
+        elif isinstance(data, Data2D):
+            mask = np.ones(data.data.shape)
+            data_list = [data.data, data.qx_data, data.qy_data, data.q_data,
+                         data.err_data, data.dqx_data, data.dqy_data, data.mask]
+        else:
+            mask = np.ones(0)
+            data_list = []
         for array in data_list:
             if array is not None:
@@ -214 +222 @@
         nans = np.where(mask == 0)[0]
         if len(nans) > 0:
-            data.x = np.delete(data.x, nans)
-            data.y = np.delete(data.y, nans)
-            if data.dx is not None:
-                data.dx = np.delete(data.dx, nans)
-            if data.dxl is not None:
-                data.dxl = np.delete(data.dxl, nans)
-            if data.dxw is not None:
-                data.dxw = np.delete(data.dxw, nans)
-            if data.dy is not None:
-                data.dy = np.delete(data.dy, nans)
+            if isinstance(data, Data1D):
+                data.x = np.delete(data.x, nans)
+                data.y = np.delete(data.y, nans)
+                if data.dx is not None:
+                    data.dx = np.delete(data.dx, nans)
+                if data.dxl is not None:
+                    data.dxl = np.delete(data.dxl, nans)
+                if data.dxw is not None:
+                    data.dxw = np.delete(data.dxw, nans)
+                if data.dy is not None:
+                    data.dy = np.delete(data.dy, nans)
+            elif isinstance(data, Data2D):
+                data.data = np.delete(data.data, nans)
+                data.qx_data = np.delete(data.qx_data, nans)
+                data.qy_data = np.delete(data.qy_data, nans)
+                if data.q_data is not None:
+                    data.q_data = np.delete(data.q_data, nans)
+                if data.err_data is not None:
+                    data.err_data = np.delete(data.err_data, nans)
+                if data.dqx_data is not None:
+                    data.dqx_data = np.delete(data.dqx_data, nans)
+                if data.dqy_data is not None:
+                    data.dqy_data = np.delete(data.dqy_data, nans)
+                if data.mask is not None:
+                    data.mask = np.delete(data.mask, nans)
         return data
 
@@ -255 +278 @@
                     dataset.x_bins = dataset.qx_data[:int(n_cols)]
                 dataset.data = dataset.data.flatten()
+                dataset = self._remove_nans_in_data(dataset)
                 if len(dataset.data) > 0:
                     dataset.xmin = np.min(dataset.qx_data)