Changeset 404 for sans/Dev/trunk/NCNR_User_Procedures/USANS

Timestamp:

Sep 12, 2008 9:25:36 PM (14 years ago)

Author:

ajj

Message:

Refactoring USANS functions to use root:Packages:NIST:USANS as their base to comply with canSAS proposal.

Location:

sans/Dev/trunk/NCNR_User_Procedures/USANS

Files:

• BT5_Loader.ipf (modified) (5 diffs)
• COR_Graph.ipf (modified) (23 diffs)
• LakeDesmearing_JB.ipf (modified) (71 diffs)
• Main_USANS.ipf (modified) (42 diffs)
• USANS_Includes.ipf (modified) (1 diff)
• WriteUSANSData.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/USANS/BT5_Loader.ipf

@@ -28 +28 @@
 Function LoadBT5File(fname,type)
         String fname,type
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         Variable num=200,err=0,refnum
-        Make/O/D/N=(num) $("root:"+type+":Angle")
-        Make/O/D/N=(num) $("root:"+type+":DetCts")
-        Make/O/D/N=(num) $("root:"+type+":ErrDetCts")
-        Make/O/D/N=(num) $("root:"+type+":MonCts")
-        Make/O/D/N=(num) $("root:"+type+":TransCts")
-        Wave Angle = $("root:"+type+":Angle")
-        Wave DetCts = $("root:"+type+":DetCts")
-        Wave ErrDetCts = $("root:"+type+":ErrDetCts")
-        Wave MonCts = $("root:"+type+":MonCts")
-        Wave TransCts = $("root:"+type+":TransCts")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":Angle")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":DetCts")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":ErrDetCts")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":MonCts")
+        Make/O/D/N=(num) $(USANSFolder+":"+type+":TransCts")
+        Wave Angle = $(USANSFolder+":"+type+":Angle")
+        Wave DetCts = $(USANSFolder+":"+type+":DetCts")
+        Wave ErrDetCts = $(USANSFolder+":"+type+":ErrDetCts")
+        Wave MonCts = $(USANSFolder+":"+type+":MonCts")
+        Wave TransCts = $(USANSFolder+":"+type+":TransCts")
         
         Open/R refNum as fname          //if fname is "", a dialog will be presented
@@ -128 +130 @@
         String type
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
         Variable pkNotFound,pkPt,pkAngle,pkVal,temp
-        Wave angle = $("root:"+type+":Angle")
-        Wave detCts = $("root:"+type+":DetCts")
+        Wave angle = $(USANSFolder+":"+type+":Angle")
+        Wave detCts = $(USANSFolder+":"+type+":DetCts")
+
 
         WaveStats/Q detcts
@@ -165 +170 @@
         String type
         Variable pkAngle
-        
-        Wave angle = $("root:"+type+":Angle")
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave angle = $(USANSFolder+":"+type+":Angle")
         Variable num=numpnts(angle)
         Variable deg2QConv=5.55e-5              //JGB -- 2/24/01
         
-        Make/O/N=(num) $("root:"+type+":Qvals")
-        Wave qvals = $("root:"+type+":Qvals")   
+        Make/O/N=(num) $(USANSFolder+":"+type+":Qvals")
+        Wave qvals = $(USANSFolder+":"+type+":Qvals")   
         Qvals = deg2QConv*(angle[p] - pkAngle)
         
@@ -187 +194 @@
         String type
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
         Variable levNotFound,levPt,Cts,num,ii
-        Wave angle = $("root:"+type+":Angle")
-        Wave detCts = $("root:"+type+":DetCts")
-        Wave TransCts = $("root:"+type+":TransCts")
+        Wave angle = $(USANSFolder+":"+type+":Angle")
+        Wave detCts = $(USANSFolder+":"+type+":DetCts")
+        Wave TransCts = $(USANSFolder+":"+type+":TransCts")
         FindLevel/Q/P angle,2           //use angles greater than 2 deg
         levNotFound=V_Flag              //V_Flag==1 if no pk found
@@ -207 +216 @@
         
         //update the note
-        Wave DetCts = $("root:"+type+":DetCts")
+        Wave DetCts = $(USANSFolder+":"+type+":DetCts")
         String str,strVal
         str=note(DetCts)

sans/Dev/trunk/NCNR_User_Procedures/USANS/COR_Graph.ipf

@@ -23 +23 @@
 //
 Function DoCORGraph()
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         DoWindow/F COR_Graph
@@ -32 +34 @@
                 SetVariable gTransWide,pos={210,12},size={135,15},title="Trans - Wide",format="%5.4f"
                 SetVariable gTransWide,help={"Average counts on transmssion detector at wide angles"}
-                SetVariable gTransWide,limits={0,1,0.001},value= root:Globals:MainPanel:gTransWide
+                SetVariable gTransWide,limits={0,1,0.001},value= $(USANSFolder+":Globals:MainPanel:gTransWide")
                 SetVariable gTransRock,pos={210,27},size={135,15},title="Trans - Rock",format="%5.4f"
                 SetVariable gTransRock,help={"Transmission counts at the zero-angle peak"}
-                SetVariable gTransRock,limits={0,1,0.001},value= root:Globals:MainPanel:gTransRock
+                SetVariable gTransRock,limits={0,1,0.001},value= $(USANSFolder+":Globals:MainPanel:gTransRock")
                 SetVariable gEmpCts,pos={210,42},size={135,15},title="EMP Level",format="%7.4f"
-                SetVariable gEmpCts,limits={-Inf,Inf,0.1},value= root:Globals:MainPanel:gEmpCts
+                SetVariable gEmpCts,limits={-Inf,Inf,0.1},value= $(USANSFolder+":Globals:MainPanel:gEmpCts")
                 SetVariable gEmpCts,help={"High q limit of empty cell scattering normalized to 1.0e6 monitor counts"}
                 SetVariable gBkgCts,pos={210,57},size={135,15},title="BKG Level",format="%7.4f"
-                SetVariable gBkgCts,limits={-Inf,Inf,0.1},value= root:Globals:MainPanel:gBkgCts
+                SetVariable gBkgCts,limits={-Inf,Inf,0.1},value= $(USANSFolder+":Globals:MainPanel:gBkgCts")
                 SetVariable gBkgCts,help={"Background scattering level normalized to 1.0e6 monitor counts"}
                 SetVariable gThick,pos={210,72},size={135,15},title="SAM Thick(cm)",format="%5.4f"
                 SetVariable gThick,help={"Thickness of the sample in centimeters"}
-                SetVariable gThick,limits={0,5,0.01},value= root:Globals:MainPanel:gThick
+                SetVariable gThick,limits={0,5,0.01},value= $(USANSFolder+":Globals:MainPanel:gThick")
                 Button UpdateButton,pos={115,19},size={88,20},proc=UpdateButtonProc,title="Update Trans"
                 Button UpdateButton,help={"Updates both the wide and rocking transmission values based on the raw data files"}
@@ -94 +96 @@
 //
 Function GraphSAM()
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //is it already on the graph?
-        SetDataFolder root:Graph
+        SetDataFolder $(USANSFolder+":Graph")
         String list=""
         list = Wavelist("DetCts_SAM*",";","WIN:COR_Graph")
-        SetDataFolder root:
         if(strlen(list)!=0)
                 //Print "SAM already on graph"
@@ -104 +108 @@
         Endif
         //append the data if it exists
-        If(waveExists($"root:Graph:DetCts_SAM")==1)
+        If(waveExists($"DetCts_SAM")==1)
                 DoWindow/F COR_Graph
-                AppendToGraph :Graph:DetCts_SAM vs :Graph:Qvals_SAM
+                AppendToGraph DetCts_SAM vs Qvals_SAM
                 ModifyGraph rgb(DetCts_SAM)=(1,12815,52428)
                 ModifyGraph mode(DetCts_SAM)=3,marker(DetCts_SAM)=19,msize(DetCts_SAM)=2
                 ModifyGraph tickUnit=1
-                ErrorBars DetCts_SAM Y,wave=(:Graph:ErrDetCts_SAM,:Graph:ErrDetCts_SAM)
+                ErrorBars DetCts_SAM Y,wave=(ErrDetCts_SAM,ErrDetCts_SAM)
         endif
+        SetDataFolder root:
 End
 
@@ -117 +122 @@
 //
 Function GraphEMP()
-        SetDataFolder root:Graph
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":Graph")
         String list=""
         list = Wavelist("DetCts_EMP*",";","WIN:COR_Graph")
-        SetDataFolder root:
         if(strlen(list)!=0)
         //      Print "EMP already on graph"
@@ -126 +133 @@
         Endif
         //append the data if it exists
-        If(waveExists($"root:Graph:DetCts_EMP")==1)
+        If(waveExists($"DetCts_EMP")==1)
                 DoWindow/F COR_Graph
-                AppendToGraph :Graph:DetCts_EMP vs :Graph:Qvals_EMP
+                AppendToGraph DetCts_EMP vs Qvals_EMP
                 ModifyGraph msize(DetCts_EMP)=2,rgb(DetCts_EMP)=(1,39321,19939)
                 ModifyGraph mode(DetCts_EMP)=3,marker(DetCts_EMP)=19
                 ModifyGraph tickUnit=1
-                ErrorBars DetCts_EMP Y,wave=(:Graph:ErrDetCts_EMP,:Graph:ErrDetCts_EMP)
+                ErrorBars DetCts_EMP Y,wave=(ErrDetCts_EMP,ErrDetCts_EMP)
         endif
+        SetDataFolder root:
         return(0)
 End
@@ -140 +148 @@
 //
 Function GraphCOR()
-        SetDataFolder root:Graph
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":Graph")
+        
         String list=""
         list = Wavelist("DetCts_COR*",";","WIN:COR_Graph")
-        SetDataFolder root:
         if(strlen(list)!=0)
         //      Print "COR already on graph"
@@ -149 +159 @@
         Endif
         //append the data if it exists
-        If(waveExists($"root:Graph:DetCts_COR")==1)
+        If(waveExists($"DetCts_COR")==1)
                 DoWindow/F COR_Graph
-                AppendToGraph :Graph:DetCts_COR vs :Graph:Qvals_COR
+                AppendToGraph DetCts_COR vs Qvals_COR
                 ModifyGraph msize(DetCts_COR)=2,rgb(DetCts_COR)=(52428,34958,1)
                 ModifyGraph mode(DetCts_COR)=3,marker(DetCts_COR)=19
                 ModifyGraph tickUnit=1
-                ErrorBars DetCts_COR Y,wave=(:Graph:ErrDetCts_COR,:Graph:ErrDetCts_COR)
+                ErrorBars DetCts_COR Y,wave=(ErrDetCts_COR,ErrDetCts_COR)
         endif
+
+        SetDataFolder root:
         return(0)
 End
@@ -162 +174 @@
 // add horizoontal lines for the background and empty cell levels
 Function GraphEMPBKGLevels()
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //if the data is on the graph, remove them and replot, to properly reset the scale
         DoUpdate
@@ -172 +187 @@
         Endif
         DoUpdate
-        AppendToGraph :EMP:EMPLevel,:BKG:BKGLevel
+        AppendToGraph $(USANSFolder+":EMP:EMPLevel"),$(USANSFolder+":BKG:BKGLevel")
         ModifyGraph rgb(empLevel)=(0,0,0),lsize(bkgLevel)=2,rgb(bkgLevel)=(52428,1,1)
         ModifyGraph lsize(empLevel)=2,offset={0,0}
         ModifyGraph tickUnit=1
         GetAxis/W=COR_Graph/Q bottom
