Changeset 1022

Timestamp:

Feb 2, 2017 9:52:47 AM (6 years ago)

Author:

srkline

Message:

ADDED:

included common NCNR procedures for the PlotManager?, to allow plotting of 1D data sets using a familiar interface

greatly expanded Patch functionality to include input in the multiple sections of the Nexus file, including separate panels to handle patching of waves to the file - needed for non-linear coefficients, dead time, and XY beam centers. All patch operations are expandable as more fields become necessary to patch.

removed bug of group_id being defined in /reduction and in /sample (removed R/W that referenced /reduction)

added panel to "isolate" a single detector panel, allowing the corrections to be applied/removed/recalculated as needed to directly see their effects.

linked new procedures to their appropriate action buttons

Added more data fields (label, intent, etc.) to the VCALC to Nexus data writer to get more realistic values into the fake data files for testing

Added VCALC simulation functions with EMP and BGD in anticipation of testing the CORRECT step

more little bug and documentation fixes which I can't remember, but they are all important...

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/Packages/PlotManager/PlotManager_v40.ipf (modified) (1 diff)
• Reduction/VSANS/VC_BeamCenter.ipf (modified) (1 diff)
• Reduction/VSANS/VC_DetectorBinning_Q.ipf (modified) (1 diff)
• Reduction/VSANS/VC_DetectorBinning_Utils.ipf (modified) (2 diffs)
• Reduction/VSANS/VC_VCALCPanel_MockUp.ipf (modified) (1 diff)
• Reduction/VSANS/VSANS_Includes.ipf (modified) (3 diffs)
• Reduction/VSANS/V_DataPlotting.ipf (modified) (16 diffs)
• Reduction/VSANS/V_Detector_Isolate.ipf (added)
• Reduction/VSANS/V_HDF5_Read.ipf (modified) (1 diff)
• Reduction/VSANS/V_HDF5_Write.ipf (modified) (2 diffs)
• Reduction/VSANS/V_IQ_Utilities.ipf (modified) (4 diffs)
• Reduction/VSANS/V_Initialize.ipf (modified) (1 diff)
• Reduction/VSANS/V_Menu.ipf (modified) (1 diff)
• Reduction/VSANS/V_PatchFiles.ipf (modified) (42 diffs)
• Reduction/VSANS/V_Test_RAW_Panel.ipf (modified) (2 diffs)
• Reduction/VSANS/V_Testing_Data_Procs.ipf (modified) (7 diffs)
• Reduction/VSANS/V_Utilities_General.ipf (modified) (4 diffs)
• Reduction/VSANS/V_VSANS_Preferences.ipf (modified) (3 diffs)
• Reduction/VSANS/V_WorkFolderUtils.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf

@@ -157 +157 @@
         Variable rr,gg,bb
         
-        SVAR angst = root:Packages:NIST:gAngstStr
+        SVAR/Z angst = root:Packages:NIST:gAngstStr
         
         SetDataFolder $("root:"+DF)

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

@@ -145 +145 @@
 //
 // -- 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)
+//    calculation from spilling 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

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

@@ -920 +920 @@
         endif
 
-        if(binType==4)          // slit aperture binning - Mt, ML, MR, MB are averaged
+        if(binType==4)          // slit aperture binning - MT, ML, MR, MB are averaged
                 ClearIQIfDisplayed("VCALC","MLRTB")
                 ClearIQIfDisplayed("VCALC","MLR")

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

@@ -49 +49 @@
         //
         // peak @ 0.015 in middle of middle detector, maybe not "real" vycor, but that is to be resolved
-        //      Make/O/D coef_BroadPeak = {1e-9, 3, 20, 500.0, 0.015,3,0.1}             
+        //      Make/O/D coef_BroadPeak = {1e-9, 3, 20, 500.0, 0.015,3,0.1}     
+        //
+        //
+        Variable addEmpBgd=0
+        
+                
         String funcStr = VCALC_getModelFunctionStr()
         strswitch(funcStr)
@@ -76 +81 @@
                         tmpInten = VC_BlockedBeam(1,qTot[p][q])
                         break
+                case "Debye +":
+                        tmpInten = VC_Debye(10,300,0.0001,qTot[p][q])
+                        addEmpBgd = 1
+                        break
+                case "AgBeh +":
+                        tmpInten = VC_BroadPeak(1e-9,3,20,100.0,0.1,3,0.1,qTot[p][q])
+                        addEmpBgd = 1
+                        break
+                case "Empty Cell +":
+                        tmpInten = VC_EC_Empirical(2.2e-8,3.346,0.0065,9.0,0.016,qTot[p][q])
+                        tmpInten += VC_BlockedBeam(1,qTot[p][q])
+                        break
                 default:
                         tmpInten = VC_Debye(10,300,0.1,qTot[p][q])
         endswitch
 
+
+        if(addEmpBgd == 1)
+                tmpInten += VC_EC_Empirical(2.2e-8,3.346,0.0065,9.0,0.016,qTot[p][q])
+                tmpInten += VC_BlockedBeam(1,qTot[p][q])
+        endif
+
+        
 // TODO: this is faked to get around the singularity at the center of the back detector
 //

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

@@ -912 +912 @@
 // tab 5
         String/G gModelFunctionType = "Debye;Sphere;Big Debye;Big Sphere;AgBeh;Vycor;Empty Cell;Blocked Beam;"
-
+        gModelFunctionType += "Debye +;AgBeh +;Empty Cell +;"
 
 ////////////////////

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

@@ -8 +8 @@
         return(0)
 End
+
+
+// These files are COMMON NCNR FILES
+// the first three are necessary for loading and plotting of 1D data sets
+// using the PlotManager
+#include "PlotUtilsMacro_v40"
+#include "PlotManager_v40"
+#include "NIST_XML_v40"
+
+
+
+// VC designation is for VCALC (mostly)
+// and V designation is for VSANS
+// no prefix = COMMON procedure files
+//  note that the common files are not in the VSANS procedure folder and
+//  are not included in the line count
 
 
@@ -53 +69 @@
 #include "V_DataPlotting"
 
-// 1D binning, combining
+// 1D binning, combining 1D sets
 #include "V_IQ_Utilities"
 
-// testing procedures
+// testing procedures, to fill fake data from VCALC simulations
 #include "V_Testing_Data_Procs"
 
@@ -71 +87 @@
 
 #include "V_Correct"
+#include "V_Detector_Isolate"
+

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

@@ -13 +13 @@
 // simple entry procedure
 //
-Function V_PlotData_Panel()
-        DoWindow V_1D_Data
-        if(V_flag==0)
-                Execute "V_DrawPlotPanel()"
-        else
-                SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType
-
-                V_QBinAllPanels(type)
-
-        // TODO:
-        // x- "B" detector is currently skipped - Q is not yet calculated
-                Execute ("V_Back_IQ_Graph(\""+type+"\")")
-                Execute ("V_Middle_IQ_Graph(\""+type+"\")")
-                Execute ("V_Front_IQ_Graph(\""+type+"\")")
-        endif
-End
-
-
 // graph with the 1D representation of the VSANS detectors
 //
@@ -42 +24 @@
 // -- see Middle_IQ_Graph() and similar for how VCALC does this plot
 //
