Changeset 5c5e7fd in sasview for src/sas/sascalc

Timestamp:

Sep 22, 2017 7:06:16 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

af3e9f5

Parents:

a5bd87a

Message:

convert bytes to string when reading from HDF

File:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (5 diffs)

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

@@ -16 +16 @@
 from sas.sascalc.dataloader.file_reader_base_class import FileReader
 
+def decode(s):
+    return s.decode() if isinstance(s, bytes) else s
+
+def h5attr(node, key, default=None):
+    return decode(node.attrs.get(key, default))
 
 class Reader(FileReader):
@@ -130 +135 @@
             # Get all information for the current key
             value = data.get(key)
-            if value.attrs.get(u'canSAS_class') is not None:
-                class_name = value.attrs.get(u'canSAS_class')
-            else:
-                class_name = value.attrs.get(u'NX_class')
+            classname = h5attr(value, u'canSAS_class')
+            if classname is None:
+                class_name = h5attr(value, u'NX_class')
             if class_name is not None:
                 class_prog = re.compile(class_name)
@@ -225 +229 @@
 
                 for data_point in data_set:
+                    if data_point.dtype.char == 'S':
+                        data_point = decode(bytes(data_point))
                     # Top Level Meta Data
                     if key == u'definition':
@@ -231 +237 @@
                         self.current_datainfo.run.append(data_point)
                         try:
-                            run_name = value.attrs['name']
+                            run_name = h5attr(value, 'name')
                             run_dict = {data_point: run_name}
                             self.current_datainfo.run_name = run_dict
@@ -576 +582 @@
         :return: unit for the value passed to the method
         """
-        unit = value.attrs.get(u'units')
+        unit = h5attr(value, u'units')
         if unit is None:
-            unit = value.attrs.get(u'unit')
+            unit = h5attr(value, u'unit')
         # Convert the unit formats
         if unit == "1/A":