Changeset 63ddc03 in sasview for src/sas/sascalc/dataloader

Timestamp:

Apr 9, 2018 10:00:41 AM (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:

0863065

Parents:

4a8d55c (diff), b09aee8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket-1068-2

Location:

src/sas/sascalc/dataloader

Files:

• file_reader_base_class.py (modified) (4 diffs)
• loader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -31 +31 @@
 FIELDS_2D = ('data', 'qx_data', 'qy_data', 'q_data', 'err_data',
                  'dqx_data', 'dqy_data', 'mask')
-
+DEPRECATION_MESSAGE = ("\rThe extension of this file suggests the data set migh"
+                       "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, but, should it be successful, "
+                       "SasView cannot guarantee the accuracy of the data.")
 
 class FileReader(object):
@@ -40 +44 @@
     # List of allowed extensions
     ext = ['.txt']
+    # Deprecated extensions
+    deprecated_extensions = ['.asc', '.nxs']
     # Bypass extension check and try to load anyway
     allow_all = False
@@ -87 +93 @@
                     if not self.f_open.closed:
                         self.f_open.close()
+                    if any(filepath.lower().endswith(ext) for ext in
+                           self.deprecated_extensions):
+                        self.handle_error_message(DEPRECATION_MESSAGE)
                     if len(self.output) > 0:
                         # Sort the data that's been loaded
@@ -146 +155 @@
         else:
             logger.warning(msg)
+            raise NoKnownLoaderException(msg)
 
     def send_to_output(self):

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