Changeset deaa0c6 in sasview for src/sas/sascalc/dataloader

Timestamp:

Sep 25, 2017 1:58:13 PM (7 years ago)

Author:

krzywon

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

Children:

ffb6474

Parents:

7b07fbe

Message:

Load fit states and project filess with 2D data sets using new loader system.

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (1 diff)
• file_reader_base_class.py (modified) (3 diffs)

src/sas/sascalc/dataloader/data_info.py

@@ -1176 +1176 @@
         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
+        if len(data.data.shape) == 2:
+            n_rows, n_cols = data.data.shape
+            final_dataset.y_bins = data.qy_data[0::int(n_cols)]
+            final_dataset.x_bins = data.qx_data[:int(n_cols)]
     else:
         return_string = "Should Never Happen: _combine_data_info_with_plottable input is not a plottable1d or " + \

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -167 +167 @@
                     dataset.x_bins = dataset.qx_data[:int(n_cols)]
                 dataset.data = dataset.data.flatten()
+                if len(dataset.data) > 0:
+                    dataset.xmin = np.min(dataset.qx_data)
+                    dataset.xmax = np.max(dataset.qx_data)
+                    dataset.ymin = np.min(dataset.qy_data)
+                    dataset.ymax = np.max(dataset.qx_data)
 
     def format_unit(self, unit=None):
@@ -249 +254 @@
             has_error_dy = self.current_dataset.err_data is not None
             has_mask = self.current_dataset.mask is not None
-            has_q_data = self.current_dataset.q_data is not None
             x = self.current_dataset.qx_data
             self.current_dataset.data = self.current_dataset.data[x != 0]
             self.current_dataset.qx_data = self.current_dataset.qx_data[x != 0]
             self.current_dataset.qy_data = self.current_dataset.qy_data[x != 0]
+            self.current_dataset.q_data = np.sqrt(
+                np.square(self.current_dataset.qx_data) + np.square(
+                    self.current_dataset.qy_data))
             if has_error_dy:
                 self.current_dataset.err_data = self.current_dataset.err_data[x != 0]
@@ -262 +269 @@
             if has_mask:
                 self.current_dataset.mask = self.current_dataset.mask[x != 0]
-            if has_q_data:
-                self.current_dataset.q_data = self.current_dataset.q_data[x != 0]
 
     def reset_data_list(self, no_lines=0):