Changeset f118fe2f in sasview

Timestamp:

Oct 20, 2010 6:04:42 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fb59ed9

Parents:

85bb870

Message:

added cansa reader in addition to ascii reader when an error araised

File:

• DataLoader/loader.py (modified) (2 diffs)

DataLoader/loader.py

@@ -32 +32 @@
 # Default readers are defined in the readers sub-module
 import readers
-from readers import ascii_reader
+from readers import ascii_reader,cansas_reader
 
 class Registry(ExtensionRegistry):
@@ -76 +76 @@
             return super(Registry, self).load(path, format=format)
         except:
-            # No reader was found. Default to the ascii reader.
-            ascii_loader = ascii_reader.Reader()
-            return ascii_loader.read(path)
-        
+            try:
+                # No reader was found. Default to the ascii reader.
+                ascii_loader = ascii_reader.Reader()
+                return ascii_loader.read(path)
+            except:
+                cansas_loader = cansas_reader.Reader()
+                return cansas_loader.read(path)
     def find_plugins(self, dir):
         """