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

Timestamp:

Aug 1, 2017 5:00:20 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:

713a047

Parents:

2f85af7

Message:

Ensure loaded data is always sorted correctly

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -55 +55 @@
                     self.get_file_contents()
 
-                    if isinstance(self.output[0], Data1D):
-                        self.sort_one_d_data()
-                    elif isinstance(self.output[0], Data2D):
-                        self.sort_two_d_data()
-
                 except DataReaderException as e:
                     self.handle_error_message(e.message)
@@ -75 +70 @@
             msg += "Please check your file path and try again."
             self.handle_error_message(msg)
+
+        if isinstance(self.output[0], Data1D):
+            self.sort_one_d_data()
+        elif isinstance(self.output[0], Data2D):
+            self.sort_two_d_data()
+
         # Return a list of parsed entries that data_loader can manage
         return self.output