Changeset 248ff73 in sasview

Timestamp:

Aug 1, 2017 9:36:38 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:

5a8cdbb

Parents:

b2c28a5

Message:

Ensure unit tests pass

utest_averaging still fails as it relies on loading in an Igor 2D file,
which is no longer possible

Files:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (3 diffs)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (3 diffs)
• test/fileconverter/test/utest_nxcansas_writer.py (modified) (5 diffs)
• test/sasdataloader/test/utest_red2d_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -66 +66 @@
                     if not self.f_open.closed:
                         self.f_open.close()
+                    if len(self.output) > 0:
+                        # Sort the data that's been loaded
+                        self.sort_one_d_data()
+                        self.sort_two_d_data()
         else:
             msg = "Unable to find file at: {}\n".format(filepath)
             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
@@ -122 +121 @@
                 if data.dlam is not None:
                     data.dlam = np.asarray([data.dlam[i] for i in ind]).astype(np.float64)
-                data.xmin = np.min(data.x)
-                data.xmax = np.max(data.x)
-                data.ymin = np.min(data.y)
-                data.ymax = np.max(data.y)
-            final_list.append(data)
-        self.output = final_list
-        self.remove_empty_q_values()
+                if len(data.x > 0):
+                    data.xmin = np.min(data.x)
+                    data.xmax = np.max(data.x)
+                    data.ymin = np.min(data.y)
+                    data.ymax = np.max(data.y)
+        #     final_list.append(data)
+        # self.output = final_list
 
     def sort_two_d_data(self):
@@ -157 +156 @@
                     dataset.x_bins = dataset.qx_data[:int(n_cols)]
                 dataset.data = dataset.data.flatten()
-                final_list.append(dataset)
-        self.output = final_list
+        #         final_list.append(dataset)
+        # self.output = final_list
 
     def set_all_to_none(self):

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

@@ -37 +37 @@
     Read the specified settings file to associate
     default readers to file extension.
-    
+
     :param loader: Loader object
     :param settings: path to the json settings file [string]

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

@@ -130 +130 @@
                 self.current_datainfo.meta_data[PREPROCESS] = self.processing_instructions
                 self._parse_entry(entry)
-                self.send_to_output() # Combune datasets with DataInfo
+                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
         except FileContentsException as fc_exc:
             # File doesn't meet schema - try loading with a less strict schema
@@ -215 +220 @@
             self.current_dataset = plottable_1D(np.empty(0), np.empty(0),
                 np.empty(0), np.empty(0))
-            self.current_dataset.dxl = np.empty(0)
-            self.current_dataset.dxw = np.empty(0)
         self.base_ns = "{" + CANSAS_NS.get(self.cansas_version).get("ns") + "}"
 
@@ -295 +298 @@
                     self.current_dataset.dx = np.append(self.current_dataset.dx, data_point)
                 elif tagname == 'dQw':
+                    if self.current_dataset.dqw is None: self.current_dataset.dqw = np.empty(0)
                     self.current_dataset.dxw = np.append(self.current_dataset.dxw, data_point)
                 elif tagname == 'dQl':
+                    if self.current_dataset.dxl is None: self.current_dataset.dxl = np.empty(0)
                     self.current_dataset.dxl = np.append(self.current_dataset.dxl, data_point)
                 elif tagname == 'Qmean':

test/fileconverter/test/utest_nxcansas_writer.py

@@ -1 +1 @@
 from sas.sascalc.file_converter.nxcansas_writer import NXcanSASWriter
-from sas.sascalc.dataloader.readers.cansas_reader import Reader as XMLReader
-from sas.sascalc.dataloader.readers.red2d_reader import Reader as DATReader
-from sas.sascalc.dataloader.readers.cansas_reader_HDF5 import Reader as HDF5Reader
+from sas.sascalc.dataloader.loader import Loader
 
 import os
@@ -14 +12 @@
 
     def setUp(self):
+        self.loader = Loader()
         self.writer = NXcanSASWriter()
         self.read_file_1d = "cansas1d.xml"
@@ -19 +18 @@
         self.read_file_2d = "exp18_14_igor_2dqxqy.dat"
         self.write_file_2d = "export2d.h5"
-        self.hdf5_reader = HDF5Reader()
 
-        xml_reader = XMLReader()
-        self.data_1d = xml_reader.read(self.read_file_1d)[0]
+        self.data_1d = self.loader.load(self.read_file_1d)[0]
 
-        dat_reader = DATReader()
-        self.data_2d = dat_reader.read(self.read_file_2d)
+        self.data_2d = self.loader.load(self.read_file_2d)[0]
         self.data_2d.detector[0].name = ''
         self.data_2d.source.radiation = 'neutron'
@@ -31 +27 @@
     def test_write_1d(self):
         self.writer.write([self.data_1d], self.write_file_1d)
-        data = self.hdf5_reader.read(self.write_file_1d)
+        data = self.loader.load(self.write_file_1d)
         self.assertTrue(len(data) == 1)
         data = data[0]
@@ -41 +37 @@
     def test_write_2d(self):
         self.writer.write([self.data_2d], self.write_file_2d)
-        data = self.hdf5_reader.read(self.write_file_2d)
+        data = self.loader.load(self.write_file_2d)
         self.assertTrue(len(data) == 1)
         data = data[0]

test/sasdataloader/test/utest_red2d_reader.py

@@ -7 +7 @@
 import unittest
 from sas.sascalc.dataloader.loader import  Loader
- 
+
 import os.path
 
 class abs_reader(unittest.TestCase):
-    
+
     def setUp(self):
         self.loader = Loader()
-        
+
     def test_checkdata(self):
         """
             Test .DAT file loaded as IGOR/DAT 2D Q_map
         """
-        f = self.loader.load("exp18_14_igor_2dqxqy.dat")
+        f = self.loader.load("exp18_14_igor_2dqxqy.dat")[0]
         # The length of the data is 10
         self.assertEqual(len(f.qx_data),  36864)
@@ -26 +26 @@
         self.assertEqual(f.Q_unit, '1/A')
         self.assertEqual(f.I_unit, '1/cm')
-        
+
         self.assertEqual(f.meta_data['loader'],"IGOR/DAT 2D Q_map")
-        
-        
+
+
 if __name__ == '__main__':
     unittest.main()
-