Changeset 983 for sans/Dev

Timestamp:

Mar 7, 2016 11:55:46 AM (7 years ago)

Author:

srkline

Message:

CHANGES to SANS:
Now allow 4 files to be combined in one step. This required modification of one routine in NIST_XML to allow an extra file name, and significant addition to the NSORT panel to allow an (optional) 4th data file. behaviors are still the same as before with 2, 3, or 4 sets being allowed. The "combine table" also allows up to 4 files to be combined (can be mixed, 2, 3, 4 all allowed).

More addtions to VSANS present as well, not specific changes, but in-progress changes to the beam center handling and ciombining data to 1D.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NIST_XML_v40.ipf (modified) (2 diffs)
• Reduction/SANS/NSORT.ipf (modified) (62 diffs)
• Reduction/VSANS/VC_BeamCenter.ipf (modified) (12 diffs)
• Reduction/VSANS/VC_UtilityProcedures.ipf (modified) (5 diffs)
• Reduction/VSANS/VC_VCALCPanel_MockUp.ipf (modified) (8 diffs)
• Reduction/VSANS/V_HDF5_RW_Utils.ipf (modified) (5 diffs)
• Reduction/VSANS/V_HDF5_Write.ipf (modified) (202 diffs)
• Reduction/VSANS/V_Test_RAW_Panel.ipf (modified) (9 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -825 +825 @@
 End
 
-Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res])
+Function WriteNSORTedXMLFile(qw,iw,sw,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
         Wave qw,iw,sw,res
-        String firstFileName,secondFileName,thirdFileName,normTo
-        Variable norm12,norm23
+        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+        Variable norm12,norm23,norm34
 
         Variable err=0,refNum,numCols,dialog=1
@@ -904 +904 @@
         
         nf.sasProcessNote = "COMBINED FILE CREATED: "+date()+"\n"
-        nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+"\n"
+        nf.sasProcessNote += "NSORT-ed : " +firstFileName+";"+secondFileName+";"+thirdFileName+";"+fourthFileName+"\n"
         nf.sasProcessNote += "normalized to  "+normTo+"\n"
-        fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+"\n"
+        fprintf refNum, "multiplicative factor 1-2 = "+num2str(norm12)+" multiplicative factor 2-3 = "+num2str(norm23)+" multiplicative factor 3-4 = "+num2str(norm34)+"\n"
 
         if (numCols == 3)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

@@ -8 +8 @@
 // NSORT panel for combining and inter-normalizing 2 or 3 datasets
 // that have previously been averaged
+//
+// MAR 2016 SRK added functionality to combine 4 datasets
 //
 // - handles 3 or 6-column datasets
@@ -36 +38 @@
         MedQPopMenuProc("",1,"")
         HighQPopMenuProc("",1,"")
+        HighestQPopMenuProc("",1,"")
 End
 
@@ -48 +51 @@
         Variable/G root:myGlobals:NSORT:gScale1_2 = 1
         Variable/G root:myGlobals:NSORT:gScale2_3 = 1
+        Variable/G root:myGlobals:NSORT:gScale3_4 = 1
         //
         //save the number of points to trim from beginning/end of the data files
@@ -57 +61 @@
         Variable/G root:myGlobals:NSORT:gPtsBeg3 = NumVarOrDefault("root:myGlobals:NSORT:gPtsBeg3", 0 )
         Variable/G root:myGlobals:NSORT:gPtsEnd3 = NumVarOrDefault("root:myGlobals:NSORT:gPtsEnd3", 0 )
+        Variable/G root:myGlobals:NSORT:gPtsBeg4 = NumVarOrDefault("root:myGlobals:NSORT:gPtsBeg4", 0 )
+        Variable/G root:myGlobals:NSORT:gPtsEnd4 = NumVarOrDefault("root:myGlobals:NSORT:gPtsEnd4", 0 )
         
         Variable/G root:myGlobals:NSORT:gColumns1 = 0
         Variable/G root:myGlobals:NSORT:gColumns2 = 0
         Variable/G root:myGlobals:NSORT:gColumns3 = 0
+        Variable/G root:myGlobals:NSORT:gColumns4 = 0
         Variable/G root:myGlobals:NSORT:gNormToNum = 1
         String/G root:myGlobals:NSORT:gPathStr = ""
@@ -73 +80 @@
 Function LoadDataForNSORT(fileStr,setNum)
         String fileStr          //full path:name to a valid file
-        Variable setNum //number of set (used for naming) = 0, 1, or 2 (ONLY)
+        Variable setNum //number of set (used for naming) = 0, 1, or 2 (ONLY), (2016) 3 is now valid for 4th data set
         
         Variable err=0
@@ -84 +91 @@
         NVAR gColumns2 = root:myGlobals:NSORT:gColumns2
         NVAR gColumns3 = root:myGlobals:NSORT:gColumns3
+        NVAR gColumns4 = root:myGlobals:NSORT:gColumns4
         NVAR begPts1 = root:myGlobals:NSORT:gPtsBeg1
         NVAR endPts1 = root:myGlobals:NSORT:gPtsEnd1
@@ -90 +98 @@
         NVAR begPts3 = root:myGlobals:NSORT:gPtsBeg3
         NVAR endPts3 = root:myGlobals:NSORT:gPtsEnd3
-
+        NVAR begPts4 = root:myGlobals:NSORT:gPtsBeg4
+        NVAR endPts4 = root:myGlobals:NSORT:gPtsEnd4
+        
         String cmd
         String typStr= "", trimStr=""
@@ -118 +128 @@
                         begPts = begPts3
                         endPts = endPts3
+                        break
+                case 4:
+                        sprintf cmd , "A_LoadOneDDataToName(\"%s\",\"%s\",%d,%d)",fileStr,"HighestQSet",0,1
+                        Execute cmd
+                        typStr = "HighestQSet"
+                        trimStr = "TrimHighestQSet"
+                        begPts = begPts4
+                        endPts = endPts4
                         break
         endswitch
@@ -168 +186 @@
                         gColumns3 = numCols
                         break
+                case 4:
+                        gColumns4 = numCols
+                        break
         endswitch
         
@@ -174 +195 @@
 End
 
-Function WriteNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res])
+Function WriteNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
         Wave q3,i3,sig3,res
-        String firstFileName,secondFileName,thirdFileName,normTo
-        Variable norm12,norm23
+        String firstFileName,secondFileName,thirdFileName,fourthfileName,normTo
+        Variable norm12,norm23,norm34
 
         NVAR useXMLOutput = root:Packages:NIST:gXML_Write
@@ -183 +204 @@
         if (useXMLOutput == 1)
                 if(WaveExists(res))
-                        WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,res=res)
+                        WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,res=res)
                 else
-                        WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23)
+                        WriteNSORTedXMLFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
                 endif
         else
                 if(WaveExists(res))
-                        WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,res=res)
+                        WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,res=res)
                 else
-                        WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23)
+                        WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34)
                 endif           
         endif
@@ -198 +219 @@
 
 
-Function WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,normTo,norm12,norm23,[res])
+Function WriteOLDNSORTedFile(q3,i3,sig3,firstFileName,secondFileName,thirdFileName,fourthFileName,normTo,norm12,norm23,norm34,[res])
         Wave q3,i3,sig3,res
-        String firstFileName,secondFileName,thirdFileName,normTo
-        Variable norm12,norm23
+        String firstFileName,secondFileName,thirdFileName,fourthFileName,normTo
+        Variable norm12,norm23,norm34
 
         Variable err=0,refNum,numCols,dialog=1
@@ -287 +308 @@
 //      fprintf refnum, "THIRD File %s",hdr3            //new, Mar 2008
         
-        fprintf refNum, "NSORT-ed   %s \t  +  %s\t  + %s\r\n",firstFileName, secondFileName,thirdFileName
+        fprintf refNum, "NSORT-ed   %s\t  +  %s\t  +  %s\t + %s\r\n",firstFileName, secondFileName,thirdFileName,fourthFileName
         fprintf refNum, "normalized to   %s\r\n",normTo
-        fprintf refNum, "multiplicative factor 1-2 = %12.8g\t multiplicative factor 2-3 = %12.8g\r\n",norm12,norm23
+        fprintf refNum, "multiplicative factor 1-2 = %12.8g\t multiplicative factor 2-3 = %12.8g\t multiplicative factor 3-4 = %12.8g\r\n",norm12,norm23,norm34
 
         if (numCols == 3)
@@ -376 +397 @@
         KillDataFolder/Z MedQSet
         KillDataFolder/Z HighQSet
+        KillDataFolder/Z HighestQSet
 
 End
@@ -393 +415 @@
         Variable setNum,err
         //switch on ctrlName string - Plot_1, Plot_2, Plot_3
-        if(cmpstr(ctrlName,"Plot_1")==0)
-                //low-q
-                setNum = 1
-                ControlInfo/W=NSORT_Panel popup_1
-        else
-                if(cmpstr(ctrlName,"Plot_2")==0)
+        
+        strswitch(ctrlName)     // string switch
+                case "Plot_1":          
+                        //low-q
+                        setNum = 1
+                        ControlInfo/W=NSORT_Panel popup_1
+                        break
+                case "Plot_2":          
                         //medium-q
                         setNum = 2
                         ControlInfo/W=NSORT_Panel popup_2
-                else
+                        break
+                case "Plot_3":          
                         //high-q
                         setNum = 3
                         ControlInfo/W=NSORT_Panel popup_3
-                Endif
-        Endif
-        
+                        break
+                case "Plot_4":          
+                        //highest-q
+                        setNum = 4
+                        ControlInfo/W=NSORT_Panel popup_4
+                        break
+        endswitch
+        
+
         //find the file from the partial filename
         If( (cmpstr(S_value,"")==0) || (cmpstr(S_value,"none")==0) )
@@ -439 +470 @@
         if(WinType("NSORT_Graph")==0)
                 //no window, create one
-                if(cmpstr(ctrlName,"Plot_1")==0)
-                        //low-q
-                        Display/K=1
-                        DoWindow/C NSORT_Graph
-                        DisplayLowSet()
-                else
-                        if(cmpstr(ctrlName,"Plot_2")==0)
+                strswitch(ctrlName)     // string switch
+                        case "Plot_1":          
+                                //low-q
+                                Display/K=1
+                                DoWindow/C NSORT_Graph
+                                DisplayLowSet()
+                                break
+                        case "Plot_2":          
                                 //medium-q
                                 Display/K=1
                                 DoWindow/C NSORT_Graph
                                 DisplayMedSet()
-                        else
+                                break
+                        case "Plot_3":          
                                 //high-q
                                 Display/K=1
                                 DoWindow/C NSORT_Graph
                                 DisplayHighSet()
-                        Endif
-                Endif
+                                break
+                        case "Plot_4":          
+                                //highest-q
+                                Display/K=1
+                                DoWindow/C NSORT_Graph
+                                DisplayHighestSet()
+                                break
+                endswitch
                 Legend
         else
@@ -463 +502 @@
                 list = TraceNameList("NSORT_Graph",";",1)
         
-                if(cmpstr(ctrlName,"Plot_1")==0)
-                        //low-q
-                        isOnPlot = strsearch(list, "LowQSet_i", 0)              // isOnPlot == -1 if it is NOT found in the list
-                        if(isOnPlot == -1)
-                                DisplayLowSet()
-                        Endif
-                else
-                        if(cmpstr(ctrlName,"Plot_2")==0)
+                strswitch(ctrlName)     // string switch
+                        case "Plot_1":          
+                                //low-q
+                                isOnPlot = strsearch(list, "LowQSet_i", 0)              // isOnPlot == -1 if it is NOT found in the list
+                                if(isOnPlot == -1)
+                                        DisplayLowSet()
+                                Endif
+                                break
+                        case "Plot_2":          
                                 //medium-q
                                 isOnPlot = strsearch(list, "MedQSet_i", 0)              // isOnPlot == -1 if it is NOT found in the list
@@ -476 +516 @@
                                         DisplayMedSet()
                                 Endif
-                        else
+                                break
+                        case "Plot_3":          
                                 //high-q
                                 isOnPlot = strsearch(list, "HighQSet_i", 0)             // isOnPlot == -1 if it is NOT found in the list
@@ -482 +523 @@
                                         DisplayHighSet()
                                 Endif
-                        Endif
-                Endif
+                                break
+                        case "Plot_4":          
+                                //highest-q
+                                isOnPlot = strsearch(list, "HighestQSet_i", 0)          // isOnPlot == -1 if it is NOT found in the list
+                                if(isOnPlot == -1)
+                                        DisplayHighestSet()
+                                Endif
+                                break
+                endswitch       
+        
         Endif
+        
+        
         //the stripPoints variable boxes should also update the graph, if necessary
-        
+        return(0)
+End
+
+//adds both highest-q sets (full and trimmed) to the graph, which is 
+//assumed to exist along with the high-q waves
+//
+Function DisplayHighestSet()
+        //function assumes that the window "NSORT_Graph" already exists
+//      DoWindow/F NSORT_Graph
+
+        SetDataFolder root:HighestQSet:
+        AppendToGraph/W=NSORT_Graph $"HighestQSet_i" vs $"HighestQSet_q"
+        ModifyGraph/W=NSORT_Graph log=1,mode=3,marker($"HighestQSet_i")=8,msize=2,rgb($"HighestQSet_i")=(65535,32896,0),opaque($"HighestQSet_i")=1
+        ErrorBars/W=NSORT_Graph/T=0 $"HighestQSet_i" Y,wave=($"HighestQSet_s",$"HighestQSet_s")
+        AppendToGraph/W=NSORT_Graph $"TrimHighestQSet_i" vs $"TrimHighestQSet_q"
+        ModifyGraph/W=NSORT_Graph mode($"TrimHighestQSet_i")=3,marker($"TrimHighestQSet_i")=19,msize=2,rgb($"TrimHighestQSet_i")=(65535,32896,0)
+        SetDataFolder root:
 End
 
