Ignore:
Timestamp:
Jul 27, 2017 1:38:41 PM (5 years ago)
Author:
srkline
Message:

changes to HDFLoadGroup to use the new R=2 flag to allow reading of duplicated groups in the data file (the temperature log). Requires Igor 7.05+ and HDF5XOP 1.24+

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/HDF5gateway_NCNR.ipf

    r1056 r1058  
    429429        //   read the data (too bad that HDF5LoadGroup does not read the attributes) 
    430430        String base_name = StringFromList(0,FileName,".") 
    431         HDF5LoadGroup/Z/L=7/O/R/T=$base_name  :, fileID, hdf5Path               //      recursive 
     431        // SRK - added /R=2 flag to allow duplicate groups to be loaded (Jul 2017) 
     432        HDF5LoadGroup/Z/L=7/O/R=2/T=$base_name  :, fileID, hdf5Path             //      recursive 
    432433        if ( V_Flag != 0 ) 
    433434                SetDataFolder $oldFolder 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Detector_Isolate.ipf

    r1025 r1058  
    235235                case "RAW": 
    236236                case "ADJ": 
     237                case "SAM": 
     238                case "EMP": 
     239                case "BGD": 
    237240                        wave dispW = $("root:Packages:NIST:VSANS:"+folder+":entry:instrument:detector_"+str+":data") 
    238241         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

    r1056 r1058  
    464464// 
    465465 
    466  
     466// ***NOTE*** 
     467// The temperature block definitons inculde dupilcated groups. As of 7/27/17 (HDF 5 XOP version 1.24, in Igor 7.05) 
     468// these duplicated blocks are now handled "correctly" by reading in the multiple copies into 
     469// duplciated data folders. WM (Howard) modifed the XOP to accomodate this condition. 
     470// This is the R=2 flag for HDF5LoadGroup 
    467471 
    468472//// to skip DAS_logs. I need to generate all of the data folders myself 
     
    492496        endif 
    493497        hdf5path = "/entry/control" 
    494         HDF5LoadGroup/Z/L=7/O/R  :, fileID, hdf5Path            //      YES recursive 
     498        HDF5LoadGroup/Z/L=7/O/R=2  :, fileID, hdf5Path          //      YES recursive 
    495499 
    496500        if(isFolder == -1) 
     
    500504        endif 
    501505        hdf5path = "/entry/instrument" 
    502         HDF5LoadGroup/Z/L=7/O/R  :, fileID, hdf5Path            //      YES recursive 
     506        HDF5LoadGroup/Z/L=7/O/R=2  :, fileID, hdf5Path          //      YES recursive 
    503507 
    504508        if(isFolder == -1) 
     
    508512        endif    
    509513        hdf5path = "/entry/reduction" 
    510         HDF5LoadGroup/Z/L=7/O/R  :, fileID, hdf5Path            //      YES recursive 
     514        HDF5LoadGroup/Z/L=7/O/R=2  :, fileID, hdf5Path          //      YES recursive 
    511515 
    512516        if(isFolder == -1) 
     
    516520        endif    
    517521        hdf5path = "/entry/sample" 
    518         HDF5LoadGroup/Z/L=7/O/R  :, fileID, hdf5Path            //      YES recursive 
     522        HDF5LoadGroup/Z/L=7/O/R=2  :, fileID, hdf5Path          //      YES recursive (This is the only one that may have duplicated groups) 
    519523 
    520524        if(isFolder == -1) 
     
    524528        endif    
    525529        hdf5path = "/entry/user" 
    526         HDF5LoadGroup/Z/L=7/O/R  :, fileID, hdf5Path            //      YES recursive 
     530        HDF5LoadGroup/Z/L=7/O/R=2  :, fileID, hdf5Path          //      YES recursive 
    527531 
    528532 
Note: See TracChangeset for help on using the changeset viewer.