Changeset ae69c690 in sasview

Timestamp:

Sep 15, 2017 2:48:18 PM (7 years ago)

Author:

krzywon

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6d62b7f

Parents:

da9b239

Message:

Ensure dxl and dxw and the same length as each other and as x.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (2 diffs)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -191 +191 @@
         self.output = []
 
-    def remove_empty_q_values(self, has_error_dx=False, has_error_dy=False):
+    def remove_empty_q_values(self, has_error_dx=False, has_error_dy=False,
+                              has_error_dxl=False, has_error_dxw=False):
         """
         Remove any point where Q == 0
@@ -198 +199 @@
         self.current_dataset.x = self.current_dataset.x[x != 0]
         self.current_dataset.y = self.current_dataset.y[x != 0]
-        self.current_dataset.dy = self.current_dataset.dy[x != 0] if \
-            has_error_dy else np.zeros(len(self.current_dataset.y))
-        self.current_dataset.dx = self.current_dataset.dx[x != 0] if \
-            has_error_dx else np.zeros(len(self.current_dataset.x))
+        if has_error_dy:
+            self.current_dataset.dy = self.current_dataset.dy[x != 0]
+        if has_error_dx:
+            self.current_dataset.dx = self.current_dataset.dx[x != 0]
+        if has_error_dxl:
+            self.current_dataset.dxl = self.current_dataset.dxl[x != 0]
+        if has_error_dxw:
+            self.current_dataset.dxw = self.current_dataset.dxw[x != 0]
 
     def reset_data_list(self, no_lines=0):

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -511 +511 @@
         """
         has_error_dx = self.current_dataset.dx is not None
+        has_error_dxl = self.current_dataset.dxl is not None
+        has_error_dxw = self.current_dataset.dxw is not None
         has_error_dy = self.current_dataset.dy is not None
         self.remove_empty_q_values(has_error_dx=has_error_dx,
+                                   has_error_dxl=has_error_dxl,
+                                   has_error_dxw=has_error_dxw,
                                    has_error_dy=has_error_dy)
         self.send_to_output()  # Combine datasets with DataInfo
@@ -678 +682 @@
             di_exists = True
         if dqw_exists and not dql_exists:
-            array_size = self.current_dataset.dxw.size - 1
-            self.current_dataset.dxl = np.append(self.current_dataset.dxl,
-                                                 np.zeros([array_size]))
+            array_size = self.current_dataset.dxw.size
+            self.current_dataset.dxl = np.zeros(array_size)
         elif dql_exists and not dqw_exists:
-            array_size = self.current_dataset.dxl.size - 1
-            self.current_dataset.dxw = np.append(self.current_dataset.dxw,
-                                                 np.zeros([array_size]))
+            array_size = self.current_dataset.dxl.size
+            self.current_dataset.dxw = np.zeros(array_size)
         elif not dql_exists and not dqw_exists and not dq_exists:
-            array_size = self.current_dataset.x.size - 1
+            array_size = self.current_dataset.x.size
             self.current_dataset.dx = np.append(self.current_dataset.dx,
                                                 np.zeros([array_size]))
         if not di_exists:
-            array_size = self.current_dataset.y.size - 1
+            array_size = self.current_dataset.y.size
             self.current_dataset.dy = np.append(self.current_dataset.dy,
                                                 np.zeros([array_size]))

test/sasdataloader/test/utest_abs_reader.py

@@ -333 +333 @@
         self.assertEqual(self.data.x[1], 0.03)
         self.assertAlmostEquals(self.data.y[1], 1001.0)
-        self.assertEqual(self.data.dx[0], 0.0)
         self.assertEqual(self.data.dxl[1], 0.005)
         self.assertEqual(self.data.dxw[1], 0.001)