@@ -559 +626 @@
         MedQPopMenuProc("popup_2",1,"")
         HighQPopMenuProc("popup_3",1,"")
+        HighestQPopMenuProc("popup_4",1,"")
         
 End
@@ -572 +640 @@
 // 2 == MedQ
 // 3 == HighQ
+// 4 == HighestQ
 //
 //"Plot_1" is the low-q button name
 //"Plot_2" is the med-q button name
 //"Plot_3" is the high-q button name
+//"Plot_4" is the high-q button name
 //
 //calling plot_0_Button() responds as if that named button were pressed
@@ -610 +680 @@
         NVAR Columns2 = root:myGlobals:NSORT:gColumns2
         NVAR Columns3 = root:myGlobals:NSORT:gColumns3
-        if( (Columns1 == 3) || (Columns2 == 3) || (Columns3 == 3) ) 
+        NVAR Columns4 = root:myGlobals:NSORT:gColumns4
+        if( (Columns1 == 3) || (Columns2 == 3) || (Columns3 == 3) || (Columns4 == 3)) 
                 isAThree = 1
         endif
-        if( (Columns1 == 6) || (Columns2 == 6) || (Columns3 == 6) ) 
+        if( (Columns1 == 6) || (Columns2 == 6) || (Columns3 == 6) || (Columns4 == 6)) 
                 isASix = 1
         endif
@@ -621 +692 @@
         
         //is there just one data set? if so, then dispatch to a simpler routine, since no normalization is needed
-        ControlInfo/W=NSORT_Panel popup_2               //if MedQSet is "none", then so is HighQSet
+        ControlInfo/W=NSORT_Panel popup_2               //if MedQSet is "none", then so is HighQSet and HighestQSet
         fileStr = S_Value
         if(cmpstr(fileStr,"none") == 0)
@@ -658 +729 @@
                 ControlInfo/W=NSORT_Panel popup_1
                 if(isAThree)
-                        WriteNSORTedFile(lowq,lowi,lows,S_Value,"none","none",S_Value,scaleFactor,1)
+                        WriteNSORTedFile(lowq,lowi,lows,S_Value,"none","none","none",S_Value,scaleFactor,1,1)
                 else
-                        WriteNSORTedFile(lowq,lowi,lows,S_Value,"none","none",S_Value,scaleFactor,1,res=lowres)
+                        WriteNSORTedFile(lowq,lowi,lows,S_Value,"none","none","none",S_Value,scaleFactor,1,1,res=lowres)
                 endif
                 //  just get the new list and return - don't actually "pop" the menu, or the selected item will change
@@ -692 +763 @@
 Window NSORT_Panel()
         PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(569,69,944,485)/K=2
+        NewPanel /W=(569,69,944,584)//K=2
         ModifyPanel cbRGB=(49151,53155,65535)
         ModifyPanel fixedSize=1
@@ -702 +773 @@
         DrawLine 0,214,346,214
         DrawLine 0,295,346,295
+        DrawLine 0,372,347,372
+        DrawLine 0,460,346,460
+        
         SetDrawEnv fstyle= 5
         DrawText 5,74,"Low Q:"
@@ -708 +782 @@
         SetDrawEnv fstyle= 5
         DrawText 8,234,"High Q: (or none)"
+        SetDrawEnv fstyle= 5
+        DrawText 8,314,"Highest Q: (or none)"
         SetDrawEnv fstyle= 4
         DrawText 178,75,"Delete Points?"
@@ -714 +790 @@
         SetDrawEnv fstyle= 4
         DrawText 184,236,"Delete Points?"
-        DrawLine 0,363,346,363
-        DrawText 31,357,"To Manually scale data, enter scale factors above"
-        Button NSORT_Done,pos={274,387},size={50,20},proc=NSORT_DoneButton,title="Done"
+        SetDrawEnv fstyle= 4
+        DrawText 184,316,"Delete Points?"
+        DrawText 31,456,"To Manually scale data, enter scale factors above"
+        
+        Button NSORT_Done,pos={274,483},size={50,20},proc=NSORT_DoneButton,title="Done"
         Button NSORT_Done,help={"closes the panel"}
         Button Plot_1,pos={279,63},size={50,20},proc=Plot_0_Button,title="Plot"
@@ -724 +802 @@
         Button Plot_3,pos={284,223},size={50,20},proc=Plot_0_Button,title="Plot"
         Button Plot_3,help={"Plots the dataset from the popup, showing the full set as open circles and the trimmed set as solid circles"}
+        Button Plot_4,pos={284.00,303.00},size={50.00,20.00},proc=Plot_0_Button,title="Plot"
+        Button Plot_4,help={"Plots the dataset from the popup, showing the full set as open circles and the trimmed set as solid circles"}
+
         Button PathButton,pos={6,26},size={80,20},proc=NSORTPickPathButton,title="Pick Path"
         Button PathButton,help={"Select the local path to the folder containing your SANS data"}
@@ -740 +821 @@
         SetVariable end_3,fSize=10,help={"How many points to remove from the high-q end of this dataset"}
         SetVariable end_3,limits={-Inf,Inf,0},value= root:myGlobals:NSORT:gPtsEnd3
+        SetVariable end_4,pos={182.00,349.00},size={80.00,16.00},proc=SetBegOrEnd,title="End Pts"
+        SetVariable end_4,help={"How many points to remove from the high-q end of this dataset"}
+        SetVariable end_4,fSize=10
+        SetVariable end_4,limits={-inf,inf,0},value= root:myGlobals:NSORT:gPtsEnd4
         SetVariable beg_1,pos={182,79},size={80,14},proc=SetBegOrEnd,title="Beg Pts"
         SetVariable beg_1,fSize=10,help={"How many points to remove from the low-q end of this dataset"}
@@ -749 +834 @@
         SetVariable beg_3,fSize=10,help={"How many points to remove from the low-q end of this dataset"}
         SetVariable beg_3,limits={-Inf,Inf,0},value= root:myGlobals:NSORT:gPtsBeg3
-        Button DoCombine,pos={13,387},size={160,20},proc=WriteNSORTFileButton,title="Write Combined File"
+        SetVariable beg_4,pos={182.00,326.00},size={80.00,16.00},proc=SetBegOrEnd,title="Beg Pts"
+        SetVariable beg_4,help={"How many points to remove from the low-q end of this dataset"}
+        SetVariable beg_4,fSize=10
+        SetVariable beg_4,limits={-inf,inf,0},value= root:myGlobals:NSORT:gPtsBeg4
+        Button DoCombine,pos={13,483},size={160,20},proc=WriteNSORTFileButton,title="Write Combined File"
         Button DoCombine,help={"Combine and normalize the selected files as specifed"}
-        SetVariable scale_12,pos={159,305},size={160,14},proc=SetScale_12,title="Mult factor 1-2"
+        SetVariable scale_12,pos={159,381},size={160,14},proc=SetScale_12,title="Mult factor 1-2"
         SetVariable scale_12,fSize=10,help={"Factor that will multiply medium-q set to scale to low-q set"}
         SetVariable scale_12,limits={-Inf,Inf,0},value= root:myGlobals:NSORT:gScale1_2
-        SetVariable scale_23,pos={159,325},size={160,14},proc=SetScale_23,title="Mult factor 2-3"
+        SetVariable scale_23,pos={159,401},size={160,14},proc=SetScale_23,title="Mult factor 2-3"
         SetVariable scale_23,fSize=10,help={"Factor that will multiply high-q set to scale to medium-q set"}
         SetVariable scale_23,limits={-Inf,Inf,0},value= root:myGlobals:NSORT:gScale2_3
+        SetVariable scale_34,pos={159.00,421.00},size={160.00,16.00},proc=SetScale_34,title="Mult factor 3-4"
+        SetVariable scale_34,help={"Factor that will multiply highest-q set to scale to high-q set"}
+        SetVariable scale_34,fSize=10
+        SetVariable scale_34,limits={-inf,inf,0},value= root:myGlobals:NSORT:gScale3_4
         CheckBox check1,pos={5,105},size={160,20},proc=CheckProc,title="Normalize to this file",value=1
         CheckBox check1,help={"If checked, the combined dataset will be normalized to this dataset"}
@@ -763 +856 @@
         CheckBox check3,pos={4,270},size={160,20},proc=CheckProc,title="Normalize to this file",value=0
         CheckBox check3,help={"If checked, the combined dataset will be normalized to this dataset"}
+        CheckBox check4,pos={4.00,350.00},size={107.00,16.00},proc=CheckProc,title="Normalize to this file"
+        CheckBox check4,help={"If checked, the combined dataset will be normalized to this dataset"}
+        CheckBox check4,value= 0
         PopupMenu popup_1,pos={6,77},size={99,19},proc=LowQPopMenuProc
         PopupMenu popup_1,mode=1,value= #"root:myGlobals:NSORT:gDataPopList"
@@ -772 +868 @@
         PopupMenu popup_3,mode=1,value= #"root:myGlobals:NSORT:gDataPopList_3"
         PopupMenu popup_3,help={"Choose the dataset with the highest overall q-value (shortest detector distance), or NONE if no third set desired"}
-        CheckBox AutoCheck,pos={14,310},size={100,20},title="Auto Scale",value=0
+        PopupMenu popup_4,pos={6.00,319.00},size={58.00,23.00},proc=HighestQPopMenuProc
+        PopupMenu popup_4,help={"Choose the dataset with the highest overall q-value (shortest detector distance), or NONE if no fourth set desired"}
+        PopupMenu popup_4,mode=1,popvalue="none",value= #"root:myGlobals:NSORT:gDataPopList_3"
+        CheckBox AutoCheck,pos={14,386},size={100,20},title="Auto Scale",value=0
         CheckBox AutoCheck,help={"If checked, the scale factor will be automatically determined, if not checked, the current values in the fields will be used"}
-        CheckBox PreviewCheck,pos={15,369},size={74,14},title="Preview Only",value= 0
-        CheckBox WarningCheck,pos={111,369},size={93,14},title="Overlap warning?",value= 1
+        CheckBox PreviewCheck,pos={15,465},size={74,14},title="Preview Only",value= 0
+        CheckBox WarningCheck,pos={111,465},size={93,14},title="Overlap warning?",value= 1
 EndMacro
 
@@ -801 +900 @@
 
         Variable/G root:myGlobals:NSORT:gScale2_3 = varNum
+End
+
+//sets the scale factor (multiplicative) between sets 3 and 4
+//re-sets the global variable
+//
+Function SetScale_34(ctrlName,varNum,varStr,varName) : SetVariableControl
+        String ctrlName
+        Variable varNum
+        String varStr
+        String varName
+
+        Variable/G root:myGlobals:NSORT:gScale3_4 = varNum
 End
 
@@ -821 +932 @@
                         CheckBox check2 value=1
                         CheckBox check3 value=0
+                        CheckBox check4 value=0
                         Variable/G root:myGlobals:NSORT:gNormToNum = 2
                         break
@@ -828 +940 @@
                         CheckBox check2 value=0
                         CheckBox check3 value=1
+                        CheckBox check4 value=0
                         Variable/G root:myGlobals:NSORT:gNormToNum = 3
+                        break
+                Endif
+                if(cmpstr(ctrlName,"check4") == 0)
+                        CheckBox check1 value=0
+                        CheckBox check2 value=0
+                        CheckBox check3 value=0
+                        CheckBox check4 value=1
+                        Variable/G root:myGlobals:NSORT:gNormToNum = 4
                         break
                 Endif
@@ -835 +956 @@
                 CheckBox check2 value=0
                 CheckBox check3 value=0
+                        CheckBox check4 value=0
                 Variable/G root:myGlobals:NSORT:gNormToNum = 1
         While(0)
+        
         ControlUpdate/A/W=NSORT_Panel
-                DoUpdate
+        DoUpdate
                 
 End
@@ -898 +1021 @@
 
 
+//when menu is popped, it gets a valid list to display and updates the control
+// - will be different, since set 3 can also be "none" if only 2 sets
+//are to be NSORTed
+//
+Function HighestQPopMenuProc(ctrlName,popNum,popStr) : PopupMenuControl
+        String ctrlName
+        Variable popNum
+        String popStr
+
+        //add the option "none" to the file list (which should already end with a semicolon)
+        String/G root:myGlobals:NSORT:gDataPopList_3 = "none;" +  ReducedDataFileList("")
+
+        ControlUpdate/W=NSORT_Panel popup_4
+        if(cmpstr(popStr,"none")==0)
+                RemoveFromGraph/Z HighestQSet_i,TrimHighestQSet_i               //remove the data from the graph
+        Endif   
+        ControlInfo/W=NSORT_Panel popup_2
+        if(cmpstr(S_Value,"none")==0)
+                PopupMenu popup_3,win=NSORT_Panel,mode=1        //force "none" (item #1) to be the selection if medium is none
+                PopupMenu popup_4,win=NSORT_Panel,mode=1        //force "none" (item #1) to be the selection if medium is none
+        endif
+        ControlInfo/W=NSORT_Panel popup_3
+        if(cmpstr(S_Value,"none")==0)
+                PopupMenu popup_4,win=NSORT_Panel,mode=1        //force "none" (item #1) to be the selection if medium is none
+        endif
+        return(0)       
+End
+
 //be sure to use the "Trim.." datasets that have had the bad points removed
 //and then do the scaling based on the choices in the panel