-        SetScale/I x V_min,V_max,"",:EMP:EMPLevel,:BKG:BKGLevel
+        SetScale/I x V_min,V_max,"",$(USANSFolder+":EMP:EMPLevel"),$(USANSFolder+":BKG:BKGLevel")
         return(0)
 End
@@ -188 +203 @@
 Function SaveButtonProc(ctrlName) : ButtonControl
         String ctrlName
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         PathInfo/S savePathName
@@ -199 +216 @@
         
         //check for data save type (controlled by radio buttons)
-        NVAR gRadioVal=root:Globals:MainPanel:gTypeCheck                //1=COR,2=SAM,3=EMP
+        NVAR gRadioVal=$(USANSFolder+":Globals:MainPanel:gTypeCheck")           //1=COR,2=SAM,3=EMP
         switch(gRadioVal)
                 case 1: //COR
@@ -220 +237 @@
         //if so, read off the point range (cursors should be on the same wave as the save type)
         if(useCrsrs)
-                Wave xwave=$("root:Graph:Qvals_"+type)
+                Wave xwave=$(USANSFolder+":Graph:Qvals_"+type)
                 ptA=x2pnt(xwave,xcsr(A))
                 ptB=x2pnt(xwave,xcsr(B))
@@ -244 +261 @@
         Variable checked
         
-        NVAR gRadioVal=root:Globals:MainPanel:gTypeCheck                //1=COR,2=SAM,3=EMP
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        NVAR gRadioVal=$(USANSFolder+":Globals:MainPanel:gTypeCheck")           //1=COR,2=SAM,3=EMP
         String type=""
         switch(gRadioVal)
@@ -267 +286 @@
                 Variable ok=WhichListItem(yname, str,";",0)
                 if(ok != -1)
-                        Wave ywave=$("root:Graph:DetCts_"+type)
+                        Wave ywave=$(USANSFolder+":Graph:DetCts_"+type)
                         Showinfo/W=COR_Graph
                         Cursor/A=1/P/S=1 A,$yname,0
@@ -293 +312 @@
         String ctrlName
         Variable checked
-        
-        NVAR gRadioVal=root:Globals:MainPanel:gTypeCheck
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        NVAR gRadioVal=$(USANSFolder+":Globals:MainPanel:gTypeCheck")
         
         strswitch(ctrlName)
@@ -323 +344 @@
 Function UpdateButtonProc(ctrlName) : ButtonControl
         String ctrlName
-        
-        Wave samCts=$"root:SAM:DetCts"
-        Wave empCts=$"root:EMP:DetCts"
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave samCts=$(USANSFolder+":SAM:DetCts")
+        Wave empCts=$(USANSFolder+":EMP:DetCts")
         if((WaveExists(samCts)==0) || (WaveExists(empCts)==0))
-                Variable/G root:Globals:MainPanel:gTransWide=NaN                //error
-                Variable/G root:Globals:MainPanel:gTransRock=NaN
+                Variable/G $(USANSFolder+":Globals:MainPanel:gTransWide")=NaN           //error
+                Variable/G $(USANSFolder+":Globals:MainPanel:gTransRock")=NaN
                 return(1)
         Endif
@@ -338 +361 @@
         samRock = NumberByKey("PEAKVAL",samNote,":",";")
         empRock = NumberByKey("PEAKVAL",empNote,":",";")
-        Variable/G root:Globals:MainPanel:gTransWide=samWide/empWide
-        Variable/G root:Globals:MainPanel:gTransRock=samRock/empRock
+        Variable/G $(USANSFolder+":Globals:MainPanel:gTransWide")=samWide/empWide
+        Variable/G $(USANSFolder+":Globals:MainPanel:gTransRock")=samRock/empRock
         
         return(0)
@@ -385 +408 @@
 Function QpkFromNote(type)
         String type
-        
-        Wave/Z detCts=$("root:Graph:DetCts_"+type)
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+                
+        Wave/Z detCts=$(USANSFolder+":Graph:DetCts_"+type)
         if(!WaveExists(detCts))
                 return(NaN)
@@ -406 +431 @@
         String type
         Variable zeroAngle
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         //SETS the wave note with the PEAKANG value
@@ -418 +445 @@
         //use the listBox wave directly
         
-        Wave/T listW=$("root:Globals:MainPanel:"+type+"Wave")
+        Wave/T listW=$(USANSFolder+":Globals:MainPanel:"+type+"Wave")
         Variable ii,num=numpnts(listW)
         String fname="",fpath=""
@@ -447 +474 @@
         
         //find the peak value at the supplied angle, rather than automatic...
-        Wave tmpangle = $("root:"+type+":Angle")
-        Wave tmpdetCts = $("root:"+type+":DetCts")
+        Wave tmpangle = $(USANSFolder+":"+type+":Angle")
+        Wave tmpdetCts = $(USANSFolder+":"+type+":DetCts")
         Variable pkHt=0
         pkHt = interp(zeroAngle,tmpangle,tmpdetcts)
@@ -463 +490 @@
         //
         //copy the data to plot to the root:Graph directory, and give clear names
-        if(WaveExists($("root:"+type+":Qvals")))
-                Duplicate/O $("root:"+type+":Qvals"),$("root:Graph:Qvals_"+type)
-        Endif
-        Duplicate/O $("root:"+type+":Angle"),$("root:Graph:Angle_"+type)
-        Duplicate/O $("root:"+type+":DetCts"),$("root:Graph:DetCts_"+type)
-        Duplicate/O $("root:"+type+":ErrDetCts"),$("root:Graph:ErrDetCts_"+type)
+        if(WaveExists($(USANSFolder+":"+type+":Qvals")))
+                Duplicate/O $(USANSFolder+":"+type+":Qvals"),$(USANSFolder+":Graph:Qvals_"+type)
+        Endif
+        Duplicate/O $(USANSFolder+":"+type+":Angle"),$(USANSFolder+":Graph:Angle_"+type)
+        Duplicate/O $(USANSFolder+":"+type+":DetCts"),$(USANSFolder+":Graph:DetCts_"+type)
+        Duplicate/O $(USANSFolder+":"+type+":ErrDetCts"),$(USANSFolder+":Graph:ErrDetCts_"+type)
         
         //now plot the data (or just bring the graph to the front)

sans/Dev/trunk/NCNR_User_Procedures/USANS/LakeDesmearing_JB.ipf

@@ -54 +54 @@
 // main entry routine
 Proc Desmear()
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //check for the correct data folder, initialize if necessary
         //
-        if(DataFolderExists("root:DSM") == 0)
+        if(DataFolderExists($(USANSFolder+":DSM")) == 0)
                 Execute "Init_Desmearing()"
         endif
         
         //always initialize these
-        String/G root:DSM:gStr1 = ""
-        String/G root:DSM:gStr2 = ""
-        String/G root:DSM:gIterStr = ""
+        String/G $(USANSFolder+":DSM:gStr1") = ""
+        String/G $(USANSFolder+":DSM:gStr2") = ""
+        String/G $(USANSFolder+":DSM:gIterStr") = ""
         
         DoWindow/F Desmear_Graph
@@ -73 +76 @@
 Proc Init_Desmearing()
         //set up the folder(s) needed
-        NewDataFolder/O root:DSM
-        NewDataFolder/O root:myGlobals          //in case it wasn't created elsewhere
-        
-        String/G root:DSM:gCurFile=""
-        
-        Variable/G root:DSM:gMaxFastIter = 100                  //max number of iter in Fast convergence
-        Variable/G root:DSM:gMaxSlowIter = 10000
-        
-        Variable/G root:DSM:gNptsExtrap = 10            //points for high q extrapolation
-        Variable/G root:DSM:gChi2Target = 1             //chi^2 target
-        Variable/G root:DSM:gPowerM = -4
-        Variable/G root:DSM:gDqv = 0.117                        //2005 measured slit height - see John
-        Variable/G root:DSM:gNq = 1
-        Variable/G root:DSM:gS = 0              // global varaible for Midpnt()
-        Variable/G root:DSM:gSmoothFac=0.03
-        
-        Variable/G root:DSM:gChi2Final = 0              //chi^2 final
-        Variable/G root:DSM:gIterations = 0             //total number of iterations
-        
-        String/G root:DSM:gStr1 = ""                            //information strings
-        String/G root:DSM:gStr2 = ""
-        String/G root:DSM:gIterStr = ""
-        Variable/G root:DSM:gChi2Smooth = 0
-        
-        Variable/G root:DSM:gFreshMask=1
+        NewDataFolder/O $(USANSFolder+":DSM")
+        NewDataFolder/O $(USANSFolder+":myGlobals")             //in case it wasn't created elsewhere
+        
+        String/G $(USANSFolder+":DSM:gCurFile")=""
+        
+        Variable/G $(USANSFolder+":DSM:gMaxFastIter") = 100                     //max number of iter in Fast convergence
+        Variable/G $(USANSFolder+":DSM:gMaxSlowIter") = 10000
+        
+        Variable/G $(USANSFolder+":DSM:gNptsExtrap") = 10               //points for high q extrapolation
+        Variable/G $(USANSFolder+":DSM:gChi2Target") = 1                //chi^2 target
+        Variable/G $(USANSFolder+":DSM:gPowerM") = -4
+        Variable/G $(USANSFolder+":DSM:gDqv") = 0.117                   //2005 measured slit height - see John
+        Variable/G $(USANSFolder+":DSM:gNq") = 1
+        Variable/G $(USANSFolder+":DSM:gS") = 0         // global varaible for Midpnt()
+        Variable/G $(USANSFolder+":DSM:gSmoothFac")=0.03
+        
+        Variable/G $(USANSFolder+":DSM:gChi2Final") = 0         //chi^2 final
+        Variable/G $(USANSFolder+":DSM:gIterations") = 0                //total number of iterations
+        
+        String/G $(USANSFolder+":DSM:gStr1") = ""                               //information strings
+        String/G $(USANSFolder+":DSM:gStr2") = ""
+        String/G $(USANSFolder+":DSM:gIterStr") = ""
+        Variable/G $(USANSFolder+":DSM:gChi2Smooth") = 0
+        
+        Variable/G $(USANSFolder+":DSM:gFreshMask")=1
 End
 
@@ -163 +166 @@
         Variable m
         Wave FW,Q_exp
-        
-        NVAR dqv = root:DSM:gDqv
-        NVAR NN = root:DSM:gNq
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        NVAR dqv = $(USANSFolder+":DSM:gDqv")
+        NVAR NN = $(USANSFolder+":DSM:gNq")
 
 //      Calculate Remainder fractions and put into separate array.
         Variable lower,ii,ss,jj
-        Duplicate/O Q_exp root:DSM:R_wave
-        wave r_wave = root:DSM:R_wave
+        Duplicate/O Q_exp $(USANSFolder+":DSM:R_wave")
+        wave r_wave = $(USANSFolder+":DSM:R_wave")
         
 //      Make/O/D/N=75 root:DSM:SS_save  //debug
@@ -241 +246 @@
 Function DU(ii,jj)
         Variable ii,jj
-        
-        Wave Q_exp = root:DSM:Q_exp
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave Q_exp = $(USANSFolder+":DSM:Q_exp")
         Variable DU
 
