Changeset 8e0dcac in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Apr 6, 2017 9:13:06 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:

857cc58

Parents:

d01b55c

Message:

Handle missing columns in .ses format

The uncertainties on spin echo length and lambda aren't strictly
required, so we should handle files that do not have them. SasView?
seems to be unhappy with an uncertainty of zero, so we've put in a
small default value. If the user isn't happy with the default value,
then they should have measured the real one.

File:

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

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

@@ -71 +71 @@
                 raise RuntimeError("{} is empty".format(path))
             x = data[:, headers.index("SpinEchoLength")]
-            dx = data[:, headers.index("SpinEchoLength_error")]
+            if "SpinEchoLength_error" in headers:
+                dx = data[:, headers.index("SpinEchoLength_error")]
+            else:
+                dx = x*0.05
             lam = data[:, headers.index("Wavelength")]
-            dlam = data[:, headers.index("Wavelength_error")]
+            if "Wavelength_error" in headers:
+                dlam = data[:, headers.index("Wavelength_error")]
+            else:
+                dlam = lam*0.05
             y = data[:, headers.index("Depolarisation")]
             dy = data[:, headers.index("Depolarisation_error")]