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

Timestamp:

Aug 19, 2016 4:44:50 AM (8 years ago)

Author:

lewis

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fe498b83

Parents:

7f71637

Message:

Set data.x_bins and data.y_bins in CanSAS 2.0 reader (references #622)

File:

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

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

@@ -136 +136 @@
                 data_set = data[key][:]
                 unit = self._get_unit(value)
-                
+
                 ## I and Q Data
                 if key == u'I':
                     if type(self.current_dataset) is plottable_2D:
-                        self.current_dataset.data = data_set.flatten()
+                        self.current_dataset.data = data_set
                         self.current_dataset.zaxis("Intensity", unit)
                     else:
@@ -336 +336 @@
             except:
                 dataset.q_data = None
+
+            if dataset.data.ndim == 2:
+                (n_rows, n_cols) = dataset.data.shape
+                dataset.y_bins = dataset.qy_data[0::n_rows]
+                dataset.x_bins = dataset.qx_data[:n_cols]
+                dataset.data = dataset.data.flatten()
+
             final_dataset = combine_data_info_with_plottable(dataset, self.current_datainfo)
             self.output.append(final_dataset)