Changeset cf29187 in sasview

Timestamp:

Jul 13, 2018 2:22:31 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:

96d06a4

Parents:

0bd8fac

Message:

Fix typo in writer, output new files, and fix reader to properly read in indices.

Files:

• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (2 diffs)
• src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (2 diffs)
• test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasdata.h5 (modified) (previous)
• test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry.h5 (modified) (previous)
• test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (modified) (previous)

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

@@ -558 +558 @@
         self.i_uncertainties = ""
 
+    @staticmethod
+    def check_is_list_or_array(iterable):
+        try:
+            iter(iterable)
+            if (not isinstance(iterable, np.ndarray)) or (isinstance(iterable, str)
+                    or isinstance(iterable, unicode)):
+                raise TypeError
+        except TypeError:
+            iterable = iterable.split(",")
+        return iterable
+
     def _find_data_attributes(self, value):
         """
@@ -568 +579 @@
         i_axes = attrs.get("I_axes", ["Q"])
         q_indices = attrs.get("Q_indices", [0])
-        try:
-            iter(q_indices)
-        except TypeError:
-            q_indices = [q_indices]
+        q_indices = map(int, self.check_is_list_or_array(q_indices))
+        i_axes = self.check_is_list_or_array(i_axes)
         keys = value.keys()
         self.mask_name = attrs.get("mask")

src/sas/sascalc/file_converter/nxcansas_writer.py

@@ -304 +304 @@
         data_entry.attrs['signal'] = 'I'
         data_entry.attrs['I_axes'] = 'Q'
-        data_entry.attrs['Q_indicies'] = 0
+        data_entry.attrs['Q_indices'] = [0]
         q_entry = data_entry.create_dataset('Q', data=data_obj.x)
         q_entry.attrs['units'] = data_obj.x_unit
@@ -333 +333 @@
         data_entry.attrs['signal'] = 'I'
         data_entry.attrs['I_axes'] = 'Qx,Qy'
-        data_entry.attrs['Q_indicies'] = [0,1]
+        data_entry.attrs['Q_indices'] = [0,1]
 
         (n_rows, n_cols) = (len(data.y_bins), len(data.x_bins))