Changeset ac370c5 in sasview
- Timestamp:
- Aug 19, 2016 4:44:50 AM (8 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.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
- Location:
- src/sas/sascalc/dataloader
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/data_info.py
rd72567e rac370c5 445 445 return len(self.name) == 0 and len(self.date) == 0 and len(self.description) == 0 \ 446 446 and len(self.term) == 0 and len(self.notes) == 0 447 447 448 448 def single_line_desc(self): 449 449 """ … … 451 451 """ 452 452 return "%s %s %s" % (self.name, self.date, self.description) 453 453 454 454 def __str__(self): 455 455 _str = "Process:\n" … … 1220 1220 result.mask = numpy.append(self.mask, other.mask) 1221 1221 if result.err_data is not None: 1222 result.err_data = numpy.append(self.err_data, other.err_data) 1222 result.err_data = numpy.append(self.err_data, other.err_data) 1223 1223 if self.dqx_data is not None: 1224 1224 result.dqx_data = numpy.append(self.dqx_data, other.dqx_data) … … 1252 1252 final_dataset.yaxis(data._yaxis, data._yunit) 1253 1253 final_dataset.zaxis(data._zaxis, data._zunit) 1254 final_dataset.x_bins = data.x_bins 1255 final_dataset.y_bins = data.y_bins 1254 1256 else: 1255 1257 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
r3d6ab79 rac370c5 136 136 data_set = data[key][:] 137 137 unit = self._get_unit(value) 138 138 139 139 ## I and Q Data 140 140 if key == u'I': 141 141 if type(self.current_dataset) is plottable_2D: 142 self.current_dataset.data = data_set .flatten()142 self.current_dataset.data = data_set 143 143 self.current_dataset.zaxis("Intensity", unit) 144 144 else: … … 336 336 except: 337 337 dataset.q_data = None 338 339 if dataset.data.ndim == 2: 340 (n_rows, n_cols) = dataset.data.shape 341 dataset.y_bins = dataset.qy_data[0::n_rows] 342 dataset.x_bins = dataset.qx_data[:n_cols] 343 dataset.data = dataset.data.flatten() 344 338 345 final_dataset = combine_data_info_with_plottable(dataset, self.current_datainfo) 339 346 self.output.append(final_dataset)
Note: See TracChangeset
for help on using the changeset viewer.