-Proc V_DrawPlotPanel()
-        
-        String type = root:Packages:NIST:VSANS:Globals:gCurDispType
-
-        PauseUpdate; Silent 1           // building window...
-        Display /W=(277,526,748,938)/N=V_1D_Data
+// -- when/if I want to add phi-averaging to this, go gack to AvgGraphics.ipf for the pink panel
+//    and to the function Draw_Plot1D() for the drawing of the plot
+//
+Function V_PlotData_Panel()
+
+
+        DoWindow V_1D_Data
+        if(V_flag==0)
+        
+                Display /W=(277,526,748,938)/N=V_1D_Data/K=1
+//              Display /W=(476,96,850,429)/N=V_1D_Data/K=1
+                ControlBar 70
+                
+                PopupMenu popup0,pos={16,5},size={71,20},title="Bin Type"
+                PopupMenu popup0,help={"This popup selects how the y-axis will be linearized based on the chosen data"}
+                PopupMenu popup0,value= "One;Two;Four;Slit Mode;"
+                PopupMenu popup0,mode=1,proc=V_BinningModePopup
+//              PopupMenu ymodel,pos={16,5},size={71,20},title="y-axis"
+//              PopupMenu ymodel,help={"This popup selects how the y-axis will be linearized based on the chosen data"}
+//              PopupMenu ymodel,value= #"\"I;log(I);ln(I);1/I;I^a;Iq^a;I^a q^b;1/sqrt(I);ln(Iq);ln(Iq^2)\""
+//              PopupMenu ymodel,mode=NumVarOrDefault("root:myGlobals:Plot_1d:gYMode", 1 ),proc=YMode_PopMenuProc
+//              PopupMenu xmodel,pos={150,5},size={74,20},title="x-axis"
+//              PopupMenu xmodel,help={"This popup selects how the x-axis will be linearized given the chosen data"}
+//              PopupMenu xmodel,value= #"\"q;log(q);q^2;q^c\""
+//              PopupMenu xmodel,mode=NumVarOrDefault("root:myGlobals:Plot_1d:gXMode", 1 ),proc=XMode_PopMenuProc
+//              Button Rescale,pos={281,4},size={70,20},proc=Rescale_Plot_1D_ButtonProc,title="Rescale"
+//              Button Rescale,help={"Rescale the x and y-axes of the data"},disable=1
+
+//              SetVariable expa,pos={28,28},size={80,15},title="pow \"a\""
+//              SetVariable expa,help={"This sets the exponent \"a\" for some y-axis formats. The value is ignored if the model does not use an adjustable exponent"}
+//              SetVariable expa,limits={-2,10,0},value= root:myGlobals:Plot_1d:gExpA
+//              SetVariable expb,pos={27,46},size={80,15},title="pow \"b\""
+//              SetVariable expb,help={"This sets the exponent \"b\" for some x-axis formats. The value is ignored if the model does not use an adjustable exponent"}
+//              SetVariable expb,limits={0,10,0},value= root:myGlobals:Plot_1d:gExpB
+//
+//              SetVariable expc,pos={167,28},size={80,15},title="pow \"c\""
+//              SetVariable expc,help={"This sets the exponent \"c\" for some x-axis formats. The value is ignored if the model does not use \"c\" as an adjustable exponent"}
+//              SetVariable expc,limits={-10,10,0},value= root:myGlobals:Plot_1d:gExpC
+                
+                Button AllQ,pos={281,28},size={70,20},proc=V_AllQ_Plot_1D_ButtonProc,title="All Q"
+                Button AllQ,help={"Show the full q-range of the dataset"}
+                
+        endif
+                
+        
+        SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType
 
         V_QBinAllPanels(type)
 
-// TODO 
+// TODO:
 // x- "B" detector is currently skipped - Q is not yet calculated
-        V_Back_IQ_Graph(type)
-        V_Middle_IQ_Graph(type)
-        V_Front_IQ_Graph(type)
-        
-End
-
-
+        Execute ("V_Back_IQ_Graph(\""+type+"\")")
+        Execute ("V_Middle_IQ_Graph(\""+type+"\")")
+        Execute ("V_Front_IQ_Graph(\""+type+"\")")
+        
+        
+End
+
+//function to restore the graph axes to full scale, undoing any zooming
+Function V_AllQ_Plot_1D_ButtonProc(ctrlName) : ButtonControl
+        String ctrlName
+        
+//      DoWindow/F V_1D_Data
+        SetAxis/A
+End
+
+
+//
+// recalculate the I(q) binning. no need to adjust model function or views
+// just rebin
+//
+Function V_BinningModePopup(ctrlName,popNum,popStr) : PopupMenuControl
+        String ctrlName
+        Variable popNum // which item is currently selected (1-based)
+        String popStr           // contents of current popup item as string
+
+        SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType
+
+        V_QBinAllPanels(type)
+
+        Execute ("V_Back_IQ_Graph(\""+type+"\")")
+        Execute ("V_Middle_IQ_Graph(\""+type+"\")")
+        Execute ("V_Front_IQ_Graph(\""+type+"\")")
+        
+        return(0)       
+End
+
+Function V_GetBinningPopMode()
+
+        Variable binType
+        ControlInfo/W=V_1D_Data popup0
+        strswitch(S_Value)      // string switch
+                case "One":
+                        binType = 1
+                        break           // exit from switch
+                case "Two":
+                        binType = 2
+                        break           // exit from switch
+                case "Four":
+                        binType = 3
+                        break           // exit from switch
+                case "Slit Mode":
+                        binType = 4
+                        break           // exit from switch
+
+                default:                        // optional default expression executed
+                        binType = 0
+                        Abort "Binning mode not found in        V_QBinAllPanels() "// when no case matches
+        endswitch
+        
+        return(binType)
+end
 
 //
@@ -68 +144 @@
 //
 // TODO
-// -- need to set binType
-// -- currently  hard-wired == 1
-//
+// x- need to set binType
+// x- currently  hard-wired == 1
+//
+// input "type" is the data type and defines the folder
 //
 Proc V_Middle_IQ_Graph(type) 
@@ -76 +153 @@
 
         Variable binType
-        
-//      ControlInfo/W=VCALC popup_b
-//      binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
-
-        binType = 1
+
+        binType = V_GetBinningPopMode()
         SetDataFolder $("root:Packages:NIST:VSANS:"+type)
 
 // clear EVERYTHING
+//              ClearAllIQIfDisplayed("MLRTB")
+//              ClearAllIQIfDisplayed("MLR")
+//              ClearAllIQIfDisplayed("MTB")            //this returns to root:
+//              ClearAllIQIfDisplayed("MT")     
+//              ClearAllIQIfDisplayed("ML")     
+//              ClearAllIQIfDisplayed("MR")     
+//              ClearAllIQIfDisplayed("MB")     
+
+        if(binType==1)
                 ClearAllIQIfDisplayed("MLRTB")
                 ClearAllIQIfDisplayed("MLR")
@@ -90 +173 @@
                 ClearAllIQIfDisplayed("ML")     
                 ClearAllIQIfDisplayed("MR")     
-                ClearAllIQIfDisplayed("MB")     
-
-        if(binType==1)
-//              ClearAllIQIfDisplayed("MLRTB")
-//              ClearAllIQIfDisplayed("MLR")
-//              ClearAllIQIfDisplayed("MTB")            //this returns to root:
-//              ClearAllIQIfDisplayed("MT")     
-//              ClearAllIQIfDisplayed("ML")     
-//              ClearAllIQIfDisplayed("MR")     
-//              ClearAllIQIfDisplayed("MB")                     
+                ClearAllIQIfDisplayed("MB")                     
                 SetDataFolder $("root:Packages:NIST:VSANS:"+type)
                 CheckDisplayed/W=V_1D_Data iBin_qxqy_ML
@@ -120 +194 @@
         
         if(binType==2)
-//              ClearAllIQIfDisplayed("MLRTB")
-//              ClearAllIQIfDisplayed("MT")     
-//              ClearAllIQIfDisplayed("ML")     
-//              ClearAllIQIfDisplayed("MR")     
-//              ClearAllIQIfDisplayed("MB")
+                ClearAllIQIfDisplayed("MLRTB")
+                ClearAllIQIfDisplayed("MT")     
+                ClearAllIQIfDisplayed("ML")     
+                ClearAllIQIfDisplayed("MR")     
+                ClearAllIQIfDisplayed("MB")
         
 
@@ -148 +222 @@
         
         if(binType==3)
-//              ClearAllIQIfDisplayed("MLR")
-//              ClearAllIQIfDisplayed("MTB")    
-//              ClearAllIQIfDisplayed("MT")     
-//              ClearAllIQIfDisplayed("ML")     
-//              ClearAllIQIfDisplayed("MR")     
-//              ClearAllIQIfDisplayed("MB")     
+                ClearAllIQIfDisplayed("MLR")
+                ClearAllIQIfDisplayed("MTB")    
+                ClearAllIQIfDisplayed("MT")     
+                ClearAllIQIfDisplayed("ML")     
+                ClearAllIQIfDisplayed("MR")     
+                ClearAllIQIfDisplayed("MB")     
         
                 SetDataFolder $("root:Packages:NIST:VSANS:"+type)
@@ -173 +247 @@
         endif
 
-        if(binType==4)          // slit aperture binning - Mt, ML, MR, MB are averaged
-//              ClearAllIQIfDisplayed("MLRTB")
-//              ClearAllIQIfDisplayed("MLR")
-//              ClearAllIQIfDisplayed("MTB")
-                
-//              SetDataFolder root:Packages:NIST:VSANS:VCALC
+        if(binType==4)          // slit aperture binning - MT, ML, MR, MB are averaged
+                ClearAllIQIfDisplayed("MLRTB")
+                ClearAllIQIfDisplayed("MLR")
+                ClearAllIQIfDisplayed("MTB")
+                
+                SetDataFolder $("root:Packages:NIST:VSANS:"+type)
                 CheckDisplayed/W=V_1D_Data iBin_qxqy_ML
                 
                 if(V_flag==0)
-                        AppendtoGraph/W=V_1D_Data iBin_qxqy_ML vs qBin_qxqy_ML
+                        AppendToGraph/W=V_1D_Data iBin_qxqy_ML vs qBin_qxqy_ML
                         AppendToGraph/W=V_1D_Data iBin_qxqy_MR vs qBin_qxqy_MR
                         AppendToGraph/W=V_1D_Data iBin_qxqy_MT vs qBin_qxqy_MT
