Changeset 5ae40e7 in sasview

Timestamp:

Apr 9, 2017 5:08:48 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:

f344f6c

Parents:

10ab40e

git-author:

Adam Washington <adam.washington@…> (04/09/17 05:01:01)

git-committer:

Adam Washington <adam.washington@…> (04/09/17 05:08:48)

Message:

Throw an exception if sesans file has conflicting units

We've decided to mandate identical units for the current file format
version to allow other programs to import the files more easily. This
may change in later versions

Files:

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

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

@@ -51 +51 @@
             _, extension = os.path.splitext(basename)
             if not (self.allow_all or extension.lower() in self.ext):
-                raise RuntimeError("{} has an unrecognized file extension".format(path))
+                raise RuntimeError(
+                    "{} has an unrecognized file extension".format(path))
         else:
-            raise RunetimeError("{} is not a file".format(path))
+            raise RuntimeError("{} is not a file".format(path))
         with open(path, 'r') as input_f:
             # Read in binary mode since GRASP frequently has no-ascii
@@ -70 +71 @@
             if "Wavelength_unit" not in self.params:
                 raise RuntimeError("Wavelength has no units")
+            if params["SpinEchoLength_unit"] != params["Wavelength_unit"]:
+                raise RuntimeError("The spin echo data has rudely used "
+                                   "different units for the spin echo length "
+                                   "and the wavelength.  While sasview could "
+                                   "handle this instance, it is a violation "
+                                   "of the file format and will not be "
+                                   "handled by other software.")
 
             headers = input_f.readline().split()

test/sasdataloader/test/utest_sesans.py

@@ -52 +52 @@
             "sesans_examples/sesans_no_data.ses")
 
+    def test_sesans_no_spin_echo_unit(self):
+        """
+            Confirm that sesans files with no units from the spin echo length raise an appropriate error
+        """
+        self.assertRaises(
+            RuntimeError,
+            self.loader,
+            "sesans_examples/no_spin_echo_unit.ses")
+
 if __name__ == "__main__":
     unittest.main()