Changeset 228


Ignore:
Timestamp:
Dec 11, 2007 4:19:31 PM (15 years ago)
Author:
srkline
Message:

analysis packages now use canSAS-approved data folders for internal storage

Location:
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/GlobalFit/GlobalFit2_NCNR.ipf

    r223 r228  
    6363//      "Unload Global Fit", WM_NewGlobalFit1#UnloadNewGlobalFit() 
    6464//end 
    65 Menu "Macros" 
     65Menu "SANS Models" 
    6666//      "Global Fit", InitGlobalFitPanel() 
    6767        Submenu "Packages" 
     
    14691469                DoWindow/K NewGF_GlobalFitMaskingPanel 
    14701470        endif 
    1471         Execute/P "DELETEINCLUDE  <Global Fit 2>" 
     1471//      Execute/P "DELETEINCLUDE  <Global Fit 2>" 
     1472        Execute/P "DELETEINCLUDE  \"GlobalFit2_NCNR\"" 
    14721473        Execute/P "COMPILEPROCEDURES " 
    1473         KillDataFolder root:Packages:NewGlobalFit 
     1474        KillDataFolder/Z root:Packages:NewGlobalFit 
    14741475end 
    14751476 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Invariant/Invariant.ipf

    r134 r228  
    2222//create the globals 
    2323Proc Init_Invariant() 
    24         NewDataFolder/O/S root:myGlobals:invariant 
     24        NewDataFolder/O root:Packages 
     25        NewDataFolder/O root:Packages:NIST 
     26        NewDataFolder/O/S root:Packages:NIST:invariant 
    2527        Variable/G gNumLow=10 
    2628        Variable/G gNumHigh=10 
     
    7173         
    7274        Variable num,invar 
    73         NVAR dQv = root:myGlobals:invariant:gDqv 
     75        NVAR dQv = root:Packages:NIST:invariant:gDqv 
    7476         
    7577        Duplicate/O qw integrand 
     
    155157         
    156158        //access the global strings representing the last data file read in 
    157         SVAR QWave = root:myGlobals:invariant:QWave 
    158         SVAR IWave = root:myGlobals:invariant:IWave 
    159         SVAR SWave = root:myGlobals:invariant:SWave 
     159        SVAR QWave = root:Packages:NIST:invariant:QWave 
     160        SVAR IWave = root:Packages:NIST:invariant:IWave 
     161        SVAR SWave = root:Packages:NIST:invariant:SWave 
    160162         
    161163        Wave qw=$QWave 
     
    208210         
    209211        //reset the invariant values to zero 
    210         NVAR meas = root:myGlobals:invariant:gInvMeas 
    211         NVAR lo = root:myGlobals:invariant:gInvLowQ 
    212         NVAR hi = root:myGlobals:invariant:gInvHighQ 
    213         NVAR total = root:myGlobals:invariant:gInvTotal 
     212        NVAR meas = root:Packages:NIST:invariant:gInvMeas 
     213        NVAR lo = root:Packages:NIST:invariant:gInvLowQ 
     214        NVAR hi = root:Packages:NIST:invariant:gInvHighQ 
     215        NVAR total = root:Packages:NIST:invariant:gInvTotal 
    214216        meas=0 
    215217        lo=0 
     
    256258        PopupMenu ywave,pos={10,60},size={154,19},title="Data File" 
    257259        PopupMenu ywave,help={"Select the experimental intensity values"} 
    258         PopupMenu ywave,mode=1,value=root:myGlobals:invariant:gDataPopList,proc=Inv_FilePopMenuProc 
     260        PopupMenu ywave,mode=1,value=root:Packages:NIST:invariant:gDataPopList,proc=Inv_FilePopMenuProc 
    259261         
    260262        Button loadButton,pos={10,90},size={130,20},proc=Inv_Load_Proc,title="Load and Plot File" 
     
    266268 
    267269        SetVariable setvar_0,pos={27,249},size={80,15},title="# points" 
    268         SetVariable setvar_0,limits={5,50,0},value= root:myGlobals:invariant:gNumLow 
     270        SetVariable setvar_0,limits={5,50,0},value= root:Packages:NIST:invariant:gNumLow 
    269271        SetVariable setvar_1,pos={166,249},size={80,15},title="# points" 
    270         SetVariable setvar_1,limits={5,200,0},value= root:myGlobals:invariant:gNumHigh 
     272        SetVariable setvar_1,limits={5,200,0},value= root:Packages:NIST:invariant:gNumHigh 
    271273        CheckBox check_0,pos={23,202},size={50,14},proc=LowCheckProc,title="Guinier" 
    272274        CheckBox check_0,value= 1 
     
    283285        ValDisplay valdisp0,pos={51,354},size={180,14},title="In measured Q-range " 
    284286        ValDisplay valdisp0,limits={0,0,0},barmisc={0,1000} 
    285         ValDisplay valdisp0,value= #"root:myGlobals:invariant:gInvMeas" 
     287        ValDisplay valdisp0,value= #"root:Packages:NIST:invariant:gInvMeas" 
    286288        ValDisplay valdisp0_1,pos={51,371},size={180,14},title="In low Q extrapolation " 
    287289        ValDisplay valdisp0_1,limits={0,0,0},barmisc={0,1000} 
    288         ValDisplay valdisp0_1,value= #"root:myGlobals:invariant:gInvLowQ" 
     290        ValDisplay valdisp0_1,value= #"root:Packages:NIST:invariant:gInvLowQ" 
    289291        ValDisplay valdisp0_2,pos={51,388},size={180,14},title="In high Q extrapolation " 
    290292        ValDisplay valdisp0_2,limits={0,0,0},barmisc={0,1000} 
    291         ValDisplay valdisp0_2,value= #"root:myGlobals:invariant:gInvHighQ" 
     293        ValDisplay valdisp0_2,value= #"root:Packages:NIST:invariant:gInvHighQ" 
    292294        ValDisplay valdisp0_3,pos={51,411},size={180,14},title="TOTAL " 
    293295        ValDisplay valdisp0_3,limits={0,0,0},barmisc={0,1000} 
    294         ValDisplay valdisp0_3,value= #"root:myGlobals:invariant:gInvTotal" 
     296        ValDisplay valdisp0_3,value= #"root:Packages:NIST:invariant:gInvTotal" 
    295297         
    296298        CheckBox check0,pos={10,116},size={101,14},proc=SlitSmearedCheckProc,title="Slit-Smeared Data" 
    297         CheckBox check0,value= root:myGlobals:invariant:gIsSlitSmeared 
     299        CheckBox check0,value= root:Packages:NIST:invariant:gIsSlitSmeared 
    298300        SetVariable setvar0,pos={136,116},size={130,15},title="Slit Height (1/A)" 
    299         SetVariable setvar0,limits={-inf,inf,0},value= root:myGlobals:invariant:gDqv 
     301        SetVariable setvar0,limits={-inf,inf,0},value= root:Packages:NIST:invariant:gDqv 
    300302         
    301303        //set up a dependency to calculate the total invariant 
    302         root:myGlobals:invariant:gInvTotal := root:myGlobals:invariant:gInvLowQ + root:myGlobals:invariant:gInvMeas + root:myGlobals:invariant:gInvHighQ 
     304        root:Packages:NIST:invariant:gInvTotal := root:Packages:NIST:invariant:gInvLowQ + root:Packages:NIST:invariant:gInvMeas + root:Packages:NIST:invariant:gInvHighQ 
    303305EndMacro 
    304306 
     
    316318        Variable inv,num 
    317319         
    318         SVAR QWave = root:myGlobals:invariant:QWave 
     320        SVAR QWave = root:Packages:NIST:invariant:QWave 
    319321        Wave qw=$QWave 
    320         SVAR IWave = root:myGlobals:invariant:IWave 
     322        SVAR IWave = root:Packages:NIST:invariant:IWave 
    321323        Wave iw=$IWave 
    322324         
    323         NVAR isSlitSmeared=root:myGlobals:invariant:gIsSlitSmeared 
     325        NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared 
    324326        if(isSlitSmeared) 
    325327                inv = Invariant_SlitSmeared(qw,iw) 
     
    332334         
    333335        // update the global display on the panel (there is a dependency for the total) 
    334         NVAR val = root:myGlobals:invariant:gInvMeas 
     336        NVAR val = root:Packages:NIST:invariant:gInvMeas 
    335337        val = inv 
    336338         
     
    353355//      print "yesGuinier = ",yesGuinier 
    354356        //number of points to use for fit 
    355         NVAR nbeg=root:myGlobals:invariant:gNumLow 
     357        NVAR nbeg=root:Packages:NIST:invariant:gNumLow 
    356358        //define the waves 
    357359        Wave extr_lqi=extr_lqi 
    358360        Wave extr_lqq=extr_lqq 
    359361         
    360         SVAR QWave = root:myGlobals:invariant:QWave 
     362        SVAR QWave = root:Packages:NIST:invariant:QWave 
    361363        Wave qw=$QWave 
    362         SVAR IWave = root:myGlobals:invariant:IWave 
     364        SVAR IWave = root:Packages:NIST:invariant:IWave 
    363365        Wave iw=$IWave 
    364         SVAR SWave = root:myGlobals:invariant:SWave 
     366        SVAR SWave = root:Packages:NIST:invariant:SWave 
    365367        Wave sw=$SWave 
    366368         
     
    389391         
    390392        //calculate the invariant 
    391         NVAR isSlitSmeared=root:myGlobals:invariant:gIsSlitSmeared 
     393        NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared 
    392394        if(isSlitSmeared) 
    393395                inv = Invariant_SlitSmeared(extr_lqq,extr_lqi) 
     
    400402         
    401403        // update the global display on the panel (there is a dependency for the total) 
    402         NVAR val = root:myGlobals:invariant:gInvLowQ 
     404        NVAR val = root:Packages:NIST:invariant:gInvLowQ 
    403405        val = inv 
    404406         
     
    419421        Wave extr_hqi=extr_hqi 
    420422        Wave extr_hqq=extr_hqq 
    421         SVAR QWave = root:myGlobals:invariant:QWave 
     423        SVAR QWave = root:Packages:NIST:invariant:QWave 
    422424        Wave qw=$QWave 
    423         SVAR IWave = root:myGlobals:invariant:IWave 
     425        SVAR IWave = root:Packages:NIST:invariant:IWave 
    424426        Wave iw=$IWave 
    425         SVAR SWave = root:myGlobals:invariant:SWave 
     427        SVAR SWave = root:Packages:NIST:invariant:SWave 
    426428        Wave sw=$SWave 
    427429         
    428430        Variable/G V_FitMaxIters=300 
    429431        Variable num=numpnts(iw),nume,inv 
    430         NVAR nend=root:myGlobals:invariant:gNumHigh             //number of points for the fit 
     432        NVAR nend=root:Packages:NIST:invariant:gNumHigh         //number of points for the fit 
    431433 
    432434        Make/O/D P_coef={0,1,-4}                        //input 
     
    439441         
    440442        //calculate the invariant 
    441         NVAR isSlitSmeared=root:myGlobals:invariant:gIsSlitSmeared 
     443        NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared 
    442444        if(isSlitSmeared) 
    443445                inv = Invariant_SlitSmeared(extr_hqq,extr_hqi) 
     
    450452         
    451453        // update the global display on the panel (there is a dependency for the total) 
    452         NVAR val = root:myGlobals:invariant:gInvHighQ 
     454        NVAR val = root:Packages:NIST:invariant:gInvHighQ 
    453455        val = inv 
    454456         
     
    463465                DoWindow/K $"Invariant_Graph" 
    464466        endif 
    465         if (DatafolderExists("root:myGlobals:invariant")) 
    466                 KillDatafolder root:myGlobals:invariant 
     467        if (DatafolderExists("root:Packages:NIST:invariant")) 
     468                KillDatafolder root:Packages:NIST:invariant 
    467469        endif 
    468470        SetDataFolder root: 
     
    472474end 
    473475 
    474 Menu "Macros" 
     476Menu "SANS Models" 
    475477        Submenu "Packages" 
    476478                "Unload Invariant", UnloadInvariant() 
     
    503505                tempStr = "Pick the data path" 
    504506        Endif 
    505         String/G root:myGlobals:invariant:gDataPopList =tempStr 
     507        String/G root:Packages:NIST:invariant:gDataPopList =tempStr 
    506508        ControlUpdate/W=Invariant_Panel ywave 
    507509         
     
    578580        //Print tempName 
    579581         
    580         String cleanLastFileName = CleanupName(root:myGlobals:gLastFileName,0) 
     582        String cleanLastFileName = CleanupName(root:Packages:NIST:gLastFileName,0) 
    581583        String dataStr = "root:"+cleanLastFileName+":" 
    582584         
    583585        // keep global copies of the names rather than reading from the popup 
    584586        tempName=dataStr + cleanLastFileName+"_q" 
    585         String/G root:myGlobals:invariant:QWave=tempName 
     587        String/G root:Packages:NIST:invariant:QWave=tempName 
    586588        tempName=dataStr + cleanLastFileName+"_i" 
    587         String/G root:myGlobals:invariant:IWave=tempName 
     589        String/G root:Packages:NIST:invariant:IWave=tempName 
    588590        tempName=dataStr + cleanLastFileName+"_s" 
    589         String/G root:myGlobals:invariant:SWave=tempName 
     591        String/G root:Packages:NIST:invariant:SWave=tempName 
    590592 
    591593        //Plot, and adjust the scaling to match the axis scaling set by the popups 
     
    612614        Variable checked 
    613615 
    614         NVAR isSlitSmeared=root:myGlobals:invariant:gIsSlitSmeared 
    615         SVAR fileStr=root:myGlobals:gLastFileName 
     616        NVAR isSlitSmeared=root:Packages:NIST:invariant:gIsSlitSmeared 
     617        SVAR fileStr=root:Packages:NIST:gLastFileName 
    616618         
    617619        //reset the global to the checkbox state 
     
    620622        if(checked)             //get the smearing info 
    621623                String cleanLastFileName = "root:"+CleanupName(fileStr,0) 
    622                 NVAR dQv=root:myGlobals:invariant:gDqv 
     624                NVAR dQv=root:Packages:NIST:invariant:gDqv 
    623625                String tempName = cleanLastFileName+"sq" 
    624626                Wave/Z w=$tempName 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/LinearizedFits/LinearizedFits.ipf

    r133 r228  
    55/////////////////////////////// 
    66//procedures for creating and initializing the Linearized FIT panel 
    7 //global variables (numerical only) are kept in root:myGlobals:FIT folder 
     7//global variables (numerical only) are kept in root:Packages:NIST:FIT folder 
    88// 
    99// this is based on the FIT routines in the SANS Reduction package, and has been modified here 
     
    3636        If(WinType("A_FitPanel") == 0) 
    3737                //create the necessary data folder 
    38                 NewDataFolder/O root:myGlobals 
    39                 NewDataFolder/O root:myGlobals:FIT 
     38                NewDataFolder/O root:Packages 
     39                NewDataFolder/O root:Packages:NIST 
     40                NewDataFolder/O root:Packages:NIST:FIT 
    4041                //initialize the values 
    41                 Variable/G root:myGlobals:FIT:gLolim = 0.02 
    42                 Variable/G root:myGlobals:FIT:gUplim = 0.04 
    43                 Variable/G root:myGlobals:FIT:gExpA = 1 
    44                 Variable/G root:myGlobals:FIT:gExpB = 1 
    45                 Variable/G root:myGlobals:FIT:gExpC = 1 
    46                 Variable/G root:myGlobals:FIT:gBack = 0 
    47                 String/G root:myGlobals:FIT:gDataPopList = "none" 
     42                Variable/G root:Packages:NIST:FIT:gLolim = 0.02 
     43                Variable/G root:Packages:NIST:FIT:gUplim = 0.04 
     44                Variable/G root:Packages:NIST:FIT:gExpA = 1 
     45                Variable/G root:Packages:NIST:FIT:gExpB = 1 
     46                Variable/G root:Packages:NIST:FIT:gExpC = 1 
     47                Variable/G root:Packages:NIST:FIT:gBack = 0 
     48                String/G root:Packages:NIST:FIT:gDataPopList = "none" 
    4849                A_FitPanel() 
    4950        else 
     
    5960// already be initialized 
    6061Window A_FitPanel() 
    61         //String angst = root:myGlobals:gAngstStr 
     62        //String angst = root:Packages:NIST:gAngstStr 
    6263        String angst = "A" 
    6364        PauseUpdate; Silent 1           // building window... 
     
    7374        PopupMenu ywave,pos={13,60},size={154,19},title="Data File" 
    7475        PopupMenu ywave,help={"Select the experimental intensity values"} 
    75         PopupMenu ywave,mode=1,value=root:myGlobals:FIT:gDataPopList,proc=A_FIT_FilePopMenuProc 
     76        PopupMenu ywave,mode=1,value=root:Packages:NIST:FIT:gDataPopList,proc=A_FIT_FilePopMenuProc 
    7677        Button loadButton,pos={13,92},size={130,20},proc=A_FIT_Load_Proc,title="Load and Plot File" 
    7778        Button loadButton,help={"After choosing a file, load it into memory and plot it with this button."} 
     
    8788        SetVariable lolim,pos={64,147},size={134,17},title="Lower Limit" 
    8889        SetVariable lolim,help={"Enter the lower q-limit to perform the fit ("+angst+"^-1)"} 
    89         SetVariable lolim,limits={0,5,0},value= root:myGlobals:FIT:gLolim 
     90        SetVariable lolim,limits={0,5,0},value= root:Packages:NIST:FIT:gLolim 
    9091        SetVariable uplim,pos={63,169},size={134,17},title="Upper Limit" 
    9192        SetVariable uplim,help={"Enter the upper q-limit to perform the fit ("+angst+"^-1)"} 
    92         SetVariable uplim,limits={0,5,0},value= root:myGlobals:FIT:gUplim 
     93        SetVariable uplim,limits={0,5,0},value= root:Packages:NIST:FIT:gUplim 
    9394        SetVariable expa,pos={13,311},size={80,17},title="pow \"a\"" 
    9495        SetVariable expa,help={"This sets the exponent \"a\" for some y-axis formats. The value is ignored if the model does not use an adjustable exponent"} 
    95         SetVariable expa,limits={-2,10,0},value= root:myGlobals:FIT:gExpA 
     96        SetVariable expa,limits={-2,10,0},value= root:Packages:NIST:FIT:gExpA 
    9697        SetVariable expb,pos={98,311},size={80,17},title="pow \"b\"" 
    9798        SetVariable expb,help={"This sets the exponent \"b\" for some x-axis formats. The value is ignored if the model does not use an adjustable exponent"} 
    98         SetVariable expb,limits={0,10,0},value= root:myGlobals:FIT:gExpB 
     99        SetVariable expb,limits={0,10,0},value= root:Packages:NIST:FIT:gExpB 
    99100        PopupMenu xmodel,pos={155,280},size={79,19},title="x-axis" 
    100101        PopupMenu xmodel,help={"This popup selects how the x-axis will be linearized given the chosen data"} 
     
    104105        SetVariable back,pos={70,338},size={139,17},title="background" 
    105106        SetVariable back,help={"This constant background value will be subtracted from the experimental intensity before fitting is done"} 
    106         SetVariable back,limits={-Inf,Inf,0},value= root:myGlobals:FIT:gBack 
     107        SetVariable back,limits={-Inf,Inf,0},value= root:Packages:NIST:FIT:gBack 
    107108        SetVariable expc,pos={182,310},size={80,17},title="pow \"c\"" 
    108109        SetVariable expc,help={"This sets the exponent \"c\" for some x-axis formats. The value is ignored if the model does not use \"c\" as an adjustable exponent"} 
    109         SetVariable expc,limits={-10,10,0},value= root:myGlobals:FIT:gExpC 
     110        SetVariable expc,limits={-10,10,0},value= root:Packages:NIST:FIT:gExpC 
    110111        Button sh_all,pos={65,193},size={130,20},proc=A_ShowAllButtonProc,title="Show Full q-range" 
    111112        Button sh_all,help={"Use this to show the entire q-range of the data rather than just the fitted range."} 
     
    182183                tempStr = "Pick the data path" 
    183184        Endif 
    184         String/G root:myGlobals:FIT:gDataPopList =tempStr 
     185        String/G root:Packages:NIST:FIT:gDataPopList =tempStr 
    185186        ControlUpdate ywave 
    186187         
     
    225226//check for physical limits on exponent values 
    226227// if bad values found, alert, and reset to good values so the rescaling can continue 
    227         NVAR gA = root:myGlobals:FIT:gExpA 
    228         NVAR gB = root:myGlobals:FIT:gExpB 
    229         NVAR gC = root:myGlobals:FIT:gExpC 
     228        NVAR gA = root:Packages:NIST:FIT:gExpA 
     229        NVAR gB = root:Packages:NIST:FIT:gExpB 
     230        NVAR gC = root:Packages:NIST:FIT:gExpC 
    230231        if((pow_a < -2) || (pow_a > 10)) 
    231232                DoAlert 0,"Exponent a must be in the range (-2,10) - the exponent a has been reset to 1" 
     
    740741end 
    741742 
    742 Menu "Macros" 
     743Menu "SANS Models" 
    743744        Submenu "Packages" 
    744745                "Unload Linear Fitting", UnloadLinFit() 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker/SANSModelPicker.ipf

    r200 r228  
    5353Proc Init_FileList() 
    5454        //create the data folders  and globals 
    55         NewDataFolder/O root:myGlobals          //others will need this...make it just in case 
    56          
    57         if(!DataFolderExists("root:myGlobals:FileList")) 
    58                 NewDataFolder/O/S root:myGlobals:FileList 
     55        NewDataFolder/O root:Packages 
     56        NewDataFolder/O root:Packages:NIST 
     57         
     58        if(!DataFolderExists("root:Packages:NIST:FileList")) 
     59                NewDataFolder/O/S root:Packages:NIST:FileList 
    5960                //create the waves 
    6061                Make/O/T/N=0 fileWave,includedFileWave 
     
    8990// if the wave SANS_Model_List does not exist 
    9091Proc ReadNewProcList() 
    91         KillWaves/Z root:myGlobals:FileList:SANS_Model_List             //kill the old list 
     92        KillWaves/Z root:Packages:NIST:FileList:SANS_Model_List         //kill the old list 
    9293        FileList_GetListButtonProc("") 
    9394End 
     
    104105// 
    105106Proc TypeNewModelList() 
    106         variable ii=0,num=numpnts(root:myGlobals:FileList:SANS_Model_List) 
     107        variable ii=0,num=numpnts(root:Packages:NIST:FileList:SANS_Model_List) 
    107108        printf "Make/O/T/N=%d  SANS_Model_List\r\r",num 
    108109        do 
    109                 printf "SANS_Model_List[%d] = \"%s\"\r",ii,root:myGlobals:FileList:SANS_Model_List[ii] 
     110                printf "SANS_Model_List[%d] = \"%s\"\r",ii,root:Packages:NIST:FileList:SANS_Model_List[ii] 
    110111                ii+=1 
    111112        while(ii<num) 
     
    113114 
    114115Proc FileList_BuiltInList() 
    115         SetDataFolder root:myGlobals:FileList 
     116        SetDataFolder root:Packages:NIST:FileList 
    116117 
    117118////paste here... after deleting the old make statement and list 
     
    197198        String ProcedureName 
    198199         
    199         SetDataFolder root:myGlobals:FileList 
     200        SetDataFolder root:Packages:NIST:FileList 
    200201        Variable num 
    201202        num=numpnts(fileWave) 
     
    214215        Variable val 
    215216        // a switch for me to turn off file checking 
    216         root:myGlobals:FileList:checkForFiles=val       //0==no check, 1=check   
     217        root:Packages:NIST:FileList:checkForFiles=val   //0==no check, 1=check   
    217218End 
    218219 
     
    232233        ModifyPanel fixedSize=1 
    233234         
    234         ListBox fileList,pos={4,3},size={200,203},listWave=root:myGlobals:FileList:fileWave 
    235         ListBox fileList,selWave=root:myGlobals:FileList:selWave,mode= 4 
     235        ListBox fileList,pos={4,3},size={200,203},listWave=root:Packages:NIST:FileList:fileWave 
     236        ListBox fileList,selWave=root:Packages:NIST:FileList:selWave,mode= 4 
    236237        ListBox inclList,pos={4,212},size={200,100} 
    237         ListBox inclList,listWave=root:myGlobals:FileList:includedFileWave 
    238         ListBox inclList,selWave=root:myGlobals:FileList:selToDelWave,mode= 4 
     238        ListBox inclList,listWave=root:Packages:NIST:FileList:includedFileWave 
     239        ListBox inclList,selWave=root:Packages:NIST:FileList:selToDelWave,mode= 4 
    239240        Button button0,pos={212,173},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)" 
    240241        Button button0,help={"Includes the selected procedures, functions appear under the SANS Models menu"} 
     
    269270        //loop through the selected files in the list... 
    270271        // 
    271         Wave/T fileWave=$"root:myGlobals:FileList:fileWave" 
    272         Wave sel=$"root:myGlobals:FileList:selWave" 
     272        Wave/T fileWave=$"root:Packages:NIST:FileList:fileWave" 
     273        Wave sel=$"root:Packages:NIST:FileList:selWave" 
    273274         
    274275        Variable num=numpnts(sel),ii 
    275276        String fname="" 
    276277         
    277 //      NVAR doCheck=root:myGlobals:FileList:checkForFiles 
     278//      NVAR doCheck=root:Packages:NIST:FileList:checkForFiles 
    278279        ii=num-1                //work bottom-up to not lose the index 
    279280        do 
     
    287288        //try the list of already-included files 
    288289        if(cmpstr(fname,"")==0) 
    289                 Wave/T inclFileWave=$"root:myGlobals:FileList:includedFileWave" 
    290                 Wave seltoDel=$"root:myGlobals:FileList:selToDelWave" 
     290                Wave/T inclFileWave=$"root:Packages:NIST:FileList:includedFileWave" 
     291                Wave seltoDel=$"root:Packages:NIST:FileList:selToDelWave" 
    291292                num=numpnts(seltoDel) 
    292293                ii=num-1                //work bottom-up to not lose the index 
     
    334335        String list="" 
    335336 
    336         if(Exists("root:myGlobals:FileList:SANS_Model_List") != 1) 
    337                 SetDataFolder root:myGlobals:FileList 
     337        if(Exists("root:Packages:NIST:FileList:SANS_Model_List") != 1) 
     338                SetDataFolder root:Packages:NIST:FileList 
    338339                LoadWave/A/T 
    339340                WAVE/T w=$(StringFromList(0,S_WaveNames,";")) 
    340341                SetDataFolder root: 
    341342        else 
    342                 WAVE/T w=$("root:myGlobals:FileList:SANS_Model_List") 
     343                WAVE/T w=$("root:Packages:NIST:FileList:SANS_Model_List") 
    343344        endif 
    344345         
    345346//      // convert the input wave to a semi-list 
    346 //      SVAR allFiles=root:myGlobals:FileList:allFiles 
     347//      SVAR allFiles=root:Packages:NIST:FileList:allFiles 
    347348//      allFiles=MP_TextWave2SemiList(w) 
    348349        list=MP_TextWave2SemiList(w) 
     
    353354 
    354355        // remove the items that have already been included 
    355         Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave" 
     356        Wave/T includedFileWave=$"root:Packages:NIST:FileList:includedFileWave" 
    356357        Variable numInc=numpnts(includedFileWave) 
    357358        for(ii=0;ii<numInc;ii+=1) 
     
    360361        list = SortList(list,";",0) 
    361362        num=ItemsInList(list,";") 
    362         WAVE/T fileWave=$"root:myGlobals:FileList:fileWave" 
    363         WAVE selWave=$"root:myGlobals:FileList:selWave" 
     363        WAVE/T fileWave=$"root:Packages:NIST:FileList:fileWave" 
     364        WAVE selWave=$"root:Packages:NIST:FileList:selWave" 
    364365        Redimension/N=(num) fileWave            //make the waves the proper length 
    365366        Redimension/N=(num) selWave 
     
    393394 
    394395// new way, to catch all files in all subfolders 
    395         SVAR allFiles=root:myGlobals:FileList:allFiles 
     396        SVAR allFiles=root:Packages:NIST:FileList:allFiles 
    396397        allFiles=""             //clear the list 
    397398 
     
    412413        list = RemoveFromList("DemoLoader.ipf",list,";" ) 
    413414        // remove the items that have already been included 
    414         Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave" 
     415        Wave/T includedFileWave=$"root:Packages:NIST:FileList:includedFileWave" 
    415416        Variable numInc=numpnts(includedFileWave) 
    416417        for(ii=0;ii<numInc;ii+=1) 
     
    419420        list = SortList(list,";",0) 
    420421        num=ItemsInList(list,";") 
    421         WAVE/T fileWave=$"root:myGlobals:FileList:fileWave" 
    422         WAVE selWave=$"root:myGlobals:FileList:selWave" 
     422        WAVE/T fileWave=$"root:Packages:NIST:FileList:fileWave" 
     423        WAVE selWave=$"root:Packages:NIST:FileList:selWave" 
    423424        Redimension/N=(num) fileWave            //make the waves the proper length 
    424425        Redimension/N=(num) selWave 
     
    434435 
    435436        Variable err=0 
    436         String/G root:myGlobals:FileList:allFiles="" 
    437         SVAR allFiles = root:myGlobals:FileList:allFiles 
     437        String/G root:Packages:NIST:FileList:allFiles="" 
     438        SVAR allFiles = root:Packages:NIST:FileList:allFiles 
    438439         
    439440        PathInfo Igor 
     
    458459         
    459460        //loop through the selected files in the list... 
    460         Wave/T fileWave=$"root:myGlobals:FileList:fileWave" 
    461         Wave sel=$"root:myGlobals:FileList:selWave" 
     461        Wave/T fileWave=$"root:Packages:NIST:FileList:fileWave" 
     462        Wave sel=$"root:Packages:NIST:FileList:selWave" 
    462463        //and adjust the included file lists 
    463         Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave" 
    464         Wave selToDel=$"root:myGlobals:FileList:selToDelWave" 
     464        Wave/T includedFileWave=$"root:Packages:NIST:FileList:includedFileWave" 
     465        Wave selToDel=$"root:Packages:NIST:FileList:selToDelWave" 
    465466         
    466467        Variable numIncl=numpnts(includedFileWave) 
     
    473474        Execute/P "INSERTINCLUDE \"WriteModelData\"" 
    474475         
    475         NVAR doCheck=root:myGlobals:FileList:checkForFiles 
     476        NVAR doCheck=root:Packages:NIST:FileList:checkForFiles 
    476477         
    477478        ii=num-1                //work bottom-up to not lose the index 
     
    509510         
    510511        //loop through the selected files in the list... 
    511         Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave" 
    512         Wave selToDel=$"root:myGlobals:FileList:selToDelWave" 
     512        Wave/T includedFileWave=$"root:Packages:NIST:FileList:includedFileWave" 
     513        Wave selToDel=$"root:Packages:NIST:FileList:selToDelWave" 
    513514        // and put the unwanted procedures back in the to-add list 
    514         Wave/T fileWave=$"root:myGlobals:FileList:fileWave" 
    515         Wave sel=$"root:myGlobals:FileList:selWave" 
     515        Wave/T fileWave=$"root:Packages:NIST:FileList:fileWave" 
     516        Wave sel=$"root:Packages:NIST:FileList:selWave" 
    516517         
    517518         
     
    578579// if root:MenuItemStr exists 
    579580//Menu "SANS Models" 
    580 //      StrVarOrDefault("root:myGlobals:FileList:MenuItemStr_def","ModelPicker_Panel")//, RefreshMenu() 
     581//      StrVarOrDefault("root:Packages:NIST:FileList:MenuItemStr_def","ModelPicker_Panel")//, RefreshMenu() 
    581582//      SubMenu "Unsmeared Models" 
    582 //              StrVarOrDefault("root:myGlobals:FileList:MenuItemStr1","ModelPicker_Panel") 
     583//              StrVarOrDefault("root:Packages:NIST:FileList:MenuItemStr1","ModelPicker_Panel") 
    583584//      End 
    584585//      SubMenu "Smeared Models" 
    585 //              StrVarOrDefault("root:myGlobals:FileList:MenuItemStr2","ModelPicker_Panel") 
     586//              StrVarOrDefault("root:Packages:NIST:FileList:MenuItemStr2","ModelPicker_Panel") 
    586587//      End 
    587588//      SubMenu "Models 3" 
     
    608609//      list += MacroList("WriteM*",sep,"KIND:1,NPARAMS:4")             //data writer 
    609610//      list += "-"+sep 
    610 //      String/G root:myGlobals:FileList:MenuItemStr_def = TrimListTo255(list) 
     611//      String/G root:Packages:NIST:FileList:MenuItemStr_def = TrimListTo255(list) 
    611612//       
    612613//      list = "" 
     
    615616//      list = RemoveFromList("FreezeModel", list ,";")                 // remove FreezeModel, it's not a model 
    616617//      //      list += "-"+sep 
    617 //      String/G root:myGlobals:FileList:MenuItemStr1 = TrimListTo255(list) 
     618//      String/G root:Packages:NIST:FileList:MenuItemStr1 = TrimListTo255(list) 
    618619// 
    619620//      list="" 
    620621//      list += MacroList("PlotSmea*",sep,"KIND:1,NPARAMS:1")                   //smeared plot procedures 
    621622//      list += MacroList("PlotSmea*",sep,"KIND:1,NPARAMS:2")                   //smeared RPA has 2 parameters 
    622 //      String/G root:myGlobals:FileList:MenuItemStr2 = TrimListTo255(list) 
     623//      String/G root:Packages:NIST:FileList:MenuItemStr2 = TrimListTo255(list) 
    623624// 
    624625//      BuildMenu "SANS Models" 
     
    678679        String prefix 
    679680         
    680         SVAR allFiles=root:myGlobals:FileList:allFiles 
     681        SVAR allFiles=root:Packages:NIST:FileList:allFiles 
    681682        // Build a prefix (a number of tabs to indicate the folder level by indentation) 
    682683        prefix = "" 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/PlotUtils2D.ipf

    r200 r228  
    3939                                SetDataFolder root: 
    4040                                KillWaves $n0,$n1,$n2           // kill the default waveX that were loaded 
    41                                 //if(DataFolderExists("root:myGlobals")) 
    42                                 //      String/G root:myGlobals:gLastFileName = filename 
    43                                 //endif 
    4441                                return          //quits the macro 
    4542                        endif 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/SumModel/SumSANSModels.ipf

    r200 r228  
    3030// (smeared fitting still broken) 
    3131// - created data folders are now buried in myGlobals 
     32// DEC 07 
     33// - created data folders are now :Packages:NIST:SumModel 
    3234// 
    3335/////////////////////////////// 
     
    3840        DoWindow/F Sum_Model_Panel 
    3941        if(V_flag==0) 
    40                 if(!DataFolderExists("root:myGlobals")) 
    41                         NewDataFolder root:myGlobals 
     42                if(!DataFolderExists("root:Packages:NIST")) 
     43                        NewDataFolder root:Packages:NIST 
    4244                endif 
    43                 NewDataFolder/O root:myGlobals:SumModel 
     45                NewDataFolder/O root:Packages:NIST:SumModel 
    4446                InitSMPGlobals() 
    4547                Sum_Model_Panel() 
     
    5052// 
    5153Function InitSMPGlobals() 
    52         Variable/G root:myGlobals:SumModel:gNParMod1=0 
    53         Variable/G root:myGlobals:SumModel:gNParMod2=0 
     54        Variable/G root:Packages:NIST:SumModel:gNParMod1=0 
     55        Variable/G root:Packages:NIST:SumModel:gNParMod2=0 
    5456end 
    5557 
     
    7173        GroupBox group1,pos={5,50},size={216,107},title="Function # 1" 
    7274        SetVariable setvar1,pos={14,128},size={140,15},title="# of Parameters" 
    73         SetVariable setvar1,limits={0,20,1},value= root:myGlobals:SumModel:gNParMod1 
     75        SetVariable setvar1,limits={0,20,1},value= root:Packages:NIST:SumModel:gNParMod1 
    7476        GroupBox group2,pos={5,171},size={216,107},title="Function # 2" 
    7577        SetVariable setvar2,pos={14,249},size={140,15},title="# of Parameters" 
    76         SetVariable setvar2,limits={0,20,1},value= root:myGlobals:SumModel:gNParMod2 
     78        SetVariable setvar2,limits={0,20,1},value= root:Packages:NIST:SumModel:gNParMod2 
    7779        Button button0,pos={36,299},size={150,20},proc=PlotSumButtonProc,title="Plot Summed Model" 
    7880        Button button1,pos={15,330},size={190,20},proc=PlotSmearedSumButtonProc,title="Plot Smeared Summed Model" 
     
    157159        //make the coefficients and parameters based on the panel values         
    158160        Variable nParam,n1,n2 
    159         n1 = root:myGlobals:SumModel:gNParMod1 
    160         n2 = root:myGlobals:SumModel:gNParMod2 
     161        n1 = root:Packages:NIST:SumModel:gNParMod1 
     162        n2 = root:Packages:NIST:SumModel:gNParMod2 
    161163        nParam = n1 + n2 
    162164        if(n1==0 || n2==0 || nparam==0) 
     
    164166        endif 
    165167        // n is ok, keep extra copy so changing panel will not affect functions 
    166         Variable/G root:myGlobals:SumModel:gN1=n1 
    167         Variable/G root:myGlobals:SumModel:gN2=n2 
     168        Variable/G root:Packages:NIST:SumModel:gN1=n1 
     169        Variable/G root:Packages:NIST:SumModel:gN2=n2 
    168170         
    169171        // these are the function names - make global so the fit function 
    170172        // can find them 
    171173        ControlInfo/W=Sum_Model_Panel popup1_0 
    172         String/G root:myGlobals:SumModel:gModelStr1=S_Value 
     174        String/G root:Packages:NIST:SumModel:gModelStr1=S_Value 
    173175        ControlInfo/W=Sum_Model_Panel popup2_0 
    174         String/G root:myGlobals:SumModel:gModelStr2=S_Value 
     176        String/G root:Packages:NIST:SumModel:gModelStr2=S_Value 
    175177         
    176178        //these are the coefficent waves - local only 
     
    225227        //make the coefficients and parameters based on the panel values         
    226228        Variable nParam,n1,n2 
    227         n1 = root:myGlobals:SumModel:gNParMod1 
    228         n2 = root:myGlobals:SumModel:gNParMod2 
     229        n1 = root:Packages:NIST:SumModel:gNParMod1 
     230        n2 = root:Packages:NIST:SumModel:gNParMod2 
    229231        nParam = n1 + n2 
    230232        if(n1==0 || n2==0 || nparam==0) 
     
    232234        endif 
    233235        // n is ok, keep extra copy so changing panel will not affect functions 
    234         Variable/G root:myGlobals:SumModel:gN1=n1 
    235         Variable/G root:myGlobals:SumModel:gN2=n2 
     236        Variable/G root:Packages:NIST:SumModel:gN1=n1 
     237        Variable/G root:Packages:NIST:SumModel:gN2=n2 
    236238         
    237239        // these are the function names - make global so the fit function 
    238240        // can find them 
    239241        ControlInfo/W=Sum_Model_Panel popup1_0 
    240         String/G root:myGlobals:SumModel:gModelStr1=S_Value 
     242        String/G root:Packages:NIST:SumModel:gModelStr1=S_Value 
    241243        ControlInfo/W=Sum_Model_Panel popup2_0 
    242         String/G root:myGlobals:SumModel:gModelStr2=S_Value 
     244        String/G root:Packages:NIST:SumModel:gModelStr2=S_Value 
    243245         
    244246        //these are the coefficent waves - local only, in the current data folder! 
     
    289291        Wave w,yw,xw 
    290292         
    291         SVAR funcStr1=root:myGlobals:SumModel:gModelStr1                //string names of the functions, set by the macro 
    292         SVAR funcStr2=root:myGlobals:SumModel:gModelStr2 
    293         NVAR n1=root:myGlobals:SumModel:gN1                     //number of coefficients, set by the macro 
    294         NVAR n2=root:myGlobals:SumModel:gN2 
     293        SVAR funcStr1=root:Packages:NIST:SumModel:gModelStr1            //string names of the functions, set by the macro 
     294        SVAR funcStr2=root:Packages:NIST:SumModel:gModelStr2 
     295        NVAR n1=root:Packages:NIST:SumModel:gN1                 //number of coefficients, set by the macro 
     296        NVAR n2=root:Packages:NIST:SumModel:gN2 
    295297         
    296298        Variable retVal 
     
    358360end 
    359361 
    360 Menu "Macros" 
     362Menu "SANS Models" 
    361363        Submenu "Packages" 
    362364                "Unload Sum SANS Models", UnloadSumModel() 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

    r223 r228  
    1313 
    1414Function Init_WrapperPanel() 
     15        //make sure that folders exist - this is the first initialization to be called 
     16        NewDataFolder/O root:Packages 
     17        NewDataFolder/O root:Packages:NIST 
     18         
    1519        DoWindow/F WrapperPanel 
    1620        if(V_flag==0) 
    17                 if(exists("root:coefKWStr")==0) 
    18                         String/G root:coefKWStr="" 
    19                 endif 
    20                 if(exists("root:suffixKWStr")==0) 
    21                         String/G root:suffixKWStr="" 
     21                if(exists("root:Packages:NIST:coefKWStr")==0) 
     22                        String/G root:Packages:NIST:coefKWStr="" 
     23                endif 
     24                if(exists("root:Packages:NIST:suffixKWStr")==0) 
     25                        String/G root:Packages:NIST:suffixKWStr="" 
    2226                endif 
    2327                Execute "WrapperPanel()" 
     
    422426        String funcStr 
    423427 
    424         SVAR listStr=root:coefKWStr 
     428        SVAR listStr=root:Packages:NIST:coefKWStr 
    425429        String coefStr = StringByKey(funcStr, listStr  ,"=",";",0) 
    426430 
     
    437441        String coefStr 
    438442 
    439         SVAR listStr=root:suffixKWStr 
     443        SVAR listStr=root:Packages:NIST:suffixKWStr 
    440444        String suffixStr = StringByKey(coefStr, listStr  ,"=",";",0) 
    441445 
     
    627631        String funcStr,coefStr 
    628632         
    629         SVAR listStr=root:coefKWStr 
     633        SVAR listStr=root:Packages:NIST:coefKWStr 
    630634        String properCoefStr = StringByKey(funcStr, listStr  ,"=",";",0) 
    631635        if(cmpstr(coefStr,properCoefStr)==0) 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotManager.ipf

    r211 r228  
    3838        Button button5,pos={15,323},size={220,20},proc=A_PlotManager_KillAll,title="Remove All Data From Memory" 
    3939        ListBox fileList,pos={13,11},size={206,179} 
    40         ListBox fileList,listWave=root:myGlobals:OneDLoader:fileWave 
    41         ListBox fileList,selWave=root:myGlobals:OneDLoader:selWave,mode= 4 
     40        ListBox fileList,listWave=root:Packages:NIST:OneDLoader:fileWave 
     41        ListBox fileList,selWave=root:Packages:NIST:OneDLoader:selWave,mode= 4 
    4242        Button button6,pos={238,153},size={100,20},proc=A_OneDLoader_LoadButton,title="Load File(s)" 
    4343        Button button6,help={"Loads the selected files into memory and will graph them if that option is checked"} 
     
    198198Proc A_Init_OneDLoader() 
    199199        //create the data folder 
    200         NewDataFolder/O/S root:myGlobals:OneDLoader 
     200        NewDataFolder/O/S root:Packages:NIST:OneDLoader 
    201201        //create the waves 
    202202        Make/O/T/N=1 fileWave="" 
     
    231231         
    232232        num=ItemsInList(newlist,";") 
    233         WAVE/T fileWave=$"root:myGlobals:OneDLoader:fileWave" 
    234         WAVE selWave=$"root:myGlobals:OneDLoader:selWave" 
     233        WAVE/T fileWave=$"root:Packages:NIST:OneDLoader:fileWave" 
     234        WAVE selWave=$"root:Packages:NIST:OneDLoader:selWave" 
    235235        Redimension/N=(num) fileWave 
    236236        Redimension/N=(num) selWave 
     
    243243         
    244244        //loop through the selected files in the list... 
    245         Wave/T fileWave=$"root:myGlobals:OneDLoader:fileWave" 
    246         Wave sel=$"root:myGlobals:OneDLoader:selWave" 
     245        Wave/T fileWave=$"root:Packages:NIST:OneDLoader:fileWave" 
     246        Wave sel=$"root:Packages:NIST:OneDLoader:selWave" 
    247247        Variable num=numpnts(sel),ii=0 
    248248        String fname="",pathStr="",fullPath="",newFileName="" 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/PlotUtilsMacro.ipf

    r220 r228  
    2626        String funcStr,coefStr,suffix 
    2727         
    28         if(exists("root:coefKWStr")==0) 
    29                 String/G root:coefKWStr="" 
    30                 String/G root:suffixKWStr="" 
    31         endif 
    32         SVAR coefKWStr = root:coefKWStr 
    33         SVAR suffixKWStr = root:suffixKWStr 
     28        if(exists("root:Packages:NIST:coefKWStr")==0) 
     29                String/G root:Packages:NIST:coefKWStr="" 
     30                String/G root:Packages:NIST:suffixKWStr="" 
     31        endif 
     32        SVAR coefKWStr = root:Packages:NIST:coefKWStr 
     33        SVAR suffixKWStr = root:Packages:NIST:suffixKWStr 
    3434        coefKWStr += funcStr+"="+coefStr+";" 
    3535        suffixKWStr += coefStr+"="+suffix+";" 
     
    9393                                        SetDataFolder root: 
    9494                                        KillWaves $n0,$n1,$n2           // kill the default waveX that were loaded 
    95                                         //if(DataFolderExists("root:myGlobals")) 
    96                                         //      String/G root:myGlobals:gLastFileName = filename 
     95                                        //if(DataFolderExists("root:Packages:NIST")) 
     96                                        //      String/G root:Packages:NIST:gLastFileName = filename 
    9797                                        //endif 
    9898                                        return          //quits the macro 
     
    141141                                        SetDataFolder root: 
    142142                                        KillWaves $n0,$n1,$n2,$n3,$n4,$n5               // kill the default waveX that were loaded 
    143                                         //if(DataFolderExists("root:myGlobals")) 
    144                                         //      String/G root:myGlobals:gLastFileName = filename 
     143                                        //if(DataFolderExists("root:Packages:NIST")) 
     144                                        //      String/G root:Packages:NIST:gLastFileName = filename 
    145145                                        //endif         //set the last file loaded to the one NOT loaded 
    146146                                        return          //quits the macro 
     
    215215                                if(V_flag==2)   //user selected No, don't load the data 
    216216                                        KillWaves $n0,$n1,$n2,$n3,$n4,$n5               // kill the default waveX that were loaded 
    217                                         //if(DataFolderExists("root:myGlobals")) 
    218                                         //      String/G root:myGlobals:gLastFileName = filename 
     217                                        //if(DataFolderExists("root:Packages:NIST")) 
     218                                        //      String/G root:Packages:NIST:gLastFileName = filename 
    219219                                        //endif         //set the last file loaded to the one NOT loaded 
    220220                                        return          //quits the macro 
     
    236236         
    237237        ////// 
    238         if(DataFolderExists("root:myGlobals")) 
    239                 String/G root:myGlobals:gLastFileName = filename 
     238        if(DataFolderExists("root:Packages:NIST")) 
     239                String/G root:Packages:NIST:gLastFileName = filename 
    240240        endif 
    241241         
     
    393393                if(V_flag==2)   //user selected No 
    394394                        KillWaves $n0,$n1,$n2,$n3,$n4           // kill the default waveX that were loaded 
    395                         if(DataFolderExists("root:myGlobals")) 
    396                                 String/G root:myGlobals:gLastFileName = filename 
     395                        if(DataFolderExists("root:Packages:NIST")) 
     396                                String/G root:Packages:NIST:gLastFileName = filename 
    397397                        endif           //set the last file loaded to the one NOT loaded 
    398398                        return          //quits the macro 
     
    408408        KillWaves $n0,$n1,$n2,$n3,$n4 
    409409         
    410         if(DataFolderExists("root:myGlobals")) 
    411                 String/G root:myGlobals:gLastFileName = filename 
     410        if(DataFolderExists("root:Packages:NIST")) 
     411                String/G root:Packages:NIST:gLastFileName = filename 
    412412        endif 
    413413                 
     
    462462        if (V_flag == 0) 
    463463                //path does not exist - no folder selected 
    464                 String/G root:myGlobals:gCatPathStr = "no folder selected" 
     464                String/G root:Packages:NIST:gCatPathStr = "no folder selected" 
    465465                return(1) 
    466466        else 
     
    472472                        return(1) 
    473473                endif 
    474                 String/G root:myGlobals:gCatPathStr = dum 
     474                String/G root:Packages:NIST:gCatPathStr = dum 
    475475                return(0)               //no error 
    476476        endif 
Note: See TracChangeset for help on using the changeset viewer.