Ignore:
Timestamp:
Oct 16, 2009 2:24:50 PM (13 years ago)
Author:
srkline
Message:

Merging changes of NCNR_ in to the ILL_ files. This is mostly the :Packages:NIST: data folder structure that is new since Lionel made his changes.

Removed Lionel's InitializeILL file, and moved his specific changes (just some global variables) to the initialization routine in ILL_Utils, where it belongs.

File:
1 edited

Legend:

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

    r572 r573  
    8585        String sansfname,textstr 
    8686         
    87         Make/O/N=23 $"root:Packages:NIST:RAW:IntegersRead" 
    88         Make/O/N=52 $"root:Packages:NIST:RAW:RealsRead" 
     87        Make/O/D/N=23 $"root:Packages:NIST:RAW:IntegersRead" 
     88        Make/O/D/N=52 $"root:Packages:NIST:RAW:RealsRead" 
    8989        Make/O/T/N=11 $"root:Packages:NIST:RAW:TextRead" 
    9090        Make/O/N=7 $"root:Packages:NIST:RAW:LogicalsRead" 
     
    361361        SetDataFolder curPath           //use the full path, so it will always work 
    362362         
    363         Make/O/N=16384 $"root:Packages:NIST:RAW:data" 
     363        Make/O/D/N=16384 $"root:Packages:NIST:RAW:data" 
    364364        WAVE data=$"root:Packages:NIST:RAW:data" 
    365365        SkipAndDecompressVAX(w,data) 
     
    509509        Variable/G $(curPath + ":gIsLogScale") = 0              //initial state is linear, keep this in DIV folder 
    510510         
    511         Make/O/N=23 $(curPath + ":IntegersRead") 
    512         Make/O/N=52 $(curPath + ":RealsRead") 
     511        Make/O/D/N=23 $(curPath + ":IntegersRead") 
     512        Make/O/D/N=52 $(curPath + ":RealsRead") 
    513513        Make/O/T/N=11 $(curPath + ":TextRead") 
    514514         
     
    759759        SetDataFolder curPath           //use the full path, so it will always work 
    760760         
    761         Make/O/N=16384 $(curPath + ":data") 
     761        Make/O/D/N=16384 $(curPath + ":data") 
    762762        WAVE data = $(curPath + ":data") 
    763763         
     
    918918Function FillFakeHeader_ASC(destFolder) 
    919919        String destFolder 
    920         Make/O/N=23 $("root:Packages:NIST:"+destFolder+":IntegersRead") 
    921         Make/O/N=52 $("root:Packages:NIST:"+destFolder+":RealsRead") 
     920        Make/O/D/N=23 $("root:Packages:NIST:"+destFolder+":IntegersRead") 
     921        Make/O/D/N=52 $("root:Packages:NIST:"+destFolder+":RealsRead") 
    922922        Make/O/T/N=11 $("root:Packages:NIST:"+destFolder+":TextRead") 
    923923         
Note: See TracChangeset for help on using the changeset viewer.