Changeset e801a4e in sasview

Timestamp:

Apr 9, 2017 3:24:21 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:

35cf5c0

Parents:

a81af92

Message:

Test that SESANS files insist on proper headers

Files:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (2 diffs)
• test/sasdataloader/test/sesans_examples/no_wavelength.ses (added)
• test/sasdataloader/test/utest_sesans.py (modified) (1 diff)

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

@@ -86 +86 @@
             headers = input_f.readline().split()
 
+            self._insist_header(headers, "SpinEchoLength")
+            self._insist_header(headers, "Depolarisation")
+            self._insist_header(headers, "Depolarisation_error")
+            self._insist_header(headers, "Wavelength")
+
             data = np.loadtxt(input_f)
             if data.size < 1:
@@ -141 +146 @@
 
     @staticmethod
+    def _insist_header(headers, name):
+        if name not in headers:
+            raise RuntimeError(
+                "Missing {} column in spin echo data".format(name))
+
+    @staticmethod
     def _unit_conversion(value, value_unit, default_unit):
         """

test/sasdataloader/test/utest_sesans.py

@@ -78 +78 @@
             self.loader,
             "sesans_examples/next_gen.ses")
+
+    def test_sesans_mandatory_headers(self):
+        """
+            Confirm that sesans files throw an exception if one of the mandator headers is missing.
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_wavelength.ses")
+
 if __name__ == "__main__":
     unittest.main()