Changeset f344f6c in sasview

Timestamp:

Apr 9, 2017 5:09:13 AM (8 years ago)

Author:

Adam Washington <adam.washington@…>

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:

a81af92

Parents:

5ae40e7

Message:

Throw exception if SES file has not version data

Files:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (1 diff)
• test/sasdataloader/test/utest_sesans.py (modified) (1 diff)

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

@@ -66 +66 @@
                 line = input_f.readline()
             self.params = params
+
+            if "FileFormatVersion" not in self.params:
+                raise RuntimeError("SES file missing FileFormatVersion")
 
             if "SpinEchoLength_unit" not in self.params:

test/sasdataloader/test/utest_sesans.py

@@ -61 +61 @@
             "sesans_examples/no_spin_echo_unit.ses")
 
+    def test_sesans_no_version(self):
+        """
+            Confirm that sesans files with no file format version raise an appropriate error
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_version.ses")
+
 if __name__ == "__main__":
     unittest.main()