@@ -259 +266 @@
         Variable ii,jj
         
-        Wave Q_exp=root:DSM:Q_exp
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
+        Wave Q_exp=$(USANSFolder+":DSM:Q_exp")
         Variable IG,UL,UU
 
@@ -284 +293 @@
         Variable ii,jj
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         Variable FF
-        NVAR dqv = root:DSM:gDqv
+        NVAR dqv = $(USANSFolder+":DSM:gDqv")
 
         FF = (1.0/dqv)*(0.5+HH(ii,jj))
@@ -295 +306 @@
         Variable ii,jj
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         Variable GG
-        NVAR dqv = root:DSM:gDqv
+        NVAR dqv = $(USANSFolder+":DSM:gDqv")
         
         GG = (1.0/dqv)*(0.5-HH(ii,jj))
@@ -305 +318 @@
         Variable ii,jj
 
-        Wave Q_exp=root:DSM:Q_exp
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        Wave Q_exp=$(USANSFolder+":DSM:Q_exp")
         Variable HH
         
@@ -316 +331 @@
 Function CC(ii,jj)
         Variable ii,jj
-        
-        wave Q_exp = root:DSM:Q_exp
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        wave Q_exp = $(USANSFolder+":DSM:Q_exp")
         Variable CC
         
@@ -339 +356 @@
 Function QROMO(A,B,qi,m)
         Variable A,B,qi,m
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         Variable EPS,JMAX,JMAXP,KM,K
@@ -346 +365 @@
         K=KM+1
         
-        Make/O/D/N=(JMAX) root:DSM:S_wave
-        Make/O/D/N=(JMAX+1) root:DSM:H_wave
-        wave S_wave=root:DSM:S_wave
-        wave H_wave=root:DSM:H_wave
+        Make/O/D/N=(JMAX) $(USANSFolder+":DSM:S_wave")
+        Make/O/D/N=(JMAX+1) $(USANSFolder+":DSM:H_wave")
+        wave S_wave=$(USANSFolder+":DSM:S_wave")
+        wave H_wave=$(USANSFolder+":DSM:H_wave")
         S_wave=0
         H_wave=0
@@ -386 +405 @@
         
         Variable ii,mm,nmax,ns,dif,den,ho,hp,wi,dift
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         NMAX=10
         
-        Make/O/D/N=(NMAX) root:DSM:Ci,root:DSM:Di
-        wave Ci = root:DSM:Ci
-        wave Di = root:DSM:Di
+        Make/O/D/N=(NMAX) $(USANSFolder+":DSM:Ci"),$(USANSFolder+":DSM:Di")
+        wave Ci = $(USANSFolder+":DSM:Ci")
+        wave Di = $(USANSFolder+":DSM:Di")
 
         NS=1
@@ -438 +459 @@
         
         Variable it,tnm,del,ddel,x,summ,jj
-        
-        NVAR S_ret = root:DSM:gS
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        NVAR S_ret = $(USANSFolder+":DSM:gS")
         
         IF (N == 0)
@@ -490 +513 @@
         Variable lo,hi,dialog           //=1 will present dialog for name
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
         String termStr="\r\n"
-        String destStr = "root:DSM:"
+        String destStr = USANSFolder+":DSM:"
         String formatStr = "%15.6g %15.6g %15.6g %15.6g %15.6g %15.6g"+termStr
         
@@ -543 +568 @@
         String samStr="",dateStr="",str1,str2
         
-        NVAR m = root:DSM:gPowerM                                       // power law exponent
-        NVAR chiFinal = root:DSM:gChi2Final             //chi^2 final
-        NVAR iter = root:DSM:gIterations                //total number of iterations
+        NVAR m = $(USANSFolder+":DSM:gPowerM")                          // power law exponent
+        NVAR chiFinal = $(USANSFolder+":DSM:gChi2Final")                //chi^2 final
+        NVAR iter = $(USANSFolder+":DSM:gIterations:")          //total number of iterations
         
         //get the number of spline passes from the wave note
@@ -584 +609 @@
         Wave w
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         Variable num_extr=25
         
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         
         Make/O/D/N=(num_extr) extr_hqq,extr_hqi
@@ -614 +641 @@
         Wave qw,iw,sw
         Variable nbeg,nend,num_extr
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         Variable/G V_FitMaxIters=300
@@ -624 +653 @@
 //      Print "num,num_new",num,num_new
         
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         Make/O/D/N=(num_new) Q_ext,I_ext,S_ext
         
@@ -694 +723 @@
         Wave qw,iw,sw
         Variable nend
-        
-        Setdatafolder root:DSM
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Setdatafolder $(USANSFolder+":DSM")
         
 //      Wave extr_lqi=extr_lqi
@@ -742 +773 @@
 
 Proc Desmear_Graph() 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         PauseUpdate; Silent 1           // building window...
         Display /W=(5,44,408,558) /K=1
@@ -770 +803 @@
         CheckBox DSMControl_0b,help={"Toggle Log/Lin Q display"},value= 1
         TitleBox DSMControl_0c,pos={120,37},size={104,19},font="Courier",fSize=10
-        TitleBox DSMControl_0c,variable= root:DSM:gStr1
+        TitleBox DSMControl_0c,variable= $(USANSFolder+":DSM:gStr1")
         //second message string not used currently
 //      TitleBox DSMControl_0d,pos={120,57},size={104,19},font="Courier",fSize=10
@@ -797 +830 @@
         SetVariable DSMControl_2b,pos={31,70},size={100,15},title="# of points"
         SetVariable DSMControl_2b,help={"Set the number of points for the power-law extrapolation"}
-        SetVariable DSMControl_2b,limits={5,100,1},value=  root:DSM:gNptsExtrap
+        SetVariable DSMControl_2b,limits={5,100,1},value=  $(USANSFolder+":DSM:gNptsExtrap")
         SetVariable DSMControl_2b,disable=1
         CheckBox DSMControl_2c,pos={157,45},size={105,14},proc=DSM_ExtrapolationCheckProc,title="Show Extrapolation"
@@ -805 +838 @@
         SetVariable DSMControl_2d,help={"Power Law exponent from the fit = the DESMEARED slope - override as needed"}
         SetVariable DSMControl_2d format="%5.2f"
-        SetVariable DSMControl_2d,limits={-inf,inf,0},value= root:DSM:gPowerM
+        SetVariable DSMControl_2d,limits={-inf,inf,0},value= $(USANSFolder+":DSM:gPowerM")
         SetVariable DSMControl_2d,disable=1
         
@@ -830 +863 @@
         SetVariable DSMControl_3f,help={"Smoothing factor for the smoothing spline"}
         SetVariable DSMControl_3f format="%5.4f"
-        SetVariable DSMControl_3f,limits={0.01,2,0.01},value= root:DSM:gSmoothFac
+        SetVariable DSMControl_3f,limits={0.01,2,0.01},value= $(USANSFolder+"DSM:gSmoothFac")
         SetVariable DSMControl_3f,disable=1
         CheckBox DSMControl_3g,pos={268,39},size={90,14},title="Log-scale smoothing?"
@@ -846 +879 @@
         SetVariable DSMControl_4b,pos={35,63},size={120,15},title="Chi^2 target"
         SetVariable DSMControl_4b,help={"Set the targetchi^2 for convergence (recommend chi^2=1)"}
-        SetVariable DSMControl_4b,limits={0,inf,0.1},value= root:DSM:gChi2Target
+        SetVariable DSMControl_4b,limits={0,inf,0.1},value= $(USANSFolder+":DSM:gChi2Target")
         SetVariable DSMControl_4b,disable=1
         SetVariable DSMControl_4c,pos={35,35},size={80,15},title="dQv"
         SetVariable DSMControl_4c,help={"Slit height as read in from the data file. 0.117 is the NIST value, override if necessary"}
-        SetVariable DSMControl_4c,limits={-inf,inf,0},value= root:DSM:gDqv
+        SetVariable DSMControl_4c,limits={-inf,inf,0},value= $(USANSFolder+":DSM:gDqv")
         SetVariable DSMControl_4c,disable=1
         TitleBox DSMControl_4d,pos={160,37},size={104,19},font="Courier",fSize=10
-        TitleBox DSMControl_4d,variable= root:DSM:gIterStr
+        TitleBox DSMControl_4d,variable= $(USANSFolder+":DSM:gIterStr")
         TitleBox DSMControl_4d,disable=1
         
@@ -912 +945 @@
 
 Proc AppendSmeared()
-        SetDataFolder root:DSM
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":DSM")
 //      if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_exp_orig",0,2) == -1)            //Igor 5
         if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_exp_orig",0) == -1)
@@ -927 +962 @@
         TextBox/K/N=text1
 //      TextBox/C/N=text1/F=0/A=MT/E=2/X=5.50/Y=0.00 root:DSM:gCurFile                  //Igor 5
-        TextBox/C/N=text1/F=0/A=MT/E=1/X=5.50/Y=0.00 root:DSM:gCurFile
+        TextBox/C/N=text1/F=0/A=MT/E=1/X=5.50/Y=0.00 $(USANSFolder+"DSM:gCurFile")
 End
 
 Proc AppendMask()
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
 //      if( strsearch(TraceNameList("Desmear_Graph", "", 1),"MaskData",0,2) == -1)                      //Igor 5
         if( strsearch(TraceNameList("Desmear_Graph", "", 1),"MaskData",0) == -1)
-                SetDataFolder root:DSM:
+                SetDataFolder $(USANSFolder+":DSM:")
                 AppendToGraph/W=Desmear_Graph MaskData vs Q_exp_orig
                 ModifyGraph mode(MaskData)=3,marker(MaskData)=8,msize(MaskData)=2.5,opaque(MaskData)=1
@@ -942 +979 @@
 
 Proc AppendSmoothed()
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
 //      if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_smth",0,2) == -1)                        //Igor 5
         if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_smth",0) == -1)
-                SetDataFolder root:DSM:
+                SetDataFolder $(USANSFolder+":DSM:")
                 AppendToGraph/W=Desmear_Graph I_smth vs Q_smth
                 ModifyGraph/W=Desmear_Graph rgb(I_smth)=(3,52428,1),lsize(I_smth)=2
@@ -952 +991 @@
 
 Function RemoveSmoothed()
-        SetDataFolder root:DSM:
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":DSM:")
         RemoveFromGraph/W=Desmear_Graph/Z I_smth
         setdatafolder root:
@@ -958 +999 @@
 
 Function RemoveMask()
-        SetDataFolder root:DSM:
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":DSM:")
         RemoveFromGraph/W=Desmear_Graph/Z MaskData
         setdatafolder root:
@@ -964 +1007 @@
 
 Proc AppendDesmeared()
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
 //      if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_dsm",0,2) == -1)         //Igor 5
         if( strsearch(TraceNameList("Desmear_Graph", "", 1),"I_dsm",0) == -1)
-                SetDataFolder root:DSM:
+                SetDataFolder $(USANSFolder+":DSM:")
                 AppendToGraph/W=Desmear_Graph I_dsm vs Q_dsm
                 ModifyGraph mode(I_dsm)=3,marker(I_dsm)=19
@@ -976 +1021 @@
 
 Function RemoveDesmeared()
-        SetDataFolder root:DSM:
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":DSM:")
         RemoveFromGraph/W=Desmear_Graph/Z I_dsm
         setdatafolder root:
