Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/data_info.py

    rd72567e ra4deca6  
    445445        return len(self.name) == 0 and len(self.date) == 0 and len(self.description) == 0 \ 
    446446            and len(self.term) == 0 and len(self.notes) == 0 
    447              
     447 
    448448    def single_line_desc(self): 
    449449        """ 
     
    451451        """ 
    452452        return "%s %s %s" % (self.name, self.date, self.description) 
    453       
     453 
    454454    def __str__(self): 
    455455        _str = "Process:\n" 
     
    12201220        result.mask = numpy.append(self.mask, other.mask) 
    12211221        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) 
    12231223        if self.dqx_data is not None: 
    12241224            result.dqx_data = numpy.append(self.dqx_data, other.dqx_data) 
     
    12521252        final_dataset.yaxis(data._yaxis, data._yunit) 
    12531253        final_dataset.zaxis(data._zaxis, data._zunit) 
     1254        final_dataset.x_bins = data.x_bins 
     1255        final_dataset.y_bins = data.y_bins 
    12541256    else: 
    12551257        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.