@@ -906 +1057 @@
 
         NVAR normTo = root:myGlobals:NSORT:gNormToNum
-        Variable err=0,setNum,norm12,norm23
-        String fileStr="",tempName="",name1="",name2="",name3="",normToStr=""
+        Variable err=0,setNum,norm12,norm23,norm34
+        String fileStr="",tempName="",name1="",name2="",name3="",normToStr="",name4=""
         
 //Set the number of output columns
@@ -915 +1066 @@
         NVAR Columns2 = root:myGlobals:NSORT:gColumns2
         NVAR Columns3 = root:myGlobals:NSORT:gColumns3
-        if( (Columns1 == 3) || (Columns2 == 3) || (Columns3 == 3) ) 
+        NVAR Columns4 = root:myGlobals:NSORT:gColumns4
+        if( (Columns1 == 3) || (Columns2 == 3) || (Columns3 == 3) || (Columns4 == 3) ) 
                 numOutputColumns = 3
         else
-                if( (Columns1 == 6) && (Columns2 == 6) && ((Columns3 == 0) || (Columns3 == 6)) ) 
+                if( (Columns1 == 6) && (Columns2 == 6) && ((Columns3 == 0) || (Columns3 == 6)) || (Columns4 == 6) ) 
                         numOutputColumns = 6
                 endif
@@ -971 +1123 @@
         //////end load file3
         
+        //load file4 , if necessary
+        ControlInfo/W=NSORT_Panel popup_4
+        fileStr = S_Value
+        name4 = fileStr
+        setNum = 4
+        if(cmpstr(fileStr,"none") == 0)
+                //do nothing
+        else
+                //get a valid file based on this partialName and catPathName
+                tempName = FindValidFilename(fileStr)
+        
+                //prepend path to tempName for read routine 
+                PathInfo catPathName
+                tempName = S_path + tempName
+                err = LoadDataForNSORT(tempName,setNum)
+        Endif
+        //////end load file4
+        
+        
         //assign filename of file to normalize to
-        if(normTo == 1)
-                normToStr = name1
-        else
-                if(normTo == 2)
+        switch(normTo)
+                case 1:
+                        normToStr = name1
+                        break
+                case 2:
                         normToStr = name2
-                else
+                        break
+                case 3:
                         normToStr = name3
-                Endif
-        Endif
+                        break
+                case 4:
+                        normToStr = name4
+                        break
+        endswitch
+
 
         Variable n1,n2,n12,num2
         Variable n3,n123
+        Variable n4,n1234
         
    if(numOutputColumns == 3) //Start the 3-column specific stuff here.
@@ -1071 +1249 @@
                         ControlInfo/W=NSORT_Panel PreviewCheck
                         if( V_Value==0 )                //if zero skip the preview and write out the file
-                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23)
+                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,name4,normToStr,norm12,norm23,norm34)
                         endif
                         //cleanup waves before exiting
@@ -1161 +1339 @@
                 ControlInfo/W=NSORT_Panel PreviewCheck
                 if( V_Value==0 )                //if zero skip the preview and write out the file
-                        err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,normToStr,norm12,norm23)
+                        err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,name4,normToStr,norm12,norm23,norm34)
                 endif
                 //cleanup waves before exiting
                 KillWaves/Z q12,i12,sig12,q123,i123,sig123
+                
+                
+                //do we need to continue, or write out the set here and stop?
+                if(cmpstr(name4,"none") == 0)
+                        //stop here
+                        norm34 = 1              //norm34 was not used
+                        Variable/G root:myGlobals:NSORT:gScale3_4 = 1
+                        //If any of them have three columns write three column data
+                        
+                        ControlInfo/W=NSORT_Panel PreviewCheck
+                        if( V_Value==0 )                //if zero skip the preview and write out the file
+                                err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,name4,normToStr,norm12,norm23,norm34)
+                        endif
+                        //cleanup waves before exiting
+                        KillWaves/Z q123,i123,sig123
+                        return err
+                Endif
+                
+                //need to add the fourth file... which was already loaded at the top of the function
+                /////
+                //order points in sets 123-4, indexing overlap region
+                //put result in temporary waves
+                WaveStats/Q q123
+                n123 = V_npnts
+                WaveStats/Q $"root:HighestQSet:TrimHighestQSet_q"
+                n4 = V_npnts
+                n1234 = n123 + n4
+                
+                Make/O/N=(n1234) q1234,i1234,sig1234
+                WAVE highestq = $"root:HighestQSet:TrimHighestQSet_q"
+                WAVE highesti = $"root:HighestQSet:TrimHighestQSet_i"
+                WAVE highests = $"root:HighestQSet:TrimHighestQSet_s"
+        
+                q1234[0,n123-1] = q123[p]
+                q1234[n12,n123+n4-1]= highestq[p-n123]
+                i1234[0,n123-1] = i123[p]
+                i1234[n12,n123+n4-1]= highesti[p-n123]
+                sig1234[0,n123-1] = sig123[p]
+                sig1234[n12,n123+n4-1]= highests[p-n123]
+                
+                Sort q1234, q1234,i1234,sig1234
+                /////////////////
+                
+                //find the maximum point number of set 2  in the overlap region
+                FindLevel/P/Q highestq,(q123[n123-1])
+                num2 = trunc(V_levelX)
+                //Print "num2 = ",num2
+                
+                if (auto)
+                        //there must be overlap points to use auto-scaling
+                        if(numtype(num2) != 0)
+                                Abort "There are no data points in the overlap region. Either reduce the number of deleted points or use manual scaling."
+                        endif
+                        //do auto-scaling of data
+                        norm34 = NCNR_GetScalingInOverlap(num2,q123,i123,highestq,highesti)
+                        //Set the global variable for the 123 - 4 scale factor
+                        Variable/G root:myGlobals:NSORT:gScale3_4 = norm34
+                else
+                        //use the value from the panel ( which is the global)
+                        NVAR temp34 = root:myGlobals:NSORT:gScale3_4
+                        norm34 = temp34
+                Endif
+                
+// normalization
+                switch (normTo)
+                        case 1:
+                        case 2:
+                        case 3:
+                                //normalize to first or second or third file, so multiply fourth by norm34
+                                highesti *= norm34
+                                highests *= norm34
+                                break
+                        case 4:
+                                //normalize to FOURTH file, 123 by multiplicative factor 1/norm34
+                                norm34 = 1/norm34
+                                i123 *= norm34
+                                sig123 *= norm34
+                                // for the display, scale the trimmed sets 1 and 2 and 3
+                                lowi *= norm34
+                                lows *= norm34
+                                medi *= norm34
+                                meds *= norm34
+                                highi *= norm34
+                                highs *= norm34
+                                break
+                endswitch
+                                
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
+
+                //Print "NSORT-ed ",name1," + ", name2, " + ", name3
+                //Print "normalized to ",normTo
+                //Print "multiplicative factor 1-2 = ",norm12," multiplicative factor 12 - 3 = ",norm23
+                
+                
+                Make/O/N=(n1234) q1234,i1234,sig1234
+                q1234[0,n123-1] = q123[p]
+                q1234[n123,n123+n4-1]= highestq[p-n123]
+                i1234[0,n123-1] = i123[p]
+                i1234[n123,n123+n4-1]= highesti[p-n123]
+                sig1234[0,n123-1] = sig123[p]
+                sig1234[n123,n123+n4-1]= highests[p-n123]
+                
+                Sort q123, q123,i123,sig123
+                //at this point 12 - 3 are combined
+                //write out the set here and stop
+        
+                ControlInfo/W=NSORT_Panel PreviewCheck
+                if( V_Value==0 )                //if zero skip the preview and write out the file
+                        err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,name4,normToStr,norm12,norm23,norm34)
+                endif
+                //cleanup waves before exiting
+                KillWaves/Z q12,i12,sig12,q123,i123,sig123
+                
+                
+                
+                
                 //combined dataset will already be displayed if the NSORT_Graph is open
         
@@ -1188 +1483 @@
                 WAVE lows = $"root:LowQSet:TrimLowQSet_s"
                 WAVE meds = $"root:MedQSet:TrimMedQSet_s"
-//              WAVE lowsq = $"root:LowQSet:TrimLowQSet_sq"
-//              WAVE medsq = $"root:MedQSet:TrimMedQSet_sq"
-//              WAVE lowqb = $"root:LowQSet:TrimLowQSet_qb"
-//              WAVE medqb =  $"root:MedQSet:TrimMedQSet_qb"
-//              WAVE lowfs = $"root:LowQSet:TrimLowQSet_fs"
-//              WAVE medfs = $"root:MedQSet:TrimMedQSet_fs"
                 WAVE lowres = $"root:LowQSet:TrimLowQSet_res"
                 WAVE medres = $"root:MedQSet:TrimMedQSet_res"
@@ -1209 +1498 @@
                 fs12[0,n1-1] = lowres[p][2]
                 fs12[n1,n1+n2-1]= medres[p-n1][2]
-//              res12[0,n1-1][0]=lowres[p][0]
-//              res12[n1,n1+n2-1][0]=medres[p-n1][0]
-//              res12[0,n1-1][1]=lowres[p][1]
-//              res12[n1,n1+n2-1][1]=medres[p-n1][1]
-//              res12[0,n1-1][2]=lowres[p][2]
-//              res12[n1,n1+n2-1][2]=medres[p-n1][2]
 
                 
@@ -1273 +1556 @@
                 fs12[0,n1-1] = lowres[p][2]
                 fs12[n1,n1+n2-1]= medres[p-n1][2]
-//              res12[0,n1-1][0]=lowres[p][0]
-//              res12[n1,n1+n2-1][0]=medres[p-n1][0]
-//              res12[0,n1-1][1]=lowres[p][1]
-//              res12[n1,n1+n2-1][1]=medres[p-n1][1]
-//              res12[0,n1-1][2]=lowres[p][2]
-//              res12[n1,n1+n2-1][2]=medres[p-n1][2]
 
                 
@@ -1294 +1571 @@
                                 res12[][1] = qb12[p]
                                 res12[][2] = fs12[p]
-                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23,res=res12)
+                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,name4,normToStr,norm12,norm23,norm34,res=res12)
                         endif
                         // always clean up waves before exiting
@@ -1316 +1593 @@
                 WAVE highi = $"root:HighQSet:TrimHighQSet_i"
                 WAVE highs = $"root:HighQSet:TrimHighQSet_s"
-//              WAVE highsq = $"root:HighQSet:TrimHighQSet_sq"
-//              WAVE highqb = $"root:HighQSet:TrimHighQSet_qb"
-//              WAVE highfs = $"root:HighQSet:TrimHighQSet_fs"
                 WAVE highres = $"root:HighQSet:TrimHighQSet_res"
         
         
                 q123[0,n12-1] = q12[p]
-                q123[n1,n12+n3-1]= highq[p-n12]
+                q123[n12,n12+n3-1]= highq[p-n12]
                 i123[0,n12-1] = i12[p]
-                i123[n1,n12+n3-1]= highi[p-n12]
+                i123[n12,n12+n3-1]= highi[p-n12]
                 sig123[0,n12-1] = sig12[p]
-                sig123[n1,n12+n3-1]= highs[p-n12]
+                sig123[n12,n12+n3-1]= highs[p-n12]
                 sq123[0,n12-1] = sq12[p]
-                sq123[n1,n12+n3-1]= highres[p-n12][0]
+                sq123[n12,n12+n3-1]= highres[p-n12][0]
                 qb123[0,n12-1] = qb12[p]
-                qb123[n1,n12+n3-1]= highres[p-n12][1]
+                qb123[n12,n12+n3-1]= highres[p-n12][1]
                 fs123[0,n12-1] = fs12[p]
-                fs123[n1,n12+n3-1]= highres[p-n12][2]
-//              res123[0,n12-1][0] = highres[p][0]
-//              res123[n1,n12+n3-1][0] = highres[p-n12][0]
-//              res123[0,n12-1][1] = highres[p][1]
-//              res123[n1,n12+n3-1][1] = highres[p-n12][1]
-//              res123[0,n12-1][2] = highres[p][2]
-//              res123[n1,n12+n3-1][2] = highres[p-n12][2]
+                fs123[n12,n12+n3-1]= highres[p-n12][2]
 
                 
@@ -1401 +1669 @@
                 fs123[0,n12-1] = fs12[p]
                 fs123[n12,n12+n3-1]= highres[p-n12][2]
-//              res123[0,n12-1][0] = highres[p][0]
-//              res123[n1,n12+n3-1][0] = highres[p-n12][0]
-//              res123[0,n12-1][1] = highres[p][1]
-//              res123[n1,n12+n3-1][1] = highres[p-n12][1]
-//              res123[0,n12-1][2] = highres[p][2]
-//              res123[n1,n12+n3-1][2] = highres[p-n12][2]
+
                 
                 Sort q123, q123,i123,sig123,sq123,qb123,fs123
                 //at this point 12 - 3 are combined
