Changeset dfcdbf8 in sasview for src/sas/sascalc/dataloader/readers

Timestamp:

Nov 1, 2018 2:23:18 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:

282bc3f

Parents:

9f45f83

Message:

Handle INTs attributes properly, better handling of unrecognized units during unit conversion, and remove intensity unit conversion.

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_point
+                        self.current_datainfo.meta_data['reader'] = data_set
+                        break
                     # Run
                     elif key == u'run':
-                        self.current_datainfo.run.append(data_point)
+                        self.current_datainfo.run.append(data_set)
                         try:
                             run_name = h5attr(value, 'name')
-                            run_dict = {data_point: run_name}
+                            run_dict = {data_set: run_name}
                             self.current_datainfo.run_name = run_dict
                         except Exception:
                             pass
+                        break
                     # Title
                     elif key == u'title':
-                        self.current_datainfo.title = data_point
+                        self.current_datainfo.title = data_set
                     # Note
                     elif key == u'SASnote':
-                        self.current_datainfo.notes.append(data_point)
+                        self.current_datainfo.notes.append(data_set)
+                        break
                     # Sample Information
                     elif self.parent_class == u'SASsample':
@@ -619 +622 @@
                 raise TypeError
         except TypeError:
-            iterable = iterable.split(",")
+            if isinstance(iterable, basestring):
+                iterable = iterable.split(",")
+            else:
+                iterable = [iterable]
         return iterable