Changeset feec1cb in sasview for src/sas/sascalc/dataloader

Timestamp:

Sep 13, 2018 1:54:54 PM (6 years ago)

Author:

krzywon

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

9a0fc50

Parents:

2ca5d57b

Message:

Differentiate between scalars and arrays.

File:

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

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

@@ -633 +633 @@
                 elif q_vals.attrs.get("uncertainty") is not None:
                     self.q_uncertainties = q_vals.attrs.get("uncertainty")
-                if isinstance(self.q_uncertainties, str) is not None:
-                    self.q_uncertainties = [self.q_uncertainties]
+                if isinstance(self.q_uncertainties, str):
+                    self.q_uncertainties = self.q_uncertainties.split(",")
                 if q_vals.attrs.get("resolutions") is not None:
                     self.q_resolutions = q_vals.attrs.get("resolutions")
-                if isinstance(self.q_resolutions, str):
+                if isinstance(self.q_resolutions, (str, unicode)):
                     self.q_resolutions = self.q_resolutions.split(",")
         if self.i_name in keys: