Changeset 348bc8b in sasview for src/sas/sascalc/dataloader/readers


Ignore:
Timestamp:
Aug 17, 2016 6:08:39 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:
254f088
Parents:
4699761 (diff), e4c897b (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

File:
1 edited

Legend:

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

    r83b6408 rfcba29a  
    957957            written = written | self.write_node(pix, "z", item.pixel_size.z, 
    958958                                                {"unit": item.pixel_size_unit}) 
    959             written = written | self.write_node(det, "slit_length", 
    960                                                 item.slit_length, 
    961                                                 {"unit": item.slit_length_unit}) 
    962959            if written == True: 
    963960                self.append(pix, det) 
     961            self.write_node(det, "slit_length", item.slit_length, 
     962                {"unit": item.slit_length_unit}) 
     963 
    964964 
    965965    def _write_process_notes(self, datainfo, entry_node): 
Note: See TracChangeset for help on using the changeset viewer.