@@ -208 +282 @@
 //
 // TODO
-// -- need to set binType
-// -- currently  hard-wired == 1
+// x- need to set binType
+// x- currently  hard-wired == 1
 //
 //
@@ -216 +290 @@
 
         Variable binType
-        
-//      ControlInfo/W=VCALC popup_b
-//      binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
-
-        binType = 1
+
+
+        binType = V_GetBinningPopMode()
         SetDataFolder $("root:Packages:NIST:VSANS:"+type)
 
 // clear EVERYTHING
+//              ClearAllIQIfDisplayed("FLRTB")
+//              
+//              ClearAllIQIfDisplayed("FLR")
+//              ClearAllIQIfDisplayed("FTB")
+//
+//              ClearAllIQIfDisplayed("FT")     
+//              ClearAllIQIfDisplayed("FL")     
+//              ClearAllIQIfDisplayed("FR")     
+//              ClearAllIQIfDisplayed("FB")
+                
+        if(binType==1)
                 ClearAllIQIfDisplayed("FLRTB")
                 
@@ -233 +316 @@
                 ClearAllIQIfDisplayed("FR")     
                 ClearAllIQIfDisplayed("FB")
-                
-        if(binType==1)
-//              ClearAllIQIfDisplayed("FLRTB")
-//              
-//              ClearAllIQIfDisplayed("FLR")
-//              ClearAllIQIfDisplayed("FTB")
-//
-//              ClearAllIQIfDisplayed("FT")     
-//              ClearAllIQIfDisplayed("FL")     
-//              ClearAllIQIfDisplayed("FR")     
-//              ClearAllIQIfDisplayed("FB")
                                 
                 SetDataFolder $("root:Packages:NIST:VSANS:"+type)
@@ -265 +337 @@
         
         if(binType==2)
-//              ClearAllIQIfDisplayed("FLRTB")
-//              ClearAllIQIfDisplayed("FT")     
-//              ClearAllIQIfDisplayed("FL")     
-//              ClearAllIQIfDisplayed("FR")     
-//              ClearAllIQIfDisplayed("FB")
-//      
+                ClearAllIQIfDisplayed("FLRTB")
+                ClearAllIQIfDisplayed("FT")     
+                ClearAllIQIfDisplayed("FL")     
+                ClearAllIQIfDisplayed("FR")     
+                ClearAllIQIfDisplayed("FB")     
 
                 SetDataFolder $("root:Packages:NIST:VSANS:"+type)
@@ -293 +364 @@
         
         if(binType==3)
-//              ClearAllIQIfDisplayed("FLR")
-//              ClearAllIQIfDisplayed("FTB")    
-//              ClearAllIQIfDisplayed("FT")     
-//              ClearAllIQIfDisplayed("FL")     
-//              ClearAllIQIfDisplayed("FR")     
-//              ClearAllIQIfDisplayed("FB")     
+                ClearAllIQIfDisplayed("FLR")
+                ClearAllIQIfDisplayed("FTB")    
+                ClearAllIQIfDisplayed("FT")     
+                ClearAllIQIfDisplayed("FL")     
+                ClearAllIQIfDisplayed("FR")     
+                ClearAllIQIfDisplayed("FB")     
         
                 SetDataFolder $("root:Packages:NIST:VSANS:"+type)
@@ -318 +389 @@
         endif
 
-        if(binType==4)          // slit aperture binning - Mt, ML, MR, MB are averaged
-//              ClearAllIQIfDisplayed("FLRTB")
-//              ClearAllIQIfDisplayed("FLR")
-//              ClearAllIQIfDisplayed("FTB")
-                
-//              SetDataFolder root:Packages:NIST:VSANS:VCALC
+        if(binType==4)          // slit aperture binning - MT, ML, MR, MB are averaged
+                ClearAllIQIfDisplayed("FLRTB")
+                ClearAllIQIfDisplayed("FLR")
+                ClearAllIQIfDisplayed("FTB")
+                
+                SetDataFolder $("root:Packages:NIST:VSANS:"+type)
                 CheckDisplayed/W=V_1D_Data iBin_qxqy_FL
                 
@@ -348 +419 @@
 
 // TODO
-// -- need to set binType
-// -- currently  hard-wired == 1
+// x- need to set binType
+// x- currently  hard-wired == 1
 //
 ////////////to plot the back panel I(q)
@@ -358 +429 @@
 
         Variable binType
-        
-//      ControlInfo/W=VCALC popup_b
-//      binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
-
-        bintype = 1
-        
-                SetDataFolder $("root:Packages:NIST:VSANS:"+type)       
+
+        binType = V_GetBinningPopMode()
+        
+        SetDataFolder $("root:Packages:NIST:VSANS:"+type)       
 
         if(binType==1 || binType==2 || binType==3)

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

@@ -2296 +2296 @@
 
 //group ID
-// TODO -- is this duplicated?
+// DONE
+// x- is this duplicated?
+// x- yes, this is a duplicated field in the /entry/sample block (and is probably more appropriate there)
+// x- so pick a single location, rather than needing to duplicate.
+//
 Function V_getSample_group_ID(fname)
         String fname
-        
-        String path = "entry:reduction:group_id"        
+
+// do not use the entry/reduction location
+//      String path = "entry:reduction:group_id" 
+        String path = "entry:sample:group_id"   
+
         return(V_getRealValueFromHDF5(fname,path))
 end

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

@@ -5806 +5806 @@
 end
 
-// TODO -- do  I need to make sure that this is an integer?
+
+//
+// TODO -- I need to make sure that this is an integer in the JSON definition
+//              -- currently a text value in the data file - see trac ticket
+// x- this is also a duplicated field in the reduction block (reductio/group_id is no longer used)
+//
 // group ID !!! very important for matching up files
 // integer value
+//
 Function V_writeSample_GroupID(fname,val)
         String fname
@@ -6594 +6600 @@
 End
 
-// TODO -- is this duplicated?
-Function V_writeReduction_group_ID(fname,val)
-        String fname
-        Variable val
-        
-//      String path = "entry:reduction:box_count_error" 
-        
-        Make/O/D/N=1 wTmpWrite
-//      Make/O/R/N=1 wTmpWrite
-        String groupName = "/entry/reduction"
-        String varName = "group_id"
-        wTmpWrite[0] = val
-
-        variable err
-        err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite)
-        if(err)
-                Print "HDF write err = ",err
-        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
+// DONE x- commented out, not to be used
+//  x- is this duplicated? - yes - this is duplicated in /entry/sample
+//  x- so I need to pick a location, or be sure to fix it in both places
+//Function V_writeReduction_group_ID(fname,val)
+//      String fname
+//      Variable val
+//      
+////    String path = "entry:reduction:group_id"        
+//      
+//      Make/O/D/N=1 wTmpWrite
+////    Make/O/R/N=1 wTmpWrite
+//      String groupName = "/entry/reduction"
+//      String varName = "group_id"
+//      wTmpWrite[0] = val
+//
+//      variable err
+//      err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite)
+//      if(err)
+//              Print "HDF write err = ",err
+//      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
 
 Function V_writeReductionIntent(fname,str)

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

@@ -2 +2 @@
 #pragma rtGlobals=3             // Use modern global access method and strict wave access.
 
-
-//
 //
 // does no scaling, only the basic (default) trim of the ends, concatenate, sort, and save
-//
-// TODO:
-// -- fill in all of the details...
 //
 
@@ -17 +12 @@
 //
 // TODO 
+//
+// -- verify the binning for slit mode. Looks correct, but verify
+// -- DOCUMENT
+//
 // x- detector "B" is currently skipped since the calibration waves are not faked
 //    when the raw data is loaded. Then the qxqyqz waves are not generated.
 //
-// -- REDO the logic here. It's a mess, and will get the calculation wrong 
-//
-// -- figure out the binning type (where is it set for VSANS?)
-// -- don't know, so currently VSANS binning type is HARD-WIRED
-// -- figure out when this needs to be called to (force) re-calculate I vs Q
-//
+// x- REDO the logic here. It's a mess, and will get the calculation wrong 
+//
+// x- figure out the binning type (where is it set for VSANS?)
+// x- don't know, so currently VSANS binning type is HARD-WIRED
+// x- figure out when this needs to be called to (force) re-calculate I vs Q
+//
+
+
+
+
 Function V_QBinAllPanels(folderStr)
         String folderStr
@@ -34 +37 @@
         Variable binType,ii,delQ
         String detStr
-        binType = 1
-        
-        
+
+        binType = V_GetBinningPopMode()
 
 //// TODO:
@@ -94 +96 @@
         return(0)
 End
