Ignore:
Timestamp:
Oct 7, 2008 1:09:04 PM (14 years ago)
Author:
ajj
Message:

Moving data folders into root:Packages:NIST

This could be hairy.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
21 edited

Legend:

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

    r412 r418  
    7171         
    7272        //Check for logscale data in "type" folder 
    73         String dest = "root:"+type 
     73        String dest = "root:Packages:NIST:"+type 
    7474         
    7575        NVAR isLogScale = $(dest + ":gIsLogScale") 
     
    361361        //get the beam center from the currently displayed data type 
    362362        SVAR type = root:myGlobals:gDataDisplayType 
    363         Wave reals = $("root:"+type+":RealsRead") 
     363        Wave reals = $("root:Packages:NIST:"+type+":RealsRead") 
    364364        Variable x0,y0,x1,y1 
    365365        x0 = reals[16] - 1              //convert to [0,127] from (1,128) detector 
     
    10591059//      SetDataFolder curPath 
    10601060        //get the untarnished data, so we can rescale it freshly here 
    1061         Wave yw = $("root:"+curFolder+":aveint") 
    1062         Wave ew = $("root:"+curFolder+":sigave") 
     1061        Wave yw = $("root:Packages:NIST:"+curFolder+":aveint") 
     1062        Wave ew = $("root:Packages:NIST:"+curFolder+":sigave") 
    10631063        //get the correct x values 
    10641064        NVAR isPhiAve= root:myGlobals:Plot_1d:isPhiAve  //0 signifies (normal) x=qvals 
    10651065        if(isPhiAve) 
    10661066                //x is angle 
    1067                 Wave xw=$("root:"+curFolder+":phival") 
     1067                Wave xw=$("root:Packages:NIST:"+curFolder+":phival") 
    10681068        else 
    10691069                //x is q-values 
    1070                 Wave xw=$("root:"+curFolder+":qval") 
     1070                Wave xw=$("root:Packages:NIST:"+curFolder+":qval") 
    10711071        endif 
    10721072        Wave yAxisWave=root:myGlobals:Plot_1d:yAxisWave         //refs to waves to be modified, hard-wired positions 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Buttons.ipf

    r412 r418  
    4646        //get the current displayed data (so the correct folder is used) 
    4747        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    48         String cur = "root:"+cur_folder 
     48        String cur = "root:Packages:NIST:"+cur_folder 
    4949         
    5050        WAVE reals=$(cur + ":realsread") 
     
    9393        //get the current displayed data (so the correct folder is used) 
    9494        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    95         SetDataFolder "root:"+cur_folder                //use the full path, so it will always work 
     95        SetDataFolder "root:Packages:NIST:"+cur_folder          //use the full path, so it will always work 
    9696        WAVE data = $"data" 
    9797//      WAVE vlegend = $"vlegend" 
     
    210210 
    211211        //take the currently displayed RAW file (there is only one name in fileList) 
    212         SVAR oldName = root:RAW:fileList 
     212        SVAR oldName = root:Packages:NIST:RAW:fileList 
    213213         
    214214        //get the run number 
     
    251251        endif 
    252252         
    253         CheckDisplayed/W=SANS_Data root:MSK:overlay 
     253        CheckDisplayed/W=SANS_Data root:Packages:NIST:MSK:overlay 
    254254        if(V_flag==1)           //the overlay is present 
    255255                Button $ctrlName,title="Show Mask",win=SANS_Data 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CircSectAve.ipf

    r412 r418  
    4040        //type is the data type to do the averaging on, and will be set as the current folder 
    4141        //get the current displayed data (so the correct folder is used) 
    42         String destPath = "root:"+type 
     42        String destPath = "root:Packages:NIST:"+type 
    4343         
    4444        // 
     
    9393        //Check for the existence of the mask, if not, make one (local to this folder) that is null 
    9494         
    95         if(WaveExists($"root:MSK:data") == 0) 
     95        if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 
    9696                Print "There is no mask file loaded (WaveExists)- the data is not masked" 
    9797                Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") 
     
    9999                mask = 0 
    100100        else 
    101                 Wave mask=$"root:MSK:data" 
     101                Wave mask=$"root:Packages:NIST:MSK:data" 
    102102        Endif 
    103103         
     
    452452         
    453453        //Check for logscale data in "type" folder 
    454         SetDataFolder "root:"+type              //use the full path, so it will always work 
    455         String dest = "root:" + type 
     454        SetDataFolder "root:Packages:NIST:"+type                //use the full path, so it will always work 
     455        String dest = "root:Packages:NIST:" + type 
    456456         
    457457        NVAR isLogScale = $(dest + ":gIsLogScale") 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Correct.ipf

    r412 r418  
    8888        //check for trans==1 
    8989        NVAR doCheck=root:myGlobals:gDoTransCheck 
    90         Wave/Z samR=root:SAM:RealsRead 
    91         Wave/Z empR=root:EMP:RealsRead 
     90        Wave/Z samR=root:Packages:NIST:SAM:RealsRead 
     91        Wave/Z empR=root:Packages:NIST:EMP:RealsRead 
    9292        if(doCheck) 
    9393                trans = samR[4] 
     
    237237         
    238238        //create the necessary wave references 
    239         WAVE sam_data=$"root:SAM:data" 
    240         WAVE sam_reals=$"root:SAM:realsread" 
    241         WAVE sam_ints=$"root:SAM:integersread" 
    242         WAVE/T sam_text=$"root:SAM:textread" 
    243         WAVE bgd_data=$"root:BGD:data" 
    244         WAVE bgd_reals=$"root:BGD:realsread" 
    245         WAVE bgd_ints=$"root:BGD:integersread" 
    246         WAVE/T bgd_text=$"root:BGD:textread" 
    247         WAVE emp_data=$"root:EMP:data" 
    248         WAVE emp_reals=$"root:EMP:realsread" 
    249         WAVE emp_ints=$"root:EMP:integersread" 
    250         WAVE/T emp_text=$"root:EMP:textread" 
    251         WAVE cor_data=$"root:COR:data" 
    252         WAVE/T cor_text=$"root:COR:textread" 
     239        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     240        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     241        WAVE sam_ints=$"rootPackages:NIST::SAM:integersread" 
     242        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     243        WAVE bgd_data=$"root:Packages:NIST:BGD:data" 
     244        WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 
     245        WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 
     246        WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 
     247        WAVE emp_data=$"root:Packages:NIST:EMP:data" 
     248        WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 
     249        WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 
     250        WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 
     251        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     252        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    253253         
    254254        //get sam and bgd attenuation factors 
     
    338338 
    339339        //create the necessary wave references 
    340         WAVE sam_data=$"root:SAM:data" 
    341         WAVE sam_reals=$"root:SAM:realsread" 
    342         WAVE sam_ints=$"root:SAM:integersread" 
    343         WAVE/T sam_text=$"root:SAM:textread" 
    344         WAVE bgd_data=$"root:BGD:data" 
    345         WAVE bgd_reals=$"root:BGD:realsread" 
    346         WAVE bgd_ints=$"root:BGD:integersread" 
    347         WAVE/T bgd_text=$"root:BGD:textread" 
    348         WAVE cor_data=$"root:COR:data" 
    349         WAVE/T cor_text=$"root:COR:textread" 
     340        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     341        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     342        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     343        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     344        WAVE bgd_data=$"root:Packages:NIST:BGD:data" 
     345        WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 
     346        WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 
     347        WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 
     348        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     349        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    350350         
    351351        //get sam and bgd attenuation factors 
     
    414414Function CorrectMode_3() 
    415415        //create the necessary wave references 
    416         WAVE sam_data=$"root:SAM:data" 
    417         WAVE sam_reals=$"root:SAM:realsread" 
    418         WAVE sam_ints=$"root:SAM:integersread" 
    419         WAVE/T sam_text=$"root:SAM:textread" 
    420         WAVE emp_data=$"root:EMP:data" 
    421         WAVE emp_reals=$"root:EMP:realsread" 
    422         WAVE emp_ints=$"root:EMP:integersread" 
    423         WAVE/T emp_text=$"root:EMP:textread" 
    424         WAVE cor_data=$"root:COR:data" 
    425         WAVE/T cor_text=$"root:COR:textread" 
     416        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     417        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     418        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     419        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     420        WAVE emp_data=$"root:Packages:NIST:EMP:data" 
     421        WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 
     422        WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 
     423        WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 
     424        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     425        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    426426         
    427427        //get sam and bgd attenuation factors 
     
    496496Function CorrectMode_4() 
    497497        //create the necessary wave references 
    498         WAVE sam_data=$"root:SAM:data" 
    499         WAVE sam_reals=$"root:SAM:realsread" 
    500         WAVE sam_ints=$"root:SAM:integersread" 
    501         WAVE/T sam_text=$"root:SAM:textread" 
    502  
    503         WAVE cor_data=$"root:COR:data" 
    504         WAVE/T cor_text=$"root:COR:textread" 
     498        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     499        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     500        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     501        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     502 
     503        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     504        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    505505         
    506506        //get sam and bgd attenuation factors 
     
    531531Function CorrectMode_11() 
    532532        //create the necessary wave references 
    533         WAVE sam_data=$"root:SAM:data" 
    534         WAVE sam_reals=$"root:SAM:realsread" 
    535         WAVE sam_ints=$"root:SAM:integersread" 
    536         WAVE/T sam_text=$"root:SAM:textread" 
    537         WAVE bgd_data=$"root:BGD:data" 
    538         WAVE bgd_reals=$"root:BGD:realsread" 
    539         WAVE bgd_ints=$"root:BGD:integersread" 
    540         WAVE/T bgd_text=$"root:BGD:textread" 
    541         WAVE emp_data=$"root:EMP:data" 
    542         WAVE emp_reals=$"root:EMP:realsread" 
    543         WAVE emp_ints=$"root:EMP:integersread" 
    544         WAVE/T emp_text=$"root:EMP:textread" 
    545         WAVE drk_data=$"root:DRK:data" 
    546         WAVE drk_reals=$"root:DRK:realsread" 
    547         WAVE drk_ints=$"root:DRK:integersread" 
    548         WAVE/T drk_text=$"root:DRK:textread" 
    549         WAVE cor_data=$"root:COR:data" 
    550         WAVE/T cor_text=$"root:COR:textread" 
     533        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     534        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     535        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     536        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     537        WAVE bgd_data=$"root:Packages:NIST:BGD:data" 
     538        WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 
     539        WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 
     540        WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 
     541        WAVE emp_data=$"root:Packages:NIST:EMP:data" 
     542        WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 
     543        WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 
     544        WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 
     545        WAVE drk_data=$"root:Packages:NIST:DRK:data" 
     546        WAVE drk_reals=$"root:Packages:NIST:DRK:realsread" 
     547        WAVE drk_ints=$"root:Packages:NIST:DRK:integersread" 
     548        WAVE/T drk_text=$"root:Packages:NIST:DRK:textread" 
     549        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     550        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    551551         
    552552        //get sam and bgd attenuation factors 
     
    643643Function CorrectMode_12() 
    644644        //create the necessary wave references 
    645         WAVE sam_data=$"root:SAM:data" 
    646         WAVE sam_reals=$"root:SAM:realsread" 
    647         WAVE sam_ints=$"root:SAM:integersread" 
    648         WAVE/T sam_text=$"root:SAM:textread" 
    649         WAVE bgd_data=$"root:BGD:data" 
    650         WAVE bgd_reals=$"root:BGD:realsread" 
    651         WAVE bgd_ints=$"root:BGD:integersread" 
    652         WAVE/T bgd_text=$"root:BGD:textread" 
    653         WAVE drk_data=$"root:DRK:data" 
    654         WAVE drk_reals=$"root:DRK:realsread" 
    655         WAVE drk_ints=$"root:DRK:integersread" 
    656         WAVE/T drk_text=$"root:DRK:textread" 
    657         WAVE cor_data=$"root:COR:data" 
    658         WAVE/T cor_text=$"root:COR:textread" 
     645        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     646        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     647        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     648        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     649        WAVE bgd_data=$"root:Packages:NIST:BGD:data" 
     650        WAVE bgd_reals=$"root:Packages:NIST:BGD:realsread" 
     651        WAVE bgd_ints=$"root:Packages:NIST:BGD:integersread" 
     652        WAVE/T bgd_text=$"root:Packages:NIST:BGD:textread" 
     653        WAVE drk_data=$"root:Packages:NIST:DRK:data" 
     654        WAVE drk_reals=$"root:Packages:NIST:DRK:realsread" 
     655        WAVE drk_ints=$"root:Packages:NIST:DRK:integersread" 
     656        WAVE/T drk_text=$"root:Packages:NIST:DRK:textread" 
     657        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     658        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    659659         
    660660        //get sam and bgd attenuation factors 
     
    729729Function CorrectMode_13() 
    730730        //create the necessary wave references 
    731         WAVE sam_data=$"root:SAM:data" 
    732         WAVE sam_reals=$"root:SAM:realsread" 
    733         WAVE sam_ints=$"root:SAM:integersread" 
    734         WAVE/T sam_text=$"root:SAM:textread" 
    735         WAVE emp_data=$"root:EMP:data" 
    736         WAVE emp_reals=$"root:EMP:realsread" 
    737         WAVE emp_ints=$"root:EMP:integersread" 
    738         WAVE/T emp_text=$"root:EMP:textread" 
     731        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     732        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     733        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     734        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
     735        WAVE emp_data=$"root:Packages:NIST:EMP:data" 
     736        WAVE emp_reals=$"root:Packages:NIST:EMP:realsread" 
     737        WAVE emp_ints=$"root:Packages:NIST:EMP:integersread" 
     738        WAVE/T emp_text=$"root:Packages:NIST:EMP:textread" 
    739739        WAVE drk_data=$"root:DRK:data" 
    740740        WAVE drk_reals=$"root:DRK:realsread" 
    741741        WAVE drk_ints=$"root:DRK:integersread" 
    742742        WAVE/T drk_text=$"root:DRK:textread" 
    743         WAVE cor_data=$"root:COR:data" 
    744         WAVE/T cor_text=$"root:COR:textread" 
     743        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     744        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    745745         
    746746        //get sam and bgd attenuation factors (DRK irrelevant) 
     
    820820Function CorrectMode_14() 
    821821        //create the necessary wave references 
    822         WAVE sam_data=$"root:SAM:data" 
    823         WAVE sam_reals=$"root:SAM:realsread" 
    824         WAVE sam_ints=$"root:SAM:integersread" 
    825         WAVE/T sam_text=$"root:SAM:textread" 
     822        WAVE sam_data=$"root:Packages:NIST:SAM:data" 
     823        WAVE sam_reals=$"root:Packages:NIST:SAM:realsread" 
     824        WAVE sam_ints=$"root:Packages:NIST:SAM:integersread" 
     825        WAVE/T sam_text=$"root:Packages:NIST:SAM:textread" 
    826826 
    827827        WAVE drk_data=$"root:DRK:data" 
     
    829829        WAVE drk_ints=$"root:DRK:integersread" 
    830830        WAVE/T drk_text=$"root:DRK:textread" 
    831         WAVE cor_data=$"root:COR:data" 
    832         WAVE/T cor_text=$"root:COR:textread" 
     831        WAVE cor_data=$"root:Packages:NIST:COR:data" 
     832        WAVE/T cor_text=$"root:Packages:NIST:COR:textread" 
    833833         
    834834        //get sam and bgd attenuation factors 
     
    933933         
    934934        String destPath="" 
    935         destPath =  "root:"+Type + ":data" 
     935        destPath =  "root:Packages:NIST:"+Type + ":data" 
    936936        if(WaveExists($destpath) == 0) 
    937937                Print "There is no work file in "+type 
     
    10641064        String type = "SAM" 
    10651065        //check for SAM 
    1066         destPath = "root:"+Type + ":data" 
     1066        destPath = "root:Packages:NIST:"+Type + ":data" 
    10671067        if(WaveExists($destpath) == 0) 
    10681068                Print "There is no work file in "+type+"--Aborting" 
     
    10711071                //check for log-scaling of the "SAM" data and adjust if necessary 
    10721072                ConvertFolderToLinearScale(type) 
    1073                 Wave sam_data = $"root:SAM:data" 
     1073                Wave sam_data = $"root:Packages:NIST:SAM:data" 
    10741074        Endif 
    10751075         
     
    10771077        if( (mode ==1) || (mode==2) || (mode==11) || (mode==12) ) 
    10781078                type = "BGD" 
    1079                 destPath =  "root:"+Type + ":data" 
     1079                destPath =  "root:Packages:NIST:"+Type + ":data" 
    10801080                if(WaveExists($destpath) == 0) 
    10811081                        Print "There is no work file in "+type+"--Aborting" 
     
    10841084                        //check for log-scaling of the "BGD" data and adjust if necessary 
    10851085                        ConvertFolderToLinearScale(type) 
    1086                         Wave bgd_data = $"root:BGD:data" 
     1086                        Wave bgd_data = $"root:Packages:NIST:BGD:data" 
    10871087                Endif 
    10881088        Endif 
     
    10911091        if( (mode==1) || (mode==3) || (mode==11) || (mode==13) ) 
    10921092                type = "EMP" 
    1093                 destPath =  "root:"+Type + ":data" 
     1093                destPath =  "root:Packages:NIST:"+Type + ":data" 
    10941094                if(WaveExists($destpath) == 0) 
    10951095                        Print "There is no work file in "+type+"--Aborting" 
     
    10981098                        //check for log-scaling of the "EMP" data and adjust if necessary 
    10991099                        ConvertFolderToLinearScale(type) 
    1100                         Wave emp_data = $"root:EMP:data" 
     1100                        Wave emp_data = $"root:Packages:NIST:EMP:data" 
    11011101                Endif 
    11021102        Endif 
     
    11051105        if( (mode==11) || (mode==12) || (mode==13) || (mode==14) ) 
    11061106                type = "DRK" 
    1107                 destPath =  "root:"+Type + ":data" 
     1107                destPath =  "root:Packages:NIST:"+Type + ":data" 
    11081108                if(WaveExists($destpath) == 0) 
    11091109                        Print "There is no work file in "+type+"--Aborting" 
     
    11201120        //make needed wave references to other folders 
    11211121        //NOTE that these references MAY NOT EXIST, depending on the mode 
    1122         WAVE sam_reals = $"root:SAM:realsread" 
    1123         WAVE sam_ints = $"root:SAM:integersread" 
    1124         WAVE/T sam_text = $"root:SAM:textread" 
    1125         WAVE/Z emp_reals = $"root:EMP:realsread" 
    1126         WAVE/Z emp_ints = $"root:EMP:integersread" 
    1127         WAVE/T/Z emp_text = $"root:EMP:textread" 
    1128         WAVE/Z bgd_reals = $"root:BGD:realsread" 
    1129         WAVE/Z bgd_ints = $"root:BGD:integersread" 
    1130         WAVE/T/Z bgd_text = $"root:BGD:textread" 
     1122        WAVE sam_reals = $"root:Packages:NIST:SAM:realsread" 
     1123        WAVE sam_ints = $"root:Packages:NIST:SAM:integersread" 
     1124        WAVE/T sam_text = $"root:Packages:NIST:SAM:textread" 
     1125        WAVE/Z emp_reals = $"root:Packages:NIST:EMP:realsread" 
     1126        WAVE/Z emp_ints = $"root:Packages:NIST:EMP:integersread" 
     1127        WAVE/T/Z emp_text = $"root:Packages:NIST:EMP:textread" 
     1128        WAVE/Z bgd_reals = $"root:Packages:NIST:BGD:realsread" 
     1129        WAVE/Z bgd_ints = $"root:Packages:NIST:BGD:integersread" 
     1130        WAVE/T/Z bgd_text = $"root:Packages:NIST:BGD:textread" 
    11311131         
    11321132        //find the attenuation of the sample (if any) 
     
    11471147         
    11481148        //now switch to COR folder 
    1149         DestPath="root:COR" 
     1149        DestPath="root:Packages:NIST:COR" 
    11501150        //make appropriate wave references 
    11511151        WAVE data=$(destPath + ":data")                                 // these wave references point to the SAM data in COR 
     
    11691169         
    11701170        //make needed wave references to other folders 
    1171         Wave sam_reals = $"root:SAM:realsread" 
    1172         Wave bgd_reals = $"root:BGD:realsread" 
    1173         Wave emp_reals = $"root:EMP:realsread" 
     1171        Wave sam_reals = $"root:Packages:NIST:SAM:realsread" 
     1172        Wave bgd_reals = $"root:Packages:NIST:BGD:realsread" 
     1173        Wave emp_reals = $"root:Packages:NIST:EMP:realsread" 
    11741174         
    11751175        //get counts, trans, etc. from file headers 
     
    13791379         
    13801380        //clean up 
    1381         SetDataFolder root:COR 
     1381        SetDataFolder root:Packages:NIST:COR 
    13821382        SetDataFolder root: 
    13831383        KillWaves/Z cor1,cor2,noadd 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/DisplayUtils.ipf

    r412 r418  
    2323        //macro will take whatever is in "type" folder 
    2424        //check the contents of "type" to make sure that data exists 
    25         String wavePath = "root:"+type+":data" 
     25        String wavePath = "root:Packages:NIST:"+type+":data" 
    2626        if(WaveExists($wavePath) == 0) 
    2727                String errString="There is no data in "+type 
     
    174174        else 
    175175                //check the contents of "type" to make sure that data exists 
    176                 String wavePath = "root:"+type+":data" 
     176                String wavePath = "root:Packages:NIST:"+type+":data" 
    177177                if(WaveExists($wavePath) == 0) 
    178178                        String errString="There is no data in "+type 
     
    203203         
    204204        //check the contents of "type" to make sure that data exists 
    205         String wavePath = "root:"+type+":data" 
     205        String wavePath = "root:Packages:NIST:"+type+":data" 
    206206        if(WaveExists($wavePath) == 0) 
    207207                Abort "There is no data in "+type 
     
    224224        String folder    
    225225         
    226         String dest = "root:"+folder 
     226        String dest = "root:Packages:NIST:"+folder 
    227227        NVAR isLogscale = $(dest + ":gIsLogScale") 
    228228        If(!isLogScale) 
     
    262262        String folder    
    263263         
    264         String dest = "root:"+folder 
     264        String dest = "root:Packages:NIST:"+folder 
    265265        NVAR isLogscale = $(dest + ":gIsLogScale") 
    266266//      Print "ConvertFolderToLogScale() -- ",dest," has gIsLogscale = ",isLogScale 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf

    r417 r418  
    2727#include "PatchFiles"                   version>=5.0 
    2828//#include "PlotUtils"                  version>=5.0 
    29 #include "PlotUtilsMacro_v40"           version>=4.0 
     29//AJJ October 2008 - switch to shared file loader 
     30#include "PlotUtilsMacro_v40" 
     31#include "NIST_XML_v40" 
     32#include "USANS_SlitSmearing_v40" 
     33// 
    3034#include "ProDiv"                               version>=5.0 
    3135#include "ProtocolAsPanel"              version>=5.0 
     
    5458 
    5559#include "TISANE" 
     60 
     61 
     62//AJJ Oct 2008 
     63#include "PlotManager_v40" 
    5664 
    5765// to include the analysis packages, uncomment the following 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

    r412 r418  
    5252Function InitFolders() 
    5353         
     54        NewDataFolder/O root:Packages 
     55        NewDataFolder/O root:Packages:NIST 
     56         
    5457        NewDataFolder/O root:myGlobals 
    5558        NewDataFolder/O root:myGlobals:CatVSHeaderInfo 
    56         NewDataFolder/O root:RAW 
    57         NewDataFolder/O root:SAM 
    58         NewDataFolder/O root:EMP 
    59         NewDataFolder/O root:BGD 
    60         NewDataFolder/O root:COR 
    61         NewDataFolder/O root:DIV 
    62         NewDataFolder/O root:MSK 
    63         NewDataFolder/O root:ABS 
    64         NewDataFolder/O root:CAL 
    65         NewDataFolder/O root:STO 
    66         NewDataFolder/O root:SUB 
    67         NewDataFolder/O root:DRK 
     59        NewDataFolder/O root:Packages:NIST:RAW 
     60        NewDataFolder/O root:Packages:NIST:SAM 
     61        NewDataFolder/O root:Packages:NIST:EMP 
     62        NewDataFolder/O root:Packages:NIST:BGD 
     63        NewDataFolder/O root:Packages:NIST:COR 
     64        NewDataFolder/O root:Packages:NIST:DIV 
     65        NewDataFolder/O root:Packages:NIST:MSK 
     66        NewDataFolder/O root:Packages:NIST:ABS 
     67        NewDataFolder/O root:Packages:NIST:CAL 
     68        NewDataFolder/O root:Packages:NIST:STO 
     69        NewDataFolder/O root:Packages:NIST:SUB 
     70        NewDataFolder/O root:Packages:NIST:DRK 
     71         
     72 
    6873         
    6974        Return(0) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Marquee.ipf

    r412 r418  
    3232        Variable counts = 0,ii,jj 
    3333         
    34         String dest =  "root:"+type 
     34        String dest =  "root:Packages:NIST:"+type 
    3535         
    3636        //check for logscale data, but don't change the data 
     
    121121        //now change the extra variables in the empty beam file 
    122122        //get the filename from the SAM folder (there will only be one file) 
    123         SVAR partialName = root:SAM:FileList 
     123        SVAR partialName = root:Packages:NIST:SAM:FileList 
    124124        //construct valid filename, then prepend path 
    125125        String tempName = FindValidFilename(partialName) 
     
    158158        //get the current displayed data (so the correct folder is used) 
    159159        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    160         String dest = "root:" + cur_folder 
     160        String dest = "root:Packages:NIST:" + cur_folder 
    161161         
    162162        Variable xzsum,yzsum,zsum,xctr,yctr 
     
    455455        endif 
    456456        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    457         WAVE data=$("root:"+cur_folder+":data")         //don't care if it's log or linear scale 
     457        WAVE data=$("root:Packages:NIST:"+cur_folder+":data")           //don't care if it's log or linear scale 
    458458        Make/O/N=(max(xwidth,ywidth)+1) Position,AvgCounts 
    459459        AvgCounts=0 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MaskUtils.ipf

    r412 r418  
    2121//reads the data (1=mask, 0 = no mask) 
    2222//and plots a quickie image to make sure it's ok 
    23 //data is always read into root:MSK folder 
     23//data is always read into root:Packages:NIST:MSK folder 
    2424// 
    2525Proc ReadMASK() 
    2626         
    27         //SetDataFolder root:MSK 
     27        //SetDataFolder root:Packages:NIST:MSK 
    2828        String fname = PromptForPath("Select Mask file") 
    2929        if(strlen(fname)==0) 
     
    3232        ReadMCID_MASK(fname) 
    3333         
    34         //SetDataFolder root:MSK 
     34        //SetDataFolder root:Packages:NIST:MSK 
    3535////    SRK SEP06 disable plot of mask data, just show the overlay 
    36 ////    String waveStr = "root:MSK:data" 
     36////    String waveStr = "root:Packages:NIST:MSK:data" 
    3737////    NewImage/F/S=2/K=1 $waveStr 
    3838////    ModifyImage '' ctab= {*,*,YellowHot,0} 
     
    4545 
    4646 
    47 //reads the mask data into the root:MSK folder 
     47//reads the mask data into the root:Packages:NIST:MSK folder 
    4848//setDataFolder is required here 
    4949//y-values must be flipped to get proper array assignment of the mask 
     
    5656        NVAR pixelsX = root:myGlobals:gNPixelsX 
    5757        NVAR pixelsY = root:myGlobals:gNPixelsY 
    58         SetDataFolder root:MSK 
     58        SetDataFolder root:Packages:NIST:MSK 
    5959        Killwaves/Z data,data0          //kill the old data, if it exists 
    6060        String cmd = "GBLoadWave/N=data/T={72,72}/O/S=4/W=1/U=16384 /Q  \"" + fname +"\"" 
    6161        Execute cmd  
    62         SetDataFolder root:MSK                                          //make sure correct data folder is set 
    63         WAVE data0 = $"root:MSK:data0" 
     62        SetDataFolder root:Packages:NIST:MSK                                            //make sure correct data folder is set 
     63        WAVE data0 = $"root:Packages:NIST:MSK:data0" 
    6464        Redimension/N=(pixelsX,pixelsY) data0 
    6565        Flip_Y(data0) 
    6666         
    67         SetDataFolder root:MSK 
     67        SetDataFolder root:Packages:NIST:MSK 
    6868        Rename data0,data 
    6969         
    70         Variable/G root:MSK:gIsLogScale = 0 
    71         String/G root:MSK:fileList = GetFileNameFromPathNoSemi(fname) 
     70        Variable/G root:Packages:NIST:MSK:gIsLogScale = 0 
     71        String/G root:Packages:NIST:MSK:fileList = GetFileNameFromPathNoSemi(fname) 
    7272        //back to root folder 
    7373        SetDataFolder root: 
     
    153153        Variable state 
    154154         
    155         String maskPath = "root:MSK:data" 
     155        String maskPath = "root:Packages:NIST:MSK:data" 
    156156        if(WaveExists($maskPath) == 1) 
    157157                //duplicate the mask, which is named "data" 
     
    159159                Redimension/D root:MSK:overlay 
    160160         
    161                 String tempStr = "root:MSK:overlay" 
     161                String tempStr = "root:Packages:NIST:MSK:overlay" 
    162162                ResetLoop(tempStr)              //keeps 1's and sets 0's to NaN 
    163163         
     
    168168                endif 
    169169                 
    170                 CheckDisplayed/W=SANS_Data root:MSK:overlay 
     170                CheckDisplayed/W=SANS_Data root:Packages:NIST:MSK:overlay 
    171171                //Print "V_flag = ",V_flag 
    172172         
     
    178178                        if(state==1) 
    179179                                //append the new overlay 
    180                                 AppendImage/L=left/B=bottom root:MSK:overlay 
     180                                AppendImage/L=left/B=bottom root:Packages:NIST:MSK:overlay 
    181181                                //set the color table to vary from 0 to * (=max data = 1), with blue maximum 
    182182                                //Nan's will appear transparent (just a general feature of images) 
     
    296296        //there must be data in root:curDispType:data FIRST 
    297297        SVAR curType=root:myGlobals:gDataDisplayType 
    298         if(WaveExists($("root:"+curType+":data") )) 
     298        if(WaveExists($("root:Packages:NIST:"+curType+":data") )) 
    299299                DoWindow/F drawMaskWin 
    300300                If(V_flag == 0) 
     
    319319                //create the data folder and the globals 
    320320                                NewDataFolder/O root:myGlobals:drawMask 
    321                                 Duplicate/O $("root:"+type+":data") root:myGlobals:drawMask:data                //copy of the data 
     321                                Duplicate/O $("root:Packages:NIST:"+type+":data") root:myGlobals:drawMask:data          //copy of the data 
    322322                Endif 
    323323                //if the data folder's there , then the globals must also be there so don't do anything 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NCNR_DataReadWrite.ipf

    r412 r418  
    5959//VAX record markers are skipped as needed 
    6060//VAX data as read in is in compressed I*2 format, and is decompressed 
    61 //immediately after being read in. The final root:RAW:data wave is the real 
     61//immediately after being read in. The final root:Packages:NIST:RAW:data wave is the real 
    6262//neutron counts and can be directly operated on 
    6363// 
     
    7878        String fname 
    7979        //this function is for reading in RAW data only, so it will always put data in RAW folder 
    80         String curPath = "root:RAW" 
     80        String curPath = "root:Packages:NIST:RAW" 
    8181        SetDataFolder curPath           //use the full path, so it will always work 
    8282        Variable/G root:RAW:gIsLogScale = 0             //initial state is linear, keep this in RAW folder 
     
    8585        String sansfname,textstr 
    8686         
    87         Make/O/N=23 $"root:RAW:IntegersRead" 
    88         Make/O/N=52 $"root:RAW:RealsRead" 
    89         Make/O/T/N=11 $"root:RAW:TextRead" 
    90          
    91         Wave intw=$"root:RAW:IntegersRead" 
    92         Wave realw=$"root:RAW:RealsRead" 
    93         Wave/T textw=$"root:RAW:TextRead" 
     87        Make/O/N=23 $"root:Packages:NIST:RAW:IntegersRead" 
     88        Make/O/N=52 $"root:Packages:NIST:RAW:RealsRead" 
     89        Make/O/T/N=11 $"root:Packages:NIST:RAW:TextRead" 
     90         
     91        Wave intw=$"root:Packages:NIST:RAW:IntegersRead" 
     92        Wave realw=$"root:Packages:NIST:RAW:RealsRead" 
     93        Wave/T textw=$"root:Packages:NIST:RAW:TextRead" 
    9494         
    9595        //***NOTE **** 
     
    228228        strToExecute = GBLoadStr + "/S=39/U=4" + "\"" + fname + "\"" 
    229229        Execute strToExecute 
    230         Wave w=$"root:RAW:tempGBWave0" 
     230        Wave w=$"root:Packages:NIST:RAW:tempGBWave0" 
    231231        b=4     //num of reals read 
    232232        realw[a,a+b-1] = w[p-a] 
     
    334334        SetDataFolder curPath           //use the full path, so it will always work 
    335335         
    336         Make/O/N=16384 $"root:RAW:data" 
    337         WAVE data=$"root:RAW:data" 
     336        Make/O/N=16384 $"root:Packages:NIST:RAW:data" 
     337        WAVE data=$"root:Packages:NIST:RAW:data" 
    338338        SkipAndDecompressVAX(w,data) 
    339339        Redimension/N=(128,128) data                    //NIST raw data is 128x128 - do not generalize 
    340340         
    341341        //keep a string with the filename in the RAW folder 
    342         String/G root:RAW:fileList = textw[0] 
     342        String/G root:Packages:NIST:RAW:fileList = textw[0] 
    343343         
    344344        //set the globals to the detector dimensions (pixels) 
     
    350350//      endif 
    351351         
    352         //clean up - get rid of w = $"root:RAW:tempGBWave0" 
     352        //clean up - get rid of w = $"root:Packages:NIST:RAW:tempGBWave0" 
    353353        KillWaves/Z w 
    354354         
     
    428428//main entry procedure for reading a "WORK.DIV" file 
    429429//displays a quick image of the  file, to check that it's correct 
    430 //data is deposited in root:DIV data folder 
     430//data is deposited in root:Packages:NIST:DIV data folder 
    431431// 
    432432// local, currently unused 
     
    439439        ReadHeaderAndWork("DIV",fname)          //puts what is read in work.div 
    440440         
    441         String waveStr = "root:DIV:data" 
     441        String waveStr = "root:Packages:NIST:DIV:data" 
    442442        NewImage/F/K=1/S=2 $waveStr             //this is an experimental IGOR operation 
    443443        ModifyImage '' ctab= {*,*,YellowHot,0} 
     
    445445         
    446446        //change the title string to WORK.DIV, rather than PLEXnnn_TST_asdfa garbage 
    447         String/G root:DIV:fileList = "WORK.DIV" 
     447        String/G root:Packages:NIST:DIV:fileList = "WORK.DIV" 
    448448         
    449449        SetDataFolder root:             //(redundant) 
     
    474474//      SVAR cur_folder=root:myGlobals:gDataDisplayType 
    475475        String cur_folder = type 
    476         String curPath = "root:"+cur_folder 
     476        String curPath = "root:Packages:NIST:"+cur_folder 
    477477        SetDataFolder curPath           //use the full path, so it will always work 
    478478         
     
    728728         GBLoadStr="GBLoadWave/O/N=tempGBwave/T={2,2}/J=2/W=1/Q" 
    729729 
    730         curPath = "root:"+cur_folder 
     730        curPath = "root:Packages:NIST:"+cur_folder 
    731731        SetDataFolder curPath           //use the full path, so it will always work 
    732732         
     
    828828        String fname, destPath 
    829829        //this function is for reading in ASCII data so put data in user-specified folder 
    830         SetDataFolder "root:"+destPath 
     830        SetDataFolder "root:Packages:NIST:"+destPath 
    831831 
    832832        NVAR pixelsX = root:myGlobals:gNPixelsX 
     
    890890Function FillFakeHeader_ASC(destFolder) 
    891891        String destFolder 
    892         Make/O/N=23 $("root:"+destFolder+":IntegersRead") 
    893         Make/O/N=52 $("root:"+destFolder+":RealsRead") 
    894         Make/O/T/N=11 $("root:"+destFolder+":TextRead") 
    895          
    896         Wave intw=$("root:"+destFolder+":IntegersRead") 
    897         Wave realw=$("root:"+destFolder+":RealsRead") 
    898         Wave/T textw=$("root:"+destFolder+":TextRead") 
     892        Make/O/N=23 $("root:Packages:NIST:"+destFolder+":IntegersRead") 
     893        Make/O/N=52 $("root:Packages:NIST:"+destFolder+":RealsRead") 
     894        Make/O/T/N=11 $("root:Packages:NIST:"+destFolder+":TextRead") 
     895         
     896        Wave intw=$("root:Packages:NIST:"+destFolder+":IntegersRead") 
     897        Wave realw=$("root:Packages:NIST:"+destFolder+":RealsRead") 
     898        Wave/T textw=$("root:Packages:NIST:"+destFolder+":TextRead") 
    899899         
    900900        //Put in appropriate "fake" values 
    901901        //parse values as needed from headerLines 
    902         Wave/T hdr=$("root:"+destFolder+":hdrLines") 
     902        Wave/T hdr=$("root:Packages:NIST:"+destFolder+":hdrLines") 
    903903        Variable monCt,lam,offset,sdd,trans,thick 
    904904        Variable xCtr,yCtr,a1,a2,a1a2Dist,dlam,bsDiam 
     
    951951//      Print tempStr 
    952952//      Print junkStr 
    953         String/G $("root:"+destFolder+":fileList") = tempStr 
     953        String/G $("root:Packages:NIST:"+destFolder+":fileList") = tempStr 
    954954        textw[0] = tempStr              //filename 
    955955        textw[1] = junkStr              //run date-time 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProDiv.ipf

    r412 r418  
    3636        String type 
    3737         
    38         Wave data=$("root:"+type+":data") 
     38        Wave data=$("root:Packages:NIST:"+type+":data") 
    3939         
    4040        Variable refnum,ii=0,hdrBytes=516,a,b,offset 
     
    192192        String type 
    193193         
    194         WAVE data=$("root:"+type+":data") 
     194        WAVE data=$("root:Packages:NIST:"+type+":data") 
    195195        Variable totCts=sum(data,Inf,-Inf)              //sum all of the data 
    196196         
     
    272272         
    273273        //do it crudely, with nested for loops 
    274         WAVE ctrData=$("root:"+ctrtype+":data") 
    275         WAVE offData=$("root:"+offtype+":data") 
     274        WAVE ctrData=$("root:Packages:NIST:"+ctrtype+":data") 
     275        WAVE offData=$("root:Packages:NIST:"+offtype+":data") 
    276276        Variable ii,jj 
    277277         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

    r412 r418  
    13751375        //fileList has NAMES ONLY - since it was derived from the file header 
    13761376        String testStr 
    1377         testStr = "root:"+type+":fileList" 
     1377        testStr = "root:Packages:NIST:"+type+":fileList" 
    13781378        if(Exists(testStr) == 2)                //2 if string variable exists 
    13791379                SVAR curFiles = $testStr 
     
    16161616                If(cmpstr(prot[1],"none") == 0) 
    16171617                        //clean out the EMP folder? 
    1618                         //KillDataFolder root:EMP 
    1619                         //NewDataFolder/O root:EMP 
     1618                        //KillDataFolder root:Packages:NIST:EMP 
     1619                        //NewDataFolder/O root:Packages:NIST:EMP 
    16201620                        break 
    16211621                Endif 
     
    17501750                Endif 
    17511751                //get the sample trans and thickness from the activeType folder 
    1752                 String destStr = "root:"+activeType+":realsread" 
     1752                String destStr = "root:Packages:NIST:"+activeType+":realsread" 
    17531753                Wave dest = $destStr 
    17541754                Variable c0 = dest[4]           //sample transmission 
     
    17771777                                //if none desired, make sure that the old mask is deleted 
    17781778                                //junkStr = GetDataFolder(1) 
    1779                                 //SetDataFolder root:MSK 
    1780                                 KillWaves/Z root:MSK:data 
     1779                                //SetDataFolder root:Packages:NIST:MSK 
     1780                                KillWaves/Z root:Packages:NIST:MSK:data 
    17811781                                //SetDataFolder junkStr 
    17821782                                DoAlert 0,"No Mask file selected, data not masked" 
     
    17941794                //if none desired, make sure that the old mask is deleted 
    17951795                //junkStr = GetDataFolder(1) 
    1796                 //SetDataFolder root:MSK 
    1797                 KillWaves/Z root:MSK:data 
     1796                //SetDataFolder root:Packages:NIST:MSK 
     1797                KillWaves/Z root:Packages:NIST:MSK:data 
    17981798                //SetDataFolder junkStr 
    17991799        Endif 
     
    18631863                //then save 
    18641864                //get name from textwave of the activeType dataset 
    1865                 String textStr = "root:"+activeType+":textread" 
     1865                String textStr = "root:Packages:NIST:"+activeType+":textread" 
    18661866                Wave/T textPath = $textStr 
    18671867                If(WaveExists(textPath) == 1) 
     
    19941994                endif 
    19951995                         
    1996                 Wave/T tw=$"root:RAW:TextRead" 
    1997                 Wave rw=$"root:RAW:RealsRead" 
    1998                 Wave iw=$"root:RAW:IntegersRead" 
     1996                Wave/T tw=$"root:Packages:NIST:RAW:TextRead" 
     1997                Wave rw=$"root:Packages:NIST:RAW:RealsRead" 
     1998                Wave iw=$"root:Packages:NIST:RAW:IntegersRead" 
    19991999                String acctStr = tw[3] 
    20002000                //NG5 attenuator transmission is assumed to be the same as the table for NG7 
     
    20512051                //need the detector sensitivity file - make a guess, allow to override 
    20522052                String junkStr="" 
    2053                 if(! waveexists($"root:DIV:data")) 
     2053                if(! waveexists($"root:Packages:NIST:DIV:data")) 
    20542054                         junkStr = PromptForPath("Select the detector sensitivity file") 
    20552055                        If(strlen(junkStr)==0 || CheckIfRawData(junkStr))               //raw check==1 if RAW, DIV is not 
     
    20642064                        Log_Lin("bisLog")        
    20652065                endif    
    2066                 Wave divData = $"root:div:Data" 
    2067                 Wave data = $"root:raw:data"            //this will be the linear data 
     2066                Wave divData = $"root:Packages:NIST:div:Data" 
     2067                Wave data = $"root:Packages:NIST:raw:data"              //this will be the linear data 
    20682068                // correct by detector sensitivity 
    20692069                data /= divData 
    20702070                 
    20712071                // now do the sum, only in the box       
    2072 //              detCnt = sum($"root:raw:data", -inf, inf ) 
     2072//              detCnt = sum($"root:Packages:NIST:raw:data", -inf, inf ) 
    20732073//              Print "box is now ",x1,x2,y1,y2 
    20742074                detCnt = SumCountsInBox(x1,x2,y1,y2,"RAW") 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RawWindowHook.ipf

    r412 r418  
    4242        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    4343        SVAR cur_title = root:myGlobals:gCurTitle 
    44         String curPath = "root:"+cur_folder 
     44        String curPath = "root:Packages:NIST:"+cur_folder 
    4545        Wave/T tw=$(curPath+":TextRead") 
    4646        cur_title = tw[6]                       //always update the title string 
     
    208208        //get the current displayed data (so the correct folder is used) 
    209209        SVAR cur_folder=root:myGlobals:gDataDisplayType 
    210         SetDataFolder "root:"+cur_folder                //use the full path, so it will always work 
    211         String curPath = "root:" + cur_folder 
     210        SetDataFolder "root:Packages:NIST:"+cur_folder          //use the full path, so it will always work 
     211        String curPath = "root:Packages:NIST:" + cur_folder 
    212212        NVAR dataIsLog=$(curPath + ":gIsLogScale")              //now a global variable in the current folder, not the globals folder 
    213213        if (dataIsLog)  
     
    277277        Variable dx,dy,thetax,thetay,qval,qx,qy 
    278278         
    279 //      Wave realW=$"root:raw:realsRead" 
     279//      Wave realW=$"root:Packages:NIST:raw:realsRead" 
    280280//      Variable pixSizeX = realW[10]/10                //header is in mm, want cm 
    281281//      Variable pixSizeY = realW[13]/10                //header is in mm, want cm 
     
    307307        //wavelength is in Angstroms 
    308308         
    309 //      Wave realW=$"root:raw:realsRead" 
     309//      Wave realW=$"root:Packages:NIST:raw:realsRead" 
    310310//      Variable pixSize = realW[10]/10         //header is in mm, want cm 
    311311         
     
    332332        //wavelength is in Angstroms 
    333333         
    334 //      Wave realW=$"root:raw:realsRead" 
     334//      Wave realW=$"root:Packages:NIST:raw:realsRead" 
    335335//      Variable pixSize = realW[13]/10         //header is in mm, want cm 
    336336                 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/RectAnnulAvg.ipf

    r412 r418  
    5050        //type is the data type to do the averaging on, and will be set as the current folder 
    5151        //get the current displayed data (so the correct folder is used) 
    52         String destPath = "root:"+type 
     52        String destPath = "root:Packages:NIST:"+type 
    5353        // 
    5454        Variable xcenter,ycenter,x0,y0,sx,sx3,sy,sy3,dtsize,dtdist,dr,ddr 
     
    106106        //Check for the existence of the mask, if not, make one (local to this folder) that is null 
    107107         
    108         if(WaveExists($"root:MSK:data") == 0) 
     108        if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 
    109109                Print "There is no mask file loaded (WaveExists)- the data is not masked" 
    110110                Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") 
     
    112112                mask = 0 
    113113        else 
    114                 Wave mask=$"root:MSK:data" 
     114                Wave mask=$"root:Packages:NIST:MSK:data" 
    115115        Endif 
    116116         
     
    459459        //type is the data type to do the averaging on, and will be set as the current folder 
    460460        //get the current displayed data (so the correct folder is used) 
    461         String destPath = "root:"+type 
     461        String destPath = "root:Packages:NIST:"+type 
    462462         
    463463        Variable xcenter,ycenter,x0,y0,sx,sx3,sy,sy3,dtsize,dtdist 
     
    504504        //Check for the existence of the mask, if not, make one (local to this folder) that is null 
    505505         
    506         if(WaveExists($"root:MSK:data") == 0) 
     506        if(WaveExists($"root:Packages:NIST:MSK:data") == 0) 
    507507                Print "There is no mask file loaded (WaveExists)- the data is not masked" 
    508508                Make/O/N=(pixelsX,pixelsY) $(destPath + ":mask") 
     
    510510                mask = 0 
    511511        else 
    512                 Wave mask=$"root:MSK:data" 
     512                Wave mask=$"root:Packages:NIST:MSK:data" 
    513513        Endif 
    514514         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SANS_Utilities.ipf

    r412 r418  
    421421 
    422422        //not foolproof - will generage an error if any wavs, etc.. are in use. 
    423         KillDataFolder root:RAW 
    424         KillDataFolder root:SAM 
    425         KillDataFolder root:EMP 
    426         KillDataFolder root:BGD 
    427         KillDataFolder root:COR 
    428         KillDataFolder root:DIV 
    429         KillDataFolder root:MSK 
    430         KillDataFolder root:ABS 
    431         KillDataFolder root:CAL 
     423        KillDataFolder root:Packages:NIST:RAW 
     424        KillDataFolder root:Packages:NIST:SAM 
     425        KillDataFolder root:Packages:NIST:EMP 
     426        KillDataFolder root:Packages:NIST:BGD 
     427        KillDataFolder root:Packages:NIST:COR 
     428        KillDataFolder root:Packages:NIST:DIV 
     429        KillDataFolder root:Packages:NIST:MSK 
     430        KillDataFolder root:Packages:NIST:ABS 
     431        KillDataFolder root:Packages:NIST:CAL 
    432432        SetDataFolder root: 
    433433         
     
    440440        String type 
    441441         
    442         SetDataFolder $("root:"+type) 
     442        SetDataFolder $("root:Packages:NIST:"+type) 
    443443        KillWaves/A/Z 
    444444        KillStrings/A/Z 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

    r412 r418  
    766766        //type is the data type to do the averaging on, and will be set as the current folder 
    767767        //get the current displayed data (so the correct folder is used) 
    768         String destPath = "root:"+type 
     768        String destPath = "root:Packages:NIST:"+type 
    769769         
    770770        // 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Schematic.ipf

    r412 r418  
    107107         
    108108        text2 = "Using Protocol: "+protocolName 
    109         text3 = "Sample file: "+ root:SAM:fileList 
     109        text3 = "Sample file: "+ root:Packages:NIST:SAM:fileList 
    110110        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample 
    111111        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" 
     
    319319                NVAR doLogScaling = root:myGlobals:gLogScalingAsDefault 
    320320                 
    321                 wave data = $("root:"+type+":data") 
     321                wave data = $("root:Packages:NIST:"+type+":data") 
    322322                if(waveExists(data)) 
    323323                        PauseUpdate; Silent 1           // building window... 
     
    346346                        if(cmpstr(choice,"MSK overlay")==0) 
    347347                                nameStr = type+"MSK_PNG" 
    348                                 Duplicate/O root:MSK:data root:MSK:overlay 
    349                                 Redimension/D root:MSK:overlay 
    350                                 String tempStr = "root:MSK:overlay" 
     348                                Duplicate/O root:Packages:NIST:MSK:data root:MSK:overlay 
     349                                Redimension/D root:Packages:NIST:MSK:overlay 
     350                                String tempStr = "root:Packages:NIST:MSK:overlay" 
    351351                        ResetLoop(tempStr) 
    352                         AppendImage root:MSK:overlay 
     352                        AppendImage root:Packages:NIST:MSK:overlay 
    353353                                ModifyImage overlay ctab={0,1,BlueRedGreen,0} 
    354354                endif 
     
    363363                        ModifyGraph btLen=3 
    364364                        ModifyGraph tlOffset=-2 
    365                         SVAR fileStr = $("root:"+type+":fileList") 
     365                        SVAR fileStr = $("root:Packages:NIST:"+type+":fileList") 
    366366                        Textbox/N=text0/F=0/A=MT/X=0.00/Y=0.00/E fileStr 
    367367                         
     
    438438         
    439439        text2 = "Using Protocol: "+protocolName 
    440         text3 = "Sample file: "+ root:SAM:fileList 
     440        text3 = "Sample file: "+ root:Packages:NIST:SAM:fileList 
    441441        text5 = "T\\BSAM\\M = " + getTransStrFromReals("SAM")   //trans and thickness of the sample 
    442442        text5 += "   d\\BSAM\\M = " + getThickStrFromReals("SAM") + " cm" 
     
    633633        String type 
    634634         
    635         String name="root:"+type+":realsread" 
     635        String name="root:Packages:NIST:"+type+":realsread" 
    636636        WAVE reals = $name 
    637637        if(waveExists(reals)) 
     
    649649        String type 
    650650         
    651         String name="root:"+type+":realsread" 
     651        String name="root:Packages:NIST:"+type+":realsread" 
    652652        WAVE reals = $name 
    653653        if(waveExists(reals)) 
     
    665665        String type 
    666666         
    667         String name="root:"+type+":realsread" 
     667        String name="root:Packages:NIST:"+type+":realsread" 
    668668        WAVE reals = $name 
    669669        if(waveExists(reals)) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Tile_2D.ipf

    r412 r418  
    398398         
    399399        WAVE NIHColors = $"root:myGlobals:NIHColors" 
    400         WAVE data = $("root:"+type+":data") 
     400        WAVE data = $("root:Packages:NIST:"+type+":data") 
    401401        String nameStr = type +num2str(ii)+ "L_PNG" 
    402402 
     
    421421        ModifyGraph btLen=3 
    422422        ModifyGraph tlOffset=-2 
    423         SVAR fileStr = $("root:"+type+":fileList") 
     423        SVAR fileStr = $("root:Packages:NIST:"+type+":fileList") 
    424424        Textbox/N=text0/F=0/A=MT/X=0.00/Y=0.00/E fileStr 
    425425         
     
    578578                        String/G root:myGlobals:gDataDisplayType="RAW"   
    579579                        fRawWindowHook() 
    580                         WAVE/T/Z tw = $"root:RAW:textRead"      //to be sure that wave exists if no data was ever displayed 
     580                        WAVE/T/Z tw = $"root:Packages:NIST:RAW:textRead"        //to be sure that wave exists if no data was ever displayed 
    581581                        newFileName= GetNameFromHeader(tw[0]) 
    582582                         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Transmission.ipf

    r412 r418  
    737737                                                transCts =  SumCountsInBox(x1,x2,y1,y2,"SAM")    
    738738                                                // get the attenuator, lambda, and sample string (to get the instrument) 
    739                                                 WAVE/T samText = $"root:SAM:textRead" 
    740                                                 WAVE samReals = $"root:SAM:realsRead" 
     739                                                WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 
     740                                                WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 
    741741                                                samfileStr = samText[3] 
    742742                                                lambda = samReals[26] 
     
    846846                                                transCts =  SumCountsInBox(x1,x2,y1,y2,"SAM")    
    847847                                                // get the attenuator, lambda, and sample string (to get the instrument) 
    848                                                 WAVE/T samText = $"root:SAM:textRead" 
    849                                                 WAVE samReals = $"root:SAM:realsRead" 
     848                                                WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 
     849                                                WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 
    850850                                                samfileStr = samText[3] 
    851851                                                lambda = samReals[26] 
     
    960960                                                transCts =  SumCountsInBox(0,pixelsX-1,0,pixelsY-1,"SAM")        
    961961                                                // get the attenuator, lambda, and sample string (to get the instrument) 
    962                                                 WAVE/T samText = $"root:SAM:textRead" 
    963                                                 WAVE samReals = $"root:SAM:realsRead" 
     962                                                WAVE/T samText = $"root:Packages:NIST:SAM:textRead" 
     963                                                WAVE samReals = $"root:Packages:NIST:SAM:realsRead" 
    964964                                                samfileStr = samText[3] 
    965965                                                lambda = samReals[26] 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WorkFileUtils.ipf

    r412 r418  
    6363         
    6464        // if the desired workfile doesn't exist, let the user know, and just make a new one 
    65         destPath = "root:"+newType + ":data" 
     65        destPath = "root:Packages:NIST:"+newType + ":data" 
    6666        if(WaveExists($destpath) == 0) 
    6767                Print "There is no old work file to add to - a new one will be created" 
     
    7272         
    7373        //now make references to data in newType folder 
    74         DestPath="root:"+newType         
     74        DestPath="root:Packages:NIST:"+newType   
    7575        WAVE data=$(destPath +":data")                  // these wave references point to the EXISTING work data 
    7676        WAVE/T textread=$(destPath + ":textread") 
     
    109109         
    110110        //DetCorr() has not been applied to the data in RAW , do it now in a local reference to the raw data 
    111         WAVE raw_data = $"root:RAW:data" 
    112         WAVE raw_reals =  $"root:RAW:realsread" 
    113         WAVE/T raw_text = $"root:RAW:textread" 
    114         WAVE raw_ints = $"root:RAW:integersread" 
     111        WAVE raw_data = $"root:Packages:NIST:RAW:data" 
     112        WAVE raw_reals =  $"root:Packages:NIST:RAW:realsread" 
     113        WAVE/T raw_text = $"root:Packages:NIST:RAW:textread" 
     114        WAVE raw_ints = $"root:Packages:NIST:RAW:integersread" 
    115115         
    116116        //check for log-scaling of the raw data - make sure it's linear 
     
    243243        // replace with the contents of raw 
    244244 
    245         destPath = "root:" + newType 
     245        destPath = "root:Packages:NIST:" + newType 
    246246         
    247247        //check for log-scaling of the RAW data and adjust if necessary 
     
    250250 
    251251        //copy from current dir (RAW) to work, defined by destpath 
    252         DestPath = "root:"+newType 
    253         Duplicate/O $"root:RAW:data",$(destPath + ":data") 
    254 //      Duplicate/O $"root:RAW:vlegend",$(destPath + ":vlegend") 
    255         Duplicate/O $"root:RAW:textread",$(destPath + ":textread") 
    256         Duplicate/O $"root:RAW:integersread",$(destPath + ":integersread") 
    257         Duplicate/O $"root:RAW:realsread",$(destPath + ":realsread") 
     252        DestPath = "root:Packages:NIST:"+newType 
     253        Duplicate/O $"root:Packages:NIST:RAW:data",$(destPath + ":data") 
     254//      Duplicate/O $"root:Packages:NIST:RAW:vlegend",$(destPath + ":vlegend") 
     255        Duplicate/O $"root:Packages:NIST:RAW:textread",$(destPath + ":textread") 
     256        Duplicate/O $"root:Packages:NIST:RAW:integersread",$(destPath + ":integersread") 
     257        Duplicate/O $"root:Packages:NIST:RAW:realsread",$(destPath + ":realsread") 
    258258        Variable/G $(destPath + ":gIsLogscale")=0                       //overwite flag in newType folder, data converted (above) to linear scale 
    259259         
     
    329329        String type 
    330330         
    331         WAVE reals=$("root:RAW:realsread") 
     331        WAVE reals=$("root:Packages:NIST:RAW:realsread") 
    332332        reals[1]=1              //true monitor counts, still in raw 
    333333        Raw_to_work(type) 
    334334        //data is now in "type" folder 
    335         WAVE data=$("root:"+type+":data") 
    336         WAVE new_reals=$("root:"+type+":realsread") 
     335        WAVE data=$("root:Packages:NIST:"+type+":data") 
     336        WAVE new_reals=$("root:Packages:NIST:"+type+":realsread") 
    337337         
    338338        Variable norm_mon,tot_mon,scale 
     
    355355        String type 
    356356         
    357         WAVE reals=$("root:RAW:realsread") 
     357        WAVE reals=$("root:Packages:NIST:RAW:realsread") 
    358358        reals[1]=1              //true monitor counts, still in raw 
    359359        Add_Raw_to_work(type) 
    360360        //data is now in "type" folder 
    361         WAVE data=$("root:"+type+":data") 
    362         WAVE new_reals=$("root:"+type+":realsread") 
     361        WAVE data=$("root:Packages:NIST:"+type+":data") 
     362        WAVE new_reals=$("root:Packages:NIST:"+type+":realsread") 
    363363         
    364364        Variable norm_mon,tot_mon,scale 
     
    747747        // if the desired workfile doesn't exist, let the user know, and abort 
    748748        String destPath="" 
    749         destPath = "root:"+Type + ":data" 
     749        destPath = "root:Packages:NIST:"+Type + ":data" 
    750750        if(WaveExists($destpath) == 0) 
    751751                Print "There is no work file in "+type+"--Aborting" 
     
    754754        //check for DIV 
    755755        // if the DIV workfile doesn't exist, let the user know,and abort 
    756         destPath = "root:DIV:data" 
     756        destPath = "root:Packages:NIST:DIV:data" 
    757757        if(WaveExists($destpath) == 0) 
    758758                Print "There is no work file in DIV --Aborting" 
     
    766766        //copy type information to CAL, wiping out the old contents of the CAL folder first 
    767767         
    768         //destPath = "root:CAL" 
     768        //destPath = "root:Packages:NIST:CAL" 
    769769        //SetDataFolder destPath 
    770770        //KillWaves/A/Z                 //get rid of the old data in CAL folder 
     
    775775 
    776776        //copy from current dir (type)=destPath to CAL, overwriting CAL contents 
    777         destPath = "root:" + type 
    778         Duplicate/O $(destPath + ":data"),$"root:CAL:data" 
    779 //      Duplicate/O $(destPath + ":vlegend"),$"root:CAL:vlegend" 
    780         Duplicate/O $(destPath + ":textread"),$"root:CAL:textread" 
    781         Duplicate/O $(destPath + ":integersread"),$"root:CAL:integersread" 
    782         Duplicate/O $(destPath + ":realsread"),$"root:CAL:realsread" 
     777        destPath = "root:Packages:NIST:" + type 
     778        Duplicate/O $(destPath + ":data"),$"root:Packages:NIST:CAL:data" 
     779//      Duplicate/O $(destPath + ":vlegend"),$"root:Packages:NIST:CAL:vlegend" 
     780        Duplicate/O $(destPath + ":textread"),$"root:Packages:NIST:CAL:textread" 
     781        Duplicate/O $(destPath + ":integersread"),$"root:Packages:NIST:CAL:integersread" 
     782        Duplicate/O $(destPath + ":realsread"),$"root:Packages:NIST:CAL:realsread" 
    783783        //need to save a copy of filelist string too (from the current type folder) 
    784784        SVAR oldFileList = $(destPath + ":fileList") 
    785785 
    786786        //now switch to reference waves in CAL folder 
    787         destPath = "root:CAL" 
     787        destPath = "root:Packages:NIST:CAL" 
    788788        //make appropriate wave references 
    789789        Wave data=$(destPath + ":data")                                 // these wave references point to the data in CAL 
     
    795795        String/G $(destPath + ":fileList") = oldFileList 
    796796 
    797         Wave div_data = $"root:DIV:data"                //hard-wired in.... 
     797        Wave div_data = $"root:Packages:NIST:DIV:data"          //hard-wired in.... 
    798798        //do the division, changing data in CAL 
    799799        data /= div_data 
     
    855855        String destPath 
    856856        //check for "type" 
    857         destPath = "root:"+Type + ":data" 
     857        destPath = "root:Packages:NIST:"+Type + ":data" 
    858858        if(WaveExists($destpath) == 0) 
    859859                Print "There is no work file in "+type+"--Aborting" 
     
    861861        Endif 
    862862        //check for log-scaling of the "type" data and adjust if necessary 
    863         destPath = "root:"+Type 
     863        destPath = "root:Packages:NIST:"+Type 
    864864        NVAR gIsLogScale = $(destPath + ":gIsLogScale") 
    865865        if(gIsLogScale) 
     
    872872        //copy over the waves data,vlegend,text,integers,reals(read) 
    873873 
    874         String oldType= "root:"+type            //this is where the data to be absoluted is  
     874        String oldType= "root:Packages:NIST:"+type              //this is where the data to be absoluted is  
    875875        //copy from current dir (type) to ABS, defined by destPath 
    876         Duplicate/O $(oldType + ":data"),$"root:ABS:data" 
    877 //      Duplicate/O $(oldType + ":vlegend"),$"root:ABS:vlegend" 
    878         Duplicate/O $(oldType + ":textread"),$"root:ABS:textread" 
    879         Duplicate/O $(oldType + ":integersread"),$"root:ABS:integersread" 
    880         Duplicate/O $(oldType + ":realsread"),$"root:ABS:realsread" 
     876        Duplicate/O $(oldType + ":data"),$"root:Packages:NIST:ABS:data" 
     877//      Duplicate/O $(oldType + ":vlegend"),$"root:Packages:NIST:ABS:vlegend" 
     878        Duplicate/O $(oldType + ":textread"),$"root:Packages:NIST:ABS:textread" 
     879        Duplicate/O $(oldType + ":integersread"),$"root:Packages:NIST:ABS:integersread" 
     880        Duplicate/O $(oldType + ":realsread"),$"root:Packages:NIST:ABS:realsread" 
    881881        //need to save a copy of filelist string too (from the current type folder) 
    882882        SVAR oldFileList = $(oldType + ":fileList") 
    883883        //need to copy filelist string too 
    884         String/G $"root:ABS:fileList" = oldFileList 
     884        String/G $"root:Packages:NIST:ABS:fileList" = oldFileList 
    885885         
    886886        //now switch to ABS folder 
    887887        //make appropriate wave references 
    888         WAVE data=$"root:ABS:data"                                      // these wave references point to the "type" data in ABS 
    889         WAVE/T textread=$"root:ABS:textread"                    //that are to be directly operated on 
    890         WAVE integersread=$"root:ABS:integersread" 
    891         WAVE realsread=$"root:ABS:realsread" 
    892         Variable/G $"root:ABS:gIsLogscale"=0                    //make new flag in ABS folder, data is linear scale 
     888        WAVE data=$"root:Packages:NIST:ABS:data"                                        // these wave references point to the "type" data in ABS 
     889        WAVE/T textread=$"root:Packages:NIST:ABS:textread"                      //that are to be directly operated on 
     890        WAVE integersread=$"root:Packages:NIST:ABS:integersread" 
     891        WAVE realsread=$"root:Packages:NIST:ABS:realsread" 
     892        Variable/G $"root:Packages:NIST:ABS:gIsLogscale"=0                      //make new flag in ABS folder, data is linear scale 
    893893         
    894894        //do the actual absolute scaling here, modifying the data in ABS 
     
    937937        // if the desired workfile doesn't exist, let the user know, and abort 
    938938        String destPath="" 
    939         destPath = "root:"+oldType + ":data" 
     939        destPath = "root:Packages:NIST:"+oldType + ":data" 
    940940        if(WaveExists($destpath) == 0) 
    941941                Print "There is no work file in "+oldtype+"--Aborting" 
     
    949949 
    950950        //copy from current dir (type)=destPath to newtype, overwriting newtype contents 
    951         destPath = "root:" + oldtype 
    952         Duplicate/O $(destPath + ":data"),$("root:"+newtype+":data") 
    953         Duplicate/O $(destPath + ":textread"),$("root:"+newtype+":textread") 
    954         Duplicate/O $(destPath + ":integersread"),$("root:"+newtype+":integersread") 
    955         Duplicate/O $(destPath + ":realsread"),$("root:"+newtype+":realsread") 
     951        destPath = "root:Packages:NIST:" + oldtype 
     952        Duplicate/O $(destPath + ":data"),$("root:Packages:NIST:"+newtype+":data") 
     953        Duplicate/O $(destPath + ":textread"),$("root:Packages:NIST:"+newtype+":textread") 
     954        Duplicate/O $(destPath + ":integersread"),$("root:Packages:NIST:"+newtype+":integersread") 
     955        Duplicate/O $(destPath + ":realsread"),$("root:Packages:NIST:"+newtype+":realsread") 
    956956        //need to save a copy of filelist string too (from the current type folder) 
    957957        SVAR oldFileList = $(destPath + ":fileList") 
    958958 
    959959        //now switch to reference waves in newtype folder 
    960         destPath = "root:"+newtype 
     960        destPath = "root:Packages:NIST:"+newtype 
    961961        Variable/G $(destPath + ":gIsLogScale")=0                       //make new flag in newtype folder, data is linear scale 
    962962        //need to copy filelist string too 
     
    10451045        NVAR pixelsY = root:myGlobals:gNPixelsY 
    10461046         
    1047         WAVE/Z data1=$("root:"+workMathStr+"File_1:data") 
     1047        WAVE/Z data1=$("root:Packages:NIST:"+workMathStr+"File_1:data") 
    10481048        If(cmpstr(str2,"UNIT MATRIX")==0) 
    10491049                Make/O/N=(pixelsX,pixelsY) root:myGlobals:WorkMath:data         //don't put in File_2 folder 
     
    10531053                //Load set #2 
    10541054                Load_NamedASC_File(pathStr+str2,workMathStr+"File_2") 
    1055                 WAVE/Z data2=$("root:"+workMathStr+"File_2:data") 
     1055                WAVE/Z data2=$("root:Packages:NIST:"+workMathStr+"File_2:data") 
    10561056        Endif 
    10571057 
     
    10651065        //copy contents of str1 folder to dest and create the wave ref (it will exist) 
    10661066        CopyWorkContents(workMathStr+"File_1",workMathStr+dest) 
    1067         WAVE/Z destData=$("root:"+workMathStr+dest+":data") 
     1067        WAVE/Z destData=$("root:Packages:NIST:"+workMathStr+dest+":data") 
    10681068         
    10691069        //dispatch 
     
    12291229        String type 
    12301230         
    1231         SetDataFolder $("root:"+type) 
     1231        SetDataFolder $("root:Packages:NIST:"+type) 
    12321232        KillWaves/a/z 
    12331233        KillStrings/a/z 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteQIS.ipf

    r412 r418  
    2020         
    2121        String destStr="" 
    22         destStr = "root:"+type 
     22        destStr = "root:Packages:NIST:"+type 
    2323         
    2424        Variable refNum 
     
    9999        hdrStr2 += num2str(rw[25])+"    "+num2str(rw[27])+"    "+num2str(rw[21])+"    "+textW[9] + "\r\n" 
    100100         
    101         SVAR samFiles = $("root:"+type+":fileList") 
     101        SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 
    102102        //actually open the file here 
    103103        Open refNum as fullpath 
     
    155155         
    156156        String destStr 
    157         destStr = "root:"+type 
     157        destStr = "root:Packages:NIST:"+type 
    158158         
    159159        Variable refNum 
     
    218218        hdrStr2 += num2str(rw[25])+"    "+num2str(rw[27])+"    "+num2str(rw[21])+"    "+textW[9] + "\r\n" 
    219219         
    220         SVAR samFiles = $("root:"+type+":fileList") 
     220        SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 
    221221        //actually open the file here 
    222222        Open refNum as fullpath 
     
    290290        print "type=",type 
    291291        //graph the current data and save a little graph 
    292         Wave data =  $("root:"+type+":data") 
     292        Wave data =  $("root:Packages:NIST:"+type+":data") 
    293293        Wave q_x_axis = $"root:myGlobals:q_x_axis" 
    294294        Wave q_y_axis = $"root:myGlobals:q_y_axis" 
     
    337337        String destStr="",ave="C",typeStr="" 
    338338        Variable step=1,refnum 
    339         destStr = "root:"+type 
     339        destStr = "root:Packages:NIST:"+type 
    340340         
    341341        //must select the linear_data to export 
     
    364364                Wave/T proto=$("root:myGlobals:Protocols:"+gProtoStr) 
    365365        endif 
    366         SVAR samFiles = $("root:"+type+":fileList") 
     366        SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 
    367367        //check each wave - MUST exist, or will cause a crash 
    368368        If(!(WaveExists(data))) 
     
    468468        Variable refnum 
    469469         
    470         destStr = "root:"+type 
     470        destStr = "root:Packages:NIST:"+type 
    471471         
    472472        //must select the linear_data to export 
     
    643643        String destStr="",typeStr="" 
    644644        Variable step=1,refnum 
    645         destStr = "root:"+type 
     645        destStr = "root:Packages:NIST:"+type 
    646646         
    647647        //must select the linear_data to export 
     
    669669                Wave/T proto=$("root:myGlobals:Protocols:"+gProtoStr) 
    670670        endif 
    671         SVAR samFiles = $("root:"+type+":fileList") 
     671        SVAR samFiles = $("root:Packages:NIST:"+type+":fileList") 
    672672        //check each wave - MUST exist, or will cause a crash 
    673673        If(!(WaveExists(data))) 
Note: See TracChangeset for help on using the changeset viewer.