Changes in / [df72475:c22b621] in sasview

Location:

src/sas/sascalc/dataloader/readers

Files:

• cansas_reader.py (modified) (2 diffs)
• cansas_reader_HDF5.py (modified) (1 diff)

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

@@ -589 +589 @@
             try:
                 unit = attr['unit']
+                # Split the units to retain backwards compatibility with
+                # projects, analyses, and saved data from v4.1.0
                 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:
@@ -1237 +1237 @@
             if units is not None:
                 toks = variable.split('.')
-                # TODO: why split() when accessing unit, but not when setting value?
                 local_unit = getattr(storage, toks[0]+"_unit")
                 if local_unit is not None and units.lower() != local_unit.lower():

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

@@ -226 +226 @@
 
                 for data_point in data_set:
-                    if data_point.dtype.char == 'S':
-                        data_point = decode(bytes(data_point))
+                    if isinstance(data_point, np.ndarray):
+                        if data_point.dtype.char == 'S':
+                            data_point = decode(bytes(data_point))
+                    else:
+                        data_point = decode(data_point)
                     # Top Level Meta Data
                     if key == u'definition':