-
 
 

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

@@ -138 +138 @@
         //check platform, so Angstrom can be drawn correctly
 
-        //TODO  - this is different on Igor 7
+        //TODO  - this is different on Igor 7. Macintosh # has been updated, but Windows has not
+        // use Print char2num("Ã
+") to find the magic number
         if(cmpstr("Macintosh",IgorInfo(2)) == 0)
-                String/G root:Packages:NIST:VSANS:Globals:gAngstStr = num2char(-127)
+                String/G root:Packages:NIST:VSANS:Globals:gAngstStr = num2char(197)
+                String/G root:Packages:NIST:gAngstStr = num2char(197)
                 Variable/G root:Packages:NIST:VSANS:Globals:gIsMac = 1
         else
                 //either Windows or Windows NT
                 String/G root:Packages:NIST:VSANS:Globals:gAngstStr = num2char(-59)
+                String/G root:Packages:NIST:gAngstStr = num2char(-59)
                 Variable/G root:Packages:NIST:VSANS:Globals:gIsMac = 0
                 //SetIgorOption to keep some PC's (graphics cards?) from smoothing the 2D image

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

@@ -24 +24 @@
                 "Patch Beam Center XY",V_PatchDet_xyCenters_Panel()
                 "Patch Detector Deadtime",V_PatchDetectorDeadtimePanel()
+                "Patch Detector Calibration",V_PatchDetectorCalibrationPanel()
         End
         Submenu "Work Files"

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

@@ -14 +14 @@
 //
 ///////////////////////////////
-
-//
-// Updated for use with VSANS (in process)
-// -- currently very crude, and needs to be changed to accomodate the 
-//   large number of parameters in the file that may/will need to be patched.
-// -- if this turns out to be too crude or too difficult to work with for what 
-//   VSANS needs, I may ditch the entire procedure and start fresh
-//
-// June 2016 SRK
-//
 
 // TODOs have been inserted to comment out all of the calls that don't compile and need to be replaced
@@ -41 +31 @@
 //               different, and this may lead to different interface choices
 //
+// -- need to add some mechanism (new panel?) to enter:
+//    -- box coordinates
+//    -- ABS parameters
+//    -- averaging options -- these will have new options versus SANS (binning panels, slit mode, etc.)
 //
 
 
 //**************************
-// Vers. 1.2 092101
-//
-//procedures required to allow patching of raw SANS data headers
-//only a limited number of fields are allowable for changes, although the list could
-//be enhanced quite easily, at the expense of a larger, more complex panel
+//
+//procedures required to allow patching of raw vSANS data headers
 //information for the Patch Panel is stored in the root:Packages:NIST:VSANS:Globals:Patch subfolder
 //
@@ -72 +63 @@
 
 //initialization of the panel, creating the necessary data folder and global
-//variables if necessary - simultaneously initialize the globals for the Trans
-//panel at this time, to make sure they all exist
+//variables if necessary - 
 //
 // root:Packages:NIST:VSANS:Globals:
@@ -91 +81 @@
         //ok, create the globals
         String/G root:Packages:NIST:VSANS:Globals:Patch:gPatchMatchStr = "*"
+        String/G root:Packages:NIST:VSANS:Globals:Patch:gPatchCurLabel = "no file selected"
+        
         PathInfo catPathName
         If(V_flag==1)
@@ -99 +91 @@
         endif
         String/G root:Packages:NIST:VSANS:Globals:Patch:gPatchList = "none"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS1 = "no file selected"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS2 = "no file selected"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS3 = "no box selected"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS4 = "no file selected"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS5 = "no file selected"
-//      String/G root:Packages:NIST:VSANS:Globals:Patch:gPS6 = "no file selected"
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV1 =0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV2 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV3 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV4 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV5 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV6 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV7 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV8 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV9 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV10 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV11 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV12 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV13 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV14 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV15 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV16 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV17 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV18 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gPV19 = 0
-//      Variable/G root:Packages:NIST:VSANS:Globals:Patch:gTransCts = 0
+
         Variable/G root:Packages:NIST:VSANS:Globals:Patch:gRadioVal = 1
         
@@ -171 +138 @@
         PopupMenu PatchPopup,help={"The displayed file is the one that will be edited. The entire list will be edited if \"Change All..\" is selected. \r If no items, or the wrong items appear, click on the popup to refresh. \r List items are selected from the file based on MatchString"}
         PopupMenu PatchPopup,mode=1,popvalue="none",value= #"root:Packages:NIST:VSANS:Globals:Patch:gPatchList"
-//      Button SHButton,pos={324,37},size={100,20},proc=ShowHeaderButtonProc,title="Show Header"
-//      Button SHButton,help={"This will display the header of the file indicated in the popup menu."}
+
         Button CHButton,pos={314,37},size={110,20},proc=V_ChangeHeaderButtonProc,title="Change Header"
         Button CHButton,help={"This will change the checked values (ONLY) in the single file selected in the popup."}
@@ -181 +147 @@
         Button ChAllButton,pos={245,60},size={180,20},proc=V_ChAllHeadersButtonProc,title="Change All Headers in List"
         Button ChAllButton,help={"This will change the checked values (ONLY) in ALL of the files in the popup list, not just the top file. If the \"change\" checkbox for the item is not checked, nothing will be changed for that item."}
-        Button DoneButton,pos={314,85},size={110,20},proc=V_DoneButtonProc,title="Done Patching"
+        Button DoneButton,pos={450,60},size={110,20},proc=V_DoneButtonProc,title="Done Patching"
         Button DoneButton,help={"When done Patching files, this will close this control panel."}
         CheckBox check0,pos={18,80},size={40,15},title="Run #",value= 1,mode=1,proc=V_MatchCheckProc
         CheckBox check1,pos={78,80},size={40,15},title="Text",value= 0,mode=1,proc=V_MatchCheckProc
-        CheckBox check2,pos={138,80},size={40,15},title="SDD",value= 0,mode=1,proc=V_MatchCheckProc
-
-        PopupMenu popup_0,pos={450,85},size={109,20},title="Detector Panel",proc=V_PatchPopMenuProc
+        CheckBox check2,pos={138,80},size={40,15},title="Group_ID",value= 0,mode=1,proc=V_MatchCheckProc
+
+        SetVariable curStr,pos={50,112},size={350,20},title="File Label:"
+        SetVariable curStr,help={"Label of current file in popup list"}
+        SetVariable curStr,font="Courier",fSize=10
+        SetVariable curStr,limits={-Inf,Inf,0},value= root:Packages:NIST:VSANS:Globals:Patch:gPatchCurLabel
+        
+        PopupMenu popup_0,pos={450,112},size={109,20},title="Detector Panel",proc=V_PatchPopMenuProc
         PopupMenu popup_0,mode=1,popvalue="FL",value= #"\"FL;FR;FT;FB;ML;MR;MT;MB;B;\""
 
 
-        TabControl PatchTab,pos={20,120},size={570,400}
+        TabControl PatchTab,pos={20,140},size={570,380}
         TabControl PatchTab,tabLabel(0)="Control",tabLabel(1)="Reduction",tabLabel(2)="Sample"
         TabControl PatchTab,tabLabel(3)="Instrument",tabLabel(4)="Detectors",tabLabel(5)="PolSANS"
@@ -197 +168 @@
 
 
-        ListBox list0,pos={30,150.00},size={550.00,350},proc=V_PatchListBoxProc,frame=1
+        ListBox list0,pos={30,170.00},size={550.00,330},proc=V_PatchListBoxProc,frame=1
         ListBox list0,fSize=10,userColumnResize= 1,listWave=PP_ListWave,selWave=PP_SelWave,titleWave=PP_TitleWave
         ListBox list0,mode=2,widths={30,200}
@@ -236 +207 @@
         switch(tab)     
                 case 0: 
-                        //Print "tab 0"
+                        //Print "tab 0 = CONTROL"
                         
                         V_FillListBox0(PP_ListWave,PP_SelWave)
                         break           
                 case 1: 
-                        //Print "tab 1"
+                        //Print "tab 1 = REDUCTION"
                         
                         V_FillListBox1(PP_ListWave,PP_SelWave)
                         break
                 case 2: 
-                        //Print "tab 2"
+                        //Print "tab 2 = SAMPLE"
                         
                         V_FillListBox2(PP_ListWave,PP_SelWave)
                         break
                 case 3: 
-                        //Print "tab 3"
+                        //Print "tab 3 = INSTRUMENT"
                         
                         V_FillListBox3(PP_ListWave,PP_SelWave)
                         break
                 case 4: 
-                        //Print "tab 4"
+                        //Print "tab 4 = DETECTORS"
                         
                         V_FillListBox4(PP_ListWave,PP_SelWave)
                         break
                 case 5: 