-                //write out the set here and stop
+                
+                //do we need to continue, or write out the set here and stop?
+                if(cmpstr(name4,"none") == 0)
+                        //stop here
+                
+                        ControlInfo/W=NSORT_Panel PreviewCheck
+                        if( V_Value==0 )                //if zero skip the preview and write out the file
+                                res123[][0] = sq123[p]
+                                res123[][1] = qb123[p]
+                                res123[][2] = fs123[p]
+                                err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,name4,normToStr,norm12,norm23,norm34,res=res123)
+                        endif
+                        // always clean up waves before exiting
+                        KillWaves/Z q12,i12,sig12,q123,i123,sig123,sq123,qb123,fs123 //,res123
+                        return err
+                Endif
+                
+                // new 2016 - combine the 4th data set
+
+                //need to add the fourth file... which was already loaded at the top of the function
+                /////
+                //order points in sets 123-4, indexing overlap region
+                //put result in temporary waves
+                WaveStats/Q q123
+                n123 = V_npnts
+                WaveStats/Q $"root:HighestQSet:TrimHighestQSet_q"
+                n4 = V_npnts
+                n1234 = n123 + n4
+                
+                Make/O/N=(n1234) q1234,i1234,sig1234,sq1234,qb1234,fs1234
+                Make/O/N=(n1234,3) res1234
+                WAVE highestq = $"root:HighestQSet:TrimHighestQSet_q"
+                WAVE highesti = $"root:HighestQSet:TrimHighestQSet_i"
+                WAVE highests = $"root:HighestQSet:TrimHighestQSet_s"
+                WAVE highestres = $"root:HighestQSet:TrimHighestQSet_res"
+        
+        
+                q1234[0,n123-1] = q123[p]
+                q1234[n123,n123+n4-1]= highestq[p-n123]
+                i1234[0,n123-1] = i123[p]
+                i1234[n123,n123+n4-1]= highesti[p-n123]
+                sig1234[0,n123-1] = sig123[p]
+                sig1234[n123,n123+n4-1]= highests[p-n123]
+                sq1234[0,n123-1] = sq123[p]
+                sq1234[n123,n123+n4-1]= highestres[p-n123][0]
+                qb1234[0,n123-1] = qb123[p]
+                qb1234[n123,n123+n4-1]= highestres[p-n123][1]
+                fs1234[0,n123-1] = fs123[p]
+                fs1234[n123,n123+n4-1]= highestres[p-n123][2]
+
+                
+                Sort q1234, q1234,i1234,sig1234,sq1234,qb1234,fs1234
+                /////////////////
+                
+                //find the maximum point number of set 2  in the overlap region
+                FindLevel/P/Q highestq,(q123[n123-1])
+                num2 = trunc(V_levelX)
+                //Print "num2 = ",num2
+                
+                if (auto)
+                        //there must be overlap points to use auto-scaling
+                        if(numtype(num2) != 0)
+                                Abort "There are no data points in the overlap region. Either reduce the number of deleted points or use manual scaling."
+                        endif
+                        //do auto-scaling of data
+                        norm34 = NCNR_GetScalingInOverlap(num2,q123,i123,highestq,highesti)
+                        //Set the global variable for the 12 - 3 scale factor
+                        Variable/G root:myGlobals:NSORT:gScale3_4 = norm34
+                else
+                        //use the value from the panel ( which is the global)
+                        NVAR temp34 = root:myGlobals:NSORT:gScale3_4
+                        norm34 = temp34
+                Endif
+
+// normalization
+                switch (normTo)
+                        case 1:
+                        case 2:
+                        case 3:
+                                //normalize to first or second or third file, so multiply fourth by norm34
+                                highesti *= norm34
+                                highests *= norm34
+                                break
+                        case 4:
+                                //normalize to FOURTH file, 123 by multiplicative factor 1/norm34
+                                norm34 = 1/norm34
+                                i123 *= norm34
+                                sig123 *= norm34
+                                // for the display, scale the trimmed sets 1 and 2 and 3
+                                lowi *= norm34
+                                lows *= norm34
+                                medi *= norm34
+                                meds *= norm34
+                                highi *= norm34
+                                highs *= norm34
+                                break
+                endswitch
+                
+        
+                //Print "NSORT-ed ",name1," + ", name2, " + ", name3
+                //Print "normalized to ",normTo
+                //Print "multiplicative factor 1-2 = ",norm12," multiplicative factor 12 - 3 = ",norm23
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
+                
+                Make/O/N=(n1234) q1234,i1234,sig1234
+                Make/O/N=(n1234,3) res1234
+                q1234[0,n123-1] = q123[p]
+                q1234[n123,n123+n4-1]= highestq[p-n123]
+                i1234[0,n123-1] = i123[p]
+                i1234[n123,n123+n4-1]= highesti[p-n123]
+                sig1234[0,n123-1] = sig123[p]
+                sig1234[n123,n123+n4-1]= highests[p-n123]
+                sq1234[0,n123-1] = sq123[p]
+                sq1234[n123,n123+n4-1]= highestres[p-n123][0]
+                qb1234[0,n123-1] = qb123[p]
+                qb1234[n123,n123+n4-1]= highestres[p-n123][1]
+                fs1234[0,n123-1] = fs123[p]
+                fs1234[n123,n123+n4-1]= highestres[p-n123][2]
+                
+                Sort q1234, q1234,i1234,sig1234,sq1234,qb1234,fs1234
+                //at this point 123 - 4 are combined
+                
+//write out the set here and stop
+                        //stop here
         
                 ControlInfo/W=NSORT_Panel PreviewCheck
                 if( V_Value==0 )                //if zero skip the preview and write out the file
-                        res123[][0] = sq123[p]
-                        res123[][1] = qb123[p]
-                        res123[][2] = fs123[p]
-                        err=WriteNSORTedFile(q123,i123,sig123,name1,name2,name3,normToStr,norm12,norm23,res=res123)
+                        res1234[][0] = sq1234[p]
+                        res1234[][1] = qb1234[p]
+                        res1234[][2] = fs1234[p]
+                        err=WriteNSORTedFile(q1234,i1234,sig1234,name1,name2,name3,name4,normToStr,norm12,norm23,norm34,res=res1234)
                 endif
-                //cleanup waves before exiting
-                KillWaves/Z q12,i12,sig12,q123,i123,sig123,sq123,qb123,fs123 //,res123
+                // always clean up waves before exiting
+                KillWaves/Z q123,i123,sig123,q1234,i1234,sig1234,sq1234,qb1234,fs1234 //,res1234
+                return err
+
                 //combined dataset will already be displayed if the NSORT_Graph is open
         
                 ////////////////
                 return err
-   endif // End the 6-column specific stuff here
-        
-End
+   endif // End the if(6-column) specific stuff here
+        
+        
+End
+
+
+
 
 
@@ -1488 +1881 @@
                 PopupMenu popup_3,win=NSORT_Panel,mode=(1)
         endif
+End
+
+/////////////////////////////////////////////////////////////
+// testing, may speed up NSORT, NCNR-specific naming scheme of 
+// run numbers and a run prefix
+//
+// it is assumed that you are combining data from the current reduction session,
+// so that the XML y/n hasn't changed.
+//
+// updated to use 4 files
+//
+// TODO:
+// -- still assuming ABS
+//
+Function Set4NSORTFiles(low,med,hi,highest,pref)
+        Variable low,med,hi,highest
+        String pref
+        
+        //make strings from the numbers
+        String absStr="",ext
+        Variable popNum
+        DoWindow/F NSORT_Panel
+        
+        SVAR lowQPopStr = root:myGlobals:NSORT:gDataPopList
+        SVAR medHiQPopStr = root:myGlobals:NSORT:gDataPopList_3
+        
+        NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+        if(useXMLOutput)
+                ext = ".ABSx"
+        else
+                ext = ".ABS"
+        endif
+        
+        //lowQ menu
+        absStr = pref+RunDigitString(low)+ext
+        popNum = WhichListItem(absStr,lowQPopStr,";",0)
+        if(popNum == -1)
+                Abort "Could not find file: " + absStr +" aborting...  Be sure that your output format is the same as the input"
+        endif
+        popNum += 1             // add 1 to get the item number
+        PopupMenu popup_1,win=NSORT_Panel,mode=(popNum)
+        
+        //medQ (a different list for the popup)
+        absStr = pref+RunDigitString(med)+ext
+        popNum = WhichListItem(absStr,medHiQPopStr,";",0)
+        if(popNum == -1)
+                Abort "Could not find file: "+absStr+" aborting...  Be sure that your output format is the same as the input"
+        endif
+        popNum += 1             // add 1 to get the item number
+        PopupMenu popup_2,win=NSORT_Panel,mode=(popNum)
+        
+        
+        //highQ (same pop list as medQ)
+        if(hi != 0)
+                absStr = pref+RunDigitString(hi)+ext
+                popNum = WhichListItem(absStr,medHiQPopStr,";",0)
+                if(popNum == -1)
+                        Abort "Could not find file: "+absStr+" aborting...  Be sure that your output format is the same as the input"
+                endif
+                popNum += 1             // add 1 to get the item number
+                PopupMenu popup_3,win=NSORT_Panel,mode=(popNum)
+        else
+                PopupMenu popup_3,win=NSORT_Panel,mode=(1)
+        endif
+        
+        //highestQ (same pop list as medQ)
+        if(highest != 0)
+                absStr = pref+RunDigitString(highest)+ext
+                popNum = WhichListItem(absStr,medHiQPopStr,";",0)
+                if(popNum == -1)
+                        Abort "Could not find file: "+absStr+" aborting...  Be sure that your output format is the same as the input"
+                endif
+                popNum += 1             // add 1 to get the item number
+                PopupMenu popup_4,win=NSORT_Panel,mode=(popNum)
+        else
+                PopupMenu popup_4,win=NSORT_Panel,mode=(1)
+        endif
+        
+        return(0)
 End
 
@@ -1692 +2164 @@
         MedQPopMenuProc("",1,"")
         HighQPopMenuProc("",1,"")
+        HighestQPopMenuProc("",1,"")
         
 //      String savedDataFolder = GetDataFolder(1)               // save
@@ -1697 +2170 @@
         Wave MediumRun = root:myGlobals:CombineTable:MediumRun
         Wave HighRun = root:myGlobals:CombineTable:HighRun
+        Wave HighestRun = root:myGlobals:CombineTable:HighestRun
         Wave/T prefix = root:myGlobals:CombineTable:Prefix
         Wave/T saveName = root:myGlobals:CombineTable:saveName
@@ -1702 +2176 @@
         Variable/G root:myGlobals:CombineTable:useTable=1
         
-        Variable num=numpnts(lowRun),ii,lowFile,medFile,hiFile
+        Variable num=numpnts(lowRun),ii,lowFile,medFile,hiFile,highestFile
         String prefixStr = ""
         Pathinfo catPathName
@@ -1712 +2186 @@
                 medFile = MediumRun[ii]
                 hiFile = highRun[ii]
+                highestFile = highestRun[ii]
                 prefixStr = prefix[ii]
                 
-                Set3NSORTFiles(lowFile,medFile,hiFile,prefixStr)                //set the files and pop the NSORT popups
+                Set4NSORTFiles(lowFile,medFile,hiFile,highestFile,prefixStr)            //set the files and pop the NSORT popups
                 
                 //pass the new file name in as a global (ugh!)
@@ -1783 +2258 @@
                 Wave medium = $"root:myGlobals:CombineTable:MediumRun"
                 Wave high = $"root:myGlobals:CombineTable:HighRun"
+                Wave highest = $"root:myGlobals:CombineTable:HighestRun"
                 Wave/T prefix = $"root:myGlobals:CombineTable:Prefix"
                 Wave/T saveName = $"root:myGlobals:CombineTable:SaveName"
@@ -1805 +2281 @@
         endif
 
-
-        if( !(num==2 || num==3) )
-                Abort "invalid table selection - must select either 2 or 3 files to combine"
-        endif
-        Make/O/T/N=(3) tmpLbl
-        Make/O/N=(3) tmpSDD,tmpRun
+        if( !(num==2 || num==3 || num==4) )
+                Abort "invalid table selection - must select either 2 or 3 or 4 files to combine"
+        endif
+        Make/O/T/N=(4) tmpLbl
+        Make/O/N=(4) tmpSDD,tmpRun
+        
+        //initialize with fake values in case 2 or 3 files are combined
+        tmpLbl = ""
+        tmpSDD = 0.01           //fake sdd in meters to always be the "highest" Q
+        tmpRun = 0                      //pass a run number of zero to be later interpreted as "none"
+        
+        //fill in the real values from the selection
         for(ii=V_startRow;ii<=V_endRow;ii+=1)
                 tmpLbl[ii-V_startRow] = gLabels[ii]
@@ -1816 +2298 @@
                 tmpRun[ii-V_startRow] = gRunNumber[ii]
         endfor
-        if(num==2)      // then "highest" q run needs to be forced to zero
-                ii=2
-                tmpLbl[ii] = ""
-                tmpSDD[ii] = 0.01               //fake sdd in meters to always be the "highest" Q
-                tmpRun[ii] = 0                  //pass a run number of zero to be later interpreted as "none"
-        endif
+//      if(num==2)      // then "highest" q run needs to be forced to zero
+//              ii=2
+//              tmpLbl[ii] = ""
+//              tmpSDD[ii] = 0.01               //fake sdd in meters to always be the "highest" Q
+//              tmpRun[ii] = 0                  //pass a run number of zero to be later interpreted as "none"
+//      endif
         Sort tmpSDD, tmpSDD,tmpLbl,tmpRun
         
@@ -1827 +2309 @@
         
         num=numpnts(low)
-        InsertPoints num, 1, low,medium,high,prefix,SaveName
-        low[num] = tmpRun[2]
-        medium[num] = tmpRun[1]
-        high[num] = tmpRun[0]
+        InsertPoints num, 1, low,medium,high,highest,prefix,SaveName
+        low[num] = tmpRun[3]
+        medium[num] = tmpRun[2]
+        high[num] = tmpRun[1]
+        highest[num] = tmpRun[0]
         prefix[num] = GetPrefixStrFromFile(filenames[ii])
         saveName[num] = saveStr 