@@ -982 +1029 @@
 
 Function AppendExtrapolation()
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
 //      if( strsearch(TraceNameList("Desmear_Graph", "", 1),"extr_hqi",0,2) == -1)              //Igor 5
         if( strsearch(TraceNameList("Desmear_Graph", "", 1),"extr_hqi",0) == -1)
-                SetDataFolder root:DSM:
+                SetDataFolder $(USANSFolder+":DSM:")
                 AppendToGraph/W=Desmear_Graph extr_hqi vs extr_hqq
                 ModifyGraph/W=Desmear_Graph lSize(extr_hqi)=2
@@ -992 +1041 @@
 
 Function RemoveExtrapolation()
-        SetDataFolder root:DSM:
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SetDataFolder $(USANSFolder+":DSM:")
         RemoveFromGraph/W=Desmear_Graph/Z extr_hqi
         setdatafolder root:
@@ -1007 +1058 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         String qStr,iStr,sStr,sqStr
         Variable nq,dqv,numBad,val
@@ -1016 +1069 @@
         Execute "U_LoadOneDDataWithName(\"\")"
         //define the waves that the smoothing will be looking for...
-        SVAR fname = root:myGlobals:gLastFileName                       //this changes as any data is loaded
-        SVAR curFile = root:DSM:gCurFile                                                //keep this for title, save
+        SVAR fname = $(USANSFolder+":myGlobals:gLastFileName")          //this changes as any data is loaded
+        SVAR curFile = $(USANSFolder+":DSM:gCurFile")                                   //keep this for title, save
         curFile = fname
         
@@ -1025 +1078 @@
         sqStr = CleanupName((fName + "sq"),0)           //the sq-wave, which should have -dQv as the elements
 
-        Duplicate/O $qStr root:DSM:Q_exp                        //root:DSM:Q_exp_orig
-        Duplicate/O $iStr root:DSM:I_exp                        //root:DSM:I_exp_orig
-        Duplicate/O $sStr root:DSM:S_exp                //root:DSM:S_exp_orig
-        wave Q_exp = root:DSM:Q_exp
-        Wave I_exp = root:DSM:I_exp
-        Wave S_exp = root:DSM:S_exp
+        Duplicate/O $qStr $(USANSFolder+":DSM:Q_exp     ")              
+        Duplicate/O $iStr $(USANSFolder+":DSM:I_exp")           
+        Duplicate/O $sStr $(USANSFolder+":DSM:S_exp     ")      
+        wave Q_exp = $(USANSFolder+":DSM:Q_exp")
+        Wave I_exp = $(USANSFolder+":DSM:I_exp")
+        Wave S_exp = $(USANSFolder+":DSM:S_exp")
         Wave/Z sigQ = $sqStr
         
@@ -1036 +1089 @@
         // ? and trim the low q to be >= 3.0e-5 (1/A), below this USANS is not reliable.
         NumBad = RemoveBadQPoints(Q_exp,I_exp,S_exp,0)
-        SVAR str1 = root:DSM:gStr1
+        SVAR str1 = $(USANSFolder+":DSM:gStr1")
         sprintf str1,"%d negative q-values were removed",numBad
         
@@ -1045 +1098 @@
 //      sprintf str2,"%d q-values below q = %g were removed",numBad,val
         
-        Duplicate/O root:DSM:Q_exp root:DSM:Q_exp_orig
-        Duplicate/O root:DSM:I_exp root:DSM:I_exp_orig
-        Duplicate/O root:DSM:S_exp root:DSM:S_exp_orig
-        wave I_exp_orig = root:DSM:I_exp_orig
-        
-        nq = numpnts(root:DSM:Q_exp)
+        Duplicate/O $(USANSFolder+":DSM:Q_exp") $(USANSFolder+":DSM:Q_exp_orig")
+        Duplicate/O $(USANSFolder+":DSM:I_exp") $(USANSFolder+":DSM:I_exp_orig")
+        Duplicate/O $(USANSFolder+":DSM:S_exp") $(USANSFolder+":DSM:S_exp_orig")
+        wave I_exp_orig = $(USANSFolder+":DSM:I_exp_orig")
+        
+        nq = numpnts($(USANSFolder+":DSM:Q_exp"))
         
         if(WaveExists(sigQ))                    //try to read dQv
@@ -1060 +1113 @@
                 DoAlert 0,"Could not find dQv in the data file - using " + num2str(dqv)
         endif
-        NVAR gDqv = root:DSM:gDqv                               //needs to be global for Weights_L()
-        NVAR gNq = root:DSM:gNq
+        NVAR gDqv = $(USANSFolder+":DSM:gDqv")                          //needs to be global for Weights_L()
+        NVAR gNq = $(USANSFolder+":DSM:gNq")
         //reset the globals
         gDqv = dqv
@@ -1132 +1185 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
 //      Variable aExists= strlen(CsrInfo(A)) > 0                        //Igor 5
         Variable aExists= strlen(CsrWave(A)) > 0                        //Igor 4
@@ -1138 +1193 @@
         endif
         
-        Duplicate/O root:DSM:Q_exp_orig,root:DSM:Q_msk
-        Duplicate/O root:DSM:I_exp_orig,root:DSM:I_msk
-        Duplicate/O root:DSM:S_exp_orig,root:DSM:S_msk
-        Wave Q_msk=root:DSM:Q_msk
-        Wave I_msk=root:DSM:I_msk
-        Wave S_msk=root:DSM:S_msk
+        Duplicate/O $(USANSFolder+":DSM:Q_exp_orig"),$(USANSFolder+":DSM:Q_msk")
+        Duplicate/O $(USANSFolder+":DSM:I_exp_orig"),$(USANSFolder+":DSM:I_msk")
+        Duplicate/O $(USANSFolder+":DSM:S_exp_orig"),$(USANSFolder+":DSM:S_msk")
+        Wave Q_msk=$(USANSFolder+":DSM:Q_msk")
+        Wave I_msk=$(USANSFolder+":DSM:I_msk")
+        Wave S_msk=$(USANSFolder+":DSM:S_msk")
         
         //finish up - trim the data sets and reassign the working set
-        Wave MaskData=root:DSM:MaskData
+        Wave MaskData=$(USANSFolder+":DSM:MaskData")
         
         RemoveMaskedPoints(MaskData,Q_msk,I_msk,S_msk)
 
         //reset the number of points
-        NVAR gNq = root:DSM:gNq
+        NVAR gNq = $(USANSFolder+":DSM:gNq")
         gNq = numpnts(Q_msk)
         
@@ -1165 +1220 @@
         String ctrlName
         
-        Wave MaskData=root:DSM:MaskData
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave MaskData=$(USANSFolder+":DSM:MaskData")
         MaskData = NaN
         
@@ -1177 +1234 @@
         String ctrlName
         
-        Wave data=root:DSM:I_exp_orig
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave data=$(USANSFolder+":DSM:I_exp_orig")
         
 //      Variable aExists= strlen(CsrInfo(A)) > 0                        //Igor 5
@@ -1184 +1243 @@
 // need to get rid of old smoothed data if data is re-masked
         Execute "RemoveSmoothed()"
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         Killwaves/Z I_smth,Q_smth,S_smth
-        SetDataFolder root:
                 
         if(aExists)             //mask the selected point
                 // toggle NaN (keep) or Data value (= masked)
-                Wave MaskData=root:DSM:MaskData
+                Wave MaskData
                 MaskData[pcsr(A)] = (numType(MaskData[pcsr(A)])==0) ? NaN : data[pcsr(A)]               //if NaN, doesn't plot 
         else
@@ -1196 +1254 @@
                 ShowInfo
                 //if the mask wave does not exist, make one
-                if(exists("root:DSM:MaskData") != 1)
-                        Duplicate/O root:DSM:Q_exp_orig root:DSM:MaskData
-                        Wave MaskData=root:DSM:MaskData
+                if(exists("MaskData") != 1)
+                        Duplicate/O Q_exp_orig MaskData
                         MaskData = NaN          //use all data
                 endif
                 Execute "AppendMask()"  
         endif
-        
+
+        SetDataFolder root:
+
         return(0)
 End
@@ -1212 +1271 @@
 Function DSM_MaskLTCursor(ctrlName) : ButtonControl
         String ctrlName
-        
-        Wave data=root:DSM:I_exp_orig
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+                
+//      Variable aExists= strlen(CsrInfo(A)) > 0                        //Igor 5
+        Variable aExists= strlen(CsrWave(A)) > 0                        //Igor 4
+        
+        if(!aExists)
+                return(1)
+        endif
+// need to get rid of old smoothed data if data is re-masked
+        Execute "RemoveSmoothed()"
+        SetDataFolder $(USANSFolder+":DSM")
+        Killwaves/Z I_smth,Q_smth,S_smth
+
+        Wave data=I_exp_orig
+
+        Variable pt,ii
+        pt = pcsr(A)
+        for(ii=pt;ii>=0;ii-=1)
+                // toggle NaN (keep) or Data value (= masked)
+                Wave MaskData
+                MaskData[ii] = (numType(MaskData[ii])==0) ? NaN : data[ii]              //if NaN, doesn't plot 
+        endfor
+
+        SetDataFolder root:
+        return(0)
+End
+
+// when the mask button is pressed, A must be on the graph
+// Displays MaskData wave on the graph
+//
+Function DSM_MaskGTCursor(ctrlName) : ButtonControl
+        String ctrlName
+        
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+
         
 //      Variable aExists= strlen(CsrInfo(A)) > 0                        //Igor 5
@@ -1225 +1318 @@
         SetDataFolder root:DSM
         Killwaves/Z I_smth,Q_smth,S_smth
-        SetDataFolder root:
-
-        Wave MaskData=root:DSM:MaskData
-        Variable pt,ii
-        pt = pcsr(A)
-        for(ii=pt;ii>=0;ii-=1)
-                // toggle NaN (keep) or Data value (= masked)
-                MaskData[ii] = (numType(MaskData[ii])==0) ? NaN : data[ii]              //if NaN, doesn't plot 
-        endfor
-        return(0)
-End
-
-// when the mask button is pressed, A must be on the graph
-// Displays MaskData wave on the graph
-//
-Function DSM_MaskGTCursor(ctrlName) : ButtonControl
-        String ctrlName
-        
-        Wave data=root:DSM:I_exp_orig
-        
-//      Variable aExists= strlen(CsrInfo(A)) > 0                        //Igor 5
-        Variable aExists= strlen(CsrWave(A)) > 0                        //Igor 4
-        
-        if(!aExists)
-                return(1)
-        endif
-// need to get rid of old smoothed data if data is re-masked
-        Execute "RemoveSmoothed()"
-        SetDataFolder root:DSM
-        Killwaves/Z I_smth,Q_smth,S_smth
-        SetDataFolder root:
-
-        Wave MaskData=root:DSM:MaskData
+
+        Wave data=I_exp_orig
+
         Variable pt,ii,endPt
         endPt=numpnts(MaskData)
@@ -1263 +1326 @@
         for(ii=pt;ii<endPt;ii+=1)
                 // toggle NaN (keep) or Data value (= masked)
+                Wave MaskData
                 MaskData[ii] = (numType(MaskData[ii])==0) ? NaN : data[ii]              //if NaN, doesn't plot 
         endfor
+
+        SetDataFolder root:
+
         return(0)
 End
 
 Function CleanUpJunk()
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+
         // clean up the old junk on the graph, /Z for no error
         Execute "RemoveExtrapolation()"
