Changeset 857cc58 in sasview for src/sas/sascalc/dataloader/readers/sesans_reader.py

Timestamp:

Apr 6, 2017 9:15:56 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:

cc47336

Parents:

8e0dcac

Message:

Fix unit conversion in sesans reader

File:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (2 diffs)

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

@@ -108 +108 @@
             output.sample.name = params["Sample"]
             output.sample.ID = params["DataFileTitle"]
-            output.sample.thickness = float(
-                self._unit_conversion(
-                    params["Thickness"], "cm", self._unit_fetch("Thickness"))[0])
+            output.sample.thickness = self._unit_conversion(
+                float(params["Thickness"]), "cm",
+                self._unit_fetch("Thickness"))[0]
 
             output.sample.zacceptance = (
@@ -133 +133 @@
         # (float, string, string) -> float
         if has_converter and value_unit != default_unit:
-            data_conv_q = Converter(value_unit)
-            value = data_conv_q(value, units=default_unit)
+            data_conv_q = Converter(default_unit)
+            value = data_conv_q(value, units=value_unit)
             new_unit = default_unit
         else: