Changeset d0764bf in sasview for src/sas/sascalc

Timestamp:

Mar 10, 2017 6:41:23 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:

62b9793

Parents:

09f2328

Message:

Send data to cansas nexus reader if file extension is not recognized.

Location:

src/sas/sascalc/dataloader

Files:

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

src/sas/sascalc/dataloader/loader.py

@@ -31 +31 @@
 from readers import ascii_reader
 from readers import cansas_reader
+from readers import cansas_reader_HDF5
 
 class Registry(ExtensionRegistry):
@@ -73 +74 @@
                 return ascii_loader.read(path)
             except:
-                cansas_loader = cansas_reader.Reader()
-                return cansas_loader.read(path)
+                try:
+                    cansas_loader = cansas_reader.Reader()
+                    return cansas_loader.read(path)
+                except:
+                    cansas_nexus_loader = cansas_reader_HDF5.Reader()
+                    return cansas_nexus_loader.read(path)
 
     def find_plugins(self, dir):

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

@@ -53 +53 @@
     ext = ['.h5', '.H5']
     ## Flag to bypass extension check
-    allow_all = False
+    allow_all = True
     ## List of files to return
     output = None