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

Timestamp:

Sep 14, 2017 2:25:41 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:

e56f335

Parents:

c54c965

Message:

Remove empty dx and dy arrays.

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -115 +115 @@
                 data.y = np.asarray([data.y[i] for i in ind]).astype(np.float64)
                 if data.dx is not None:
+                    if len(data.dx) == 0:
+                        data.dx = None
+                        continue
                     data.dx = np.asarray([data.dx[i] for i in ind]).astype(np.float64)
                 if data.dxl is not None:
@@ -121 +124 @@
                     data.dxw = np.asarray([data.dxw[i] for i in ind]).astype(np.float64)
                 if data.dy is not None:
+                    if len(data.dy) == 0:
+                        data.dy = None
+                        continue
                     data.dy = np.asarray([data.dy[i] for i in ind]).astype(np.float64)
                 if data.lam is not None:
@@ -204 +210 @@
         x = np.zeros(no_lines)
         y = np.zeros(no_lines)
-        self.current_dataset = plottable_1D(x, y)
+        dx = np.zeros(no_lines)
+        dy = np.zeros(no_lines)
+        self.current_dataset = plottable_1D(x, y, dx, dy)
 
     @staticmethod