Changeset 18af6d2 in sasview for src/sas/sascalc

Timestamp:

Jan 23, 2018 10:34:37 AM (7 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:

6bd4235

Parents:

5a4d022

Message:

Clear data locations when a new data set is created and coerce I and Q to appropriate data types.

File:

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

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

@@ -227 +227 @@
         :param unit: unit attribute
         """
-        # FIXME: check attributes of SASdata for Q, dQ, Mask, etc.
         if key == self.i_name:
             if isinstance(self.current_dataset, plottable_2D):
@@ -552 +551 @@
             self.current_dataset = plottable_1D(x, y)
         self.current_datainfo.filename = self.raw_data.filename
+        self.mask_name = ""
+        self.i_name = ""
+        self.i_node = ""
+        self.q_name = []
+        self.q_uncertainties = ""
+        self.q_resolutions = ""
+        self.i_uncertainties = ""
 
     def _find_data_attributes(self, value):
@@ -561 +567 @@
         attrs = value.attrs
         signal = attrs.get("signal")
-
-        i_axes = np.array(attrs.get("I_axes").split(","))
-        q_indices = np.array(attrs.get("Q_indices"))
+        i_axes = np.array(str(attrs.get("I_axes")).split(","))
+        q_indices = np.int_(attrs.get("Q_indices").split(","))
+        keys = value.keys()
         self.mask_name = attrs.get("mask")
-        keys = value.keys()
         for val in q_indices:
             self.q_name.append(i_axes[val])