-                        //Print "tab 5"
+                        //Print "tab 5 = POL_SANS"
 
                         V_FillListBox5(PP_ListWave,PP_SelWave)
@@ -276 +247 @@
 
 // fill list boxes based on the tab
+//
+// *** if the number of elements is changed, then be sure that the variable nRows is updated
+//    * this is the same procedure for all of the tabs
+//    * then be sure that the new listWave assignments are properly indexed
 //
 // CONTROL
@@ -320 +295 @@
 // fill list boxes based on the tab
 //
-// Reduction items
+// REDUCTION items
 //
 Function V_FillListBox1(listWave,selWave)
@@ -495 +470 @@
 // fill list boxes based on the tab
 //
-// TODO --
+// TODO -- is this all of the fields that I want to edit?
+//
 // DETECTORS
 //
@@ -574 +550 @@
 // fill list boxes based on the tab
 //
-// TODO --
+// TODO -- this all needs to be filled in, once I figure out what is needed
+//
 // PolSANS
 //
@@ -610 +587 @@
 
 
-// TODO - determine if I really need this --- I don't 
+// TODO -- determine if I really need this --- I don't 
 //  think I really have any reason to respond to events from list box actions
-// or edits. the final action of patching is done with the button
+//  or edits. the final action of patching is done with the button
 //
 Function V_PatchListBoxProc(lba) : ListBoxControl
@@ -649 +626 @@
 
 //button action procedure to select the local path to the folder that
-//contains the SANS data
+//contains the vSANS data
 //sets catPathName, updates the path display and the popup of files (in that folder)
 //
@@ -655 +632 @@
         String PathButton
         
+        // call the main procedure to set the data path
+        V_PickPath()
+        
         //set the global string to the selected pathname
-        V_PickPath()
         //set a local copy of the path for Patch
         PathInfo/S catPathName
-        String dum = S_path
+   String dum = S_path
         if (V_flag == 0)
                 //path does not exist - no folder selected
@@ -675 +654 @@
         V_SetMatchStrProc("",0,"*","")          //this is equivalent to finding everything, typical startup case
 
-End
-
-
+        return(0)
+End
+
+//
 //returns a list of valid files (raw data, no version numbers, no averaged files)
 //that is semicolon delimited, and is suitable for display in a popup menu
@@ -706 +686 @@
 End
 
+
+
+//
+// TODO:
+// -- test all of the filters to be sure they actually work properly.
+//   Run # filter works
+//   Text filter works
+//
+// -- SDD filter does not apply -- what is a better filter choice?
+// -- can I filter intent? group_id?
+// -- can't just search for "sample" - this returns everything
+//
+//
+//
+//
+//
 //returns a list of valid files (raw data, no version numbers, no averaged files)
 //that is semicolon delimited, and is suitable for display in a popup menu
@@ -751 +747 @@
         
         String list="",item="",fname,runList="",numStr=""
-        Variable ii,num=ItemsInList(newList),val,sdd
+        Variable ii,num=ItemsInList(newList),val,group_id
         NVAR gRadioVal= root:Packages:NIST:VSANS:Globals:Patch:gRadioVal
         
@@ -786 +782 @@
         endif
         
-        // SDD
+        // group_id
+        // replace this with: V_getSample_GroupID(fname)
         Variable pos
-        String SDDStr=""
+        String IDStr=""
         if(gRadioVal == 3)
                 pos = strsearch(match, "*", 0)
@@ -801 +798 @@
                         item=StringFromList(ii, newList , ";")
                         fname = path + item
-// TODO -- replace call -- this is hard-wired for "FL"
-                        sdd = V_getDet_ActualDistance(fname,"FL")
-                        if(pos == -1)
-                                //no wildcard
-                                if(abs(val - sdd) < 0.01        )               //if numerically within 0.01 meter, they're the same
-                                        list += item + ";"
-                                endif
-                        else
-                                //yes, wildcard, try a string match?
-                                // string match doesn't work -- 1* returns 1m and 13m data
-                                // round the value (or truncate?)
-                                
-                                //SDDStr = num2str(sdd)
-                                //if(strsearch(SDDStr,match[0,pos-1],0) != -1)
-                                //      list += item + ";"
-                                //endif
-                                
-                                if(abs(val - round(sdd)) < 0.01 )               //if numerically within 0.01 meter, they're the same
-                                        list += item + ";"
-                                endif
-        
+                        group_id = V_getSample_GroupID(fname)
+                        if(group_id == val)
+                                list += item + ";"
                         endif
+        
                 endfor
                 
@@ -847 +827 @@
         String popStr
 
-        //change the contents of gPatchList that is displayed
-        //based on selected Path, match str, and
-        //further trim list to include only RAW SANS files
         
 //      String/G root:Packages:NIST:VSANS:Globals:Patch:gPatchList = list
 //      ControlUpdate PatchPopup
         V_ShowHeaderButtonProc("SHButton")
+        
+        return(0)
 End
 
@@ -881 +860 @@
                 V_ShowHeaderButtonProc("SHButton")
         endif
+        return(0)
 End
 
@@ -927 +907 @@
         ControlUpdate/A/W=V_Patch_Panel
         
+        // no matter what tab is selected, show the file label
+        SVAR fileLabel = root:Packages:NIST:VSANS:Globals:Patch:gPatchCurLabel
+        fileLabel = V_getSampleDescription(tempName)
+        
+        return(0)
 End
 
@@ -1052 +1037 @@
         
 
-//
-//      ControlInfo checkPS1            //change the sample label ?
-//      if(V_Value == 1)
-//              SVAR gPS1 = root:Packages:NIST:VSANS:Globals:Patch:gPS1
-//              V_writeSampleDescription(fname,gPS1)
-//      endif
-//      
-//      ControlInfo checkPV1
-//      if(V_Value == 1)                //sample transmission
-//              ControlInfo PV1
-//              V_writeSampleTransmission(fname,V_value)
-//      Endif
-//      
-//      ControlInfo checkPV2
-//      if(V_Value == 1)                //sample thickness
-//              ControlInfo PV2
-//              V_writeSampleThickness(fname,V_Value)
-//      Endif
-//      
-//      ControlInfo checkPV5
-//      if(V_Value == 1)                //attenuator number
-//              ControlInfo PV5
-//              V_writeAttenThickness(fname,V_value)
-//      Endif
-//
-//      ControlInfo checkPV6            // count time
-//      if(V_Value == 1)
-//              ControlInfo PV6
-//              V_writeCount_time(fname,V_Value)
-//      Endif
-//
-//      ControlInfo checkPV7    
-//      if(V_Value == 1)    //monitor count
-//              ControlInfo PV7 
-//              V_writeMonitorCount(fname,V_Value)
-//      Endif
-//
-//      ControlInfo checkPV10   
-//      if(V_Value == 1)      //wavelength
-//              ControlInfo PV10
-//              V_writeWavelength(fname,V_Value)
-//      Endif
-//
-//      ControlInfo checkPV11           
-//      if(V_Value == 1)      //wavelength spread
-//              ControlInfo PV11
-//              V_writeWavelength_spread(fname,V_Value)
-//      Endif   
-//
-//      ControlInfo checkPV14           
-//      if(V_Value == 1)      //source aperture
-//              ControlInfo PV14
-//              textStr = num2str(V_Value)
-//              V_writeSourceAp_size(fname,textStr)             //this is expecting a string
-//      Endif
-//      
-//      ControlInfo checkPV15           
-//      if(V_Value == 1)      //sample aperture
-//              ControlInfo PV15
-//              V_writeSampleAp2_size(fname,V_Value)            //TODO -- not sure if this is correct call
-//      Endif
-//
-//      ControlInfo checkPV16
-//      if(V_Value == 1)      //source-sam dist
-//              ControlInfo PV16
-//// TODO -- replace call
-////            WriteSrcToSamDistToHeader(fname,num)
-//      Endif
-//
-//      ControlInfo checkPV18
-//      if(V_Value == 1)      //beamstop diam
-//              ControlInfo PV18
-//              V_writeBeamStopC2_size(fname,V_Value)                   //TODO depends on which det carriage I'm working with (2) or (3)
-//      Endif   
-//
-//      ControlInfo checkPS2            //change the DIV file name?
-//      if(V_Value == 1)
-//              SVAR gPS2 = root:Packages:NIST:VSANS:Globals:Patch:gPS2
-//              V_writeSensitivityFileName(fname,gPS2)
-//      endif   
-//      
-//      ControlInfo checkPS3            //change the sample intent?
-//      if(V_Value == 1)
-//              SVAR gPS3 = root:Packages:NIST:VSANS:Globals:Patch:gPS3
-//              V_writeReductionIntent(fname,gPS3)
-//      endif   
-//
-//      
-//// individual detector values 
-//      ControlInfo checkPV3
-//      if(V_Value == 1)                //pixel X
-//              ControlInfo PV3
-//              V_writeDet_beam_center_x(fname,detStr,V_Value)  
-//      Endif
-//      
-//      ControlInfo checkPV4
-//      if(V_Value == 1)                // pixel Y
-//              ControlInfo PV4
-//              V_writeDet_beam_center_y(fname,detStr,V_Value)  
-//      Endif
-//      
-//      ControlInfo checkPV17
-//      if(V_Value == 1)      //det offset
-//              ControlInfo PV17
-//              V_writeDet_LateralOffset(fname,detStr,V_Value)          // TODO lateral or vertical offset, based on detStr
-//      Endif
-//
-//      ControlInfo checkPV19
-//      if(V_Value == 1)     //SDD
-//              ControlInfo PV19
-//              V_writeDet_distance(fname,detStr,V_Value)        
-//      Endif
-//
-//      ControlInfo checkPV8    
-//      if(V_Value == 1)     //total detector count
-//              ControlInfo PV8
-//              V_writeDet_IntegratedCount(fname,detStr,V_value)                
-//      Endif
 
 
@@ -1230 +1097 @@
         if ((selWave[8][0] & 2^4) != 0)         //"group_id (sample)"
                 val = str2num(listWave[8][2])
