Changeset 68aa210 in sasview


Ignore:
Timestamp:
Jun 7, 2016 10:18:19 AM (6 years ago)
Author:
krzywon
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:
ae308a4
Parents:
70305bd2
Message:

Added a reader for 1D and 2D CanSAS v2.0 data in HDF5 format. Added the h5py requirement to check_packages.

Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • check_packages.py

    r96e151f r68aa210  
    2020    'html5lib':{'version':'0.95','import_name':'html5lib','test':'__version__'}, 
    2121    'reportlab':{'version':'2.5','import_name':'reportlab','test':'Version'}, 
     22    'h5py':{'version':'2.5','import_name':'h5py','test':'__version__'}, 
    2223    'lxml':{'version':'2.3','import_name':'lxml.etree','test':'LXML_VERSION'}, 
    2324    'PIL':{'version':'1.1.7','import_name':'Image','test':'VERSION'}, 
  • src/sas/sascalc/dataloader/readers/defaults.json

    rb699768 r68aa210  
    99            "-extension":".ses", 
    1010            "-reader":"sesans_reader" 
     11         }, 
     12         { 
     13            "-extension":".h5", 
     14            "-reader":"cansas_reader_HDF5" 
    1115         }, 
    1216         { 
Note: See TracChangeset for help on using the changeset viewer.