Changeset a4deca6 in sasview


Ignore:
Timestamp:
Aug 19, 2016 8:58:15 AM (3 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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
66f21cd
Parents:
a854f21
git-author:
Lewis O'Driscoll <lewis.o'driscoll@…> (08/19/16 04:44:50)
git-committer:
Lewis O'Driscoll <lewis.o'driscoll@…> (08/19/16 08:58:15)
Message:

Set data.x_bins and data.y_bins in CanSAS 2.0 reader (references #622)

Location:
src/sas/sascalc/dataloader
Files:
2 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 " + \ 
  • src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

    ra854f21 ra4deca6  
    136136                data_set = data[key][:] 
    137137                unit = self._get_unit(value) 
    138                  
     138 
    139139                ## I and Q Data 
    140140                if key == u'I': 
    141141                    if type(self.current_dataset) is plottable_2D: 
    142                         self.current_dataset.data = data_set.flatten() 
     142                        self.current_dataset.data = data_set 
    143143                        self.current_dataset.zaxis("Intensity", unit) 
    144144                    else: 
     
    332332            except: 
    333333                dataset.q_data = None 
     334 
     335            if dataset.data.ndim == 2: 
     336                (n_rows, n_cols) = dataset.data.shape 
     337                dataset.y_bins = dataset.qy_data[0::n_rows] 
     338                dataset.x_bins = dataset.qx_data[:n_cols] 
     339                dataset.data = dataset.data.flatten() 
     340 
    334341            final_dataset = combine_data_info_with_plottable(dataset, self.current_datainfo) 
    335342            self.output.append(final_dataset) 
Note: See TracChangeset for help on using the changeset viewer.