Changeset 0fcb097 in sasview for src


Ignore:
Timestamp:
Aug 19, 2016 10:55:29 AM (8 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
ac3353d
Parents:
c476457 (diff), 45d7662 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into file-converter

Location:
src/sas
Files:
16 added
3 edited

Legend:

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

    rac370c5 r45d7662  
    10371037        _str += "   Z-axis:       %s\t[%s]\n" % (self._zaxis, self._zunit) 
    10381038        _str += "   Length:       %g \n" % (len(self.data)) 
     1039        _str += "   Shape:        (%d, %d)\n" % (len(self.y_bins), len(self.x_bins)) 
    10391040        return _str 
    10401041 
  • src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py

    r995f4eb r0fcb097  
    341341            if dataset.data.ndim == 2: 
    342342                (n_rows, n_cols) = dataset.data.shape 
    343                 dataset.y_bins = dataset.qy_data[0::n_rows] 
     343                dataset.y_bins = dataset.qy_data[0::n_cols] 
    344344                dataset.x_bins = dataset.qx_data[:n_cols] 
    345345                dataset.data = dataset.data.flatten() 
  • src/sas/sascalc/dataloader/readers/cansas_reader.py

    r5f26aa4 rfdd3ba1  
    11791179            written = written | self.write_node(pix, "z", item.pixel_size.z, 
    11801180                                                {"unit": item.pixel_size_unit}) 
    1181             written = written | self.write_node(det, "slit_length", 
    1182                                                 item.slit_length, 
    1183                                                 {"unit": item.slit_length_unit}) 
    11841181            if written == True: 
    11851182                self.append(pix, det) 
     1183            self.write_node(det, "slit_length", item.slit_length, 
     1184                {"unit": item.slit_length_unit}) 
     1185 
    11861186 
    11871187    def _write_process_notes(self, datainfo, entry_node): 
Note: See TracChangeset for help on using the changeset viewer.