Changeset c1dc994 in sasview for src/sas/sascalc

Timestamp:

Nov 9, 2018 3:48:41 PM (6 years ago)

Author:

Jeff Krzywon <jkrzywon@…>

Branches:

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

Children:

802fc18

Parents:

9b08354

Message:

Differentiate between array and scalar datasets when loading meta data.

File:

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

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

@@ -172 +172 @@
                     # Top Level Meta Data
                     if key == u'definition':
-                        self.current_datainfo.meta_data['reader'] = data_set
-                        break
+                        if isinstance(data_set, basestring):
+                            self.current_datainfo.meta_data['reader'] = data_set
+                            break
+                        else:
+                            self.current_datainfo.meta_data[
+                                'reader'] = data_point
                     # Run
                     elif key == u'run':
-                        self.current_datainfo.run.append(data_set)
                         try:
                             run_name = h5attr(value, 'name')
@@ -183 +186 @@
                         except Exception:
                             pass
-                        break
+                        if isinstance(data_set, basestring):
+                            self.current_datainfo.run.append(data_set)
+                            break
+                        else:
+                            self.current_datainfo.run.append(data_point)
                     # Title
                     elif key == u'title':
-                        self.current_datainfo.title = data_set
+                        if isinstance(data_set, basestring):
+                            self.current_datainfo.title = data_set
+                            break
+                        else:
+                            self.current_datainfo.title = data_point
                     # Note
                     elif key == u'SASnote':