@@ -1279 +1348 @@
         
         //always initialize these
-        String/G root:DSM:gStr1 = ""
-        String/G root:DSM:gStr2 = ""
-        String/G root:DSM:gIterStr = ""
+        String/G $(USANSFolder+":DSM:gStr1") = ""
+        String/G $(USANSFolder+":DSM:gStr2") = ""
+        String/G $(USANSFolder+":DSM:gIterStr") = ""
         
         // clean up the old waves from smoothing and desmearing steps
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         Killwaves/Z I_smth,I_dsm,I_dsm_sm,Q_smth,Q_dsm,S_smth,S_dsm,Yi_SS,Yq_SS
         Killwaves/Z Weights,FW,R_wave,S_wave,H_wave,Di,Ci
@@ -1302 +1371 @@
         String ctrlName
 
-        NVAR nend = root:DSM:gNptsExtrap
-        NVAR m_pred = root:DSM:gPowerM
-        
-        SetDataFolder root:DSM
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+
+        NVAR nend = $(USANSFolder+":DSM:gNptsExtrap")
+        NVAR m_pred = $(USANSFolder+":DSM:gPowerM")
+        
+        SetDataFolder $(USANSFolder+":DSM")
 //use masked data if it exists
         if(exists("I_msk")==1 && exists("Q_msk")==1 && exists("S_msk")==1)
-                wave Qw = root:DSM:Q_msk
-                Wave Iw = root:DSM:I_msk
-                Wave Sw = root:DSM:S_msk
+                wave Qw = $(USANSFolder+":DSM:Q_msk")
+                Wave Iw = $(USANSFolder+":DSM:I_msk")
+                Wave Sw = $(USANSFolder+":DSM:S_msk")
         else
                 //start from the "_exp" waves
                 if(exists("I_exp")==1 && exists("Q_exp")==1 && exists("S_exp")==1)
-                        wave Qw = root:DSM:Q_exp
-                        Wave Iw = root:DSM:I_exp
-                        Wave Sw = root:DSM:S_exp
+                        wave Qw = $(USANSFolder+":DSM:Q_exp")
+                        Wave Iw = $(USANSFolder+":DSM:I_exp")
+                        Wave Sw = $(USANSFolder+":DSM:S_exp")
                 endif
         endif
@@ -1347 +1418 @@
         String ctrlName
 
-        SetDataFolder root:DSM  
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+
+        SetDataFolder $(USANSFolder+":DSM")     
 
         Variable ii,new_n,pass,nq_ext,offset,doLog=1
@@ -1362 +1435 @@
                 //start from the "msk", creating smth waves
                 if(exists("I_msk")==1 && exists("Q_msk")==1 && exists("S_msk")==1)
-                        wave Q_msk = root:DSM:Q_msk
-                        Wave I_msk = root:DSM:I_msk
-                        Wave S_msk = root:DSM:S_msk
+                        wave Q_msk,I_msk,S_msk
                         Duplicate/O I_msk,I_smth,Q_smth,S_smth
                         I_smth = I_msk
@@ -1372 +1443 @@
                         //start from the "_exp" waves
                         if(exists("I_exp")==1 && exists("Q_exp")==1 && exists("S_exp")==1)
-                                wave Q_exp = root:DSM:Q_exp
-                                Wave I_exp = root:DSM:I_exp
-                                Wave S_exp = root:DSM:S_exp
+                                wave Q_exp,I_exp,S_exp
                                 Duplicate/O I_exp,I_smth,Q_smth,S_smth
                                 I_smth = I_exp
@@ -1383 +1452 @@
         endif
         
-        wave Q_smth = root:DSM:Q_smth
-        Wave I_smth = root:DSM:I_smth
-        Wave S_smth = root:DSM:S_smth
+        wave Q_smth,I_smth,S_smth
 
         // extend the data to avoid end effects
@@ -1399 +1466 @@
         
         //whether extending or not, the working data is "_ext", set by ExtendToSmooth()
-        setDataFolder root:DSM
-        wave Q_ext = root:DSM:Q_ext
-        Wave I_ext = root:DSM:I_ext
-        Wave S_ext = root:DSM:S_ext
+        SetDataFolder $(USANSFolder+":DSM")     
+        wave Q_ext,I_ext ,S_ext
         
         noteStr=note(I_smth)
@@ -1415 +1480 @@
         if(doLog)
                 //convert to log scale
-                Duplicate/O I_ext root:DSM:I_log,root:DSM:I_log_err
-                Wave I_log = root:DSM:I_log
-                Wave I_log_err = root:DSM:I_log_err
+                Duplicate/O I_ext I_log,I_log_err
+                Wave I_log ,I_log_err
                 I_log = log(I_ext)
                 WaveStats/Q I_log
@@ -1441 +1505 @@
         endif
 
-        NVAR sParam = root:DSM:gSmoothFac
+        NVAR sParam = $(USANSFolder+":DSM:gSmoothFac")
         
         ControlInfo/W=Desmear_Graph DSMControl_3c               //SSCheck
@@ -1490 +1554 @@
 
         //reset the global
-        NVAR gNq = root:DSM:gNq
+        NVAR gNq = $(USANSFolder+":DSM:gNq")
         gNq = nq
         //report the chi^2 difference between the smoothed curve and the experimental data
@@ -1506 +1570 @@
 Function DSM_SmoothUndoButtonProc(ctrlName) : ButtonControl
         String ctrlName
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
         
         Execute "RemoveSmoothed()"
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         Killwaves/Z I_smth,Q_smth,S_smth,Q_ext,I_ext,S_ext,Yi_SS,Yq_SS
         SetDataFolder root:
@@ -1518 +1584 @@
         Wave I_smth
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
         //start from the "msk", if they exist
         if(exists("I_msk")==1 && exists("Q_msk")==1 && exists("S_msk")==1)
-                Wave iw = root:DSM:I_msk
-                Wave sw = root:DSM:S_msk
+                Wave iw = $(USANSFolder+":DSM:I_msk")
+                Wave sw = $(USANSFolder+":DSM:S_msk")
         else
                 //start from the "_exp" waves
                 if(exists("I_exp")==1 && exists("Q_exp")==1 && exists("S_exp")==1)
-                        Wave iw = root:DSM:I_exp
-                        Wave sw = root:DSM:S_exp
+                        Wave iw = $(USANSFolder+":DSM:I_exp")
+                        Wave sw = $(USANSFolder+":DSM:S_exp")
                 endif
         endif
@@ -1547 +1615 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+
         String saveStr
-        SVAR curFile = root:DSM:gCurFile
+        SVAR curFile = $(USANSFolder+":DSM:gCurFile")
         saveStr = CleanupName((curFile),0)              //the output filename
         //
@@ -1600 +1670 @@
         String ctrlName
         
-        SetDataFolder root:DSM
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
+        SetDataFolder $(USANSFolder+":DSM")
         if(exists("I_smth")==1 && exists("Q_smth")==1 && exists("S_smth")==1)
-                wave Q_smth = root:DSM:Q_smth
-                Wave I_smth = root:DSM:I_smth
-                Wave S_smth = root:DSM:S_smth
+                wave Q_smth , I_smth ,S_smth 
                 Duplicate/O I_smth,I_work,Q_work,S_work
                 I_work = I_smth
@@ -1612 +1682 @@
                 //start from the "msk", creating work waves
                 if(exists("I_msk")==1 && exists("Q_msk")==1 && exists("S_msk")==1)
-                        wave Q_msk = root:DSM:Q_msk
-                        Wave I_msk = root:DSM:I_msk
-                        Wave S_msk = root:DSM:S_msk
+                        wave Q_msk,I_msk,S_msk
                         Duplicate/O I_msk,I_work,Q_work,S_work
                         I_work = I_msk
@@ -1622 +1690 @@
                         //start from the "_exp" waves
                         if(exists("I_exp")==1 && exists("Q_exp")==1 && exists("S_exp")==1)
-                                wave Q_exp = root:DSM:Q_exp
-                                Wave I_exp = root:DSM:I_exp
-                                Wave S_exp = root:DSM:S_exp
+                                wave Q_exp,I_exp,S_exp 
                                 Duplicate/O I_exp,I_work,Q_work,S_work
                                 I_work = I_exp
@@ -1632 +1698 @@
                 endif
         endif
-        SetDataFolder root:
-        
-        NVAR nq = root:DSM:gNq
-        NVAR m = root:DSM:gPowerM
-        NVAR chi2_target = root:DSM:gChi2Target
-        NVAR maxFastIter = root:DSM:gMaxFastIter
-        NVAR maxSlowIter = root:DSM:gMaxSlowIter
+        //SetDataFolder root:
+        
+        NVAR nq = gNq
+        NVAR m = gPowerM
+        NVAR chi2_target = gChi2Target
+        NVAR maxFastIter = gMaxFastIter
+        NVAR maxSlowIter = gMaxSlowIter
         
         //      SET WEIGHTING OF EXPERIMENTAL DATA.
-        Duplicate/O Q_work root:DSM:weights
-        Wave weights = root:DSM:weights
+        Duplicate/O Q_work weights
+        Wave weights = weights
         weights = 1/S_work^2
 
 //      calculate weighting array for smearing of data
-        Make/O/D/N=(nq,nq) root:DSM:FW
-        Wave FW = root:DSM:FW
+        Make/O/D/N=(nq,nq) FW
+        Wave FW
         Weights_L(m,FW,Q_work)
 
@@ -1655 +1721 @@
 //      y_old = I_old, y_new = I_dsm, I_dsm_sm = ys_new,
 // duplicate preserves the wave note!
-        Duplicate/O I_work root:DSM:I_old,root:DSM:Is_old,root:DSM:I_dsm,root:DSM:I_dsm_sm
-        Duplicate/O Q_work root:DSM:Q_dsm,root:DSM:S_dsm                //sets Q_dsm correctly
-        wave S_dsm = root:DSM:S_dsm             //set correctly at end of this function
-        wave I_old = root:DSM:I_old
-        wave Is_old = root:DSM:Is_old
-        wave I_dsm = root:DSM:I_dsm
-        wave I_dsm_sm = root:DSM:I_dsm_sm
+        Duplicate/O I_work I_old,Is_old,root:DSM:I_dsm,root:DSM:I_dsm_sm
+        Duplicate/O Q_work Q_dsm,S_dsm          //sets Q_dsm correctly
+        wave S_dsm,I_old,Is_old,I_dsm,I_dsm_sm
         I_old = I_work
         Is_old = 0
@@ -1706 +1768 @@
         Execute "AppendDesmeared()"
         DoUpdate
-
+        SetDataFolder $(USANSFolder+":DSM")
+
+        
 // step (6) - refine the desmearing using slow convergence
         Print "Starting slow convergence..... "
@@ -1745 +1809 @@
 
         // adjust the error
-        SetDataFolder root:DSM
+        SetDataFolder $(USANSFolder+":DSM")
         Duplicate/O S_work err
         S_dsm = abs(err/I_work*I_dsm)           //proportional error
@@ -1751 +1815 @@
 //      S_dsm = S_Work
         
-        NVAR gChi = root:DSM:gChi2Final         //chi^2 final
-        NVAR gIter = root:DSM:gIterations               //total number of iterations
+        NVAR gChi =  gChi2Final         //chi^2 final
+        NVAR gIter = gIterations                //total number of iterations
         gChi = chi2_new
         gIter = Iter
         
