Changeset 282bc3f in sasview

Timestamp:

Nov 1, 2018 4:35:01 PM (6 years ago)

Author:

Jeff Krzywon <jkrzywon@…>

Branches:

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

Children:

9b08354

Parents:

dfcdbf8

Message:

Change errors in NXcanSAS reader to a list to match the rest of the readers and update unit test.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (2 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (4 diffs)
• test/sasdataloader/test/utest_generic_file_reader_class.py (modified) (1 diff)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -151 +151 @@
         """
         if len(self.output) > 0:
-            self.output[-1].errors.add(msg)
+            self.output[-1].errors.append(msg)
         elif isinstance(self.current_datainfo, DataInfo):
-            self.current_datainfo.errors.add(msg)
+            self.output[-1].errors.append(msg)
         else:
             logger.warning(msg)
@@ -360 +360 @@
                 message = "Unable to convert Q units from {0} to 1/A."
                 message.format(default_q_unit)
-                data.errors.add(message)
+                data.errors.append(message)
             new_output.append(data)
         self.output = new_output

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

@@ -102 +102 @@
         self.data2d = []
         self.raw_data = None
-        self.errors = set()
+        self.errors = []
         self.logging = []
         self.q_names = []
@@ -231 +231 @@
             else:
                 # I don't know if this reachable code
-                self.errors.add("ShouldNeverHappenException")
+                self.errors.append("ShouldNeverHappenException")
 
     def process_1d_data_object(self, data_set, key, unit):
@@ -528 +528 @@
         # Append errors to dataset and reset class errors
         self.current_datainfo.errors = self.errors
-        self.errors.clear()
+        self.errors = []
 
         # Combine all plottables with datainfo and append each to output
@@ -538 +538 @@
                     zeros[i] = dataset.mask[i]
             except:
-                self.errors.add(sys.exc_value)
+                self.errors.append(sys.exc_value)
             dataset.mask = zeros
             # Calculate the actual Q matrix

test/sasdataloader/test/utest_generic_file_reader_class.py

@@ -71 +71 @@
         # Be sure the deprecation warning is passed with the file
         self.assertEqual(len(asc_load[0].errors), 1)
-        self.assertEqual(len(nxs_load[0].errors), 1)
+        self.assertEqual(len(nxs_load[0].errors), 0)
 
     def check_unknown_extension(self, data):