@@ -1905 +2388 @@
                 Make/O/N=0 $"root:myGlobals:CombineTable:MediumRun"
                 Make/O/N=0 $"root:myGlobals:CombineTable:HighRun"
+                Make/O/N=0 $"root:myGlobals:CombineTable:HighestRun"
                 Make/O/T/N=0 $"root:myGlobals:CombineTable:Prefix"
                 Make/O/T/N=0 $"root:myGlobals:CombineTable:SaveName"
@@ -1911 +2395 @@
         
         // make the second table
-        AppendToTable/W=CombinePanel#RunNumbersToCombine LowRun,MediumRun,HighRun,Prefix,SaveName
+        AppendToTable/W=CombinePanel#RunNumbersToCombine LowRun,MediumRun,HighRun,HighestRun,Prefix,SaveName
         
         SetDataFolder root:
@@ -1919 +2403 @@
 
 /////////////////////////////////
-
+// currently unused
+//
 Proc MakeCombineTable_byName()
         NewDataFolder/O root:myGlobals:CombineTable                     //in case it doesn't exist yet
@@ -1928 +2413 @@
 End
 
+//
+// currently unused
+//
 // Another beta procedure, to allow files to be combined quickly
 // - make 4 waves (text) with the low, med, hi, and wave names

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_BeamCenter.ipf

@@ -34 +34 @@
 //      ShowTools/A
         
-        PopupMenu popup_0,pos={20,20},size={109,20},proc=SetDetPanelPopMenuProc,title="Detector Panel"
+        PopupMenu popup_0,pos={20,50},size={109,20},proc=SetDetPanelPopMenuProc,title="Detector Panel"
         PopupMenu popup_0,mode=1,popvalue="FL",value= #"\"FL;FR;FT;FB;MR;ML;MT;MB;B;\""
         PopupMenu popup_1,pos={200,20},size={157,20},proc=DetModelPopMenuProc,title="Model Function"
         PopupMenu popup_1,mode=1,popvalue="BroadPeak",value= #"\"BroadPeak;other;\""
-        
+        PopupMenu popup_2,pos={20,20},size={109,20},title="Data Source"//,proc=SetFldrPopMenuProc
+        PopupMenu popup_2,mode=1,popvalue="VCALC",value= #"\"RAW;SAM;VCALC;\""
+                
         Button button_0,pos={486,20},size={80,20},proc=DetFitGuessButtonProc,title="Guess"
         Button button_1,pos={615,20},size={80,20},proc=DetFitButtonProc,title="Do Fit"
         Button button_2,pos={744,20},size={80,20},proc=DetFitHelpButtonProc,title="Help"
+        Button button_3,pos={615,400},size={110,20},proc=WriteCtrButtonProc,title="Write Centers"
+        Button button_4,pos={730,400},size={110,20},proc=CtrTableButtonProc,title="Ctr table"
+        Button button_5,pos={730,440},size={110,20},proc=WriteCtrTableButtonProc,title="Write table"
+
 
 
@@ -78 +84 @@
 
 // edit the fit coefficients    
-        Edit/W=(500,80,880,350)/HOST=#  parameters_PeakPix2D,coef_PeakPix2D
+        Edit/W=(550,80,880,370)/HOST=#  parameters_PeakPix2D,coef_PeakPix2D
         ModifyTable width(Point)=0
         ModifyTable width(parameters_PeakPix2D)=120
@@ -89 +95 @@
 
 
-
-
+//
+// function to choose which detector panel to display, and then to actually display it
+//
 Function SetDetPanelPopMenuProc(pa) : PopupMenuControl
         STRUCT WMPopupAction &pa
@@ -126 +133 @@
 
 
+// TODO - currently is hard-wired for the simulation path!
+//     need to make it more generic, especially for RAW data
+//
+// -- need to adjust the size of the image subwindows to keep the model
+//    calculation from spillon over onto the table (maybe just move the table)
+// -- need to do something for panel "B". currently ignored
+// -- currently the pixel sizes for "real" data is incorrect in the file
+//     and this is why the plots are incorrectly sized
+//
 // draw the selected panel and the model calculation, adjusting for the 
 // orientation of the panel and the number of pixels, and pixel sizes
@@ -132 +148 @@
         
         // from the selection, find the path to the data
-        // TODO - currently is hard-wired for the simulation path!
-        //     need to make it more generic, especially for RAW data
+
 
         Variable xDim,yDim
@@ -139 +154 @@
         Variable height, width
         Variable left2,top2,right2,bottom2
+        Variable nPix_X,nPix_Y,pixSize_X,pixSize_Y
+
+        
         Wave dispW=root:curDispPanel
         Wave cw = root:coef_PeakPix2D
@@ -154 +172 @@
         // and the other to set the "common" values, some of which are based on the panel dimensions
 
-        // panel-specific values
-        strswitch(str)
-                case "FL":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str)
-                        break
-                case "FR":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_R_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_R_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
-                        break
-                case "ML":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_L_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_L_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
-                        break
-                case "MR":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_R_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_R_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
-                        break   
-
-                case "FT":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_T_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_T_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
-                        break
-                case "FB":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_B_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_B_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
-                        break
-                case "MT":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_T_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_T_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
-                        break
-                case "MB":
-                        NVAR nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_X
-                        NVAR nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_Y
-                        NVAR pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_B_pixelX
-                        NVAR pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_B_pixelY
-//                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
-                        break   
-                        
-                case "B":
-                        return(0)               //just exit
-                        break                                           
-                default:
-                        return(0)               //just exit
-        endswitch
-        
-        wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str)
+// set the source of the data. not always VCALC anymore
+        String folder
+        ControlInfo popup_2
+        folder = S_Value
+
+        // TODO -- fix all of this mess
+        if(cmpstr(folder,"VCALC") == 0)
+                // panel-specific values
+                Variable VC_nPix_X = VCALC_get_nPix_X(str)
+                Variable VC_nPix_Y = VCALC_get_nPix_Y(str)
+                Variable VC_pixSize_X = VCALC_getPixSizeX(str)
+                Variable VC_pixSize_Y = VCALC_getPixSizeY(str)
+//              strswitch(str)
+//                      case "FL":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_L_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str)
+//                              break
+//                      case "FR":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_R_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_R_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
+//                              break
+//                      case "ML":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_L_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_L_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
+//                              break
+//                      case "MR":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_R_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_R_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
+//                              break   
+//      
+//                      case "FT":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_T_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_T_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
+//                              break
+//                      case "FB":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gFront_B_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gFront_B_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Front:det_"+str)
+//                              break
+//                      case "MT":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_T_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_T_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
+//                              break
+//                      case "MB":
+//                              NVAR VC_nPix_X = root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_X
+//                              NVAR VC_nPix_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_Y
+//                              NVAR VC_pixSize_X = root:Packages:NIST:VSANS:VCALC:gMiddle_B_pixelX
+//                              NVAR VC_pixSize_Y = root:Packages:NIST:VSANS:VCALC:gMiddle_B_pixelY
+//      //                      wave newW = $("root:Packages:NIST:VSANS:VCALC:Middle:det_"+str)
+//                              break   
+//                              
+//                      case "B":
+//                              return(0)               //just exit
+//                              break                                           
+//                      default:
+//                              return(0)               //just exit
+//              endswitch
+        
+        // if VCALC declare this way    
+                wave newW = $("root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_"+str+":det_"+str)
+                nPix_X = VC_nPix_X
+                nPix_Y = VC_nPix_Y
+                pixSize_X = VC_pixSize_X
+                pixSize_Y = VC_pixSize_Y
+        
+        else
+        // TODO: if real data, need new declaration w/ data as the wave name
+                wave newW = $("root:Packages:NIST:VSANS:"+folder+":entry:entry:instrument:detector_"+str+":data")
+
+                nPix_X = V_getDet_pixel_num_x(folder,str)
+                nPix_Y = V_getDet_pixel_num_Y(folder,str)
+                pixSize_X = V_getDet_x_pixel_size(folder,str)/10
+                pixSize_Y = V_getDet_y_pixel_size(folder,str)/10
+        endif
+        
 
         Variable scale = 5
         
         // common values (panel position, etc)
+        // TODO -- units are absolute, based on pixels in cm. make sure this is always correct
         strswitch(str)
                 case "FL":
@@ -313 +359 @@
 
 
-
+// TODO: 
+// -- allow other model functions as needed.
+//
+// Function to plot the specified 2D model for the detector
+//
 Function DetModelPopMenuProc(pa) : PopupMenuControl
         STRUCT WMPopupAction &pa
@@ -357 +407 @@
 End
 
-
-
-
-
+//
+// TODO -- currently hard-wired for the only fit function
+//
+Function WriteCtrButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        String detStr,fname
+                        Wave coefW=root:coef_PeakPix2D
+                        
+                        ControlInfo popup_0
+                        detStr = S_Value
+                        ControlInfo popup_2
+                        fname = S_Value
+                        
+                        V_putDet_beam_center_x(fname,detStr,coefW[9])
+                        V_putDet_beam_center_y(fname,detStr,coefW[10])
+
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
+// TODO
+// -- there is only a single fitting function available, and it's hard-wired
+// -- what values are held during the fitting are hard-wired
+//
+//
+// function to call the fit fucntion (2D)
+//
 Function DetFitButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
@@ -401 +484 @@
 End
 
+Function CtrTableButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        
+                        V_BCtrTable()
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function WriteCtrTableButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        
+                        V_BeamCtr_WriteTable()
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
 
 // TODO
 // -- some of this is hard-wired in
-// -- this is still alll in terms of pixels, which still may not be what I want
+// -- this is still all in terms of pixels, which still may not be what I want
 // -- the x-scale of the T/B panels is artificially compressed to "fake" 4mm per pixel in x-direction
 //
@@ -447 +563 @@
 end
 
+// TODO
+// these are "nominal" beam center values in pixels for the default VCALC configuration
+// This function "restores" the data display to the "instrument" conditions where the panels overlap
+// and is intended to be a TRUE view of what the detectors see - that is - the peaks should appear as rings,
+// the view should be symmetric (if the real data is symmetric)
+//
+// -- this is currently linked to the Vdata panel
+// -- will need to remove the hard-wired values and get the proper values from the data
+// -- ?? will the "proper" values be in pixels or distance? All depends on how I display the data...
+// -- may want to keep the nominal scaling values around in case the proper values aren' in the file
+//
 Function V_RestorePanels()
 
-        V_RescaleToBeamCenter("RAW","MB",64,55)
-        V_RescaleToBeamCenter("RAW","MT",64,-8.7)
-        V_RescaleToBeamCenter("RAW","MR",-8.1,64)
-        V_RescaleToBeamCenter("RAW","ML",55,64)
-        V_RescaleToBeamCenter("RAW","FB",64,55)
-        V_RescaleToBeamCenter("RAW","FT",64,-8.7)
-        V_RescaleToBeamCenter("RAW","FR",-8.1,64)
-        V_RescaleToBeamCenter("RAW","FL",55,64)
-
-
+        String fname=""
+        String detStr=""
+        Variable ii,xCtr,yCtr
+
+//// this works if the proper centers are in the file - otherwise, it's a mess  
+//      fname = "RAW"
+//      for(ii=0;ii<ItemsInList(ksDetectorListNoB);ii+=1)
+//              detStr = StringFromList(ii, ksDetectorListNoB, ";")
+//              xCtr = V_getDet_beam_center_x(fname,detStr)
+//              yCtr = V_getDet_beam_center_y(fname,detStr)
+//              V_RescaleToBeamCenter("RAW",detStr,xCtr,yCtr)
+//      endfor
+                
+                
+                // nominal values... better to use what's in the file
+//
+                V_RescaleToBeamCenter("RAW","MB",64,55)
+                V_RescaleToBeamCenter("RAW","MT",64,-8.7)
+                V_RescaleToBeamCenter("RAW","MR",-8.1,64)
+                V_RescaleToBeamCenter("RAW","ML",55,64)
+                V_RescaleToBeamCenter("RAW","FB",64,55)
+                V_RescaleToBeamCenter("RAW","FT",64,-8.7)
+                V_RescaleToBeamCenter("RAW","FR",-8.1,64)
+                V_RescaleToBeamCenter("RAW","FL",55,64)
         return(0)
 end
 
+// TODO
+// these are "spread out" values for the data panels
+// This view is meant to spread out the panels so there is (?Less) overlap so the panels can be 
+// viewed a bit easier. Isolation may still be preferred for detailed work.
+//
+// -- this is currently linked to the Vdata panel
+// -- will need to remove the hard-wired values and get the proper values from the data
+// -- ?? will the "proper" values be in pixels or distance? All depends on how I display the data...
+//
 Function V_SpreadOutPanels()
 
@@ -474 +624 @@
         return(0)
 end
