Changeset ac370c5 in sasview for src

Timestamp:

Aug 19, 2016 2: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)

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (4 diffs)
• readers/cansas_reader_HDF5.py (modified) (2 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -445 +445 @@
         return len(self.name) == 0 and len(self.date) == 0 and len(self.description) == 0 \
             and len(self.term) == 0 and len(self.notes) == 0
-            
+
     def single_line_desc(self):
         """
@@ -451 +451 @@
         """
         return "%s %s %s" % (self.name, self.date, self.description)
-     
+
     def __str__(self):
         _str = "Process:\n"
@@ -1220 +1220 @@
         result.mask = numpy.append(self.mask, other.mask)
         if result.err_data is not None:
-            result.err_data = numpy.append(self.err_data, other.err_data) 
+            result.err_data = numpy.append(self.err_data, other.err_data)
         if self.dqx_data is not None:
             result.dqx_data = numpy.append(self.dqx_data, other.dqx_data)
@@ -1252 +1252 @@
         final_dataset.yaxis(data._yaxis, data._yunit)
         final_dataset.zaxis(data._zaxis, data._zunit)
+        final_dataset.x_bins = data.x_bins
+        final_dataset.y_bins = data.y_bins
     else:
         return_string = "Should Never Happen: _combine_data_info_with_plottable input is not a plottable1d or " + \

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)