Changeset 8dec7e7 in sasview for src/sas/sascalc

Timestamp:

Jul 27, 2017 12:13:00 PM (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:

0615d54

Parents:

9d786e5

Message:

Raise DefaultReaderException? in NXcanSAS reader and handle correctly

Location:

src/sas/sascalc/dataloader

Files:

• loader.py (modified) (3 diffs)
• readers/cansas_reader.py (modified) (1 diff)
• readers/cansas_reader_HDF5.py (modified) (2 diffs)

src/sas/sascalc/dataloader/loader.py

@@ -85 +85 @@
             # TODO: handle error
             raise RuntimeError(e)
-            pass
         try:
             cansas_loader = cansas_reader.Reader()
@@ -94 +93 @@
             # TODO: Handle errors properly
             raise RuntimeError(e)
-            pass
         except Exception as csr:
             # TODO: Modify cansas reader to throw DefaultReaderException
@@ -101 +99 @@
             cansas_nexus_loader = cansas_reader_HDF5.Reader()
             return cansas_nexus_loader.read(path)
-        except DefaultReaderException:
-            logging.errors("No default loader can load the data")
+        except DefaultReaderException as e:
+            logging.error("No default loader can load the data")
             # No known reader available. Give up and throw an error
             msg = "\n\tUnknown data format: %s.\n\tThe file is not a " % path
             msg += "known format that can be loaded by SasView.\n"
-            msg += "Traceback:\n%s" % e.message
             raise NoKnownLoaderException, msg
-        except FileContentsException:
+        except FileContentsException as e:
             # TODO: Handle error(s) properly
-            pass
+            raise RuntimeError(e)
 
     def find_plugins(self, dir):

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

@@ -108 +108 @@
 
         basename, _ = os.path.splitext(os.path.basename(xml_file))
-        # Raises FileContentsException - handled by superclass
-        self.load_file_and_schema(xml_file, schema_path)
-        self.current_datainfo = DataInfo()
+
         try:
+            # Raises FileContentsException
+            self.load_file_and_schema(xml_file, schema_path)
+            self.current_datainfo = DataInfo()
             # Raises FileContentsException if file doesn't meet CanSAS schema
             self.is_cansas(self.extension)

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

@@ -13 +13 @@
     TransmissionSpectrum, Detector
 from sas.sascalc.dataloader.data_info import combine_data_info_with_plottable
-from sas.sascalc.dataloader.loader_exceptions import FileContentsException
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException, DefaultReaderException
 from sas.sascalc.dataloader.file_reader_base_class import FileReader
 
@@ -78 +78 @@
                     self.raw_data = h5py.File(filename, 'r')
                 except Exception as e:
-                    raise FileContentsException, e
+                    if extension not in self.ext:
+                        msg = "CanSAS2.0 HDF5 Reader could not load file {}".format(basename + extension)
+                        raise DefaultReaderException(msg)
+                    raise FileContentsException(e.message)
                 # Read in all child elements of top level SASroot
                 self.read_children(self.raw_data, [])