+
+// function to display the beam center values for all of the detectors
+// opens a separate table with the detector label, and the XY values
+// ? Maybe list the XY pair in pixels and in real distance in the table
+//
+// TODO:
+// -- need a way to use this or another table? as input to put the new/fitted/derived
+//    beam center values into the data folders, and ultimately into the data files on disk
+// -- need read/Write for the XY in pixels, and in real-distance
+// -- where are the temporary waves to be located? root?
+// -- need way to access the Ctr_mm values
+Function V_BCtrTable()
+        
+        // order of the panel names will match the constant string
+        //FT;FB;FL;FR;MT;MB;ML;MR;B;
+        Make/O/T/N=9 panelW
+        Make/O/D/N=9 xCtr_pix,yCtr_pix,xCtr_mm,yCtr_mm
+        DoWindow/F BCtrTable
+        if(V_flag == 0)
+                Edit/W=(547,621,1076,943)/N=BCtrTable panelW,xCtr_pix,yCtr_pix,xCtr_mm,yCtr_mm
+        endif
+        
+        Variable ii
+        String detStr,fname
+        
+        fname = "RAW"
+        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
+                detStr = StringFromList(ii, ksDetectorListAll, ";")
+                panelW[ii] = detStr
+                xCtr_pix[ii] = V_getDet_beam_center_x(fname,detStr)
+                yCtr_pix[ii] = V_getDet_beam_center_y(fname,detStr)
+                // TODO
+                // and now the mm values
+                
+        endfor
+        return(0)
+End
+
+//
+// to write the new beam center values to a file on disk:
+// V_writeDet_beam_center_x(fname,detStr,val)
+//
+// to write to a local WORK folder
+// V_putDet_beam_center_x(fname,detStr,val)
+//
+Function V_BeamCtr_WriteTable()
+
+        String folder
+        
+        Variable ii
+        String detStr,fname
+        
+        Wave xCtr_pix = root:xCtr_pix
+        Wave yCtr_pix = root:yCtr_pix
+        Wave/T panelW = root:PanelW
+        
+        ControlInfo popup_2
+        folder = S_Value
+        
+        fname = folder
+        for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
+//              detStr = StringFromList(ii, ksDetectorListAll, ";")
+                detStr = panelW[ii]
+                V_putDet_beam_center_x(fname,detStr,xCtr_pix[ii])
+                V_putDet_beam_center_y(fname,detStr,yCtr_pix[ii])
+                
+                // TODO
+                // and now the mm values
+                
+        endfor
+        return(0)
+        
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_UtilityProcedures.ipf

@@ -181 +181 @@
         String type
 
-        SetDataFolder root:Packages:NIST:VSANS:VCALC
-                        
-        strswitch(type) 
-                case "FL":
-                        NVAR pixSizeX = gFront_L_pixelX
-                        break
-                case "FR":              
-                        NVAR pixSizeX = gFront_R_pixelX
-                        break
-                case "FT":
-                        NVAR pixSizeX = gFront_T_pixelX
-                        break   
-                case "FB":              
-                        NVAR pixSizeX = gFront_B_pixelX
-                        break
-                        
-                case "ML":
-                        NVAR pixSizeX = gMiddle_L_pixelX
-                        break
-                case "MR":              
-                        NVAR pixSizeX = gMiddle_R_pixelX
-                        break
-                case "MT":
-                        NVAR pixSizeX = gMiddle_T_pixelX
-                        break   
-                case "MB":              
-                        NVAR pixSizeX = gMiddle_B_pixelX
-                        break
-                                                
-                case "B":               
-                        NVAR pixSizeX = gBack_pixelX
-                        break
-                        
-                default:                                                        
-                        Print "Detector type mismatch in        V_getPixSizeX(type)"
-                        setDataFolder root:
-                        return(NaN)
-        endswitch
-
-        setDataFolder root:
+        Variable pixSizeX = V_getDet_x_pixel_size("VCALC",type)
+
+//      SetDataFolder root:Packages:NIST:VSANS:VCALC
+//                      
+//      strswitch(type) 
+//              case "FL":
+//                      NVAR pixSizeX = gFront_L_pixelX
+//                      break
+//              case "FR":              
+//                      NVAR pixSizeX = gFront_R_pixelX
+//                      break
+//              case "FT":
+//                      NVAR pixSizeX = gFront_T_pixelX
+//                      break   
+//              case "FB":              
+//                      NVAR pixSizeX = gFront_B_pixelX
+//                      break
+//                      
+//              case "ML":
+//                      NVAR pixSizeX = gMiddle_L_pixelX
+//                      break
+//              case "MR":              
+//                      NVAR pixSizeX = gMiddle_R_pixelX
+//                      break
+//              case "MT":
+//                      NVAR pixSizeX = gMiddle_T_pixelX
+//                      break   
+//              case "MB":              
+//                      NVAR pixSizeX = gMiddle_B_pixelX
+//                      break
+//                                              
+//              case "B":               
+//                      NVAR pixSizeX = gBack_pixelX
+//                      break
+//                      
+//              default:                                                        
+//                      Print "Detector type mismatch in        V_getPixSizeX(type)"
+//                      setDataFolder root:
+//                      return(NaN)
+//      endswitch
+//
+//      setDataFolder root:
                 
         return(pixSizeX)
@@ -229 +231 @@
         String type
 
-        SetDataFolder root:Packages:NIST:VSANS:VCALC
-                        
-        strswitch(type) 
-                case "FL":
-                        NVAR pixSizeY = gFront_L_pixelY
-                        break
-                case "FR":              
-                        NVAR pixSizeY = gFront_R_pixelY
-                        break
-                case "FT":
-                        NVAR pixSizeY = gFront_T_pixelY
-                        break   
-                case "FB":              
-                        NVAR pixSizeY = gFront_B_pixelY
-                        break
-                        
-                case "ML":
-                        NVAR pixSizeY = gMiddle_L_pixelY
-                        break
-                case "MR":              
-                        NVAR pixSizeY = gMiddle_R_pixelY
-                        break
-                case "MT":
-                        NVAR pixSizeY = gMiddle_T_pixelY
-                        break   
-                case "MB":              
-                        NVAR pixSizeY = gMiddle_B_pixelY
-                        break
-                                                
-                case "B":               
-                        NVAR pixSizeY = gBack_pixelY
-                        break
-                        
-                default:                                                        
-                        Print "Detector type mismatch in        V_getPixSizeY(type)"
-                        SetDataFolder root:
-                        return(NaN)
-        endswitch
-
-        setDatafolder root:
+        Variable pixSizeY = V_getDet_y_pixel_size("VCALC",type)
+        
+//      SetDataFolder root:Packages:NIST:VSANS:VCALC
+//                      
+//      strswitch(type) 
+//              case "FL":
+//                      NVAR pixSizeY = gFront_L_pixelY
+//                      break
+//              case "FR":              
+//                      NVAR pixSizeY = gFront_R_pixelY
+//                      break
+//              case "FT":
+//                      NVAR pixSizeY = gFront_T_pixelY
+//                      break   
+//              case "FB":              
+//                      NVAR pixSizeY = gFront_B_pixelY
+//                      break
+//                      
+//              case "ML":
+//                      NVAR pixSizeY = gMiddle_L_pixelY
+//                      break
+//              case "MR":              
+//                      NVAR pixSizeY = gMiddle_R_pixelY
+//                      break
+//              case "MT":
+//                      NVAR pixSizeY = gMiddle_T_pixelY
+//                      break   
+//              case "MB":              
+//                      NVAR pixSizeY = gMiddle_B_pixelY
+//                      break
+//                                              
+//              case "B":               
+//                      NVAR pixSizeY = gBack_pixelY
+//                      break
+//                      
+//              default:                                                        
+//                      Print "Detector type mismatch in        V_getPixSizeY(type)"
+//                      SetDataFolder root:
+//                      return(NaN)
+//      endswitch
+//
+//      setDatafolder root:
                 
         return(pixSizeY)
@@ -278 +282 @@
         String type
 
-        SetDataFolder root:Packages:NIST:VSANS:VCALC
-                        
-        strswitch(type) 
-                case "FL":
-                        NVAR nPix = gFront_L_nPix_X
-                        break
-                case "FR":              
-                        NVAR nPix = gFront_R_nPix_X
-                        break
-                case "FT":
-                        NVAR nPix = gFront_T_nPix_X
-                        break   
-                case "FB":              
-                        NVAR nPix = gFront_B_nPix_X
-                        break
-                        
-                case "ML":
-                        NVAR nPix = gMiddle_L_nPix_X
-                        break
-                case "MR":              
-                        NVAR nPix = gMiddle_R_nPix_X
-                        break
-                case "MT":
-                        NVAR nPix = gMiddle_T_nPix_X
-                        break   
-                case "MB":              
-                        NVAR nPix = gMiddle_B_nPix_X
-                        break
-                                                
-                case "B":               
-                        NVAR nPix = gBack_nPix_X
-                        break
-                        
-                default:                                                        
-                        Print "Detector type mismatch in        VCALC_get_nPix_X(type)"
-                        SetDataFolder root:
-                        return(NaN)
-        endswitch
-
-        setDataFolder root:
+        Variable nPix = V_getDet_pixel_num_x("VCALC",type)
+        
+//      SetDataFolder root:Packages:NIST:VSANS:VCALC
+//                      
+//      strswitch(type) 
+//              case "FL":
+//                      NVAR nPix = gFront_L_nPix_X
+//                      break
+//              case "FR":              
+//                      NVAR nPix = gFront_R_nPix_X
+//                      break
+//              case "FT":
+//                      NVAR nPix = gFront_T_nPix_X
+//                      break   
+//              case "FB":              
+//                      NVAR nPix = gFront_B_nPix_X
+//                      break
+//                      
+//              case "ML":
+//                      NVAR nPix = gMiddle_L_nPix_X
+//                      break
+//              case "MR":              
+//                      NVAR nPix = gMiddle_R_nPix_X
+//                      break
+//              case "MT":
+//                      NVAR nPix = gMiddle_T_nPix_X
+//                      break   
+//              case "MB":              
+//                      NVAR nPix = gMiddle_B_nPix_X
+//                      break
+//                                              
+//              case "B":               
+//                      NVAR nPix = gBack_nPix_X
+//                      break
+//                      
+//              default:                                                        
+//                      Print "Detector type mismatch in        VCALC_get_nPix_X(type)"
+//                      SetDataFolder root:
+//                      return(NaN)
+//      endswitch
+//
+//      setDataFolder root:
                 
         return(nPix)
@@ -326 +332 @@
         String type
 
-        SetDataFolder root:Packages:NIST:VSANS:VCALC
-                        
-        strswitch(type) 
-                case "FL":
-                        NVAR nPix = gFront_L_nPix_Y
-                        break
-                case "FR":              
-                        NVAR nPix = gFront_R_nPix_Y
-                        break
-                case "FT":
-                        NVAR nPix = gFront_T_nPix_Y
-                        break   
-                case "FB":              
-                        NVAR nPix = gFront_B_nPix_Y
-                        break
-                        
-                case "ML":
-                        NVAR nPix = gMiddle_L_nPix_Y
-                        break
-                case "MR":              
-                        NVAR nPix = gMiddle_R_nPix_Y
-                        break
-                case "MT":
-                        NVAR nPix = gMiddle_T_nPix_Y
-                        break   
-                case "MB":              
-                        NVAR nPix = gMiddle_B_nPix_Y
-                        break
-                                                
-                case "B":               
-                        NVAR nPix = gBack_nPix_Y
-                        break
-                        
-                default:                                                        
-                        Print "Detector type mismatch in        VCALC_get_nPix_Y(type)"
-                        SetDataFolder root:
-                        return(NaN)
-        endswitch
-
-        SetDataFolder root:
+        Variable nPix = V_getDet_pixel_num_y("VCALC",type)
+
+//      SetDataFolder root:Packages:NIST:VSANS:VCALC
+//                      
+//      strswitch(type) 
+//              case "FL":
+//                      NVAR nPix = gFront_L_nPix_Y
+//                      break
+//              case "FR":              
+//                      NVAR nPix = gFront_R_nPix_Y
+//                      break
+//              case "FT":
+//                      NVAR nPix = gFront_T_nPix_Y
+//                      break   
+//              case "FB":              
+//                      NVAR nPix = gFront_B_nPix_Y
+//                      break
+//                      
+//              case "ML":
+//                      NVAR nPix = gMiddle_L_nPix_Y
+//                      break
+//              case "MR":              
+//                      NVAR nPix = gMiddle_R_nPix_Y
+//                      break
+//              case "MT":
+//                      NVAR nPix = gMiddle_T_nPix_Y
+//                      break   
+//              case "MB":              
+//                      NVAR nPix = gMiddle_B_nPix_Y
+//                      break
+//                                              
+//              case "B":               
+//                      NVAR nPix = gBack_nPix_Y
+//                      break
+//                      
+//              default:                                                        
+//                      Print "Detector type mismatch in        VCALC_get_nPix_Y(type)"
+//                      SetDataFolder root:
+//                      return(NaN)
+//      endswitch
+//
+//      SetDataFolder root:
                 
         return(nPix)
@@ -419 +427 @@
 /////////// procedure to concatenate I(q) files into a single file
 //
-// currently, no rescaling is done, just crude concatentate and sort
-//
+// currently, no rescaling is done, no trimming is done, just crude concatentate and sort
+//
+// TODO
+// -- all of this needs to be done. There's nothing here...
+//

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/VC_VCALCPanel_MockUp.ipf

@@ -673 +673 @@
 ///// FRONT DETECTOR BANKS
 // dimensions for the detector banks (then get them in the drawing functions)
+// Width and height are not part of the Nexus file definition, but are needed for VCALC drawing
+// so keep them as variables
         Variable/G gFront_LR_w = 384            //front bank, nominal LR panel width (mm)
         Variable/G gFront_LR_h = 1000
@@ -679 +681 @@
 
 // SDD offset of T/B (decide on units??)
+// for the Nexus file, the detector distance should already be corrected for the "setback"
+// of the T/B panels. keep as VCALC variable
         Variable/G gFront_SDDOffset = 300                       // (mm)
         
