Changeset dcb91cf in sasview for src/sas/sascalc/dataloader

Timestamp:

Aug 21, 2017 10:16:13 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:

7b15990

Parents:

44daa56

Message:

Make suggested changes

Location:

src/sas/sascalc/dataloader

Files:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -84 +84 @@
         :param msg: Error message
         """
-        if isinstance(self.current_datainfo, DataInfo):
+        if len(self.output) > 0:
+            self.output[-1].errors.append(msg)
+        elif isinstance(self.current_datainfo, DataInfo):
             self.current_datainfo.errors.append(msg)
         else:
@@ -120 +122 @@
                 if data.dlam is not None:
                     data.dlam = np.asarray([data.dlam[i] for i in ind]).astype(np.float64)
-                if len(data.x > 0):
+                if len(data.x) > 0:
                     data.xmin = np.min(data.x)
                     data.xmax = np.max(data.x)

src/sas/sascalc/dataloader/loader.py

@@ -69 +69 @@
         readers if no reader was registered for the file's extension.
         """
+        # Gets set to a string if the file has an associated reader that fails
+        msg_from_reader = None
         try:
             return super(Registry, self).load(path, format=format)
         except NoKnownLoaderException as nkl_e:
-            pass  # try the ASCII reader
+            pass  # Try the ASCII reader
         except FileContentsException as fc_exc:
-            # File has an associated reader but it failed
-            raise RuntimeError(fc_exc.message)
+            # File has an associated reader but it failed.
+            # Save the error message to display later, but try the 3 default loaders
+            msg_from_reader = fc_exc.message
         except Exception:
             pass
 
-        # File has no associated reader - try the ASCII reader
+        # File has no associated reader, or the associated reader failed.
+        # Try the ASCII reader
         try:
             ascii_loader = ascii_reader.Reader()
@@ -86 +90 @@
             pass  # Loader specific error to try the cansas XML reader
         except FileContentsException as e:
-            raise RuntimeError(e.message)
+            if msg_from_reader is None:
+                raise RuntimeError(e.message)
 
         # ASCII reader failed - try CanSAS xML reader
@@ -95 +100 @@
             pass  # Loader specific error to try the NXcanSAS reader
         except FileContentsException as e:
-            raise RuntimeError(e.message)
-        except Exception as csr:
+            if msg_from_reader is None:
+                raise RuntimeError(e.message)
+        except Exception:
             pass
 
@@ -106 +112 @@
             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"
-            raise NoKnownLoaderException(msg)
+            if msg_from_reader is None:
+                msg = "\nUnknown data format: {}.\nThe file is not a ".format(path)
+                msg += "known format that can be loaded by SasView.\n"
+                raise NoKnownLoaderException(msg)
+            else:
+                # Associated reader and default readers all failed.
+                # Show error message from associated reader
+                raise RuntimeError(msg_from_reader)
         except FileContentsException as e:
-            raise RuntimeError(e.message)
+            err_msg = msg_from_reader if msg_from_reader is not None else e.message
+            raise RuntimeError(err_msg)
 
     def find_plugins(self, dir):

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

@@ -157 +157 @@
                     raise DataReaderException(invalid_xml) # Handled by base class
                 except FileContentsException as fc_exc:
-                    if not self.extension in self.ext: # If the file has no associated loader
-                        raise DefaultReaderException(msg)
                     msg = "CanSAS Reader could not load the file {}".format(xml_file)
                     if fc_exc.message is not None: # Propagate error messages from earlier
                         msg = fc_exc.message
+                    if not self.extension in self.ext: # If the file has no associated loader
+                        raise DefaultReaderException(msg)
                     raise FileContentsException(msg)
                     pass
@@ -179 +179 @@
             self.set_xml_file(xml_file)
         except etree.XMLSyntaxError: # File isn't valid XML so can't be loaded
-            msg = "Cansas cannot load {}.\n Invalid XML syntax".format(xml_file)
+            msg = "SasView cannot load {}.\nInvalid XML syntax".format(xml_file)
             raise FileContentsException(msg)
 
@@ -207 +207 @@
             return True # Why is this required?
         # If we get to this point then file isn't valid CanSAS
+        logger.warning("File doesn't meet CanSAS schema. Trying to load anyway.")
         raise FileContentsException("The file is not valid CanSAS")
 

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

@@ -82 +82 @@
                         raise DefaultReaderException(msg)
                     raise FileContentsException(e.message)
-                # Read in all child elements of top level SASroot
-                self.read_children(self.raw_data, [])
-                # Add the last data set to the list of outputs
-                self.add_data_set()
-                # Close the data file
-                self.raw_data.close()
-        # Return data set(s)
-        return self.output
+                try:
+                    # Read in all child elements of top level SASroot
+                    self.read_children(self.raw_data, [])
+                    # Add the last data set to the list of outputs
+                    self.add_data_set()
+                except Exception as exc:
+                    raise FileContentsException(exc.message)
+                finally:
+                    # Close the data file
+                    self.raw_data.close()
+
+                for dataset in self.output:
+                    if isinstance(dataset, Data1D):
+                        if dataset.x.size < 5:
+                            self.output = []
+                            raise FileContentsException("Fewer than 5 data points found.")
 
     def reset_class_variables(self):