-                err = V_writeReduction_group_ID(fname,val)
+                err = V_writeSample_GroupID(fname,val)
         endif   
         
@@ -1458 +1325 @@
 //This function will read only the selected values editable in the patch panel
 //
-// -- TODO --
-// re-write this to be tab-aware. ShowHeaderForPatch() calls this, but does nothing
-// to update the tab content. Figure out which function is in charge, and update the content.
+// DONE
+// x- re-write this to be tab-aware. ShowHeaderForPatch() calls this, but does nothing
+//    to update the tab content. Figure out which function is in charge, and update the content.
 //
 Function V_ReadHeaderForPatch(fname)
@@ -1479 +1346 @@
                 DoAlert 0,"The VSANS Data Reduction Tutorial Help file could not be found"
 //      endif
+        return(0)
 End
 
@@ -1590 +1458 @@
 ///////////////
 //
-// this is a block to patch waves to the file headers, and can patch multiple files
+// this is a block to patch DEADTIME waves to the file headers, and can patch multiple files
 // 
 // uses a simple panel to show what the table of values is.
@@ -1599 +1467 @@
 //        trigger a cleanout.
 //
-// TODO - link this to a panel somewhere - a button? menu item? will there be a lot more of these little panels?
+// TODO -- link this to a panel somewhere - a button? menu item? will there be a lot more of these little panels?
+//
+// TODO -- currently, this does not patch the deadtime for the back "B" detector. it is a single
+//        value, not a wave see V_WritePerfectDeadTime(filename) for how the perfect (fake) values is written.
+//
 //
 Proc V_PatchDetectorDeadtime(firstFile,lastFile,detStr,deadtimeStr)
@@ -1614 +1486 @@
         
         V_fReadDetectorDeadtime(firstFile,lastFile,detStr)
+        
 End
 
 // simple utility to patch the detector deadtime in the file headers
-// pass in the account name as a string
 // lo is the first file number
 // hi is the last file number (inclusive)
@@ -1628 +1500 @@
         Variable ii
         String fname
+        
+        // check the dimensions of the deadtimeW/N=48
+        if (DimSize(deadtimeW, 0) != 48 )
+                Abort "dead time wave is not of proper dimension (48)"
+        endif
         
         //loop over all files
@@ -1667 +1544 @@
 
 Proc V_PatchDetectorDeadtimePanel()
-        DoWindow/F Patch_Deadtime
+        DoWindow/F DeadtimePanel
         if(V_flag==0)
         
@@ -1681 +1558 @@
 
 
-//
-// TODO - needs some minor adjustment to be of practical use, but a proof of concept
+// TODO:
+// x- add method for generating "perfect" dead time to write
+// x- check deadtime wave dimension before writing (check for bad paste operation)
+// -- load from file? different ways to import?
+// -- Dead time constants for "B" are different, and not handled here (yet)
+// -- add help button/file
+// -- add done button
+// -- adjust after user testing
 //
 Proc V_DeadtimePatchPanel() : Panel
@@ -1688 +1571 @@
 
 
-        NewPanel /W=(600,400,1000,1000)/N=DeadtimePanel/K=1
+        NewPanel /W=(600,400,1000,1000)/N=DeadtimePanel /K=1
 //      ShowTools/A
-        
-        PopupMenu popup_0,pos={20,20},size={109,20},title="Detector Panel"
+        ModifyPanel cbRGB=(16266,47753,2552,23355)
+
+        SetDrawLayer UserBack
+        DrawText 85,99,"Current Values"
+        DrawText 21,258,"Write to all files (inlcusive)"
+        SetDrawEnv fsize= 14,fstyle= 1
+        DrawText 209,30,"Dead Time Constants"
+        DrawText 20,133,"Run Number(s)"
+        
+        PopupMenu popup_0,pos={20,40},size={109,20},title="Detector Panel"
         PopupMenu popup_0,mode=1,popvalue="FL",value= #"\"FL;FR;FT;FB;ML;MR;MT;MB;\""
         
-        Button button0,pos={22.00,62.00},size={50.00,20.00},proc=V_ReadDTButtonProc,title="Read"
-        Button button0_1,pos={95.00,62.00},size={50.00,20.00},proc=V_WriteDTButtonProc,title="Write"
-        SetVariable setvar0,pos={19.00,128.00},size={100.00,14.00},title="first"
+        Button button0,pos={20,81},size={50.00,20.00},proc=V_ReadDTButtonProc,title="Read"
+        Button button0_1,pos={20,220},size={50.00,20.00},proc=V_WriteDTButtonProc,title="Write"
+        Button button0_2,pos={18.00,336.00},size={140.00,20.00},proc=V_GeneratePerfDTButton,title="Perfect Dead Time"
+        
+        SetVariable setvar0,pos={20,141},size={100.00,14.00},title="first"
         SetVariable setvar0,value= K0
-        SetVariable setvar1,pos={20.00,154.00},size={100.00,14.00},title="last"
+        SetVariable setvar1,pos={20.00,167},size={100.00,14.00},title="last"
         SetVariable setvar1,value= K1
 
-        
 
 // display the wave     
         Edit/W=(180,40,380,550)/HOST=#  root:Packages:NIST:VSANS:Globals:Patch:deadTimeWave
-        ModifyTable width(Point)=0
+        ModifyTable width(Point)=40
         ModifyTable width(root:Packages:NIST:VSANS:Globals:Patch:deadTimeWave)=120
         RenameWindow #,T0
@@ -1712 +1604 @@
         
 EndMacro
