Ignore:
Timestamp:
Apr 15, 2016 4:31:14 PM (7 years ago)
Author:
srkline
Message:

removed the doubled "entry" field from the VSANS file load.

appears now to work fine with R/W routines and with VCALC.

File:
1 edited

Legend:

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

    r985 r992  
    5757 
    5858        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    59         String instPath = ":entry:entry:instrument:detector_"    
     59        String instPath = ":entry:instrument:detector_"  
    6060 
    6161        detStr = "FL" 
     
    123123 
    124124        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    125         String instPath = ":entry:entry:instrument:detector_" 
     125        String instPath = ":entry:instrument:detector_" 
    126126        String detStr="" 
    127127 
     
    301301 
    302302//detector data 
    303         Wave det = $("root:Packages:NIST:VSANS:"+folderStr+":entry:entry:instrument:detector_"+type+":det_"+type) 
     303        Wave det = $("root:Packages:NIST:VSANS:"+folderStr+":entry:instrument:detector_"+type+":det_"+type) 
    304304 
    305305// TODO - these are to be set from globals, not hard-wired 
     
    335335Function FrontPanels_AsQ() 
    336336 
    337         String frontStr = "root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:" 
     337        String frontStr = "root:Packages:NIST:VSANS:VCALC:entry:instrument:" 
    338338//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Front 
    339339        SetDataFolder $(frontStr+"detector_FB") 
     
    462462 
    463463        String folderPath = "root:Packages:NIST:VSANS:"+folderStr 
    464         String instPath = ":entry:entry:instrument:detector_"    
     464        String instPath = ":entry:instrument:detector_"  
    465465 
    466466        detStr = "ML" 
     
    524524 
    525525        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    526         String instPath = ":entry:entry:instrument:detector_" 
     526        String instPath = ":entry:instrument:detector_" 
    527527        String detStr="" 
    528528         
     
    683683//      Display /W=(1477,44,1978,517) 
    684684 
    685         String midStr = "root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:" 
     685        String midStr = "root:Packages:NIST:VSANS:VCALC:entry:instrument:" 
    686686//      SetDataFolder root:Packages:NIST:VSANS:VCALC:Middle 
    687687        SetDataFolder $(midStr+"detector_MB") 
     
    916916        // fill the panels with fake sphere scattering data 
    917917        // TODO: am I in the right data folder?? 
    918         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     918        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    919919 
    920920        WAVE det_B = det_B 
     
    962962 
    963963        String folderPath = "root:Packages:NIST:VSANS:VCALC" 
    964         String instPath = ":entry:entry:instrument:detector_" 
     964        String instPath = ":entry:instrument:detector_" 
    965965        String detStr = "" 
    966966         
     
    975975 
    976976//Back detector 
    977 //root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B:qTot_B 
     977//root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B:qTot_B 
    978978        detStr = "B" 
    979979        Wave qTot_B = $(folderPath+instPath+detStr+":qTot_"+detStr)                     // 2D q-values 
     
    10151015//      Display /W=(1477,44,1978,517) 
    10161016 
    1017         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     1017        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    10181018 
    10191019        CheckDisplayed /W=VCALC#Panels_Q det_B 
     
    10791079Window Back_IQ_Graph() : Graph 
    10801080 
    1081         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B 
     1081        SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:instrument:detector_B 
    10821082 
    10831083        Variable binType 
Note: See TracChangeset for help on using the changeset viewer.