Changeset c54c965 in sasview for src/sas

Timestamp:

Sep 14, 2017 10:43:20 AM (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:

4660990

Parents:

b1f20d1

Message:

Modify base file reader class and cansas reader to properly load save states.

Location:

src/sas/sascalc/dataloader

Files:

• file_reader_base_class.py (modified) (1 diff)
• readers/cansas_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -204 +204 @@
         x = np.zeros(no_lines)
         y = np.zeros(no_lines)
-        dy = np.zeros(no_lines)
-        dx = np.zeros(no_lines)
-        self.current_dataset = plottable_1D(x, y, dx, dy)
+        self.current_dataset = plottable_1D(x, y)
 
     @staticmethod

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

@@ -130 +130 @@
                 self.current_datainfo.meta_data[PREPROCESS] = self.processing_instructions
                 self._parse_entry(entry)
-                has_error_dx = self.current_dataset.dx 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_dy=has_error_dy)
-                self.send_to_output() # Combine datasets with DataInfo
-                self.current_datainfo = DataInfo() # Reset DataInfo
+                self.data_cleanup()
         except FileContentsException as fc_exc:
             # File doesn't meet schema - try loading with a less strict schema
@@ -507 +502 @@
             for error in self.errors:
                 self.current_datainfo.errors.add(error)
-            self.errors.clear()
-            self.send_to_output()
+            self.data_cleanup()
+            self.sort_one_d_data()
+            self.sort_two_d_data()
+            self.reset_data_list()
             empty = None
             return self.output[0], empty
+
+    def data_cleanup(self):
+        """
+        Clean up the data sets and refresh everything
+        :return: None
+        """
+        has_error_dx = self.current_dataset.dx 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_dy=has_error_dy)
+        self.send_to_output()  # Combine datasets with DataInfo
+        self.current_datainfo = DataInfo()  # Reset DataInfo
 
     def _is_call_local(self):