Changes in src/sas/sascalc/dataloader/data_info.py [d72567e:a4deca6] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/dataloader/data_info.py
rd72567e ra4deca6 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 " + \
Note: See TracChangeset
for help on using the changeset viewer.