Changeset 371b9e2 in sasview

Timestamp:

May 2, 2017 9:24:16 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3ece5dd

Parents:

5d8f9b3

git-author:

Jeff Krzywon <krzywon@…> (05/02/17 09:24:16)

git-committer:

krzywon <krzywon@…> (05/02/17 09:24:16)

Message:

Add support for a fourth reader exception and start the removal of IgorReader? support.

Files:

• src/sas/sascalc/dataloader/loader.py (modified) (1 diff)
• src/sas/sascalc/dataloader/loader_exceptions.py (modified) (2 diffs)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (1 diff)
• test/sasdataloader/test/utest_abs_reader.py (modified) (1 diff)

src/sas/sascalc/dataloader/loader.py

@@ -71 +71 @@
         try:
             return super(Registry, self).load(path, format=format)
-        except NoKnownLoaderException as e:
-            pass  # try the ASCII reader
+        except NoKnownLoaderException as nkl_e:
+            pass  # try the ASCII reader4
+        except Exception as reg_e:
+            pass
         try:
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
         except DefaultReaderException:
-            pass  # Loader specific error to try the cansas XML reader
+            pass  # Loader specific error to try the ascii reader
+        except FileContentsException:
+            # TODO: handle error
+            pass
         try:
             cansas_loader = cansas_reader.Reader()

src/sas/sascalc/dataloader/loader_exceptions.py

@@ -14 +14 @@
 
 
-class FileContentsException(Exception):
+class DefaultReaderException(Exception):
     """
-    Exception for files with an associated reader, but with no loadable data.
-    This is useful for catching loader or file format issues.
+    Exception for files with no associated reader. This should be thrown by
+    default readers only to tell Loader to try the next reader.
     """
     def __init__(self, e):
@@ -23 +23 @@
 
 
-class DefaultReaderException(Exception):
+class FileContentsException(Exception):
     """
-    Exception for files with no associated reader. This should be thrown by
-    default readers only to tell Loader to try the next reader.
+    Exception for files with an associated reader, but with no loadable data.
+    This is useful for catching loader or file format issues.
     """
     def __init__(self, e):

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

@@ -24 +24 @@
     ".h5": "cansas_reader_HDF5",
     ".txt": "ascii_reader",
-    ".asc": "IgorReader",
     ".dat": "red2d_reader",
     ".abs": "abs_reader",

test/sasdataloader/test/utest_abs_reader.py

@@ -82 +82 @@
         self.assertEqual(self.data.dy[1], 0.000315)
         self.assertEqual(self.data.dx[1], 0.008249)
-
-
-class IgorReaderTests(unittest.TestCase):
-    
-    def setUp(self):
-        # the IgorReader should be able to read this filetype
-        # if it can't, stop here.
-        reader = IgorReader()
-        self.data = reader.read("MAR07232_rest.ASC")
-
-    def test_igor_checkdata(self):
-        """
-            Check the data content to see whether 
-            it matches the specific file we loaded.
-            Check the units too to see whether the
-            Data1D defaults changed. Otherwise the
-            tests won't pass
-        """
-        self.assertEqual(self.data.filename, "MAR07232_rest.ASC")
-        self.assertEqual(self.data.meta_data['loader'], "IGOR 2D")
-        
-        self.assertEqual(self.data.source.wavelength_unit, 'A')
-        self.assertEqual(self.data.source.wavelength, 8.4)
-        
-        self.assertEqual(self.data.detector[0].distance_unit, 'mm')
-        self.assertEqual(self.data.detector[0].distance, 13705)
-        
-        self.assertEqual(self.data.sample.transmission, 0.84357)
-        
-        self.assertEqual(self.data.detector[0].beam_center_unit, 'mm')
-        center_x = (68.76 - 1)*5.0
-        center_y = (62.47 - 1)*5.0
-        self.assertEqual(self.data.detector[0].beam_center.x, center_x)
-        self.assertEqual(self.data.detector[0].beam_center.y, center_y)
-        
-        self.assertEqual(self.data.I_unit, '1/cm')
-        # 3 points should be suffcient to check that the data is in column
-        # major order.
-        np.testing.assert_almost_equal(self.data.data[0:3],
-                                       [0.279783, 0.28951, 0.167634])
-        np.testing.assert_almost_equal(self.data.qx_data[0:3],
-                                       [-0.01849072, -0.01821785, -0.01794498])
-        np.testing.assert_almost_equal(self.data.qy_data[0:3],
-                                       [-0.01677435, -0.01677435, -0.01677435])
-
-    def test_generic_loader(self):
-        # the generic loader should direct the file to IgorReader as well
-        data = Loader().load("MAR07232_rest.ASC")
-        self.assertEqual(data.meta_data['loader'], "IGOR 2D")