Changeset 7f75a3f in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Apr 5, 2017 11:08:59 AM (8 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:

278ddee

Parents:

69400ec

git-author:

Jeff Krzywon <krzywon@…> (04/05/17 11:08:59)

git-committer:

krzywon <krzywon@…> (04/05/17 11:08:59)

Message:

More explicit error messages when file loading fails. see #889

Location:

src/sas/sascalc/dataloader/readers

Files:

• ascii_reader.py (modified) (2 diffs)
• cansas_reader.py (modified) (2 diffs)
• cansas_reader_HDF5.py (modified) (2 diffs)
• xml_reader.py (modified) (1 diff)

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

@@ -17 +17 @@
 import os
 from sas.sascalc.dataloader.data_info import Data1D
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException
 
 # Check whether we have a converter available
@@ -173 +174 @@
                 if not is_data:
                     msg = "ascii_reader: x has no data"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 # Sanity check
                 if has_error_dy == True and not len(ty) == len(tdy):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 if has_error_dx == True and not len(tx) == len(tdx):
                     msg = "ascii_reader: y and dy have different length"
-                    raise RuntimeError, msg
+                    raise FileContentsException, msg
                 # If the data length is zero, consider this as
                 # though we were not able to read the file.
                 if len(tx) == 0:
-                    raise RuntimeError, "ascii_reader: could not load file"
+                    raise FileContentsException, "ascii_reader: could not load file"
 
                 #Let's re-order the data to make cal.

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

@@ -29 +29 @@
 from sas.sascalc.dataloader.readers.xml_reader import XMLreader
 from sas.sascalc.dataloader.readers.cansas_constants import CansasConstants, CurrentLevel
+from sas.sascalc.dataloader.loader_exceptions import FileContentsException
 
 # The following 2 imports *ARE* used. Do not remove either.
@@ -534 +535 @@
 
         # Load in xml file and get the cansas version from the header
-        self.set_xml_file(xml_file)
+        from lxml import etree
+        try:
+            self.set_xml_file(xml_file)
+        except etree.XMLSyntaxError:
+            msg = "Cansas cannot load this file"
+            raise FileContentsException, msg
         self.cansas_version = self.xmlroot.get("version", "1.0")
 

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
 
 
@@ -75 +76 @@
             if extension in self.ext or self.allow_all:
                 # Load the data file
-                self.raw_data = h5py.File(filename, 'r')
+                try:
+                    self.raw_data = h5py.File(filename, 'r')
+                except Exception as e:
+                    raise FileContentsException, e
                 # Read in all child elements of top level SASroot
                 self.read_children(self.raw_data, [])

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

@@ -70 +70 @@
             self.xmldoc = etree.parse(self.xml, parser=PARSER)
             self.xmlroot = self.xmldoc.getroot()
-        except etree.XMLSyntaxError as xml_error:
-            logging.info(xml_error)
+        except etree.XMLSyntaxError:
+            raise
         except Exception:
             self.xml = None