Changeset 3d950a9 in sasview for src/sas/sascalc/dataloader

Timestamp:

Oct 28, 2017 5:07:52 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ab5ff35, 3ca67dcf

Parents:

5582b078 (diff), 1576693 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (10/28/17 05:07:52)

git-committer:

GitHub <noreply@…> (10/28/17 05:07:52)

Message:

Merge pull request #111 from SasView?/ticket-1013

Ticket 1013 - Reset FileReader? class state on every data load
Closes #1013

Location:

src/sas/sascalc/dataloader

Files:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -85 +85 @@
 
         # Return a list of parsed entries that data_loader can manage
-        return self.output
+        final_data = self.output
+        self.reset_state()
+        return final_data
+
+    def reset_state(self):
+        """
+        Resets the class state to a base case when loading a new data file so previous
+        data files do not appear a second time
+        """
+        self.current_datainfo = None
+        self.current_dataset = None
+        self.output = []
 
     def nextline(self):

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

@@ -68 +68 @@
         data files do not appear a second time
         """
-        self.current_datainfo = None
-        self.current_dataset = None
-        self.current_data1d = None
+        super(Reader, self).reset_state()
         self.data = []
         self.process = Process()
@@ -79 +77 @@
         self.names = []
         self.cansas_defaults = {}
-        self.output = []
         self.ns_list = None
         self.logging = []

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

@@ -65 +65 @@
         """
         # Reinitialize when loading a new data file to reset all class variables
-        self.reset_class_variables()
+        self.reset_state()
 
         filename = self.f_open.name
@@ -101 +101 @@
                             raise FileContentsException("Fewer than 5 data points found.")
 
-    def reset_class_variables(self):
+    def reset_state(self):
         """
         Create the reader object and define initial states for class variables
         """
-        self.current_datainfo = None
-        self.current_dataset = None
+        super(Reader, self).reset_state()
         self.data1d = []
         self.data2d = []
@@ -112 +111 @@
         self.errors = set()
         self.logging = []
-        self.output = []
         self.parent_class = u''
         self.detector = Detector()