+        
 // detector resolution (xy for each bank!)
-        Variable/G gFront_L_pixelX = 0.84                       // (cm)         these tubes are vertical 8.4 mm spacing (JGB 2/2106)
-        Variable/G gFront_L_pixelY = 0.8                        // (cm)         //!! now 8 mm, since nPix=128, rather than 256
-        Variable/G gFront_R_pixelX = 0.84                       // (cm)
-        Variable/G gFront_R_pixelY = 0.8                        // (cm)
-        
-        Variable/G gFront_T_pixelX = 0.4                        // (cm)         these tubes are horizontal
-        Variable/G gFront_T_pixelY = 0.84                       // (cm)
-        Variable/G gFront_B_pixelX = 0.4                        // (cm)
-        Variable/G gFront_B_pixelY = 0.84                       // (cm)
+        Make/O/D/N=1 :entry:entry:instrument:detector_FL:x_pixel_size = 0.84            // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106)
+        Make/O/D/N=1 :entry:entry:instrument:detector_FL:y_pixel_size = 0.8             // (cm)         //!! now 8 mm, since nPix=128, rather than 256
+        Make/O/D/N=1 :entry:entry:instrument:detector_FR:x_pixel_size = 0.84
+        Make/O/D/N=1 :entry:entry:instrument:detector_FR:y_pixel_size = 0.8
+        //T/B
+        Make/O/D/N=1 :entry:entry:instrument:detector_FT:x_pixel_size = 0.4             //these tubes are horizontal
+        Make/O/D/N=1 :entry:entry:instrument:detector_FT:y_pixel_size = 0.84
+        Make/O/D/N=1 :entry:entry:instrument:detector_FB:x_pixel_size = 0.4
+        Make/O/D/N=1 :entry:entry:instrument:detector_FB:y_pixel_size = 0.84
+        
+//      Variable/G gFront_L_pixelX = 0.84                       
+//      Variable/G gFront_L_pixelY = 0.8                        
+//      Variable/G gFront_R_pixelX = 0.84                       // (cm)
+//      Variable/G gFront_R_pixelY = 0.8                        // (cm)
+//      
+//      Variable/G gFront_T_pixelX = 0.4                        // (cm)         these tubes are horizontal
+//      Variable/G gFront_T_pixelY = 0.84                       // (cm)
+//      Variable/G gFront_B_pixelX = 0.4                        // (cm)
+//      Variable/G gFront_B_pixelY = 0.84                       // (cm)
         
 // number of pixels in each bank (this can be modified at acquisition time, so it must be adjustable here)
-        Variable/G gFront_L_nPix_X = 48         // == number of tubes
-        Variable/G gFront_L_nPix_Y = 128                // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
-        Variable/G gFront_R_nPix_X = 48         // == number of tubes
-        Variable/G gFront_R_nPix_Y = 128                // == pixels in vertical direction 
-        Variable/G gFront_T_nPix_X = 128                // == pixels in horizontal direction
-        Variable/G gFront_T_nPix_Y = 48         // == number of tubes
-        Variable/G gFront_B_nPix_X = 128                // == pixels in horizontal direction
-        Variable/G gFront_B_nPix_Y = 48         // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_FL:pixel_num_x = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_FL:pixel_num_y = 128      // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
+        Make/O/D/N=1 :entry:entry:instrument:detector_FR:pixel_num_x = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_FR:pixel_num_y = 128      // == pixels in vertical direction 
+        Make/O/D/N=1 :entry:entry:instrument:detector_FT:pixel_num_x = 128      // == pixels in horizontal direction
+        Make/O/D/N=1 :entry:entry:instrument:detector_FT:pixel_num_y = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_FB:pixel_num_x = 128      // == pixels in horizontal direction
+        Make/O/D/N=1 :entry:entry:instrument:detector_FB:pixel_num_y = 48       // == number of tubes
+
+//      Variable/G gFront_L_nPix_X = 48         // == number of tubes
+//      Variable/G gFront_L_nPix_Y = 128                // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
+//      Variable/G gFront_R_nPix_X = 48         // == number of tubes
+//      Variable/G gFront_R_nPix_Y = 128                // == pixels in vertical direction 
+//      Variable/G gFront_T_nPix_X = 128                // == pixels in horizontal direction
+//      Variable/G gFront_T_nPix_Y = 48         // == number of tubes
+//      Variable/G gFront_B_nPix_X = 128                // == pixels in horizontal direction
+//      Variable/G gFront_B_nPix_Y = 48         // == number of tubes
 
 
@@ -706 +730 @@
 
 ///// MIDDLE DETECTOR BANKS
+// Width and height are not part of the Nexus file definition, but are needed for VCALC drawing
+// so keep them as variables
         Variable/G gMiddle_LR_w = 384           //middle bank, nominal LR panel width (mm)
         Variable/G gMiddle_LR_h = 1000
@@ -711 +737 @@
         Variable/G gMiddle_TB_h = 384
 // SDD offset of T/B (decide on units??)
+// for the Nexus file, the detector distance should already be corrected for the "setback"
+// of the T/B panels. keep as VCALC variable
         Variable/G gMiddle_SDDOffset = 300                      // (mm)
         
 // detector resolution (xy for each bank!)
-        Variable/G gMiddle_L_pixelX = 0.84              // (cm)         these tubes are vertical
-        Variable/G gMiddle_L_pixelY = 0.8               // (cm)
-        Variable/G gMiddle_R_pixelX = 0.84              // (cm)
-        Variable/G gMiddle_R_pixelY = 0.8               // (cm)
-        
-        Variable/G gMiddle_T_pixelX = 0.4                       // (cm)         these tubes are horizontal
-        Variable/G gMiddle_T_pixelY = 0.84                      // (cm)
-        Variable/G gMiddle_B_pixelX = 0.4                       // (cm)
-        Variable/G gMiddle_B_pixelY = 0.84              // (cm)
+        Make/O/D/N=1 :entry:entry:instrument:detector_ML:x_pixel_size = 0.84            // (cm)         these tubes are vertical 8.4 mm x-spacing (JGB 2/2106)
+        Make/O/D/N=1 :entry:entry:instrument:detector_ML:y_pixel_size = 0.8             // (cm)         //!! now 8 mm, since nPix=128, rather than 256
+        Make/O/D/N=1 :entry:entry:instrument:detector_MR:x_pixel_size = 0.84
+        Make/O/D/N=1 :entry:entry:instrument:detector_MR:y_pixel_size = 0.8
+        //T/B
+        Make/O/D/N=1 :entry:entry:instrument:detector_MT:x_pixel_size = 0.4             //these tubes are horizontal
+        Make/O/D/N=1 :entry:entry:instrument:detector_MT:y_pixel_size = 0.84
+        Make/O/D/N=1 :entry:entry:instrument:detector_MB:x_pixel_size = 0.4
+        Make/O/D/N=1 :entry:entry:instrument:detector_MB:y_pixel_size = 0.84
+
+//      Variable/G gMiddle_L_pixelX = 0.84              // (cm)         these tubes are vertical
+//      Variable/G gMiddle_L_pixelY = 0.8               // (cm)
+//      Variable/G gMiddle_R_pixelX = 0.84              // (cm)
+//      Variable/G gMiddle_R_pixelY = 0.8               // (cm)
+//      
+//      Variable/G gMiddle_T_pixelX = 0.4                       // (cm)         these tubes are horizontal
+//      Variable/G gMiddle_T_pixelY = 0.84                      // (cm)
+//      Variable/G gMiddle_B_pixelX = 0.4                       // (cm)
+//      Variable/G gMiddle_B_pixelY = 0.84              // (cm)
 
 // number of pixels in each bank (this can be modified at acquisition time, so it must be adjustable here)
-        Variable/G gMiddle_L_nPix_X = 48                // == number of tubes
-        Variable/G gMiddle_L_nPix_Y = 128               // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
-        Variable/G gMiddle_R_nPix_X = 48                // == number of tubes
-        Variable/G gMiddle_R_nPix_Y = 128               // == pixels in vertical direction 
-        Variable/G gMiddle_T_nPix_X = 128               // == pixels in horizontal direction
-        Variable/G gMiddle_T_nPix_Y = 48                // == number of tubes
-        Variable/G gMiddle_B_nPix_X = 128               // == pixels in horizontal direction
-        Variable/G gMiddle_B_nPix_Y = 48                // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_ML:pixel_num_x = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_ML:pixel_num_y = 128      // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
+        Make/O/D/N=1 :entry:entry:instrument:detector_MR:pixel_num_x = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_MR:pixel_num_y = 128      // == pixels in vertical direction 
+        Make/O/D/N=1 :entry:entry:instrument:detector_MT:pixel_num_x = 128      // == pixels in horizontal direction
+        Make/O/D/N=1 :entry:entry:instrument:detector_MT:pixel_num_y = 48       // == number of tubes
+        Make/O/D/N=1 :entry:entry:instrument:detector_MB:pixel_num_x = 128      // == pixels in horizontal direction
+        Make/O/D/N=1 :entry:entry:instrument:detector_MB:pixel_num_y = 48       // == number of tubes
+        
+//      Variable/G gMiddle_L_nPix_X = 48                // == number of tubes
+//      Variable/G gMiddle_L_nPix_Y = 128               // == pixels in vertical direction (was 256, John says likely will run @ 128 9/2015)
+//      Variable/G gMiddle_R_nPix_X = 48                // == number of tubes
+//      Variable/G gMiddle_R_nPix_Y = 128               // == pixels in vertical direction 
+//      Variable/G gMiddle_T_nPix_X = 128               // == pixels in horizontal direction
+//      Variable/G gMiddle_T_nPix_Y = 48                // == number of tubes
+//      Variable/G gMiddle_B_nPix_X = 128               // == pixels in horizontal direction
+//      Variable/G gMiddle_B_nPix_Y = 48                // == number of tubes
 
 
@@ -741 +788 @@
         Variable/G gBack_w = 320                                //w and h for the back detector, (mm)
         Variable/G gBack_h = 320
-        Variable/G gBack_pixelX = 0.1           // 1mm resolution (units of cm here)
-        Variable/G gBack_pixelY = 0.1
-        Variable/G gBack_nPix_X = 320           // detector pixels in x-direction
-        Variable/G gBack_nPix_Y = 320   
+        
+        Make/O/D/N=1 :entry:entry:instrument:detector_B:x_pixel_size = 0.1              // 1mm resolution (units of cm here)
+        Make/O/D/N=1 :entry:entry:instrument:detector_B:y_pixel_size = 0.1              
+//      Variable/G gBack_pixelX = 0.1           
+//      Variable/G gBack_pixelY = 0.1
+
+        Make/O/D/N=1 :entry:entry:instrument:detector_B:pixel_num_x = 320       // detector pixels in x-direction
+        Make/O/D/N=1 :entry:entry:instrument:detector_B:pixel_num_y = 320       
+//      Variable/G gBack_nPix_X = 320           
+//      Variable/G gBack_nPix_Y = 320   
 
 
@@ -754 +807 @@
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FL
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_X,root:Packages:NIST:VSANS:VCALC:gFront_L_nPix_Y) det_FL
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FL
         Duplicate/O det_FL qTot_FL,qx_FL,qy_FL,qz_FL
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FR
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_X,root:Packages:NIST:VSANS:VCALC:gFront_R_nPix_Y) det_FR
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FR
         Duplicate/O det_FR qTot_FR,qx_FR,qy_FR,qz_FR
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FT
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_X,root:Packages:NIST:VSANS:VCALC:gFront_T_nPix_Y) det_FT
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FT
         Duplicate/O det_FT qTot_FT,qx_FT,qy_FT,qz_FT
         
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_FB
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_X,root:Packages:NIST:VSANS:VCALC:gFront_B_nPix_Y) det_FB
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_FB
         Duplicate/O det_FB qTot_FB,qx_FB,qy_FB,qz_FB
 
@@ -775 +828 @@
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_ML
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_X,root:Packages:NIST:VSANS:VCALC:gMiddle_L_nPix_Y) det_ML
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_ML
         Duplicate/O det_ML qTot_ML,qx_ML,qy_ML,qz_ML
         
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MR
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_X,root:Packages:NIST:VSANS:VCALC:gMiddle_R_nPix_Y) det_MR
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MR
         Duplicate/O det_MR qTot_MR,qx_MR,qy_MR,qz_MR
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MT
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_X,root:Packages:NIST:VSANS:VCALC:gMiddle_T_nPix_Y) det_MT
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MT
         Duplicate/O det_MT qTot_MT,qx_MT,qy_MT,qz_MT
         
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_MB
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_X,root:Packages:NIST:VSANS:VCALC:gMiddle_B_nPix_Y) det_MB
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_MB
         Duplicate/O det_MB qTot_MB,qx_MB,qy_MB,qz_MB
 
@@ -795 +848 @@
 
         SetDataFolder root:Packages:NIST:VSANS:VCALC:entry:entry:instrument:detector_B
-        Make/O/D/N=(root:Packages:NIST:VSANS:VCALC:gBack_nPix_X,root:Packages:NIST:VSANS:VCALC:gBack_nPix_Y) det_B
+        Make/O/D/N=(pixel_num_x[0],pixel_num_y[0]) det_B
         Duplicate/O det_B qTot_B,qx_B,qy_B,qz_B
 

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_RW_Utils.ipf

@@ -544 +544 @@
 //     wave as passed in, or if it will only write as DP.
 // -- do I need to write separate functions for real, integer, etc.?