-        SVAR str = root:DSM:gIterStr
+        SVAR str = gIterStr
         sprintf str,"%d iterations required",iter
         
@@ -1765 +1829 @@
 Function DSM_RevertButtonProc(ctrlName) : ButtonControl
         String ctrlName
-
+        
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
+        
         CleanUpJunk()
-         
+
+        SetDataFolder $(USANSFolder+":DSM")
+
         //reset the working waves to the original
-        wave Q_exp_orig = root:DSM:Q_exp_orig
-        wave I_exp_orig = root:DSM:I_exp_orig
-        wave S_exp_orig = root:DSM:S_exp_orig
-
-        Duplicate/O Q_exp_orig root:DSM:Q_exp
-        Duplicate/O I_exp_orig root:DSM:I_exp
-        Duplicate/O S_exp_orig root:DSM:S_exp
+        wave Q_exp_orig,I_exp_orig,S_exp_orig
+
+        Duplicate/O Q_exp_orig Q_exp
+        Duplicate/O I_exp_orig I_exp
+        Duplicate/O S_exp_orig S_exp
         // kill the data folder
         // re-initialize?
 
+        SetDataFolder root:
+        
         return(0)
 End

sans/Dev/trunk/NCNR_User_Procedures/USANS/Main_USANS.ipf

@@ -25 +25 @@
         "Desmear USANS Data",Desmear()
         "-"
-        "Load USANS Data",U_LoadOneDData()
+        "Load USANS Data",A_LoadOneDData()
         "Convert to 6 Columns",Convert3ColTo6Col()
         "-"
@@ -53 +53 @@
 //
 Proc Init_MainUSANS()
-        NewDataFolder/O root:Globals
-        NewDataFolder/O/S root:Globals:MainPanel
+        NewDataFolder/O root:Packages
+        NewDataFolder/O root:Packages:NIST
+        NewDataFolder/O root:Packages:NIST:USANS
+        NewDataFolder/O root:Packages:NIST:USANS:Globals
+        NewDataFolder/O/S root:Packages:NIST:USANS:Globals:MainPanel
+        
+        String/G root:Packages:NIST:USANS:Globals:gUSANSFolder  = "root:Packages:NIST:USANS"
+        String USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        //NB This is also hardcoded a bit further down - search for "WHY WHY WHY" AJJ Sept 08
         
         Make/O/T/N=1 fileWave,samWave,empWave,curWave //Added curWave Sept 06 A. Jackson
@@ -81 +88 @@
         SetDataFolder root:
         
-        NewDataFolder/O root:RAW
-        NewDataFolder/O root:SAM
-        NewDataFolder/O root:COR
-        NewDataFolder/O root:EMP
-        NewDataFolder/O root:BKG
-        NewDataFolder/O root:SWAP
-        NewDataFolder/O root:Graph
+        NewDataFolder/O $(USANSFolder+":RAW")
+        NewDataFolder/O $(USANSFolder+":SAM")
+        NewDataFolder/O $(USANSFolder+":COR")
+        NewDataFolder/O $(USANSFolder+":EMP")
+        NewDataFolder/O $(USANSFolder+":BKG")
+        NewDataFolder/O $(USANSFolder+":SWAP")
+        NewDataFolder/O $(USANSFolder+":Graph")
         
         //dummy waves for bkg and emp levels
-        Make/O root:EMP:empLevel,root:BKG:bkgLevel
-        root:EMP:empLevel := root:Globals:MainPanel:gEmpCts             //dependency to connect to SetVariable in panel
-        root:BKG:bkgLevel := root:Globals:MainPanel:gBkgCts
+        Make/O $(USANSFolder+":EMP:empLevel"),$(USANSFolder+":BKG:bkgLevel")
+        //WHY WHY WHY?????
+        //Explicit dependency
+        root:Packages:NIST:USANS:EMP:empLevel := root:Packages:NIST:USANS:Globals:MainPanel:gEmpCts //dependency to connect to SetVariable in panel
+        root:Packages:NIST:USANS:BKG:bkgLevel := root:Packages:NIST:USANS:Globals:MainPanel:gBkgCts
+
         
         //INSTRUMENTAL CONSTANTS 
-        Variable/G  root:Globals:MainPanel:gTheta_H = 3.9e-6            //Darwin FWHM   (pre- NOV 2004)
-        Variable/G  root:Globals:MainPanel:gTheta_V = 0.014             //Vertical divergence   (pre- NOV 2004)
+        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gTheta_H = 3.9e-6            //Darwin FWHM   (pre- NOV 2004)
+        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gTheta_V = 0.014             //Vertical divergence   (pre- NOV 2004)
         //Variable/G  root:Globals:MainPanel:gDomega = 2.7e-7           //Solid angle of detector (pre- NOV 2004)
-        Variable/G  root:Globals:MainPanel:gDomega = 7.1e-7             //Solid angle of detector (NOV 2004)
-        Variable/G  root:Globals:MainPanel:gDefaultMCR = 1e6            //factor for normalization
+        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDomega = 7.1e-7             //Solid angle of detector (NOV 2004)
+        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDefaultMCR= 1e6             //factor for normalization
         
         //Variable/G  root:Globals:MainPanel:gDQv = 0.037               //divergence, in terms of Q (1/A) (pre- NOV 2004)
-        Variable/G  root:Globals:MainPanel:gDQv = 0.117         //divergence, in terms of Q (1/A)  (NOV 2004)
+        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDQv = 0.117         //divergence, in terms of Q (1/A)  (NOV 2004)
 
         
@@ -128 +138 @@
         DrawText 293,55,"Current Data"
         ListBox fileLB,pos={5,55},size={110,230},proc=FileListBoxProc
-        ListBox fileLB,listWave=root:Globals:MainPanel:fileWave
-        ListBox fileLB,selWave=root:Globals:MainPanel:selFileW,mode= 4
-        ListBox samLB,pos={149,55},size={110,90},listWave=root:Globals:MainPanel:samWave
+        ListBox fileLB,listWave=root:Packages:NIST:USANS:Globals:MainPanel:fileWave
+        ListBox fileLB,selWave=root:Packages:NIST:USANS:Globals:MainPanel:selFileW,mode= 4
+        ListBox samLB,pos={149,55},size={110,90},listWave=root:Packages:NIST:USANS:Globals:MainPanel:samWave
         ListBox samLB,mode= 1,selRow= -1
         Button ClearSamButton,pos={224,148},size={35,21},proc=ClearButtonProc,title="Clr"
@@ -143 +153 @@
         Button DelEmpButton,help={"Deletes the selected file(s) from the list of empty scans"}
         ListBox empLB,pos={151,194},size={110,90}
-        ListBox empLB,listWave=root:Globals:MainPanel:empWave,mode= 1,selRow= 0
+        ListBox empLB,listWave=root:Packages:NIST:USANS:Globals:MainPanel:empWave,mode= 1,selRow= 0
         Button toSamList,pos={118,55},size={25,90},proc=toSamListButtonProc,title="S->"
         Button toSamList,help={"Adds the selected file(s) to the list of sample scans"}
@@ -149 +159 @@
         Button toEmpList,help={"Adds the selected file(s) to the list of empty (cell) scans"}
         ListBox StatusLB,pos={11,358},size={386,77}
-        ListBox StatusLB,listWave=root:Globals:MainPanel:statusWave
+        ListBox StatusLB,listWave=root:Packages:NIST:USANS:Globals:MainPanel:statusWave
         Button pickPathButton,pos={6,8},size={80,20},proc=PickBT5PathButton,title="DataPath..."
         Button pickPathButton,help={"Select the data folder where the raw ICP data files are located"}
@@ -167 +177 @@
         Button AddCurToEMP,help={"Adds the current data file to the list of empty scans"}
         ListBox CurFileBox,pos={295,55},size={100,230},proc=FileListBoxProc,disable=1
-        ListBox CurFileBox,listWave=root:Globals:MainPanel:curWave,mode=1
+        ListBox CurFileBox,listWave=root:Packages:NIST:USANS:Globals:MainPanel:curWave,mode=1
         SetVariable FilterSetVar,pos={8,289},size={106,18},title="Filter",fSize=12
-        SetVariable FilterSetVar,value= root:Globals:MainPanel:FilterStr
+        SetVariable FilterSetVar,value= root:Packages:NIST:USANS:Globals:MainPanel:FilterStr
         CheckBox UseCurrentData,pos={298,290},size={10,10},proc=UseCurrentDataProc,title="Enable Current Data"
         CheckBox UseCurrentData,value=0
@@ -184 +194 @@
         PauseUpdate; Silent 1           // building window...
         String fldrSav= GetDataFolder(1)
-        SetDataFolder root:RAW:
+        String USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        SetDataFolder $(USANSFolder+":RAW:")
         //String textStr = StringForRawGraph()
         //textStr=StringByKey("FILE",textStr,":",";")+" MONRATE:"+num2str(mean(MonCts)/NumberByKey("TIMEPT",textStr,":",";"))
@@ -232 +243 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //get selected files from listbox (everything)
         //use the listBox wave directly
-        Wave/T listW=$"root:Globals:MainPanel:empWave"
+        Wave/T listW=$(USANSFolder+":Globals:MainPanel:empWave")
         //Wave for indication of current data set AJJ Sept 2006
-        Wave isCurrent = $"root:Globals:MainPanel:EMPisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:EMPisCurrent")
         Variable ii,num=numpnts(listW)
         String fname="",fpath="",curPathStr=""
@@ -283 +296 @@
         
         //copy the data to plot to the root:Graph directory, and give clear names
-        if(WaveExists($("root:EMP:Qvals")))
-                Duplicate/O $("root:EMP:Qvals"),$("root:Graph:Qvals_EMP")
+        if(WaveExists($(USANSFolder+":EMP:Qvals")))
+                Duplicate/O $(USANSFolder+":EMP:Qvals"),$(USANSFolder+":Graph:Qvals_EMP")
         Endif
-        Duplicate/O $("root:EMP:Angle"),$("root:Graph:Angle_EMP")
-        Duplicate/O $("root:EMP:DetCts"),$("root:Graph:DetCts_EMP")
-        Duplicate/O $("root:EMP:ErrDetCts"),$("root:Graph:ErrDetCts_EMP")
+        Duplicate/O $(USANSFolder+":EMP:Angle"),$(USANSFolder+":Graph:Angle_EMP")
+        Duplicate/O $(USANSFolder+":EMP:DetCts"),$(USANSFolder+":Graph:DetCts_EMP")
+        Duplicate/O $(USANSFolder+":EMP:ErrDetCts"),$(USANSFolder+":Graph:ErrDetCts_EMP")
         
         //now plot the data (or just bring the graph to the front)
@@ -307 +320 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //get selected files from listbox (everything)
         //use the listBox wave directly
-        Wave/T listW=$"root:Globals:MainPanel:samWave"
+        Wave/T listW=$(USANSFolder+":Globals:MainPanel:samWave")
         //Wave for indication of current data set AJJ Sept 2006
-        Wave isCurrent = $"root:Globals:MainPanel:SAMisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:SAMisCurrent")
         Variable ii,num=numpnts(listW)
         String fname="",fpath="",curPathStr=""
@@ -318 +333 @@
         PathInfo bt5CurPathName
         curPathStr = S_Path
