Changeset 9e6aeaf in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Sep 25, 2017 5:35:29 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

3cb3a51

Parents:

9efdb29 (diff), 0315b63 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-853-fit-gui-to-calc' into py3

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -197 +197 @@
                     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):
@@ -221 +226 @@
         self.output = []
 
-    def remove_empty_q_values(self, has_error_dx=False, has_error_dy=False,
-                              has_error_dxl=False, has_error_dxw=False):
+    def data_cleanup(self):
+        """
+        Clean up the data sets and refresh everything
+        :return: None
+        """
+        self.remove_empty_q_values()
+        self.send_to_output()  # Combine datasets with DataInfo
+        self.current_datainfo = DataInfo()  # Reset DataInfo
+
+    def remove_empty_q_values(self):
         """
         Remove any point where Q == 0
         """
-        x = self.current_dataset.x
-        self.current_dataset.x = self.current_dataset.x[x != 0]
-        self.current_dataset.y = self.current_dataset.y[x != 0]
-        if has_error_dy:
-            self.current_dataset.dy = self.current_dataset.dy[x != 0]
-        if has_error_dx:
-            self.current_dataset.dx = self.current_dataset.dx[x != 0]
-        if has_error_dxl:
-            self.current_dataset.dxl = self.current_dataset.dxl[x != 0]
-        if has_error_dxw:
-            self.current_dataset.dxw = self.current_dataset.dxw[x != 0]
+        if isinstance(self.current_dataset, plottable_1D):
+            # Booleans for resolutions
+            has_error_dx = self.current_dataset.dx is not None
+            has_error_dxl = self.current_dataset.dxl is not None
+            has_error_dxw = self.current_dataset.dxw is not None
+            has_error_dy = self.current_dataset.dy is not None
+            # Create arrays of zeros for non-existent resolutions
+            if has_error_dxw and not has_error_dxl:
+                array_size = self.current_dataset.dxw.size - 1
+                self.current_dataset.dxl = np.append(self.current_dataset.dxl,
+                                                    np.zeros([array_size]))
+                has_error_dxl = True
+            elif has_error_dxl and not has_error_dxw:
+                array_size = self.current_dataset.dxl.size - 1
+                self.current_dataset.dxw = np.append(self.current_dataset.dxw,
+                                                    np.zeros([array_size]))
+                has_error_dxw = True
+            elif not has_error_dxl and not has_error_dxw and not has_error_dx:
+                array_size = self.current_dataset.x.size - 1
+                self.current_dataset.dx = np.append(self.current_dataset.dx,
+                                                    np.zeros([array_size]))
+                has_error_dx = True
+            if not has_error_dy:
+                array_size = self.current_dataset.y.size - 1
+                self.current_dataset.dy = np.append(self.current_dataset.dy,
+                                                    np.zeros([array_size]))
+                has_error_dy = True
+
+            # Remove points where q = 0
+            x = self.current_dataset.x
+            self.current_dataset.x = self.current_dataset.x[x != 0]
+            self.current_dataset.y = self.current_dataset.y[x != 0]
+            if has_error_dy:
+                self.current_dataset.dy = self.current_dataset.dy[x != 0]
+            if has_error_dx:
+                self.current_dataset.dx = self.current_dataset.dx[x != 0]
+            if has_error_dxl:
+                self.current_dataset.dxl = self.current_dataset.dxl[x != 0]
+            if has_error_dxw:
+                self.current_dataset.dxw = self.current_dataset.dxw[x != 0]
+        elif isinstance(self.current_dataset, plottable_2D):
+            has_error_dqx = self.current_dataset.dqx_data is not None
+            has_error_dqy = self.current_dataset.dqy_data is not None
+            has_error_dy = self.current_dataset.err_data is not None
+            has_mask = self.current_dataset.mask 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]
+            if has_error_dqx:
+                self.current_dataset.dqx_data = self.current_dataset.dqx_data[x != 0]
+            if has_error_dqy:
+                self.current_dataset.dqy_data = self.current_dataset.dqy_data[x != 0]
+            if has_mask:
+                self.current_dataset.mask = self.current_dataset.mask[x != 0]
 
     def reset_data_list(self, no_lines=0):