Changeset 248ff73 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py
- Timestamp:
- Aug 1, 2017 11:36:38 AM (7 years ago)
- 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:
- 5a8cdbb
- Parents:
- b2c28a5
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/file_reader_base_class.py
ra78433dd r248ff73 66 66 if not self.f_open.closed: 67 67 self.f_open.close() 68 if len(self.output) > 0: 69 # Sort the data that's been loaded 70 self.sort_one_d_data() 71 self.sort_two_d_data() 68 72 else: 69 73 msg = "Unable to find file at: {}\n".format(filepath) 70 74 msg += "Please check your file path and try again." 71 75 self.handle_error_message(msg) 72 73 if isinstance(self.output[0], Data1D):74 self.sort_one_d_data()75 elif isinstance(self.output[0], Data2D):76 self.sort_two_d_data()77 76 78 77 # Return a list of parsed entries that data_loader can manage … … 122 121 if data.dlam is not None: 123 122 data.dlam = np.asarray([data.dlam[i] for i in ind]).astype(np.float64) 124 data.xmin = np.min(data.x)125 data.xmax = np.max(data.x)126 data.ymin = np.min(data.y)127 data.ymax = np.max(data.y)128 final_list.append(data)129 self.output = final_list130 self.remove_empty_q_values()123 if len(data.x > 0): 124 data.xmin = np.min(data.x) 125 data.xmax = np.max(data.x) 126 data.ymin = np.min(data.y) 127 data.ymax = np.max(data.y) 128 # final_list.append(data) 129 # self.output = final_list 131 130 132 131 def sort_two_d_data(self): … … 157 156 dataset.x_bins = dataset.qx_data[:int(n_cols)] 158 157 dataset.data = dataset.data.flatten() 159 final_list.append(dataset)160 self.output = final_list158 # final_list.append(dataset) 159 # self.output = final_list 161 160 162 161 def set_all_to_none(self):
Note: See TracChangeset
for help on using the changeset viewer.