Ignore:
Timestamp:
Feb 5, 2016 12:46:18 PM (7 years ago)
Author:
srkline
Message:

more additions to the raw data display panel

File:
1 edited

Legend:

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

    r977 r978  
    9393                SetScale/I y ctr,ctr+48,"",det_MT 
    9494//              det_mt[][20] = 50 
     95        det_MT *= 10 
    9596 
    9697                SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MB 
     
    99100                SetScale/I x -npix/2,npix/2,"",det_MB 
    100101                SetScale/I y -ctr,-ctr-48,"",det_MB 
     102        det_MB *= 5 
    101103                 
    102104                ctr=30 
     
    106108                SetScale/I x -ctr-48,-ctr,"",det_ML 
    107109                SetScale/I y -npix/2,npix/2,"",det_ML 
     110        det_ML *= 2 
    108111                 
    109112                SetDataFolder root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_MR 
     
    213216// -- if not, read the file in, then return the value 
    214217// 
     218// TODO: 
     219// currently, the work folders have the following path - so passing in "RAW" as fname 
     220// will take some re-configuring.  
     221//  root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FL:distance 
     222// -- be sure this read from work folders is not broken in the future, and is passed to ALL of the 
     223//    top-level R/W routines. (Write is necessary ONLY for SIM data files. Patch is direct to disk.) 
    215224Function V_getRealValueFromHDF5(fname,path) 
    216225        String fname,path 
     
    220229         
    221230        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
     231 
     232// check for a work folder first (note that "entry" is doubled) 
     233        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
     234                Wave/Z w = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     235                return(w[0]) 
     236        endif 
    222237         
    223238        if(Exists(ksBaseDFPath+folderStr+":"+path)) 
     
    257272         
    258273        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
    259          
     274 
     275// check for a work folder first (note that "entry" is doubled) 
     276        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
     277                Wave wOut = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     278                return wOut 
     279        endif 
     280                 
    260281        if(Exists(ksBaseDFPath+folderStr+":"+path)) 
    261282                valExists=1 
     
    291312         
    292313        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
     314 
     315// check for a work folder first (note that "entry" is doubled) 
     316        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
     317                Wave/T wOut = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     318                return wOut 
     319        endif 
    293320         
    294321        if(Exists(ksBaseDFPath+folderStr+":"+path)) 
     
    351378         
    352379        folderStr = V_RemoveDotExtension(V_GetFileNameFromPathNoSemi(fname)) 
     380 
     381// check for a work folder first (note that "entry" is doubled) 
     382        if(Exists("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path)) 
     383                Wave/Z/T tw = $("root:Packages:NIST:VSANS:"+folderStr+":entry:"+path) 
     384                return(tw[0]) 
     385        endif 
    353386         
    354387        if(Exists(ksBaseDFPath+folderStr+":"+path)) 
Note: See TracChangeset for help on using the changeset viewer.