+        
+        print fpath
         
         if(cmpstr("",listW[0])==0)
@@ -357 +374 @@
         //
         //copy the data to plot to the root:Graph directory, and give clear names
-        if(WaveExists($("root:SAM:Qvals")))
-                Duplicate/O $("root:SAM:Qvals"),$("root:Graph:Qvals_SAM")
+        if(WaveExists($(USANSFolder+":SAM:Qvals")))
+                Duplicate/O $(USANSFolder+":SAM:Qvals"),$(USANSFolder+":Graph:Qvals_SAM")
         Endif
-        Duplicate/O $("root:SAM:Angle"),$("root:Graph:Angle_SAM")
-        Duplicate/O $("root:SAM:DetCts"),$("root:Graph:DetCts_SAM")
-        Duplicate/O $("root:SAM:ErrDetCts"),$("root:Graph:ErrDetCts_SAM")
+        Duplicate/O $(USANSFolder+":SAM:Angle"),$(USANSFolder+":Graph:Angle_SAM")
+        Duplicate/O $(USANSFolder+":SAM:DetCts"),$(USANSFolder+":Graph:DetCts_SAM")
+        Duplicate/O $(USANSFolder+":SAM:ErrDetCts"),$(USANSFolder+":Graph:ErrDetCts_SAM")
         
         //now plot the data (or just bring the graph to the front)
@@ -374 +391 @@
         String type
         
-        Wave angle = $("root:"+Type+":Angle")
-        Wave detCts = $("root:"+Type+":DetCts")
-        Wave ErrdetCts = $("root:"+Type+":ErrDetCts")
-        Wave MonCts = $("root:"+Type+":MonCts")
-        Wave TransCts = $("root:"+Type+":TransCts")
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        Wave angle = $(USANSFolder+":"+Type+":Angle")
+        Wave detCts = $(USANSFolder+":"+Type+":DetCts")
+        Wave ErrdetCts = $(USANSFolder+":"+Type+":ErrDetCts")
+        Wave MonCts = $(USANSFolder+":"+Type+":MonCts")
+        Wave TransCts = $(USANSFolder+":"+Type+":TransCts")
         
         Sort Angle DetCts,ErrDetCts,MonCts,TransCts,Angle
@@ -395 +414 @@
         String type
         
-        String noteStr = note($("root:"+Type+":DetCts"))
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        String noteStr = note($(USANSFolder+":"+Type+":DetCts"))
         Variable ctTime
         ctTime = NumberByKey("TIMEPT",noteStr,":",";")
+        print ctTime
         //normalize by counting time
-        Wave detCts = $("root:"+Type+":DetCts")
-        Wave ErrdetCts = $("root:"+Type+":ErrDetCts")
-        Wave MonCts = $("root:"+Type+":MonCts")
-        Wave TransCts = $("root:"+Type+":TransCts")
+        Wave detCts = $(USANSFolder+":"+Type+":DetCts")
+        Wave ErrdetCts = $(USANSFolder+":"+Type+":ErrDetCts")
+        Wave MonCts = $(USANSFolder+":"+Type+":MonCts")
+        Wave TransCts = $(USANSFolder+":"+Type+":TransCts")
         
         detCts /= ctTime
@@ -411 +433 @@
         //normalize to monitor countrate [=] counts/monitor
         //trans countrate does not need to be normalized
-        NVAR defaultMCR=root:Globals:MainPanel:gDefaultMCR 
+        NVAR defaultMCR=$(USANSFolder+":Globals:MainPanel:gDefaultMCR") 
         DetCts /= monCts/defaultMCR
         ErrDetCts /= MonCts/defaultMCR
@@ -432 +454 @@
         String fromType,toType
         
-        Duplicate/O $("root:"+fromType+":Angle"),$("root:"+toType+":Angle")
-        Duplicate/O $("root:"+fromType+":DetCts"),$("root:"+toType+":DetCts")
-        Duplicate/O $("root:"+fromType+":ErrDetCts"),$("root:"+toType+":ErrDetCts")
-        Duplicate/O $("root:"+fromType+":MonCts"),$("root:"+toType+":MonCts")
-        Duplicate/O $("root:"+fromType+":TransCts"),$("root:"+toType+":TransCts")
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        Duplicate/O $(USANSFolder+":"+fromType+":Angle"),$(USANSFolder+":"+toType+":Angle")
+        Duplicate/O $(USANSFolder+":"+fromType+":DetCts"),$(USANSFolder+":"+toType+":DetCts")
+        Duplicate/O $(USANSFolder+":"+fromType+":ErrDetCts"),$(USANSFolder+":"+toType+":ErrDetCts")
+        Duplicate/O $(USANSFolder+":"+fromType+":MonCts"),$(USANSFolder+":"+toType+":MonCts")
+        Duplicate/O $(USANSFolder+":"+fromType+":TransCts"),$(USANSFolder+":"+toType+":TransCts")
         
         //check for qvals wave, move if it's there
-        if(WaveExists($("root:"+fromType+":Qvals")))
-                Duplicate/O $("root:"+fromType+":Qvals"),$("root:"+toType+":Qvals")
+        if(WaveExists($(USANSFolder+":"+fromType+":Qvals")))
+                Duplicate/O $(USANSFolder+":"+fromType+":Qvals"),$(USANSFolder+":"+toType+":Qvals")
         Endif
         
@@ -450 +474 @@
 Function AppendDataWaves(fromType,toType)
         String fromType,toType
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         String fromNote="",toNote="",newNote="",fromfile="",toFile=""
         
-        ConcatenateData( ("root:"+toType+":Angle"),("root:"+fromType+":Angle") ) //appends "from" at the end of "to"
-        ConcatenateData( ("root:"+toType+":DetCts"),("root:"+fromType+":DetCts") )
-        ConcatenateData( ("root:"+toType+":ErrDetCts"),("root:"+fromType+":ErrDetCts") )
-        ConcatenateData( ("root:"+toType+":MonCts"),("root:"+fromType+":MonCts") )
-        ConcatenateData( ("root:"+toType+":TransCts"),("root:"+fromType+":TransCts") )
+        
+        ConcatenateData( (USANSFolder+":"+toType+":Angle"),(USANSFolder+":"+fromType+":Angle") ) //appends "from" at the end of "to"
+        ConcatenateData( (USANSFolder+":"+toType+":DetCts"),(USANSFolder+":"+fromType+":DetCts") )
+        ConcatenateData( (USANSFolder+":"+toType+":ErrDetCts"),(USANSFolder+":"+fromType+":ErrDetCts") )
+        ConcatenateData( (USANSFolder+":"+toType+":MonCts"),(USANSFolder+":"+fromType+":MonCts") )
+        ConcatenateData( (USANSFolder+":"+toType+":TransCts"),(USANSFolder+":"+fromType+":TransCts") )
         
 
         //adjust the wavenote, to account for the new dataset
-        fromNote = note($("root:"+fromType+":DetCts"))
+        fromNote = note($(USANSFolder+":"+fromType+":DetCts"))
         fromFile = StringByKey("FILE",fromNote,":",";")
-        toNote = note($("root:"+toType+":DetCts"))
+        toNote = note($(USANSFolder+":"+toType+":DetCts"))
         toFile = StringByKey("FILE",toNote,":",";")
         toFile += "," + fromfile
         toNote = ReplaceStringByKey("FILE",toNote,toFile,":",";")
-        Note/K $("root:"+toType+":DetCts")
-        Note $("root:"+toType+":DetCts"),toNote
+        Note/K $(USANSFolder+":"+toType+":DetCts")
+        Note $(USANSFolder+":"+toType+":DetCts"),toNote
         
         Return(0)
@@ -540 +567 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         String fname=""
         
@@ -546 +575 @@
                 //take the selection, and simply plot the counts vs. angle - don't save the data anyplace special
                 //get the selected wave
-                Wave/T fileWave=$"root:Globals:MainPanel:fileWave"
-                Wave sel=$"root:Globals:MainPanel:selFileW"
+                Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:fileWave")
+                Wave sel=$(USANSFolder+":Globals:MainPanel:selFileW")
                 Variable ii=0,num=numpnts(sel),err
 
@@ -561 +590 @@
                 while(ii<num)
         elseif (cmpstr(ctrlName,"CurFileBox" )== 0)
-                Wave/T fileWave=$"root:Globals:MainPanel:curWave"
+                Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:curWave")
                 PathInfo bt5CurPathName
                 fname = S_Path
@@ -622 +651 @@
 Function StatusButtonProc(ctrlName) 
         String ctrlName
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         String fname=""
+
 
         if(cmpstr(ctrlName,"fileLB")==0)
                 //Print "Status Button" 
                 //display the (first) selected wave
-                Wave/T fileWave=$"root:Globals:MainPanel:fileWave"
-                Wave sel=$"root:Globals:MainPanel:selFileW"
+                Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:fileWave")
+                Wave sel=$(USANSFolder+":Globals:MainPanel:selFileW")
                 Variable ii=0,num=numpnts(sel)
                 
@@ -641 +674 @@
                 while(ii<num)
         elseif(cmpstr(ctrlName,"CurFileBox")==0)
-                Wave/T fileWave=$"root:Globals:MainPanel:curWave"
+                Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:curWave")
                 PathInfo bt5CurPathName
                 fname = S_Path
@@ -657 +690 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //Print "toSamList button"
-        Wave/T fileWave=$"root:Globals:MainPanel:fileWave"
-        Wave/T samWave=$"root:Globals:MainPanel:samWave"
-        Wave sel=$"root:Globals:MainPanel:selFileW"
+        Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:fileWave")
+        Wave/T samWave=$(USANSFolder+":Globals:MainPanel:samWave")
+        Wave sel=$(USANSFolder+":Globals:MainPanel:selFileW")
         //Wave to indicate Current status
-        Wave isCurrent = $"root:Globals:MainPanel:SAMisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:SAMisCurrent")
 
         
@@ -698 +733 @@
         String ctrlName
 
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         //Print "toEmptyList button"
-        Wave/T fileWave=$"root:Globals:MainPanel:fileWave"
-        Wave/T empWave=$"root:Globals:MainPanel:empWave"
-        Wave sel=$"root:Globals:MainPanel:selFileW"
+        Wave/T fileWave=$(USANSFolder+":Globals:MainPanel:fileWave")
+        Wave/T empWave=$(USANSFolder+":Globals:MainPanel:empWave")
+        Wave sel=$(USANSFolder+":Globals:MainPanel:selFileW")
         //Wave to indicate Current status
-        Wave isCurrent = $"root:Globals:MainPanel:EMPisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:EMPisCurrent")
 
 
@@ -739 +776 @@
 Function DelSamButtonProc(ctrlName) : ButtonControl
         String ctrlName
-        
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         ControlInfo SamLB
         Variable selRow=V_Value
@@ -745 +784 @@
         DeletePoints selRow,1,lw        
         //Clear out current flag AJJ Sept O6
-        Wave isCurrent = $"root:Globals:MainPanel:SAMisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:SAMisCurrent")
         DeletePoints selRow, 1, isCurrent       
 End
@@ -755 +794 @@
 Function DelEmpButtonProc(ctrlName) : ButtonControl
         String ctrlName
-        
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
         ControlInfo EmpLB
         Variable selRow=V_Value
@@ -761 +802 @@
         DeletePoints selRow,1,lw
         //Clear out current flag AJJ Sept O6