+
+
+
+Function V_GeneratePerfDTButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+
+                        WAVE deadTimeWave = root:Packages:NIST:VSANS:Globals:Patch:deadTimeWave
+                        ControlInfo popup_0
+                        strswitch(S_Value)
+                                case "FR":
+                                case "FL":
+                                case "MR":
+                                case "ML":
+                                case "FT":
+                                case "FB":
+                                case "MT":
+                                case "MB":
+                                        deadTimeWave = 1e-18
+
+                                        break
+                                default:
+                                        Print "Det type not found: V_GeneratePerfDTButton()"
+                        endswitch
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
 
 
@@ -1764 +1693 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////////
+// this is a block to patch CALIBRATION waves to the file headers, and can patch multiple files
+// 
+// uses a simple panel to show what the table of values is.
+// "read" will read only the first run number contents.
+//
+// TODO -- need to clear out the contents from RawVSANS, or else re-reading to check the values
+//        will read locally, and it will look like nothing was written. Executing "save" will also 
+//        trigger a cleanout.
+//
+// TODO -- link this to a panel somewhere - a button? menu item? will there be a lot more of these little panels?
+//
+// TODO -- currently this does not handle the back detector "B". see V_WritePerfectSpatialCalib(filename)
+//         for how fake data is written to the files
+//
+// TODO -- verify that the calibration waves are not transposed
+//
+Proc V_PatchDetectorCalibration(firstFile,lastFile,detStr,calibStr)
+        Variable firstFile=1,lastFile=100
+        String detStr = "FL",calibStr="calibrationWave"
+
+        V_fPatchDetectorCalibration(firstFile,lastFile,detStr,$calibStr)
+
+End
+
+Proc V_ReadDetectorCalibration(firstFile,lastFile,detStr)
+        Variable firstFile=1,lastFile=100
+        String detStr = "FL"
+        
+        V_fReadDetectorCalibration(firstFile,lastFile,detStr)
+End
+
+// simple utility to patch the detector calibration wave in the file headers
+// lo is the first file number
+// hi is the last file number (inclusive)
+//
+Function V_fPatchDetectorCalibration(lo,hi,detStr,calibW)
+        Variable lo,hi
+        String detStr
+        Wave calibW
+        
+        Variable ii
+        String fname
+        
+        // check the dimensions of the calibW (3,48)
+        if (DimSize(calibW, 0) != 3 || DimSize(calibW, 1) != 48 )
+                Abort "Calibration wave is not of proper dimension (3,48)"
+        endif
+        
+        //loop over all files
+        for(ii=lo;ii<=hi;ii+=1)
+                fname = V_FindFileFromRunNumber(ii)
+                if(strlen(fname) != 0)
+                        V_writeDetTube_spatialCalib(fname,detStr,calibW)                        
+                else
+                        printf "run number %d not found\r",ii
+                endif
+        endfor
+        
+        return(0)
+End
+
+// simple utility to read the detector deadtime stored in the file header
+Function V_fReadDetectorCalibration(lo,hi,detStr)
+        Variable lo,hi
+        String detStr
+        
+        String fname
+        Variable ii
+        
+        for(ii=lo;ii<=hi;ii+=1)
+                fname = V_FindFileFromRunNumber(ii)
+                if(strlen(fname) != 0)
+                        Wave calibW = V_getDetTube_spatialCalib(fname,detStr)
+                        Duplicate/O calibW root:Packages:NIST:VSANS:Globals:Patch:calibrationWave
+                else
+                        printf "run number %d not found\r",ii
+                endif
+        endfor
+        
+        return(0)
+End
+
+
+Proc V_PatchDetectorCalibrationPanel()
+        DoWindow/F CalibrationPanel
+        if(V_flag==0)
+        
+                NewDataFolder/O/S root:Packages:NIST:VSANS:Globals:Patch
+
+                Make/O/D/N=(3,48) calibrationWave
+                
+                SetDataFolder root:
+                
+                Execute "V_CalibrationPatchPanel()"
+        endif
+End
+
+
+//
+// TODO:
+// x- add method for generating "perfect" calibration to write
+// x- check Nx3 dimension before writing (check for bad paste operation)
+// -- load from file? different ways to import?
+// -- calibration constants for "B" are different, and not handled here (yet)
+// -- add help button/file
+// -- add done button
+// -- adjust after user testing
+//
+Proc V_CalibrationPatchPanel() : Panel
+        PauseUpdate; Silent 1           // building window...
+
+
+        NewPanel /W=(600,400,1200,1000)/N=CalibrationPanel /K=1
+//      ShowTools/A
+        ModifyPanel cbRGB=(16266,47753,2552,23355)
+
+        SetDrawLayer UserBack
+        DrawText 85,99,"Current Values"
+        DrawText 21,258,"Write to all files (inlcusive)"
+        SetDrawEnv fsize= 14,fstyle= 1
+        DrawText 227,28,"Quadratic Calibration Constants per Tube"
+        DrawText 20,133,"Run Number(s)"
+                
+        PopupMenu popup_0,pos={20,40},size={109,20},title="Detector Panel"
+        PopupMenu popup_0,mode=1,popvalue="FL",value= #"\"FL;FR;FT;FB;ML;MR;MT;MB;\""
+        
+        Button button0,pos={20,81},size={50.00,20.00},proc=V_ReadCalibButtonProc,title="Read"
+        Button button0_1,pos={20,220},size={50.00,20.00},proc=V_WriteCalibButtonProc,title="Write"
+        Button button0_2,pos={18.00,336.00},size={140.00,20.00},proc=V_GeneratePerfCalibButton,title="Perfect Calibration"
+                
+        SetVariable setvar0,pos={20,141},size={100.00,14.00},title="first"
+        SetVariable setvar0,value= K0
+        SetVariable setvar1,pos={20.00,167},size={100.00,14.00},title="last"
+        SetVariable setvar1,value= K1
+
+
+// display the wave     
+        Edit/W=(180,40,580,550)/HOST=#  root:Packages:NIST:VSANS:Globals:Patch:calibrationWave
+        ModifyTable width(Point)=40
+        ModifyTable width(root:Packages:NIST:VSANS:Globals:Patch:calibrationWave)=110
+        // the elements() command transposes the view in the table, but does not transpose the wave
+        ModifyTable elements(root:Packages:NIST:VSANS:Globals:Patch:calibrationWave) = (-3, -2)
+        RenameWindow #,T0
+        SetActiveSubwindow ##
+
+        
+EndMacro
+
+
+
+//      // and for the back detector "B"
+//      Make/O/D/N=3 tmpCalib
+//      tmpCalib[0] = 1
+//      tmpCalib[1] = 1
+//      tmpcalib[2] = 10000
+//      V_writeDet_cal_x(filename,"B",tmpCalib)
+//      V_writeDet_cal_y(filename,"B",tmpCalib)
+//
+Function V_GeneratePerfCalibButton(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+
+                        WAVE calibrationWave = root:Packages:NIST:VSANS:Globals:Patch:calibrationWave
+                        ControlInfo popup_0
+                        strswitch(S_Value)
+                                case "FR":
+                                case "FL":
+                                case "MR":
+                                case "ML":
+                                        //      // for the "tall" L/R banks
+                                        calibrationWave[0][] = -512
+                                        calibrationWave[1][] = 8
+                                        calibrationWave[2][] = 0
+                                        break
+                                case "FT":
+                                case "FB":
+                                case "MT":
+                                case "MB":
+                                        //      // for the "short" T/B banks
+                                        calibrationWave[0][] = -256
+                                        calibrationWave[1][] = 4
+                                        calibrationWave[2][] = 0
+
+                                        break
+                                default:
+                                        Print "Det type not found: V_GeneratePerfCalibButton()"
+                        endswitch
+
+
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+Function V_ReadCalibButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        
+                        ControlInfo popup_0
+                        String detStr = S_Value
+                        ControlInfo setvar0
+                        Variable lo=V_Value
+                        Variable hi=lo
+                        
+                        V_fReadDetectorCalibration(lo,hi,detStr)
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function V_WriteCalibButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        
+                        ControlInfo popup_0
+                        String detStr = S_Value
+                        ControlInfo setvar0
+                        Variable lo=V_Value
+                        ControlInfo setvar1
+                        Variable hi=V_Value
+                        Wave calibW = root:Packages:NIST:VSANS:Globals:Patch:calibrationWave
+                        
+                        V_fPatchDetectorCalibration(lo,hi,detStr,calibW)
+                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
 
 
@@ -1812 +1996 @@
         Wave yCtr_pix = root:Packages:NIST:VSANS:Globals:Patch:yCtr_pix
         Wave/T panelW = root:Packages:NIST:VSANS:Globals:Patch:panelW
-                
+        
+        // check the dimensions of the waves (9)
+        if (DimSize(xCtr_pix, 0) != 9 || DimSize(yCtr_pix, 0) != 9 || DimSize(panelW, 0) != 9)
+                Abort "waves are not of proper dimension (9)"
+        endif
+        
         //loop over all files
         for(jj=lo;jj<=hi;jj+=1)
@@ -1869 +2058 @@
 
 Proc V_PatchDet_xyCenters_Panel()
-        DoWindow/F Patch_Deadtime
+        DoWindow/F Patch_XY_Panel
         if(V_flag==0)
         
@@ -1884 +2073 @@
 
 
-//
-// TODO - document, make setVar controls larger, make cleaner
-//
-// TODO - link to main panel? link to Patch Panel?
+// TODO:
+// -- add method to read (import) from beam center panel
+// x- check wave dimensions before writing (check for bad paste operation)
+// -- load from file? different ways to import?
+// -- add help button/file
+// -- add done button
+// -- adjust after user testing
 //
 Proc V_Patch_xyCtr_Panel() : Panel
@@ -1893 +2085 @@
 
 
-        NewPanel /W=(600,400,1150,800)/N=Patch_XY_Panel/K=1
+        NewPanel /W=(600,400,1150,800)/N=Patch_XY_Panel /K=1
 //      ShowTools/A
         
-//      PopupMenu popup_0,pos={20,20},size={109,20},title="Detector Panel"
-//      PopupMenu popup_0,mode=1,popvalue="FL",value= #"\"FL;FR;FT;FB;ML;MR;MT;MB;B;\""
-        
-        Button button0,pos={22.00,62.00},size={50.00,20.00},proc=V_ReadXYButtonProc,title="Read"
-        Button button0_1,pos={95.00,62.00},size={50.00,20.00},proc=V_WriteXYButtonProc,title="Write"
-        SetVariable setvar0,pos={19.00,128.00},size={100.00,14.00},title="first"
+        ModifyPanel cbRGB=(16266,47753,2552,23355)
+
+        SetDrawLayer UserBack
+        DrawText 85,99,"Current Values"
+        DrawText 21,258,"Write to all files (inlcusive)"
+        SetDrawEnv fsize= 14,fstyle= 1
+        DrawText 262,30,"Beam Center (pixels)"
+        DrawText 20,133,"Run Number(s)"
+        
+        Button button0,pos={20,81},size={50.00,20.00},proc=V_ReadXYButtonProc,title="Read"
+        Button button0_1,pos={20,220},size={50.00,20.00},proc=V_WriteXYButtonProc,title="Write"
+        SetVariable setvar0,pos={20,141},size={100.00,14.00},title="first"
         SetVariable setvar0,value= K0
-        SetVariable setvar1,pos={20.00,154.00},size={100.00,14.00},title="last"
+        SetVariable setvar1,pos={20.00,167},size={100.00,14.00},title="last"
         SetVariable setvar1,value= K1
 
@@ -1909 +2107 @@
         SetDataFolder root:Packages:NIST:VSANS:Globals:Patch
 // display the wave     
-        Edit/W=(180,40,480,350)/HOST=#  panelW,xCtr_pix,yCtr_pix
+        Edit/W=(180,40,500,370)/HOST=#  panelW,xCtr_pix,yCtr_pix
         ModifyTable width(Point)=0
         ModifyTable width(panelW)=80

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

@@ -672 +672 @@
 End
 
-// TODO
-//
+
+// See V_Detector_Isolate.ipf
 // isolates a single panel to allow a better view of the details
 // useful for T/B panels which are partially blocked from view
 //
-// will open a separate graph or panel to display the selected detector
-// (lots to do here, depending what is necessary for instrument troubleshooting)
+// will open a separate panel to display the selected detector
+// (more to do here, depending what is necessary for instrument troubleshooting)
 // - like being able to turn corrections on/off and view with different axes (pix, mm, Q)
 //
@@ -687 +687 @@
                 case 2: // mouse up
                         // click code here
+                        V_DetectorIsolate()
                         break
                 case -1: // control being killed

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

@@ -12 +12 @@
 // -- decide if it's better to write wholesale, or as individual waves
 //
-Macro Copy_VCALC_to_VSANSFile()
+Macro Copy_VCALC_to_VSANSFile(labelStr,intent,group_id)
+        String labelStr = "sample label"
+        String intent = "SAMPLE"
+        variable group_id = 75
         
         String fileName = V_DoSaveFileDialog("pick the file to write to")
@@ -18 +21 @@
 //      
         if(strlen(fileName) > 0)
-                writeVCALC_to_file(fileName)
+                writeVCALC_to_file(fileName,labelStr,intent,group_id)
         endif
 End
@@ -25 +28 @@
 // TODO -- fill this in as needed to get fake data that's different
 //
-Function writeVCALC_to_file(fileName)
-        String fileName
+Function writeVCALC_to_file(fileName,labelStr,intent,group_id)
+        String fileName,labelStr,intent
+        Variable group_id
 
 
@@ -34 +38 @@
 // the middle SDD (correct units)
 // the back SDD (correct units)
-        Variable ii,val
+        Variable ii,val,sumCts=0
         String detStr
         for(ii=0;ii<ItemsInList(ksDetectorListAll);ii+=1)
@@ -73 +77 @@
                 // V_writeDetector_deadtime(fname,detStr,inW)
                 // TODO: need a new, separate function to write the single deadtime value in/out of "B"
+                
+                // integrated count value on each detector bank
+                sumCts += sum(tmpData)
+                V_writeDet_IntegratedCount(fileName,detStr,sum(tmpData))
 
         endfor
@@ -88 +96 @@
         V_writeWavelength(fileName,VCALC_getWavelength())
 
-// description of the sample
-
-// sample information
-// name, title, etc
         
 // fake the information about the count setup, so I have different numbers to read
@@ -97 +101 @@
         V_writeCount_time(fileName,100)
 
-// monitor count (= imon)
-// returns the number of neutrons on the sample
-//Function VCALC_getImon()
+        // monitor count (= imon)
+                // returns the number of neutrons on the sample
+                //Function VCALC_getImon()
+        V_writeMonitorCount(fileName,VCALC_getImon())
+
+        // total detector count (sum of everything)
+        V_writeDetector_counts(fileName,sumCts)
+
+        // sample description
+        V_writeSampleDescription(fileName,labelStr)
+        
+        // reduction intent
+        V_writeReductionIntent(fileName,intent)
+        
+        // reduction group_id
+        // TODO - skip for now. group_id is incorrectly written to the data file as a text value. trac ticket
+        //        has been written to fix in the future.
+//      V_writeReduction_group_ID(fileName,group_id)
+
+
 
 // ?? anything else that I'd like to see on the catalog - I could change them here to see different values
 // different collimation types?
 //
+
+
 
         return(0)

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

@@ -30 +30 @@
                 return(1)
         else
-                //set the global to the path (as a string)
-                // need 4 \ since it is the escape character
-                if(cmpstr("\\\\",dum[0,1])==0)  //Windows user going through network neighborhood
-                        DoAlert 0,alertStr
-                        KillPath catPathName
-                        return(1)
-                endif
+        // SRK 2016, for windows 10, try to eliminate this restriction  
+        //---- connecting through the network neighborhood seems to be perfectly fine except for 
+        //     path issues with GBLoadWave, which only affects VAX data sets
+                
+//              print igorinfo(3)
+//              //set the global to the path (as a string)
+//              // need 4 \ since it is the escape character
+//              if(cmpstr("\\\\",dum[0,1])==0)  //Windows user going through network neighborhood
+//                      DoAlert 0,alertStr
+//                      KillPath catPathName
+//                      return(1)
+//              endif
                 String/G root:Packges:NIST:VSANS:Globals:gCatPathStr = dum
                 return(0)               //no error
         endif
+        
 End
 
@@ -518 +524 @@
         String fullName="",partialName="",item=""
         //get list of raw data files in folder that match "num"
-//      if( (num>9999) || (num<=0) )
-//              Print "error in  FindFileFromRunNumber(num), file number too large or too small"
-//              Return ("")
-//      Endif
+
         String numStr=""
         numStr = num2str(num)
-//      if(num<10)
-//              numStr = "000"+num2str(num)
-//      else
-//              if(num<100)
-//                      numStr = "00"+num2str(num)
-//              else
-//                      if(num<1000)
-//                              numstr = "0"+num2str(num)
-//                      else
-//                              numStr = num2str(num)
-//                      endif
-//              Endif
-//      Endif
-        //Print "numstr = ",numstr
-        
+
         //make sure that path exists
         PathInfo catPathName
@@ -667 +656 @@
         else
                 //found, get the characters preceeding it, but still after the "sans" characters
-                if (pos-1 <= 4)
+                if (pos-1 < 4)
                         //not enough characters
                         return (invalid)
@@ -975 +964 @@
 // called by Marquee.ipf, MultipleReduce.ipf, ProtocolAsPanel.ipf
 //
-Function/S ParseRunNumberList(list)
+Function/S V_ParseRunNumberList(list)
         String list
         

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

@@ -87 +87 @@
         Variable/G root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor = 1
         
-        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gDoMonitorNormalizaton", 1 )
-        Variable/G root:Packages:NIST:VSANS:Globals:gDoMonitorNormalizaton = 1
+        val = NumVarOrDefault("root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization", 1 )
+        Variable/G root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization = 1
         
 
@@ -204 +204 @@
         Variable checked
         
-        NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoMonitorNormalizaton
+        NVAR gVal = root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization
         gVal = checked
 End
@@ -273 +273 @@
         CheckBox PrefCtrl_1m value=root:Packages:NIST:VSANS:Globals:gDoTubeShadowCor,pos={255,200},help={"TURN OFF ONLY FOR DEBUGGING."}
         CheckBox PrefCtrl_1n title="Do Tube Shadow Correction?",size={140,14},proc=V_DoMonitorNormPref
-        CheckBox PrefCtrl_1n value=root:Packages:NIST:VSANS:Globals:gDoMonitorNormalizaton,pos={255,220},help={"TURN OFF ONLY FOR DEBUGGING."}
+        CheckBox PrefCtrl_1n value=root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization,pos={255,220},help={"TURN OFF ONLY FOR DEBUGGING."}
                 
         

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

@@ -562 +562 @@
         // TODO -- what do I really need to save?
         
-        NVAR gDoMonitorNormalizaton = root:Packages:NIST:VSANS:Globals:gDoMonitorNormalizaton
-        if (gDoMonitorNormalizaton == 1)
+        NVAR gDoMonitorNormalization = root:Packages:NIST:VSANS:Globals:gDoMonitorNormalization
+        if (gDoMonitorNormalization == 1)
                 Print "(stub)Doing monitor normalization -- INCOMPLETE --"// for "+ detStr