Changeset 4a8d55c in sasview for src/sas

Timestamp:

Mar 27, 2018 12:05:36 PM (7 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

63ddc03

Parents:

2924532

Message:

Propagate through loader when errors are thrown regardless of the error. Add tests using the same file with different extensions (including deprecated extensions).

Location:

src/sas/sascalc/dataloader

Files:

• file_reader_base_class.py (modified) (1 diff)
• loader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -34 +34 @@
                        "t not be fully reduced. Support for the reader associat"
                        "ed with this file type has been removed. An attempt to "
-                       "load the file was made, however, even if a data set was"
-                       " generated, SasView cannot guarantee the accuracy of th"
-                       "e data.")
+                       "load the file was made, but, should it be successful, "
+                       "SasView cannot guarantee the accuracy of the data.")
 
 class FileReader(object):

src/sas/sascalc/dataloader/loader.py

@@ -90 +90 @@
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the Cansas XML reader
         except DefaultReaderException:
             pass  # Loader specific error to try the cansas XML reader
@@ -100 +102 @@
             cansas_loader = cansas_reader.Reader()
             return cansas_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the NXcanSAS reader
         except DefaultReaderException:
             pass  # Loader specific error to try the NXcanSAS reader