Changeset 8dec7e7 in sasview for src/sas/sascalc/dataloader/readers/cansas_reader.py

Timestamp:

Jul 27, 2017 12:13:00 PM (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:

0615d54

Parents:

9d786e5

Message:

Raise DefaultReaderException? in NXcanSAS reader and handle correctly

File:

• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)

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

@@ -108 +108 @@
 
         basename, _ = os.path.splitext(os.path.basename(xml_file))
-        # Raises FileContentsException - handled by superclass
-        self.load_file_and_schema(xml_file, schema_path)
-        self.current_datainfo = DataInfo()
+
         try:
+            # Raises FileContentsException
+            self.load_file_and_schema(xml_file, schema_path)
+            self.current_datainfo = DataInfo()
             # Raises FileContentsException if file doesn't meet CanSAS schema
             self.is_cansas(self.extension)