Changeset 3eb7bf2 in sasview for src/sas/sascalc

Timestamp:

Aug 2, 2017 5:48:29 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:

f26b7c1

Parents:

2a52b0e

Message:

Better comments and remove unused IgorReader?

Location:

src/sas/sascalc/dataloader

Files:

• loader.py (modified) (3 diffs)
• readers/IgorReader.py (deleted)

src/sas/sascalc/dataloader/loader.py

@@ -74 +74 @@
             pass  # try the ASCII reader
         except FileContentsException as fc_exc:
-            raise RuntimeError(fc_exc.message)
+            # File has an associated reader but it failed
+            raise RuntimeError(fc_exc)
         except Exception:
             pass
+
+        # File has no associated reader - try the ASCII reader
         try:
             ascii_loader = ascii_reader.Reader()
@@ -83 +86 @@
             pass  # Loader specific error to try the cansas XML reader
         except FileContentsException as e:
-            # TODO: handle error
             raise RuntimeError(e)
+
+        # ASCII reader failed - try CanSAS xML reader
         try:
             cansas_loader = cansas_reader.Reader()
             return cansas_loader.read(path)
         except DefaultReaderException:
-            pass  # Loader specific error to try the cansas NeXuS reader
+            pass  # Loader specific error to try the NXcanSAS reader
         except FileContentsException as e:
-            # TODO: Handle errors properly
             raise RuntimeError(e)
         except Exception as csr:
-            # TODO: Modify cansas reader to throw DefaultReaderException
             pass
+
+        # CanSAS XML reader failed - try NXcanSAS reader
         try:
             cansas_nexus_loader = cansas_reader_HDF5.Reader()
@@ -104 +108 @@
             msg = "\n\tUnknown data format: %s.\n\tThe file is not a " % path
             msg += "known format that can be loaded by SasView.\n"
-            raise NoKnownLoaderException, msg
+            raise NoKnownLoaderException(msg)
         except FileContentsException as e:
-            # TODO: Handle error(s) properly
             raise RuntimeError(e)