+// -- the lines to create a missing group have been commented out to avoid filling
+//    in missing fields that should have been generated by the data writer. Need to make
+//    a separate function that will write and generate if needed, and use this in specific cases
+//    only if I really have to force it.
 //      
 // -x change the /P=home to the user-defined data path (catPathName)            
@@ -578 +582 @@
 //              groupName = "/" + NXentry_name + groupName
                 Print "groupName = ",groupName
+                HDF5OpenGroup /Z fileID , groupName, groupID
+
+                if(!groupID)
+                // don't create the group if the name isn't right -- throw up an error
+                        //HDF5CreateGroup /Z fileID, groupName, groupID
+                        err = 1
+                        HDF5CloseFile /Z fileID
+                        DoAlert 0, "HDF5 group does not exist "+groupName+varname
+                        return(err)
+                else
+                        // get attributes and save them
+                        //HDF5ListAttributes /Z fileID, groupName    this is returning null. expect it to return semicolon delimited list of attributes 
+                        //Wave attributes = S_HDF5ListAttributes
+                endif
+        
+                HDF5SaveData /O /Z /IGOR=0 wav, groupID, varName
+                if (V_flag != 0)
+                        err = 1
+                        abort "Cannot save wave to HDF5 dataset " + varName
+                endif   
+                
+                
+                //attributes - something could be added here as optional parameters and flagged
+//              String attributes = "units"
+//              Make/O/T/N=1 tmp
+//              tmp[0] = "dimensionless"
+//              HDF5SaveData /O /Z /IGOR=0 /A=attributes tmp, groupID, varName
+//              if (V_flag != 0)
+//                      err = 1
+//                      abort "Cannot save attributes to HDF5 dataset"
+//              endif   
+        catch
+
+        endtry
+
+// it is not necessary to close the group here. HDF5CloseFile will close the group as well      
+        if(groupID)
+                HDF5CloseGroup /Z groupID
+        endif
+        
+        if(fileID)
+                HDF5CloseFile /Z fileID 
+        endif
+
+        setDataFolder $cDF
+        return err
+end
+
+//Write Wave 'wav' to hdf5 file 'fname'
+//Based on code from ANSTO (N. Hauser. nha 8/1/09)
+//
+// TODO
+//
+// -x change the /P=home to the user-defined data path (catPathName)            
+//
+Function V_WriteTextWaveToHDF(fname, groupName, varName, wav)
+        String fname, groupName, varName
+        Wave/T wav
+        
+        variable err=0, fileID,groupID
+        String cDF = getDataFolder(1), temp
+        String NXentry_name
+        
+        try     
+                HDF5OpenFile/P=catPathName /Z fileID  as fname  //open file read-write
+                if(!fileID)
+                        err = 1
+                        abort "HDF5 file does not exist"
+                endif
+                
+                //get the NXentry node name
+                HDF5ListGroup /TYPE=1 fileID, "/"
+                //remove trailing ; from S_HDF5ListGroup
+                
+                Print "S_HDF5ListGroup = ",S_HDF5ListGroup
+                
+                NXentry_name = S_HDF5ListGroup
+                NXentry_name = ReplaceString(";",NXentry_name,"")
+                if(strsearch(NXentry_name,":",0)!=-1) //more than one entry under the root node
+                        err = 1
+                        abort "More than one entry under the root node. Ambiguous"
+                endif 
+
+                //concatenate NXentry node name and groupName
+                // SRK - NOV2015 - dropped this and require the full group name passed in
+//              groupName = "/" + NXentry_name + groupName
+                Print "groupName = ",groupName
+
                 HDF5OpenGroup /Z fileID , groupName, groupID
 
@@ -612 +704 @@
 
         endtry
-
-// it is not necessary to close the group here. HDF5CloseFile will close the group as well      
+        
         if(groupID)
                 HDF5CloseGroup /Z groupID
@@ -626 +717 @@
 end
 
-//Write Wave 'wav' to hdf5 file 'fname'
-//Based on code from ANSTO (N. Hauser. nha 8/1/09)
-//
-// TODO
-//
-// -x change the /P=home to the user-defined data path (catPathName)            
-//
-Function V_WriteTextWaveToHDF(fname, groupName, varName, wav)
-        String fname, groupName, varName
-        Wave/T wav
-        
-        variable err=0, fileID,groupID
-        String cDF = getDataFolder(1), temp
-        String NXentry_name
-        
-        try     
-                HDF5OpenFile/P=catPathName /Z fileID  as fname  //open file read-write
-                if(!fileID)
-                        err = 1
-                        abort "HDF5 file does not exist"
-                endif
-                
-                //get the NXentry node name
-                HDF5ListGroup /TYPE=1 fileID, "/"
-                //remove trailing ; from S_HDF5ListGroup
-                
-                Print "S_HDF5ListGroup = ",S_HDF5ListGroup
-                
-                NXentry_name = S_HDF5ListGroup
-                NXentry_name = ReplaceString(";",NXentry_name,"")
-                if(strsearch(NXentry_name,":",0)!=-1) //more than one entry under the root node
-                        err = 1
-                        abort "More than one entry under the root node. Ambiguous"
-                endif 
-
-                //concatenate NXentry node name and groupName
-                // SRK - NOV2015 - dropped this and require the full group name passed in
-//              groupName = "/" + NXentry_name + groupName
-                Print "groupName = ",groupName
-
-                HDF5OpenGroup /Z fileID , groupName, groupID
-
-                if(!groupID)
-                // don't create the group it the name isn't right -- throw up an error
-                        //HDF5CreateGroup /Z fileID, groupName, groupID
-                        err = 1
-                        HDF5CloseFile /Z fileID
-                        DoAlert 0, "HDF5 group does not exist "+groupName+varname
-                        return(err)
-                else
-                        // get attributes and save them
-                        //HDF5ListAttributes /Z fileID, groupName    this is returning null. expect it to return semicolon delimited list of attributes 
-                        //Wave attributes = S_HDF5ListAttributes
-                endif
-        
-                HDF5SaveData /O /Z /IGOR=0 wav, groupID, varName
-                if (V_flag != 0)
-                        err = 1
-                        abort "Cannot save wave to HDF5 dataset " + varName
-                endif   
-                
-                
-                //attributes - something could be added here as optional parameters and flagged
-//              String attributes = "units"
-//              Make/O/T/N=1 tmp
-//              tmp[0] = "dimensionless"
-//              HDF5SaveData /O /Z /IGOR=0 /A=attributes tmp, groupID, varName
-//              if (V_flag != 0)
-//                      err = 1
-//                      abort "Cannot save attributes to HDF5 dataset"
-//              endif   
-        catch
-
-        endtry
-        
-        if(groupID)
-                HDF5CloseGroup /Z groupID
-        endif
-        
-        if(fileID)
-                HDF5CloseFile /Z fileID 
-        endif
-
-        setDataFolder $cDF
-        return err
-end
-
 //////////////////////////////
 //////////////////////////////
 //////////////////////////////
 
+// TODO:
+// -- this must be called as needed to force a re-read of the data from disk
+//    "as needed" means that when an operation is done that needs to ensure
+//     a fresh read from disk, it must take care of the kill.
+// -- the ksBaseDFPath needs to be removed. It's currently pointing to RawVSANS, which is
+//    really not used as intended anymore.
+//
 Function V_KillNamedDataFolder(fname)
         String fname
@@ -735 +746 @@
 //returns the name as a string without the ".fbdfasga" extension
 //
-// returns the input string if a"." can't be found (maybe it wasn't there"
+// returns the input string if a "." can't be found (maybe it wasn't there)
 Function/S V_RemoveDotExtension(item)
         String item

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_HDF5_Write.ipf

@@ -22 +22 @@
 //////////////////////////////////////////////
 //////////////////////////////////
-// for TESTING of the get functions - to quickly access and se if there are errors
+// for TESTING of the get functions - to quickly access and see if there are errors
 //
 // -- not sure how to test the string functions -- can't seem to get a FUNCREF to a string function
@@ -183 +183 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -211 +211 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -236 +236 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -262 +262 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -290 +290 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -316 +316 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -342 +342 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -368 +368 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -394 +394 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -422 +422 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -447 +447 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -473 +473 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -500 +500 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -526 +526 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -559 +559 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -592 +592 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -618 +618 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -644 +644 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -670 +670 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -696 +696 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -722 +722 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -748 +748 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -773 +773 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -800 +800 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -825 +825 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -850 +850 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -882 +882 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -907 +907 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -932 +932 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -962 +962 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -990 +990 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1017 +1017 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1044 +1044 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1071 +1071 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1100 +1100 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1126 +1126 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1153 +1153 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1179 +1179 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1208 +1208 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1233 +1233 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1258 +1258 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1283 +1283 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1308 +1308 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1333 +1333 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1357 +1357 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1382 +1382 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1410 +1410 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1435 +1435 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1459 +1459 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1485 +1485 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1509 +1509 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1535 +1535 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1561 +1561 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1586 +1586 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1612 +1612 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1637 +1637 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1662 +1662 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1687 +1687 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1712 +1712 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1737 +1737 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1762 +1762 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1786 +1786 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -1812 +1812 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1837 +1837 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1862 +1862 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1887 +1887 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1912 +1912 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1938 +1938 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1963 +1963 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -1987 +1987 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2015 +2015 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2041 +2041 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2066 +2066 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2091 +2091 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2116 +2116 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2141 +2141 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2167 +2167 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2192 +2192 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2217 +2217 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2243 +2243 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -2267 +2267 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2292 +2292 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2319 +2319 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2343 +2343 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2371 +2371 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2396 +2396 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2421 +2421 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2446 +2446 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2470 +2470 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2500 +2500 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2525 +2525 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2550 +2550 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2575 +2575 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2599 +2599 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2626 +2626 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2651 +2651 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2676 +2676 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2701 +2701 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2725 +2725 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2751 +2751 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2777 +2777 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2802 +2802 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2827 +2827 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2854 +2854 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2880 +2880 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2907 +2907 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -2932 +2932 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -2970 +2970 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3003 +3003 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3034 +3034 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3063 +3063 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3089 +3089 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3114 +3114 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3141 +3141 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3169 +3169 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
-        return(err)
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
+        return(err)
+End
+
+// fname is a local WORK folder
+Function V_putDet_beam_center_x(fname,detStr,val)
+        String fname,detStr
+        Variable val
+
+//root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FB:beam_center_x
+        String path = "root:Packages:NIST:VSANS:"+fname+":entry:"
+        path += "entry:instrument:detector_"+detStr+":beam_center_x"
+        
+        Wave/Z w = $path
+        if(waveExists(w) == 0)
+                return(1)
+        else
+        w[0] = val
+                return(0)
+        endif
+
 End
 
@@ -3194 +3213 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
-        return(err)
-End
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
+        return(err)
+End
+
+
+// fname is a local WORK folder
+Function V_putDet_beam_center_y(fname,detStr,val)
+        String fname,detStr
+        Variable val
+
+//root:Packages:NIST:VSANS:RAW:entry:entry:instrument:detector_FB:beam_center_y
+        String path = "root:Packages:NIST:VSANS:"+fname+":entry:"
+        path += "entry:instrument:detector_"+detStr+":beam_center_y"
+        
+        Wave/Z w = $path
+        if(waveExists(w) == 0)
+                return(1)
+        else
+        w[0] = val
+                return(0)
+        endif
+
+End
+
 
 // TODO -- write this function to return a WAVE with the data
@@ -3223 +3263 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3255 +3295 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3280 +3320 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3306 +3346 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3333 +3373 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3360 +3400 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3386 +3426 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3411 +3451 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3436 +3476 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3463 +3503 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3493 +3533 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         else
@@ -3520 +3560 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3547 +3587 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3571 +3611 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3597 +3637 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3622 +3662 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3652 +3692 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         endif
@@ -3682 +3722 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         endif
@@ -3715 +3755 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         endif
@@ -3745 +3785 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         endif
@@ -3773 +3813 @@
         
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 
                 return(err)
@@ -3805 +3845 @@
                 endif
                 // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-                err = V_KillNamedDataFolder(fname)
-                if(err)
-                        Print "DataFolder kill err = ",err
-                endif
+//              err = V_KillNamedDataFolder(fname)
+//              if(err)
+//                      Print "DataFolder kill err = ",err
+//              endif
                 return(err)
         endif
@@ -3836 +3876 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3860 +3900 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3886 +3926 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3910 +3950 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3935 +3975 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -3961 +4001 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -3986 +4026 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -4011 +4051 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -4035 +4075 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4061 +4101 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4089 +4129 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4115 +4155 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -4140 +4180 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4171 +4211 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End     
@@ -4198 +4238 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4224 +4264 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -4249 +4289 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4280 +4320 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End     
@@ -4307 +4347 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4335 +4375 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End     
@@ -4361 +4401 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4388 +4428 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End     
@@ -4413 +4453 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4439 +4479 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4467 +4507 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4493 +4533 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End
@@ -4518 +4558 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4549 +4589 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 End             
@@ -4583 +4623 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4609 +4649 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4636 +4676 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4663 +4703 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4690 +4730 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4716 +4756 @@
         
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
                 
         return(err)
@@ -4744 +4784 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4771 +4811 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
         return(err)
 end
@@ -4797 +4837 @@
         endif
         // now be sure to kill the data folder to force a re-read of the data next time this file is read in
-        err = V_KillNamedDataFolder(fname)
-        if(err)
-                Print "DataFolder kill err = ",err
-        endif
+//      err = V_KillNamedDataFolder(fname)
+//&