Changeset 62160509 in sasview for src/sas/sascalc

Timestamp:

Sep 25, 2017 4:26:30 PM (7 years ago)

Author:

krzywon

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

48154abb

Parents:

ffb6474

Message:

Check for units saved in v4.1.0 and convert to current.

File:

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

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

@@ -592 +592 @@
         if 'unit' in attr and attr.get('unit') is not None:
             try:
-                local_unit = attr['unit']
+                unit = attr['unit']
+                unit_list = unit.split("|")
+                if len(unit_list) > 1:
+                    self.current_dataset.xaxis(unit_list[0].strip(),
+                                               unit_list[1].strip())
+                    local_unit = unit_list[1]
+                else:
+                    local_unit = unit
                 unitname = self.ns_list.current_level.get("unit", "")
                 if "SASdetector" in self.names: