Changeset a9d3abb in sasview for src/sas/sascalc/dataloader/readers


Ignore:
Timestamp:
Sep 15, 2016 8:33:57 AM (8 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
4baf505
Parents:
7743c09
git-author:
Lewis O'Driscoll <lewis.o'driscoll@…> (08/19/16 04:44:50)
git-committer:
Piotr Rozyczko <rozyczko@…> (09/15/16 08:33:57)
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

    r7743c09 ra9d3abb  
    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.