-        Wave isCurrent = $"root:Globals:MainPanel:EMPisCurrent"
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:EMPisCurrent")
         DeletePoints selRow, 1, isCurrent       
 End
@@ -776 +817 @@
         String ctrlName
         
-        SVAR FilterStr = root:Globals:MainPanel:FilterStr
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        SVAR FilterStr = $(USANSFolder+":Globals:MainPanel:FilterStr")
+        print FilterStr
         String filter
         
@@ -809 +853 @@
         newList = SortList(newList,";",0)       //get them in order
         num=ItemsInList(newlist,";")
-        Wave/T fileWave = $" root:Globals:MainPanel:fileWave"
-        Wave selFileW = $"root:Globals:MainPanel:selFileW"
+        Wave/T fileWave = $(USANSFolder+":Globals:MainPanel:fileWave")
+        Wave selFileW = $(USANSFolder+":Globals:MainPanel:selFileW")
         Redimension/N=(num) fileWave
         Redimension/N=(num) selFileW
@@ -827 +871 @@
 Function ClearButtonProc(ctrlName) : ButtonControl
         String ctrlName
-        
-        SetDataFolder root:Globals:MainPanel
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+                
+        SetDataFolder $(USANSFolder+":Globals:MainPanel")
         strswitch(ctrlName)
                 case "ClearSamButton":
@@ -870 +916 @@
         String fname
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
         Variable err=0,refNum
-        Wave/T statusWave=$"root:Globals:MainPanel:statusWave"
+        Wave/T statusWave=$(USANSFolder+":Globals:MainPanel:statusWave")
         
         Open/R refNum as fname          //READ-ONLY.......if fname is "", a dialog will be presented
@@ -918 +966 @@
 Function TitleForRawGraph()
 
-        WAVE detCts=$"root:RAW:detCts"
-        WAVE monCts = $"root:RAW:monCts"
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        WAVE detCts=$(USANSFolder+":RAW:detCts")
+        WAVE monCts = $(USANSFolder+":RAW:monCts")
         String str=note(detCts)
         
@@ -957 +1007 @@
 //the user must supply the correct sample thickness, BKGLevel, and EMPLevel for extrapolation
 Function DoCorrectData()
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
         //constants
 //      NVAR  thetaH = root:Globals:MainPanel:gTheta_H                  //Darwin FWHM
 //      NVAR  thetaV = root:Globals:MainPanel:gTheta_V                  //Vertical divergence
-        NVAR dOmega =  root:Globals:MainPanel:gDomega                   //Solid angle of detector
-        NVAR defaultMCR = root:Globals:MainPanel:gDefaultMCR 
+        NVAR dOmega =  $(USANSFolder+":Globals:MainPanel:gDomega")                      //Solid angle of detector
+        NVAR defaultMCR = $(USANSFolder+":Globals:MainPanel:gDefaultMCR")
+                
         //waves
-        Wave iqSAM = $"root:SAM:DetCts"
-        Wave errSAM = $"root:SAM:ErrDetCts"
-        Wave qvalSAM = $"root:SAM:Qvals"
-        Wave iqEMP = $"root:EMP:DetCts"
-        Wave errEMP = $"root:EMP:ErrDetCts"
-        Wave qvalEMP = $"root:EMP:Qvals"
+        Wave iqSAM = $(USANSFolder+":SAM:DetCts")
+        Wave errSAM = $(USANSFolder+":SAM:ErrDetCts")
+        Wave qvalSAM = $(USANSFolder+":SAM:Qvals")
+        Wave iqEMP = $(USANSFolder+":EMP:DetCts")
+        Wave errEMP = $(USANSFolder+":EMP:ErrDetCts")
+        Wave qvalEMP = $(USANSFolder+":EMP:Qvals")
         //BKG,EMP levels,trans,thick
-        NVAR bkgLevel = root:Globals:MainPanel:gBkgCts
-        NVAR empLevel = root:Globals:MainPanel:gEmpCts
-        NVAR Trock = root:Globals:MainPanel:gTransRock
-        NVAR Twide = root:Globals:MainPanel:gTransWide
-        NVAR thick = root:Globals:MainPanel:gThick
+        NVAR bkgLevel = $(USANSFolder+":Globals:MainPanel:gBkgCts")
+        NVAR empLevel =  $(USANSFolder+":Globals:MainPanel:gEmpCts")
+        NVAR Trock =  $(USANSFolder+":Globals:MainPanel:gTransRock")
+        NVAR Twide =  $(USANSFolder+":Globals:MainPanel:gTransWide")
+        NVAR thick =  $(USANSFolder+":Globals:MainPanel:gThick")
         //New waves in COR folder, same length as SAM data
-        Duplicate/O iqSAM,$"root:COR:DetCts"
-        Duplicate/O errSAM,$"root:COR:ErrDetCts"
-        Duplicate/O qvalSAM,$"root:COR:Qvals"
-        Wave iqCOR = $"root:COR:DetCts"
-        Wave qvalCOR = $"root:COR:Qvals"
-        Wave errCOR = $"root:COR:ErrDetCts"
+        Duplicate/O iqSAM,$(USANSFolder+":COR:DetCts")
+        Duplicate/O errSAM,$(USANSFolder+":COR:ErrDetCts")
+        Duplicate/O qvalSAM,$(USANSFolder+":COR:Qvals")
+        Wave iqCOR = $(USANSFolder+":COR:DetCts")
+        Wave qvalCOR = $(USANSFolder+":COR:Qvals")
+        Wave errCOR = $(USANSFolder+":COR:ErrDetCts")
         
         //correction done here
@@ -1012 +1065 @@
         
         //copy to Graph directory to plot
-        Duplicate/O $("root:COR:Qvals"),$("root:Graph:Qvals_COR")
-        Duplicate/O $("root:COR:DetCts"),$("root:Graph:DetCts_COR")
-        Duplicate/O $("root:COR:ErrDetCts"),$("root:Graph:ErrDetCts_COR")
+        Duplicate/O $(USANSFolder+":COR:Qvals"),$(USANSFolder+":Graph:Qvals_COR")
+        Duplicate/O $(USANSFolder+":COR:DetCts"),$(USANSFolder+":Graph:DetCts_COR")
+        Duplicate/O $(USANSFolder+":COR:ErrDetCts"),$(USANSFolder+":Graph:ErrDetCts_COR")
         
         //now plot the data (or just bring the graph to the front)
@@ -1027 +1080 @@
 Function CleanOutFolder(type)
         String type
-        
-        SetDataFolder $("root:"+type)
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
+        
+        SetDataFolder $(USANSFolder+":"+type)
         Killwaves/Z DetCts,Qvals,ErrDetCts,Angle,MonCts,TransCts
         
-        SetDataFolder root:Graph
+        SetDataFolder $(USANSFolder+":Graph")
         KillWaves/Z $("DetCts_"+type),$("ErrDetCts_"+type),$("Qvals_"+type)
         
@@ -1053 +1108 @@
 Function RefreshCurrentButtonProc(ctrlName) : ButtonControl
         String ctrlName
+        
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder        
         
         //Prod the web update page
@@ -1092 +1149 @@
         newList = SortList(newList,";",0)       //get them in order
         num=ItemsInList(newlist,";")
-        Wave/T curWave = $" root:Globals:MainPanel:curWave"
+        Wave/T curWave = $(USANSFolder+" :Globals:MainPanel:curWave")
         Redimension/N=(num) curWave
         curWave=""
@@ -1104 +1161 @@
         String ctrlName
 
-        Wave/T curWave=$"root:Globals:MainPanel:curWave"
-        Wave/T samWave=$"root:Globals:MainPanel:samWave"
-        Wave isCurrent = $"root:Globals:MainPanel:SAMisCurrent"
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        Wave/T curWave=$(USANSFolder+":Globals:MainPanel:curWave")
+        Wave/T samWave=$(USANSFolder+":Globals:MainPanel:samWave")
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:SAMisCurrent")
         
         Variable num, ii = 0
@@ -1133 +1192 @@
         String ctrlName
 
-        Wave/T curWave=$"root:Globals:MainPanel:curWave"
-        Wave/T empWave=$"root:Globals:MainPanel:empWave"
-        Wave isCurrent = $"root:Globals:MainPanel:EMPisCurrent"
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        Wave/T curWave=$(USANSFolder+":Globals:MainPanel:curWave")
+        Wave/T empWave=$(USANSFolder+":Globals:MainPanel:empWave")
+        Wave isCurrent = $(USANSFolder+":Globals:MainPanel:EMPisCurrent")
                 
         Variable num, ii=0
@@ -1163 +1224 @@
         String ctrlName
         Variable checked
-        
-        NVAR isChecked = root:Globals:MainPanel:gUseCurrentData
+
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+        
+        NVAR isChecked = $(USANSFolder+":Globals:MainPanel:gUseCurrentData")
         
         if (checked == 1)

sans/Dev/trunk/NCNR_User_Procedures/USANS/USANS_Includes.ipf

@@ -12 +12 @@
 #include "COR_Graph",version >= 2.20                    
 #include "Main_USANS",version >= 2.20   
-#include "PlotUtils_USANS",version >= 2.20      
+#include "PlotUtilsMacro_v40",version >= 2.20   
 #include "WriteUSANSData",version >= 2.20       
 #include "LakeDesmearing_JB",version >= 2.20    

sans/Dev/trunk/NCNR_User_Procedures/USANS/WriteUSANSData.ipf

@@ -18 +18 @@
         Variable lo,hi,dialog           //=1 will present dialog for name
         
+        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
+
+        
         String termStr="\r\n"           //VAX uses only <CR> as terminator, but only CRLF seems to FTP correctly to VAX
         String destStr="",formatStr = "%15.6g %15.6g %15.6g %15.6g %15.6g %15.6g"+termStr
-        destStr = "root:"+type
+        destStr = USANSFolder+":"+type
         
         Variable refNum,integer,realval
@@ -45 +48 @@
         //
         Duplicate/O qvals,dumWave
-        NVAR DQv=root:Globals:MainPanel:gDQv
+        NVAR DQv=$(USANSFolder+":Globals:MainPanel:gDQv")
         dumWave = - DQv
         ///
@@ -72 +75 @@
         
         //tailor the output given the type of data written out...
-        WAVE inten_EMP=$("root:EMP:DetCts")
+        WAVE inten_EMP=$(USANSFolder+":EMP:DetCts")
         String samStr="",empStr="",dateStr="",samLabelStr="",paramStr="",empLevStr="",bkgLevStr=""
         String pkStr=""
-        NVAR TransWide = root:Globals:MainPanel:gTransWide
-        NVAR TransRock = root:Globals:MainPanel:gTransRock
-        NVAR empCts = root:Globals:MainPanel:gEmpCts
-        NVAR bkgCts = root:Globals:MainPanel:gBkgCts
-        NVAR thick = root:Globals:MainPanel:gThick
+        NVAR TransWide = $(USANSFolder+":Globals:MainPanel:gTransWide")
+        NVAR TransRock = $(USANSFolder+":Globals:MainPanel:gTransRock")
+        NVAR empCts = $(USANSFolder+":Globals:MainPanel:gEmpCts")
+        NVAR bkgCts = $(USANSFolder+":Globals:MainPanel:gBkgCts")
+        NVAR thick = $(USANSFolder+":Globals:MainPanel:gThick")
         
         strswitch(type)