Changeset 0b79323 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Jul 27, 2017 5:11:42 AM (7 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9d786e5

Parents:

7477fb9

Message:

Re-implement 2D CanSAS XML support

File:

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

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -54 +54 @@
                     self.f_open = open(filepath, 'rb')
                     self.get_file_contents()
-                    self.sort_one_d_data()
+
+                    if isinstance(self.output[0], Data1D):
+                        self.sort_one_d_data()
+                    elif isinstance(self.output[0], Data2D):
+                        self.sort_two_d_data()
+    
                 except DataReaderException as e:
                     self.handle_error_message(e.message)
@@ -124 +129 @@
         self.output = final_list
 
+    def sort_two_d_data(self):
+        final_list = []
+        for dataset in self.output:
+            dataset.data = dataset.data.astype(np.float64)
+            dataset.qx_data = dataset.qx_data.astype(np.float64)
+            dataset.xmin = np.min(dataset.qx_data)
+            dataset.xmax = np.max(dataset.qx_data)
+            dataset.qy_data = dataset.qy_data.astype(np.float64)
+            dataset.ymin = np.min(dataset.qy_data)
+            dataset.ymax = np.max(dataset.qy_data)
+            dataset.q_data = np.sqrt(dataset.qx_data * dataset.qx_data
+                                     + dataset.qy_data * dataset.qy_data)
+            if dataset.err_data is not None:
+                dataset.err_data = dataset.err_data.astype(np.float64)
+            if dataset.dqx_data is not None:
+                dataset.dqx_data = dataset.dqx_data.astype(np.float64)
+            if dataset.dqy_data is not None:
+                dataset.dqy_data = dataset.dqy_data.astype(np.float64)
+            if dataset.mask is not None:
+                dataset.mask = dataset.mask.astype(dtype=bool)
+
+            if len(dataset.shape) == 2:
+                n_rows, n_cols = dataset.shape
+                dataset.y_bins = dataset.qy_data[0::int(n_cols)]
+                dataset.x_bins = dataset.qx_data[:int(n_cols)]
+                dataset.data = dataset.data.flatten()
+            else:
+                dataset.y_bins = []
+                dataset.x_bins = []
+                dataset.data = dataset.data.flatten()
+            final_list.append(dataset)
+        self.output = final_list
+
     def set_all_to_none(self):
         """