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/FACILITY_DataReadWrite.ipf

    r572 r573  
    7373        String fname 
    7474        //this function is for reading in RAW data only, so it will always put data in RAW folder 
    75         String curPath = "root:RAW" 
     75        String curPath = "root:Packages:NIST:RAW:" 
    7676        SetDataFolder curPath           //use the full path, so it will always work 
    77         Variable/G root:RAW:gIsLogScale = 0             //initial state is linear, keep this in RAW folder 
     77        Variable/G root:Packages:NIST:RAW:gIsLogScale = 0               //initial state is linear, keep this in RAW folder 
    7878         
    7979        Variable refNum,integer,realval 
    8080        String sansfname,textstr 
    8181         
    82         Make/D/O/N=23 $"root:RAW:IntegersRead" 
    83         Make/D/O/N=52 $"root:RAW:RealsRead" 
    84         Make/O/T/N=11 $"root:RAW:TextRead" 
    85          
    86         Wave intw=$"root:RAW:IntegersRead" 
    87         Wave realw=$"root:RAW:RealsRead" 
    88         Wave/T textw=$"root:RAW:TextRead" 
     82        Make/O/D/N=23 $"root:Packages:NIST:RAW:IntegersRead" 
     83        Make/O/D/N=52 $"root:Packages:NIST:RAW:RealsRead" 
     84        Make/O/T/N=11 $"root:Packages:NIST:RAW:TextRead" 
     85        Make/O/N=7 $"root:Packages:NIST:RAW:LogicalsRead" 
     86         
     87        Wave intw=$"root:Packages:NIST:RAW:IntegersRead" 
     88        Wave realw=$"root:Packages:NIST:RAW:RealsRead" 
     89        Wave/T textw=$"root:Packages:NIST:RAW:TextRead" 
     90        Wave logw=$"root:Packages:NIST:RAW:LogicalsRead" 
    8991         
    9092        // FILL IN 3 ARRAYS WITH HEADER INFORMATION FOR LATER USE 
     
    196198//main entry procedure for reading a "WORK.DIV" file 
    197199//displays a quick image of the  file, to check that it's correct 
    198 //data is deposited in root:DIV data folder 
    199 // 
    200 // local, just for testing 
     200//data is deposited in root:Packages:NIST:DIV data folder 
     201// 
     202// local, currently unused 
     203// 
    201204// 
    202205Proc ReadWork_DIV() 
     
    205208        ReadHeaderAndWork("DIV",fname)          //puts what is read in work.div 
    206209         
    207         String waveStr = "root:DIV:data" 
    208         NewImage/F/K=1/S=2 $waveStr 
    209         ModifyImage '' ctab= {*,*,YellowHot,0} 
    210          
    211         String/G root:DIV:fileList = "WORK.DIV" 
     210        String waveStr = "root:Packages:NIST:DIV:data" 
     211//      NewImage/F/K=1/S=2 $waveStr             //this is an experimental IGOR operation 
     212//      ModifyImage '' ctab= {*,*,YellowHot,0} 
     213        //Display;AppendImage $waveStr 
     214         
     215        //change the title string to WORK.DIV, rather than PLEXnnn_TST_asdfa garbage 
     216//      String/G root:Packages:NIST:DIV:fileList = "WORK.DIV" 
     217        ChangeDisplay("DIV") 
    212218         
    213219        SetDataFolder root:             //(redundant) 
     
    237243 
    238244        String cur_folder = type 
    239         String curPath = "root:"+cur_folder 
     245        String curPath = "root:Packages:NIST:"+cur_folder 
    240246        SetDataFolder curPath           //use the full path, so it will always work 
    241247         
     
    304310        String fname, destPath 
    305311        //this function is for reading in ASCII data so put data in user-specified folder 
    306         SetDataFolder "root:"+destPath 
     312        SetDataFolder "root:Packages:NIST:"+destPath 
    307313 
    308314        NVAR pixelsX = root:myGlobals:gNPixelsX 
     
    369375Function FillFakeHeader_ASC(destFolder) 
    370376        String destFolder 
    371         Make/O/N=23 $("root:"+destFolder+":IntegersRead") 
    372         Make/O/N=52 $("root:"+destFolder+":RealsRead") 
    373         Make/O/T/N=11 $("root:"+destFolder+":TextRead") 
    374          
    375         Wave intw=$("root:"+destFolder+":IntegersRead") 
    376         Wave realw=$("root:"+destFolder+":RealsRead") 
    377         Wave/T textw=$("root:"+destFolder+":TextRead") 
     377        Make/O/D/N=23 $("root:Packages:NIST:"+destFolder+":IntegersRead") 
     378        Make/O/D/N=52 $("root:Packages:NIST:"+destFolder+":RealsRead") 
     379        Make/O/T/N=11 $("root:Packages:NIST:"+destFolder+":TextRead") 
     380         
     381        Wave intw=$("root:Packages:NIST:"+destFolder+":IntegersRead") 
     382        Wave realw=$("root:Packages:NIST:"+destFolder+":RealsRead") 
     383        Wave/T textw=$("root:Packages:NIST:"+destFolder+":TextRead") 
    378384         
    379385        //Put in appropriate "fake" values 
    380386        //parse values as needed from headerLines 
    381         Wave/T hdr=$("root:"+destFolder+":hdrLines") 
     387        Wave/T hdr=$("root:Packages:NIST:"+destFolder+":hdrLines") 
    382388        Variable monCt,lam,offset,sdd,trans,thick 
    383389        Variable xCtr,yCtr,a1,a2,a1a2Dist,dlam,bsDiam 
     
    430436//      Print tempStr 
    431437//      Print junkStr 
    432         String/G $("root:"+destFolder+":fileList") = tempStr 
     438        String/G $("root:Packages:NIST:"+destFolder+":fileList") = tempStr 
    433439        textw[0] = tempStr              //filename 
    434440        textw[1] = junkStr              //run date-time 
Note: See TracChangeset for help on using the changeset viewer.