Changeset dcb91cf in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Aug 21, 2017 10:16:13 AM (7 years ago)

Author:

lewis

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

Children:

7b15990

Parents:

44daa56

Message:

Make suggested changes

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -84 +84 @@
         :param msg: Error message
         """
-        if isinstance(self.current_datainfo, DataInfo):
+        if len(self.output) > 0:
+            self.output[-1].errors.append(msg)
+        elif isinstance(self.current_datainfo, DataInfo):
             self.current_datainfo.errors.append(msg)
         else:
@@ -120 +122 @@
                 if data.dlam is not None:
                     data.dlam = np.asarray([data.dlam[i] for i in ind]).astype(np.float64)
-                if len(data.x > 0):
+                if len(data.x) > 0:
                     data.xmin = np.min(data.x)
                     data.xmax = np.max(data.x)