Changeset 058f6c3 in sasview

Timestamp:

Jun 22, 2018 4:33:42 PM (6 years ago)

Author:

krzywon

Branches:

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

Children:

8f882fe

Parents:

3bab401

Message:

Fixes for failing ascii, cansasXML, red2D, and sesans reader unit tests.

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (3 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_cansas.py (modified) (3 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -308 +308 @@
         new_output = []
         for data in self.output:
+            if data.isSesans:
+                new_output.append(data)
+                continue
             file_x_unit = data._xunit
             data_conv_x = Converter(file_x_unit)
@@ -333 +336 @@
                     message.format(default_q_unit)
                     data.errors.append(message)
-                new_output.append(data)
             elif isinstance(data, Data2D):
                 try:
@@ -356 +358 @@
                     message.format(default_q_unit)
                     data.errors.append(message)
-                new_output.append(data)
             else:
                 # TODO: Throw error of some sort...
                 pass
+            new_output.append(data)
         self.output = new_output
 

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

@@ -812 +812 @@
             node.append(point)
             self.write_node(point, "Q", datainfo.x[i],
-                            {'unit': datainfo.x_unit})
+                            {'unit': datainfo._xunit})
             if len(datainfo.y) >= i:
                 self.write_node(point, "I", datainfo.y[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yunit})
             if datainfo.dy is not None and len(datainfo.dy) > i:
                 self.write_node(point, "Idev", datainfo.dy[i],
-                                {'unit': datainfo.y_unit})
+                                {'unit': datainfo._yunit})
             if datainfo.dx is not None and len(datainfo.dx) > i:
                 self.write_node(point, "Qdev", datainfo.dx[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
             if datainfo.dxw is not None and len(datainfo.dxw) > i:
                 self.write_node(point, "dQw", datainfo.dxw[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
             if datainfo.dxl is not None and len(datainfo.dxl) > i:
                 self.write_node(point, "dQl", datainfo.dxl[i],
-                                {'unit': datainfo.x_unit})
+                                {'unit': datainfo._xunit})
         if datainfo.isSesans:
             sesans_attrib = {'x_axis': datainfo._xaxis,

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

@@ -317 +317 @@
 
         # Units of axes
-        self.set_default_2d_units()
+        self.current_dataset = self.set_default_2d_units(self.current_dataset)
 
         # Store loading process information

test/sasdataloader/test/utest_cansas.py

@@ -91 +91 @@
         reader = XMLreader(self.xml_valid, self.schema_1_0)
         valid = reader.validate_xml()
-        if valid:
-            self.assertTrue(valid)
-        else:
-            self.assertFalse(valid)
+        self.assertTrue(valid)
 
     def _check_data(self, data):
@@ -193 +190 @@
     def test_save_cansas_v1_0(self):
         xmlreader = XMLreader(self.isis_1_0, self.schema_1_0)
-        valid = xmlreader.validate_xml()
-        self.assertTrue(valid)
+        self.assertTrue(xmlreader.validate_xml())
         reader_generic = Loader()
         dataloader = reader_generic.load(self.isis_1_0)
@@ -207 +203 @@
             return_data = reader2.read(self.write_1_0_filename)
             written_data = return_data[0]
-            XMLreader(self.write_1_0_filename, self.schema_1_0)
-            valid = xmlreader.validate_xml()
-            self.assertTrue(valid)
+            xmlreader = XMLreader(self.write_1_0_filename, self.schema_1_0)
+            self.assertTrue(xmlreader.validate_xml())
             self._check_data(written_data)
         if os.path.isfile(self.write_1_0_filename):