Changeset 1081 for sans/Dev/trunk

Timestamp:

Feb 2, 2018 8:26:07 AM (5 years ago)

Author:

srkline

Message:

additions to VCALC procedures to correctly account for panel motion (individual, not symmetric). Updated the plotting routines to all (mostly) pass through the same subroutines so that additional averaging modes will be easier to add.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction

Files:

• SANS/NCNR_Utils.ipf (modified) (1 diff)
• VSANS/VC_DetectorBinning_Q.ipf (modified) (25 diffs)
• VSANS/VC_FrontView_Deg.ipf (modified) (9 diffs)
• VSANS/VC_SideView.ipf (modified) (10 diffs)
• VSANS/VC_UtilityProcedures.ipf (modified) (3 diffs)
• VSANS/VC_VCALCPanel_MockUp.ipf (modified) (13 diffs)
• VSANS/V_DataPlotting.ipf (modified) (30 diffs)
• VSANS/V_DetectorCorrections.ipf (modified) (4 diffs)
• VSANS/V_Instrument_Resolution.ipf (modified) (2 diffs)
• VSANS/V_Menu.ipf (modified) (1 diff)
• VSANS/V_Testing_Data_Procs.ipf (modified) (1 diff)

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

@@ -96 +96 @@
 Function/S getResolution(inQ,lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,del_r,usingLenses,SigmaQ,QBar,fSubS)
         Variable inQ, lambda, lambdaWidth, DDet, apOff, S1, S2, L1, L2, BS, del_r,usingLenses
-        Variable &fSubS, &QBar, &SigmaQ         //these are the output quantities at the input Q value
+        Variable &SigmaQ, &QBar, &fSubS //these are the output quantities at the input Q value
         
         //lots of calculation variables

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

@@ -95 +95 @@
         
         // do the q-binning for each of the panels to get I(Q)
-        Execute "BinAllFrontPanels()"
+        BinAllFrontPanels()
+
 
         // plot the results
-        Execute "Front_IQ_Graph()"
+        String type = "VCALC"
+        String str,winStr="VCALC#Panels_IQ",workTypeStr,popStr
+        workTypeStr = "root:Packages:NIST:VSANS:"+type
+
+        ControlInfo/W=VCALC popup_b
+        popStr = S_Value                //
+        
+        sprintf str,"(\"%s\",%d,\"%s\")",workTypeStr,V_BinTypeStr2Num(popStr),winStr
+
+        Execute ("V_Front_IQ_Graph"+str)
+                
+//      Execute "Front_IQ_Graph()"
+
         FrontPanels_AsQ()
         
@@ -125 +138 @@
 
         Variable xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY,nPix_X,nPix_Y
-        Variable F_LR_sep,F_TB_sep,F_offset,F_sdd_setback
+        Variable F_L_sep,F_R_sep,F_T_sep,F_B_sep,F_sdd_setback
 
         String folderPath = "root:Packages:NIST:VSANS:VCALC"
@@ -132 +145 @@
 
 // get the values from the panel + constants    
-        F_LR_sep = VCALC_getPanelSeparation("FLR")
-        F_TB_sep = VCALC_getPanelSeparation("FTB")
-        F_offset = VCALC_getLateralOffset("FL")
+        F_L_sep = VCALC_getPanelTranslation("FL")
+        F_R_sep = VCALC_getPanelTranslation("FR")
+        F_T_sep = VCALC_getPanelTranslation("FT")
+        F_B_sep = VCALC_getPanelTranslation("FB")
         
         SDD = VCALC_getSDD("FL")                //nominal SDD [cm] - need offset for TB
@@ -182 +196 @@
                 yCtr = 0                        //values in cm
         else    
-                xCtr = nPix_X+(F_LR_sep/2/pixSizeX)             // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
+                xCtr = nPix_X-(F_L_sep/pixSizeX)                // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
                 yCtr = nPix_Y/2 
         endif
@@ -225 +239 @@
                 yCtr = 0                        //values in cm
         else    
-                xCtr = -(F_LR_sep/2/pixSizeX)-1         
+                xCtr = -(F_R_sep/pixSizeX)-1            
                 yCtr = nPix_Y/2 
         endif
@@ -265 +279 @@
         else    
                 xCtr = nPix_X/2
-                yCtr = -(F_TB_sep/2/pixSizeY)-1 
+                yCtr = -(F_T_sep/2/pixSizeY)-1 
         endif   
 
@@ -306 +320 @@
         else    
                 xCtr = nPix_X/2
-                yCtr = nPix_Y+(F_TB_sep/2/pixSizeY)             // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
+                yCtr = nPix_Y+(F_B_sep/2/pixSizeY)              // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
         endif   
                         
@@ -335 +349 @@
         String folderStr,type
         
-        Variable LR_sep,nPix,xCtr,ii,jj,numCol,pixSizeX,pixSizeY,nPix_X,nPix_Y
+        Variable L_sep,R_sep,nPix_L,nPix_R,xCtr,ii,jj,numCol,pixSizeX,pixSizeY,nPix_X,nPix_Y
 
 /// !! type passed in will be FT, FB, MT, MB, so I can't ask for the panel separation -- or I'll get the TB separation...
-        if(cmpstr(type[0],"F")==0)
-                //front
-                ControlInfo/W=VCALC VCALCCtrl_2a
-                LR_sep = V_Value        
+// translation in [cm]
+        if(cmpstr("F",type[0]) == 0)            // FT or FB passed in
+                L_sep = VCALC_getPanelTranslation("FL")
+                R_sep = VCALC_getPanelTranslation("FR")
         else
-                //middle
-                ControlInfo/W=VCALC VCALCCtrl_3a
-                LR_sep = V_Value        
-        endif           
-//separations on panel are in cm -- need to watch the units, convert to cm
-//      LR_sep /= 10
+                L_sep = VCALC_getPanelTranslation("ML")
+                R_sep = VCALC_getPanelTranslation("MR") 
+        endif
+
 
 //detector data
@@ -365 +377 @@
         //TODO -- get this from a global
         xCtr = nPix_X/2
-        nPix = trunc(LR_sep/2/pixSizeX)         // approx # of pixels Left/right of center that are not obscured by L/R panels
+        nPix_L = trunc(abs(L_sep)/pixSizeX)             // approx # of pixels Left of center that are not obscured by L/R panels
+        nPix_R = trunc(abs(R_sep)/pixSizeX)             // approx # of pixels Right of center that are not obscured by L/R panels
         
         numCol = DimSize(det,0)         // x dim (columns)
-        for(ii=0;ii<(xCtr-nPix-4);ii+=1)
+        for(ii=0;ii<(xCtr-nPix_L-4);ii+=1)
                 det[ii][] = NaN
         endfor
-        for(ii=(xCtr+nPix+6);ii<numCol;ii+=1)
+        for(ii=(xCtr+nPix_R+6);ii<numCol;ii+=1)
                 det[ii][] = NaN
         endfor
@@ -446 +459 @@
 // the results are in iBin_qxqy, qBin_qxqy, and eBin_qxqy, in the folder passed
 // 
-Proc BinAllFrontPanels()
+// TODO -- this is a (partial) duplicated routine... I need to 
+// **** COPY the logic from V_QBinAllPanels_Circular every time I add a new bin type
+//
+// -- see also BinAllMiddlePanels()
+// -- BinAllBackPanels()
+//
+Function BinAllFrontPanels()
 
         SetDeltaQ("VCALC","FL")
@@ -457 +476 @@
         binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
 
-        if(binType == 1)
-                VC_BinQxQy_to_1D("VCALC","FL")
-                VC_BinQxQy_to_1D("VCALC","FR")
-                VC_BinQxQy_to_1D("VCALC","FT")
-                VC_BinQxQy_to_1D("VCALC","FB")
-        endif
-        
-        if(binType == 2)        
-                VC_BinQxQy_to_1D("VCALC","FLR")
-                VC_BinQxQy_to_1D("VCALC","FTB")
-        endif
-
-        if(binType == 3)
-                VC_BinQxQy_to_1D("VCALC","FLRTB")
-        endif
-
-// TODO -- this is only a temporary fix for slit mode   
-        if(binType == 4)
-                /// this is for a tall, narrow slit mode        
-                VC_fBinDetector_byRows("VCALC","FL")
-                VC_fBinDetector_byRows("VCALC","FR")
-                VC_fBinDetector_byRows("VCALC","FT")
-                VC_fBinDetector_byRows("VCALC","FB")
-        endif
+        String folderStr = "VCALC"
+        
+        switch(binType)
+                case 1:
+                        VC_fDoBinning_QxQy2D(folderStr,"FL")
+                        VC_fDoBinning_QxQy2D(folderStr,"FR")
+                        VC_fDoBinning_QxQy2D(folderStr,"FT")
+                        VC_fDoBinning_QxQy2D(folderStr,"FB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"ML")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MT")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MB")                    
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 2:
+                        VC_fDoBinning_QxQy2D(folderStr,"FLR")
+                        VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 3:
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+                        VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                        
+                        break
+                case 4:                         /// this is for a tall, narrow slit mode        
+                        VC_fBinDetector_byRows(folderStr,"FL")
+                        VC_fBinDetector_byRows(folderStr,"FR")
+//                      VC_fBinDetector_byRows(folderStr,"ML")
+//                      VC_fBinDetector_byRows(folderStr,"MR")
+//                      VC_fBinDetector_byRows(folderStr,"B")
+
+                        break
+                case 5:
+                        VC_fDoBinning_QxQy2D(folderStr,"FTB")
+                        VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 6:
+                        VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 7:
+                        VC_fDoBinning_QxQy2D(folderStr,"FTB")
+                        VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                        
+                default:
+                        Abort "Binning mode not found in BinAllFrontPanels "// when no case matches     
+        endswitch
+        
+
+//      if(binType == 1)
+//              VC_BinQxQy_to_1D("VCALC","FL")
+//              VC_BinQxQy_to_1D("VCALC","FR")
+//              VC_BinQxQy_to_1D("VCALC","FT")
+//              VC_BinQxQy_to_1D("VCALC","FB")
+//      endif
+//      
+//      if(binType == 2)        
+//              VC_BinQxQy_to_1D("VCALC","FLR")
+//              VC_BinQxQy_to_1D("VCALC","FTB")
+//      endif
+//
+//      if(binType == 3)
+//              VC_BinQxQy_to_1D("VCALC","FLRTB")
+//      endif
+//
+//// TODO -- this is only a temporary fix for slit mode 
+//      if(binType == 4)
+//              /// this is for a tall, narrow slit mode        
+//              VC_fBinDetector_byRows("VCALC","FL")
+//              VC_fBinDetector_byRows("VCALC","FR")
+//              VC_fBinDetector_byRows("VCALC","FT")
+//              VC_fBinDetector_byRows("VCALC","FB")
+//      endif
                 
 End
@@ -544 +626 @@
         
         // do the q-binning for each of the panels to get I(Q)
-        Execute "BinAllMiddlePanels()"
+        BinAllMiddlePanels()
 
         // plot the results
-        Execute "Middle_IQ_Graph()"
+        String type = "VCALC"
+        String str,winStr="VCALC#Panels_IQ",workTypeStr,popStr
+        workTypeStr = "root:Packages:NIST:VSANS:"+type
+
+        ControlInfo/W=VCALC popup_b
+        popStr = S_Value                //
+        
+        sprintf str,"(\"%s\",%d,\"%s\")",workTypeStr,V_BinTypeStr2Num(popStr),winStr
+
+        Execute ("V_Middle_IQ_Graph"+str)
+                
+
+        // plot the results
+//      Execute "Middle_IQ_Graph()"
+
+
         MiddlePanels_AsQ()
         
@@ -570 +667 @@
 
         Variable xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY,nPix_X,nPix_Y
-        Variable M_LR_sep,M_TB_sep,M_offset, M_sdd_setback
+        Variable M_L_sep,M_R_sep,M_T_sep,M_B_sep, M_sdd_setback
 
 
@@ -577 +674 @@
         String detStr=""
         
-        M_LR_sep = VCALC_getPanelSeparation("MLR")
-        M_TB_sep = VCALC_getPanelSeparation("MTB")
-        M_offset = VCALC_getLateralOffset("ML")
+        M_L_sep = VCALC_getPanelTranslation("ML")
+        M_R_sep = VCALC_getPanelTranslation("MR")
+        M_T_sep = VCALC_getPanelTranslation("MT")
+        M_B_sep = VCALC_getPanelTranslation("MB")
         
         SDD = VCALC_getSDD("ML")                //nominal SDD [cm] - need offset for TB
@@ -624 +722 @@
                 yCtr = 0                        //values in cm
         else    
-                xCtr = nPix_X+(M_LR_sep/2/pixSizeX)             // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
+                xCtr = nPix_X+(M_L_sep/pixSizeX)                // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)??
                 yCtr = nPix_Y/2 
         endif           
@@ -671 +769 @@
                 yCtr = 0                        //values in cm
         else    
-                xCtr = -(M_LR_sep/2/pixSizeX)-1         
+                xCtr = -(M_R_sep/pixSizeX)-1            
                 yCtr = nPix_Y/2 
         endif   
@@ -713 +811 @@
         else    
                 xCtr = nPix_X/2
-                yCtr = -(M_TB_sep/2/pixSizeY)-1 
+                yCtr = -(M_T_sep/pixSizeY)-1 
         endif
                 
@@ -755 +853 @@
         else    
                 xCtr = nPix_X/2
-                yCtr = nPix_Y+(M_TB_sep/2/pixSizeY)             // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)?? 
+                yCtr = nPix_Y+(M_B_sep/pixSizeY)                // TODO  -- check -- starting from 47 rather than 48 (but I'm in pixel units for centers)?? 
         endif           
 
@@ -846 +944 @@
 // the results are in iBin_qxqy, qBin_qxqy, and eBin_qxqy, in the folder passed
 // 
-Proc BinAllMiddlePanels()
+Function BinAllMiddlePanels()
 
         SetDeltaQ("VCALC","ML")
@@ -857 +955 @@
         binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
 
-        if(binType == 1)
-                VC_BinQxQy_to_1D("VCALC","ML")
-                VC_BinQxQy_to_1D("VCALC","MR")
-                VC_BinQxQy_to_1D("VCALC","MT")
-                VC_BinQxQy_to_1D("VCALC","MB")
-        endif
-        
-        if(binType == 2)        
-                VC_BinQxQy_to_1D("VCALC","MLR")
-                VC_BinQxQy_to_1D("VCALC","MTB")
-        endif
-
-        if(binType == 3)
-                VC_BinQxQy_to_1D("VCALC","MLRTB")
-        endif
-        
-        // TODO -- this is only a temporary fix for slit mode   
-        if(binType == 4)
-                /// this is for a tall, narrow slit mode        
-                VC_fBinDetector_byRows("VCALC","ML")
-                VC_fBinDetector_byRows("VCALC","MR")
-                VC_fBinDetector_byRows("VCALC","MT")
-                VC_fBinDetector_byRows("VCALC","MB")
-        endif
+        String folderStr = "VCALC"
+
+        switch(binType)
+                case 1:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FL")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FT")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FB")
+                        VC_fDoBinning_QxQy2D(folderStr,"ML")
+                        VC_fDoBinning_QxQy2D(folderStr,"MR")
+                        VC_fDoBinning_QxQy2D(folderStr,"MT")
+                        VC_fDoBinning_QxQy2D(folderStr,"MB")                    
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 2:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+                        VC_fDoBinning_QxQy2D(folderStr,"MLR")
+                        VC_fDoBinning_QxQy2D(folderStr,"MTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 3:
+                        VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                        
+                        break
+                case 4:                         /// this is for a tall, narrow slit mode        
+//                      VC_fBinDetector_byRows(folderStr,"FL")
+//                      VC_fBinDetector_byRows(folderStr,"FR")
+                        VC_fBinDetector_byRows(folderStr,"ML")
+                        VC_fBinDetector_byRows(folderStr,"MR")
+//                      VC_fBinDetector_byRows(folderStr,"B")
+
+                        break
+                case 5:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+                        VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 6:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+                        VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 7:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+                        VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                        
+                default:
+                        Abort "Binning mode not found in BinAllFrontPanels "// when no case matches     
+        endswitch
+        
+
+
+//      if(binType == 1)
+//              VC_BinQxQy_to_1D("VCALC","ML")
+//              VC_BinQxQy_to_1D("VCALC","MR")
+//              VC_BinQxQy_to_1D("VCALC","MT")
+//              VC_BinQxQy_to_1D("VCALC","MB")
+//      endif
+//      
+//      if(binType == 2)        
+//              VC_BinQxQy_to_1D("VCALC","MLR")
+//              VC_BinQxQy_to_1D("VCALC","MTB")
+//      endif
+//
+//      if(binType == 3)
+//              VC_BinQxQy_to_1D("VCALC","MLRTB")
+//      endif
+//      
+//      // TODO -- this is only a temporary fix for slit mode   
+//      if(binType == 4)
+//              /// this is for a tall, narrow slit mode        
+//              VC_fBinDetector_byRows("VCALC","ML")
+//              VC_fBinDetector_byRows("VCALC","MR")
+//              VC_fBinDetector_byRows("VCALC","MT")
+//              VC_fBinDetector_byRows("VCALC","MB")
+//      endif
 End
 
@@ -1032 +1194 @@
         
         // do the q-binning for each of the panels to get I(Q)
-        Execute "BinAllBackPanels()"
+        BinAllBackPanels()
 
         // plot the results
-        Execute "Back_IQ_Graph()"
+        String type = "VCALC"
+        String str,winStr="VCALC#Panels_IQ",workTypeStr,popStr
+        workTypeStr = "root:Packages:NIST:VSANS:"+type
+
+        ControlInfo/W=VCALC popup_b
+        popStr = S_Value                //
+        
+        sprintf str,"(\"%s\",%d,\"%s\")",workTypeStr,V_BinTypeStr2Num(popStr),winStr
+
+        Execute ("V_Back_IQ_Graph"+str)
+                
+                
+        // plot the results
+//      Execute "Back_IQ_Graph()"
+
+
+
         Execute "BackPanels_AsQ()"
 
@@ -1065 +1243 @@
         String detStr = ""
         
-        B_offset = VCALC_getLateralOffset("B")
+        ControlInfo/W=VCALC VCALCCtrl_4a
+        B_offset = V_Value
         
         SDD = VCALC_getSDD("B")         //nominal SDD - need offset for TB
@@ -1165 +1344 @@
 // the results are in iBin_qxqy, qBin_qxqy, and eBin_qxqy, in the folder passed
 // 
-Proc BinAllBackPanels()
+Function BinAllBackPanels()
 
         SetDeltaQ("VCALC","B")
@@ -1172 +1351 @@
         ControlInfo/W=VCALC popup_b
         binType = V_Value               // V_value counts menu items from 1, so 1=1, 2=2, 3=4
-        
-        VC_BinQxQy_to_1D("VCALC","B")
-
-// TODO -- this is only a temporary fix for slit mode   
-        if(binType == 4)
-                /// this is for a tall, narrow slit mode        
-                VC_fBinDetector_byRows("VCALC","B")
-        endif   
+
+        String folderStr = "VCALC"
+
+        switch(binType)
+                case 1:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FL")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FT")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"ML")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MT")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MB")                    
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 2:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MTB")
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+
+                        break
+                case 3:
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+                        
+                        break
+                case 4:                         /// this is for a tall, narrow slit mode        
+//                      VC_fBinDetector_byRows(folderStr,"FL")
+//                      VC_fBinDetector_byRows(folderStr,"FR")
+//                      VC_fBinDetector_byRows(folderStr,"ML")
+//                      VC_fBinDetector_byRows(folderStr,"MR")
+                        VC_fBinDetector_byRows(folderStr,"B")
+
+                        break
+                case 5:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLRTB")
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 6:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLRTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                case 7:
+//                      VC_fDoBinning_QxQy2D(folderStr,"FTB")
+//                      VC_fDoBinning_QxQy2D(folderStr,"FLR")
+//                      VC_fDoBinning_QxQy2D(folderStr,"MLR")
+                        VC_fDoBinning_QxQy2D(folderStr, "B")            
+                
+                        break
+                        
+                default:
+                        Abort "Binning mode not found in BinAllFrontPanels "// when no case matches     
+        endswitch
+                
+//      VC_BinQxQy_to_1D("VCALC","B")
+//
+//// TODO -- this is only a temporary fix for slit mode 
+//      if(binType == 4)
+//              /// this is for a tall, narrow slit mode        
+//              VC_fBinDetector_byRows("VCALC","B")
+//      endif   
         
 End
@@ -1381 +1622 @@
         Variable ii
         
-        for(ii=0;ii<ItemsInList(ksWorkFolderListShort);ii+=1)
-                fldr = StringFromList(ii, ksWorkFolderListShort, ";")
+        String folderList_plus = ksWorkFolderListShort+";VCALC"
+        
+        for(ii=0;ii<ItemsInList(folderList_plus);ii+=1)
+                fldr = StringFromList(ii, folderList_plus, ";")
                 ClearIQIfDisplayed(fldr,type,winNameStr)
         endfor

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

@@ -36 +36 @@
 
 // get the values from the panel
-        Variable F_LR_sep,F_TB_sep, F_SDD, F_offset
-        Variable M_LR_sep,M_TB_sep, M_SDD, M_offset
+        Variable F_L_sep,F_R_sep,F_T_sep, F_B_sep,F_SDD
+        Variable M_L_sep,M_R_sep,M_T_sep, M_B_sep, M_SDD
         Variable B_SDD, B_offset
         Variable axisRange
@@ -49 +49 @@
         //front
         ControlInfo/W=VCALC VCALCCtrl_2a
-        F_LR_sep = V_Value
+        F_L_sep = V_Value
+        ControlInfo/W=VCALC VCALCCtrl_2aa
+        F_R_sep = V_Value
         ControlInfo/W=VCALC VCALCCtrl_2b
-        F_TB_sep = V_Value
-        ControlInfo/W=VCALC VCALCCtrl_2c
-        F_offset = V_Value
+        F_T_sep = V_Value
+        ControlInfo/W=VCALC VCALCCtrl_2bb
+        F_B_sep = V_Value
+
         ControlInfo/W=VCALC VCALCCtrl_2d
         F_SDD = V_Value
@@ -59 +62 @@
         //middle
         ControlInfo/W=VCALC VCALCCtrl_3a
-        M_LR_sep = V_Value
+        M_L_sep = V_Value
+        ControlInfo/W=VCALC VCALCCtrl_3aa
+        M_R_sep = V_Value
         ControlInfo/W=VCALC VCALCCtrl_3b
-        M_TB_sep = V_Value
-        ControlInfo/W=VCALC VCALCCtrl_3c
-        M_offset = V_Value
+        M_T_sep = V_Value
+        ControlInfo/W=VCALC VCALCCtrl_3bb
+        M_B_sep = V_Value
+        
         ControlInfo/W=VCALC VCALCCtrl_3d
         M_SDD = V_Value
@@ -115 +121 @@
         tmp_x1 = -atan(M_TB_w/2/(M_SDD+middle_SDDsetback))*(180/pi)             // x symmetric y is not
         tmp_x2 = -tmp_x1
-        tmp_y1 = atan(M_TB_sep/2/(M_SDD+middle_SDDsetback))*(180/pi)
-        tmp_y2 = atan((M_TB_sep/2+M_TB_h)/(M_SDD+middle_SDDsetback))*(180/pi)
+        tmp_y1 = atan(M_T_sep/(M_SDD+middle_SDDsetback))*(180/pi)
+        tmp_y2 = atan((M_T_sep+M_TB_h)/(M_SDD+middle_SDDsetback))*(180/pi)
         
 //      Print tmp_x1,tmp_x2,tmp_y1,tmp_y2
@@ -124 +130 @@
                 
 // BOTTOM (x unchanged, negate and swap y1,y2)
-        tmp_y1 = -atan((M_TB_sep/2+M_TB_h)/(M_SDD+middle_SDDsetback))*(180/pi)
-        tmp_y2 = -atan(M_TB_sep/2/(M_SDD+middle_SDDsetback))*(180/pi)
+        tmp_y1 = atan((M_B_sep-M_TB_h)/(M_SDD+middle_SDDsetback))*(180/pi)
+        tmp_y2 = atan(M_B_sep/(M_SDD+middle_SDDsetback))*(180/pi)
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (1,16019,65535)
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1          
         
 // LEFT
-        tmp_x1 = -atan((M_LR_w+M_LR_sep/2)/(M_SDD))*(180/pi)            // y symmetric x is not
-        tmp_x2 = -atan((M_LR_sep/2)/(M_SDD))*(180/pi)
+        tmp_x1 = atan((M_L_sep-M_LR_w)/(M_SDD))*(180/pi)                // y symmetric x is not
+        tmp_x2 = atan((M_L_sep)/(M_SDD))*(180/pi)
         tmp_y1 = atan(M_LR_h/2/(M_SDD))*(180/pi)
         tmp_y2 = -tmp_y1
@@ -137 +143 @@
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1                  
 // RIGHT (x changes, y the same)
-        tmp_x1 = atan((M_LR_sep/2)/(M_SDD))*(180/pi)            // y symmetric x is not
-        tmp_x2 = atan((M_LR_w+M_LR_sep/2)/(M_SDD))*(180/pi)
+        tmp_x1 = atan((M_R_sep)/(M_SDD))*(180/pi)               // y symmetric x is not
+        tmp_x2 = atan((M_LR_w+M_R_sep)/(M_SDD))*(180/pi)
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (65535,0,0)
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1  
@@ -150 +156 @@
         tmp_x1 = -atan(F_TB_w/2/(F_SDD+front_SDDsetback))*(180/pi)              // x symmetric y is not
         tmp_x2 = -tmp_x1
-        tmp_y1 = atan(F_TB_sep/2/(F_SDD+front_SDDsetback))*(180/pi)
-        tmp_y2 = atan((F_TB_sep/2+F_TB_h)/(F_SDD+front_SDDsetback))*(180/pi)
+        tmp_y1 = atan(F_T_sep/(F_SDD+front_SDDsetback))*(180/pi)
+        tmp_y2 = atan((F_T_sep+F_TB_h)/(F_SDD+front_SDDsetback))*(180/pi)
         
 //      Print tmp_x1,tmp_x2,tmp_y1,tmp_y2
@@ -159 +165 @@
                 
 // BOTTOM (x unchanged, negate and swap y1,y2)
-        tmp_y1 = -atan((F_TB_sep/2+F_TB_h)/(F_SDD+front_SDDsetback))*(180/pi)
-        tmp_y2 = -atan(F_TB_sep/2/(F_SDD+front_SDDsetback))*(180/pi)
+        tmp_y1 = atan((F_B_sep-F_TB_h)/(F_SDD+front_SDDsetback))*(180/pi)
+        tmp_y2 = atan(F_B_sep/(F_SDD+front_SDDsetback))*(180/pi)
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (1,52428,26586)
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1          
         
 // LEFT
-        tmp_x1 = -atan((F_LR_w+F_LR_sep/2)/(F_SDD))*(180/pi)            // y symmetric x is not
-        tmp_x2 = -atan((F_LR_sep/2)/(F_SDD))*(180/pi)
+        tmp_x1 = atan((F_L_sep-F_LR_w)/(F_SDD))*(180/pi)                // y symmetric x is not
+        tmp_x2 = atan((F_L_sep)/(F_SDD))*(180/pi)
         tmp_y1 = atan(F_LR_h/2/(F_SDD))*(180/pi)
         tmp_y2 = -tmp_y1
@@ -172 +178 @@
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1                  
 // RIGHT (x changes, y the same)
-        tmp_x1 = atan((F_LR_sep/2)/(F_SDD))*(180/pi)            // y symmetric x is not
-        tmp_x2 = atan((F_LR_w+F_LR_sep/2)/(F_SDD))*(180/pi)
+        tmp_x1 = atan((F_R_sep)/(F_SDD))*(180/pi)               // y symmetric x is not
+        tmp_x2 = atan((F_LR_w+F_R_sep)/(F_SDD))*(180/pi)
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (39321,26208,1)
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1  

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

@@ -45 +45 @@
 
 // TODO: 
-// -x account for the 30cm SDD offset for the T/B detectors. These are only seen in the side view.
+// -x account for the 41cm SDD setback for the T/B detectors. These are only seen in the side view.
 //
 Function UpdateSideView()
@@ -77 +77 @@
 
 // get the values from the panel
-        Variable F_LR_sep,F_TB_sep, F_SDD, F_offset
-        Variable M_LR_sep,M_TB_sep, M_SDD, M_offset
+        Variable F_LR_sep,F_T_sep, F_B_sep ,F_SDD
+        Variable M_LR_sep,M_T_sep, M_B_sep, M_SDD
         Variable B_SDD, B_offset
 
@@ -84 +84 @@
         
         //front
-//      ControlInfo VCALCCtrl_2a
-//      F_LR_sep = V_Value
+// separations are [cm] translation from zero (center) position
         ControlInfo VCALCCtrl_2b
-        F_TB_sep = V_Value
-        ControlInfo VCALCCtrl_2c
-        F_offset = V_Value
+        F_T_sep = V_Value
+        ControlInfo VCALCCtrl_2bb
+        F_B_sep = V_Value
         ControlInfo VCALCCtrl_2d
         F_SDD = V_Value
@@ -97 +96 @@
 //      M_LR_sep = V_Value
         ControlInfo VCALCCtrl_3b
-        M_TB_sep = V_Value
-        ControlInfo VCALCCtrl_3c
-        M_offset = V_Value
+        M_T_sep = V_Value
+        ControlInfo VCALCCtrl_3bb
+        M_B_sep = V_Value
         ControlInfo VCALCCtrl_3d
         M_SDD = V_Value
@@ -118 +117 @@
         FB_profileX = FT_profileX
         
-        FT_profileY[0] = F_TB_sep               // separation in cm
+        FT_profileY[0] = F_T_sep                // edge closest to zero position [cm]
         FT_profileY[1] = FT_profileY[0] + F_TB_h        // add in height of T/B panel in cm
         
-        FB_profileY = -FT_profileY
+        FB_profileY[0] = F_B_sep
+        FB_profileY[1] = F_B_sep - F_TB_h                       // height of B panel, negative Y
 
         //angles (not calculating anything, just connect the dots)
@@ -150 +150 @@
         MB_profileX = MT_profileX
         
-        MT_profileY[0] = M_TB_sep               // separation in cm
+        MT_profileY[0] = M_T_sep                // separation in cm
         MT_profileY[1] = MT_profileY[0] + M_TB_h        // add in height of T/B panel in cm
-        
-        MB_profileY = -MT_profileY
+
+        MB_profileY[0] = M_B_sep
+        MB_profileY[1] = M_B_sep - M_TB_h                       // height of B panel, negative Y        
 
         //angles (not calculating anything, just connect the dots)
@@ -302 +303 @@
 
 // get the values from the panel
-        Variable F_LR_sep,F_TB_sep, F_SDD, F_offset
-        Variable M_LR_sep,M_TB_sep, M_SDD, M_offset
+        Variable F_L_sep,F_R_sep, F_TB_sep, F_SDD
+        Variable M_L_sep,M_R_sep, M_TB_sep, M_SDD
         Variable B_SDD, B_offset
         //front
         ControlInfo VCALCCtrl_2a
-        F_LR_sep = V_Value
-//      ControlInfo VCALCCtrl_2b
-//      F_TB_sep = V_Value
-        ControlInfo VCALCCtrl_2c
-        F_offset = V_Value
+        F_L_sep = V_Value
+        ControlInfo VCALCCtrl_2aa
+        F_R_sep = V_Value
         ControlInfo VCALCCtrl_2d
         F_SDD = V_Value
@@ -317 +316 @@
         //middle
         ControlInfo VCALCCtrl_3a
-        M_LR_sep = V_Value
-//      ControlInfo VCALCCtrl_3b
-//      M_TB_sep = V_Value
-        ControlInfo VCALCCtrl_3c
-        M_offset = V_Value
+        M_L_sep = V_Value
+        ControlInfo VCALCCtrl_3aa
+        M_R_sep = V_Value
         ControlInfo VCALCCtrl_3d
         M_SDD = V_Value
@@ -340 +337 @@
         FR_profileX = FL_profileX
         
-        FL_profileY[0] = F_LR_sep               // separation in cm
-        FL_profileY[1] = FL_profileY[0] + F_LR_w        // add in width of L/R panel in cm
-        
-        FR_profileY = -FL_profileY
+        FL_profileY[0] = F_L_sep                // translation from zero in cm
+        FL_profileY[1] = F_L_sep - F_LR_w               // subtract width of L/R panel in cm
+        
+        FR_profileY[0] = F_R_sep                // translation from zero in cm
+        FR_profileY[1] = F_R_sep + F_LR_w               // add width of L/R panel in cm
 
         //angles (not calculating anything, just connect the dots)
@@ -372 +370 @@
         MR_profileX = ML_profileX
         
-        ML_profileY[0] = M_LR_sep               // separation in cm
-        ML_profileY[1] = ML_profileY[0] + M_LR_w        // add in width of L/R panel in cm
-        
-        MR_profileY = -ML_profileY
+        ML_profileY[0] = M_L_sep                // translation in cm
+        ML_profileY[1] = M_L_sep - M_LR_w               // subtract width of L/R panel in cm
+        
+        MR_profileY[0] = M_R_sep                // translation in cm
+        MR_profileY[1] = M_R_sep + M_LR_w               // add width of L/R panel in cm
 
         //angles (not calculating anything, just connect the dots)

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

@@ -63 +63 @@
 
 // returns the panel separation [cm]
-Function VCALC_getPanelSeparation(type)
+Function VCALC_getPanelTranslation(type)
         String type
         
@@ -70 +70 @@
         strswitch(type) 
                 case "FL":
+                        ControlInfo/W=VCALC VCALCCtrl_2a
+                        sep = V_Value
+                        break
                 case "FR":
-                case "FLR":             
-                        ControlInfo/W=VCALC VCALCCtrl_2a
+                        ControlInfo/W=VCALC VCALCCtrl_2aa
                         sep = V_Value
                         break
                 case "FT":
-                case "FB":
-                case "FTB":             
                         ControlInfo/W=VCALC VCALCCtrl_2b
                         sep = V_Value   
                         break
+                case "FB":
+                        ControlInfo/W=VCALC VCALCCtrl_2bb
+                        sep = V_Value   
+                        break
 
                 case "ML":
+                        ControlInfo/W=VCALC VCALCCtrl_3a
+                        sep = V_Value
+                        break
                 case "MR":
-                case "MLR":             
-                        ControlInfo/W=VCALC VCALCCtrl_3a
+                        ControlInfo/W=VCALC VCALCCtrl_3aa
                         sep = V_Value
                         break
                 case "MT":
+                        ControlInfo/W=VCALC VCALCCtrl_3b
+                        sep = V_Value
+                        break   
                 case "MB":
-                case "MTB":
-                        ControlInfo/W=VCALC VCALCCtrl_3b
+                        ControlInfo/W=VCALC VCALCCtrl_3bb
                         sep = V_Value
                         break   
@@ -107 +115 @@
 end
 
-// returns the lateral panel offset [cm]
-Function VCALC_getLateralOffset(type)
-        String type
-        
-        Variable offset
-        
-        strswitch(type) 
-                case "FL":
-                case "FR":
-                case "FLR":
-                case "FT":
-                case "FB":
-                case "FTB":             
-                        ControlInfo/W=VCALC VCALCCtrl_2c
-                        offset = V_Value        
-                        break
-
-                case "ML":
-                case "MR":
-                case "MLR":
-                case "MT":
-                case "MB":
-                case "MTB":
-                        ControlInfo/W=VCALC VCALCCtrl_3c
-                        offset = V_Value
-                        break   
-                                                
-                case "B":               
-                        ControlInfo/W=VCALC VCALCCtrl_4a
-                        offset = V_Value
-                        break
-                        
-                default:
-                        Print "Error -- type not found in        VCALC_getLateralOffset(type)"                                  
-                        offset = NaN            //no match for type             
-        endswitch
-        
-        return(offset)
-end
+
 
 // returns the (mean) wavelength from the panel -- value is angstroms

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

@@ -73 +73 @@
 
         PopupMenu popup_b,pos={690,310},size={142,20},title="Binning type",proc=VC_RebinIQ_PopProc
-        PopupMenu popup_b,mode=1,popvalue="One",value= root:Packages:NIST:VSANS:VCALC:gBinTypeStr
+        PopupMenu popup_b,mode=1,value= root:Packages:NIST:VSANS:VCALC:gBinTypeStr
         
         SetVariable setVar_a,pos={476,26},size={120,15},title="axis degrees",proc=FrontView_Range_SetVarProc
@@ -139 +139 @@
 
         
-// all controls are named VCALCCtrl_NA where N is the tab number and A is the letter denoting
+// all controls are named VCALCCtrl_NA where N is the tab number and A is the letter indexing items on tab
 
         
@@ -166 +166 @@
 
 // tab(2) - Front detector panels, initially not visible
-        SetVariable VCALCCtrl_2a,pos={30,260},size={150,15},title="L/R Separation (cm)",proc=VC_FDet_LR_SetVarProc
-        SetVariable VCALCCtrl_2a,limits={0,40,1},disable=1,value=_NUM:20
-        SetVariable VCALCCtrl_2b,pos={30,290},size={150,15},title="T/B Separation (cm)",proc=VC_FDet_LR_SetVarProc
-        SetVariable VCALCCtrl_2b,limits={0,40,1},disable=1,value=_NUM:20
-//      SetVariable VCALCCtrl_2c,pos={205,290},size={150,15},title="Lateral Offset (cm)"
-//      SetVariable VCALCCtrl_2c,limits={0,20,0.1},disable=1,value=_NUM:0
+        SetVariable VCALCCtrl_2a,pos={30,260},size={150,15},title="LEFT Offset (cm)",proc=VC_FDet_LR_SetVarProc
+        SetVariable VCALCCtrl_2a,limits={-20,19,0.1},disable=1,value=_NUM:-10
+        SetVariable VCALCCtrl_2aa,pos={30,290},size={150,15},title="RIGHT Offset (cm)",proc=VC_FDet_LR_SetVarProc
+        SetVariable VCALCCtrl_2aa,limits={-19,20,0.1},disable=1,value=_NUM:10
+        
+        SetVariable VCALCCtrl_2b,pos={30,330},size={150,15},title="TOP Offset (cm)",proc=VC_FDet_LR_SetVarProc
+        SetVariable VCALCCtrl_2b,limits={0,18,0.1},disable=1,value=_NUM:10
+        SetVariable VCALCCtrl_2bb,pos={30,360},size={150,15},title="BOTTOM Offset (cm)",proc=VC_FDet_LR_SetVarProc
+        SetVariable VCALCCtrl_2bb,limits={-18,0,0.1},disable=1,value=_NUM:-10
+        
         SetVariable VCALCCtrl_2d,pos={205,260},size={230,15},title="Sample to Detector Distance (cm)",proc=VC_FDet_SDD_SetVarProc
         SetVariable VCALCCtrl_2d,limits={100,800,1},disable=1   ,value=_NUM:150
@@ -177 +181 @@
 
 // tab(3) - Middle detector panels, initially not visible
-        SetVariable VCALCCtrl_3a,pos={30,260},size={150,15},title="L/R Separation (cm)",proc=VC_MDet_LR_SetVarProc
-        SetVariable VCALCCtrl_3a,limits={0,40.0,1},disable=1,value=_NUM:20
-        SetVariable VCALCCtrl_3b,pos={30,290},size={150,15},title="T/B Separation (cm)",proc=VC_MDet_LR_SetVarProc
-        SetVariable VCALCCtrl_3b,limits={0,40.0,1},disable=1,value=_NUM:20
-//      SetVariable VCALCCtrl_3c,pos={205,290},size={150,15},title="Lateral Offset (cm)"
-//      SetVariable VCALCCtrl_3c,limits={0,20,0.1},disable=1,value=_NUM:0
+        SetVariable VCALCCtrl_3a,pos={30,260},size={150,15},title="LEFT Offset (cm)",proc=VC_MDet_LR_SetVarProc
+        SetVariable VCALCCtrl_3a,limits={-20,19,0.1},disable=1,value=_NUM:-6
+        SetVariable VCALCCtrl_3aa,pos={30,290},size={150,15},title="RIGHT Offset (cm)",proc=VC_MDet_LR_SetVarProc
+        SetVariable VCALCCtrl_3aa,limits={-19,20,0.1},disable=1,value=_NUM:6
+                
+        SetVariable VCALCCtrl_3b,pos={30,330},size={150,15},title="TOP Offset (cm)",proc=VC_MDet_LR_SetVarProc
+        SetVariable VCALCCtrl_3b,limits={0,18,0.1},disable=1,value=_NUM:6
+        SetVariable VCALCCtrl_3bb,pos={30,360},size={150,15},title="BOTTOM Offset (cm)",proc=VC_MDet_LR_SetVarProc
+        SetVariable VCALCCtrl_3bb,limits={-18,0,0.1},disable=1,value=_NUM:-6
+
         SetVariable VCALCCtrl_3d,pos={205,260},size={230,15},title="Sample to Detector Distance (cm)",proc=VC_MDet_SDD_SetVarProc
         SetVariable VCALCCtrl_3d,limits={800,2000,1},disable=1,value=_NUM:1500
+
         
 // tab(4) - Back detector panel
@@ -312 +321 @@
 // just rebin
 //
+// this is for the VCALC 1-D plot subwindow only. so it is set up to 
+// operate on that window - but uses the same binning and plotting routines
+// as the regualr VSANS data display
+//
 Function VC_RebinIQ_PopProc(ctrlName,popNum,popStr) : PopupMenuControl
         String ctrlName
@@ -317 +330 @@
         String popStr           // contents of current popup item as string
 
-        // do the q-binning for front panels to get I(Q)
-        Execute "BinAllFrontPanels()"
-        Execute "Front_IQ_Graph()"
-
-        // do the q-binning for middle panels to get I(Q)
-        Execute "BinAllMiddlePanels()"
-        Execute "Middle_IQ_Graph()"
-        
-        // do the q-binning for the back panel to get I(Q)
-        Execute "BinAllBackPanels()"
-        Execute "Back_IQ_Graph()"
-        
+
+        String type = "VCALC"
+        String str,winStr="VCALC#Panels_IQ",workTypeStr
+        workTypeStr = "root:Packages:NIST:VSANS:"+type
+        
+// dispatch based on the string, not on the number of selection in the pop string
+        V_QBinAllPanels_Circular(type,V_BinTypeStr2Num(popStr))
+        
+        sprintf str,"(\"%s\",%d,\"%s\")",workTypeStr,V_BinTypeStr2Num(popStr),winStr
+
+        Execute ("V_Back_IQ_Graph"+str)
+        Execute ("V_Middle_IQ_Graph"+str)
+        Execute ("V_Front_IQ_Graph"+str)
+
+// OLD - do not use
+//      // do the q-binning for front panels to get I(Q)
+//      Execute "BinAllFrontPanels()"
+//      Execute "Front_IQ_Graph()"
+//
+//      // do the q-binning for middle panels to get I(Q)
+//      Execute "BinAllMiddlePanels()"
+//      Execute "Middle_IQ_Graph()"
+//      
+//      // do the q-binning for the back panel to get I(Q)
+//      Execute "BinAllBackPanels()"
+//      Execute "Back_IQ_Graph()"
+//      
         return(0)       
 End
@@ -560 +588 @@
                         String sval = sva.sval
                         
-                        Variable LR_sep,TB_sep
-                        // don't know if LR or TB called, so get the explicit values
-                        //
-                        ControlInfo VCALCCtrl_2a
-                        LR_sep = V_Value
-                        ControlInfo VCALCCtrl_2b
-                        TB_sep = V_Value
-                        
+//                      Variable LR_sep,TB_sep
+//                      // don't know if LR or TB called, so get the explicit values
+//                      //
+//                      ControlInfo VCALCCtrl_2a
+//                      LR_sep = V_Value
+//                      ControlInfo VCALCCtrl_2b
+//                      TB_sep = V_Value
+//                      
 //                      UpdateFrontDetector(LR_sep,TB_sep)
                         
@@ -598 +626 @@
                         String sval = sva.sval
                         
-                        Variable LR_sep,TB_sep
-                        // don't know if LR or TB called, so get the explicit values
-                        //
-                        ControlInfo VCALCCtrl_3a
-                        LR_sep = V_Value
-                        ControlInfo VCALCCtrl_3b
-                        TB_sep = V_Value
+//                      Variable LR_sep,TB_sep
+//                      // don't know if LR or TB called, so get the explicit values
+//                      //
+//                      ControlInfo VCALCCtrl_3a
+//                      LR_sep = V_Value
+//                      ControlInfo VCALCCtrl_3b
+//                      TB_sep = V_Value
                         
 //                      UpdateMiddleDetector(LR_sep,TB_sep)
@@ -697 +725 @@
         Make/O/D/N=1 :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)
         Make/O/D/N=1 :entry:instrument:detector_FL:pixel_num_x = 48     // == number of tubes
@@ -717 +736 @@
         Make/O/D/N=1 :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
+
 
 // pixel beam center - HDF style
@@ -761 +773 @@
         Make/O/D/N=1 :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)
@@ -781 +785 @@
         Make/O/D/N=1 :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
+
 
 // pixel beam center - HDF style
@@ -809 +806 @@
         Make/O/D/N=1 :entry:instrument:detector_B:x_pixel_size = 0.1            // 1 mm resolution (units of cm here)
         Make/O/D/N=1 :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:instrument:detector_B:pixel_num_x = 150     // detector pixels in x-direction
         Make/O/D/N=1 :entry:instrument:detector_B:pixel_num_y = 150
-//      Variable/G gBack_nPix_X = 150           
-//      Variable/G gBack_nPix_Y = 150   
+        
 
 // pixel beam center - HDF style

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

@@ -482 +482 @@
                         AppendToGraph/W=$winNameStr iBin_qxqy_MT vs qBin_qxqy_MT
                         AppendToGraph/W=$winNameStr iBin_qxqy_MB vs qBin_qxqy_MB
-                        ErrorBars/T=0 iBin_qxqy_ML Y,wave=(:eBin_qxqy_ML,:eBin_qxqy_ML)
-                        ErrorBars/T=0 iBin_qxqy_MR Y,wave=(:eBin_qxqy_MR,:eBin_qxqy_MR)
-                        ErrorBars/T=0 iBin_qxqy_MT Y,wave=(:eBin_qxqy_MT,:eBin_qxqy_MT)
-                        ErrorBars/T=0 iBin_qxqy_MB Y,wave=(:eBin_qxqy_MB,:eBin_qxqy_MB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_ML Y,wave=(:eBin_qxqy_ML,:eBin_qxqy_ML)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MR Y,wave=(:eBin_qxqy_MR,:eBin_qxqy_MR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MT Y,wave=(:eBin_qxqy_MT,:eBin_qxqy_MT)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MB Y,wave=(:eBin_qxqy_MB,:eBin_qxqy_MB)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -505 +505 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR vs qBin_qxqy_MLR
                         AppendToGraph/W=$winNameStr iBin_qxqy_MTB vs qBin_qxqy_MTB
-                        ErrorBars/T=0 iBin_qxqy_MLR Y,wave=(:eBin_qxqy_MLR,:eBin_qxqy_MLR)
-                        ErrorBars/T=0 iBin_qxqy_MTB Y,wave=(:eBin_qxqy_MTB,:eBin_qxqy_MTB)
+
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MTB Y,wave=(:eBin_qxqy_MTB,:eBin_qxqy_MTB)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -529 +529 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLRTB vs qBin_qxqy_MLRTB
-                        ErrorBars/T=0 iBin_qxqy_MLRTB Y,wave=(:eBin_qxqy_MLRTB,:eBin_qxqy_MLRTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLRTB Y,wave=(:eBin_qxqy_MLRTB,:eBin_qxqy_MLRTB)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -554 +554 @@
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_MT vs qBin_qxqy_MT
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_MB vs qBin_qxqy_MB
-                        ErrorBars/T=0 iBin_qxqy_ML Y,wave=(:eBin_qxqy_ML,:eBin_qxqy_ML)
-                        ErrorBars/T=0 iBin_qxqy_MR Y,wave=(:eBin_qxqy_MR,:eBin_qxqy_MR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_ML Y,wave=(:eBin_qxqy_ML,:eBin_qxqy_ML)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MR Y,wave=(:eBin_qxqy_MR,:eBin_qxqy_MR)
 //                      ErrorBars/T=0 iBin_qxqy_MT Y,wave=(:eBin_qxqy_MT,:eBin_qxqy_MT)
 //                      ErrorBars/T=0 iBin_qxqy_MB Y,wave=(:eBin_qxqy_MB,:eBin_qxqy_MB)
@@ -580 +580 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLRTB vs qBin_qxqy_MLRTB
-                        ErrorBars/T=0 iBin_qxqy_MLRTB Y,wave=(:eBin_qxqy_MLRTB,:eBin_qxqy_MLRTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLRTB Y,wave=(:eBin_qxqy_MLRTB,:eBin_qxqy_MLRTB)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -602 +602 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR vs qBin_qxqy_MLR
-                        ErrorBars/T=0 iBin_qxqy_MLR Y,wave=(:eBin_qxqy_MLR,:eBin_qxqy_MLR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLR Y,wave=(:eBin_qxqy_MLR,:eBin_qxqy_MLR)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -624 +624 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR vs qBin_qxqy_MLR
-                        ErrorBars/T=0 iBin_qxqy_MLR Y,wave=(:eBin_qxqy_MLR,:eBin_qxqy_MLR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLR Y,wave=(:eBin_qxqy_MLR,:eBin_qxqy_MLR)
                         
                         ModifyGraph/W=$winNameStr mode=4
@@ -683 +683 @@
                         AppendToGraph/W=$winNameStr iBin_qxqy_FT vs qBin_qxqy_FT
                         AppendToGraph/W=$winNameStr iBin_qxqy_FB vs qBin_qxqy_FB
-                        ErrorBars/T=0 iBin_qxqy_FL Y,wave=(:eBin_qxqy_FL,:eBin_qxqy_FL)
-                        ErrorBars/T=0 iBin_qxqy_FR Y,wave=(:eBin_qxqy_FR,:eBin_qxqy_FR)
-                        ErrorBars/T=0 iBin_qxqy_FT Y,wave=(:eBin_qxqy_FT,:eBin_qxqy_FT)
-                        ErrorBars/T=0 iBin_qxqy_FB Y,wave=(:eBin_qxqy_FB,:eBin_qxqy_FB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FL Y,wave=(:eBin_qxqy_FL,:eBin_qxqy_FL)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FR Y,wave=(:eBin_qxqy_FR,:eBin_qxqy_FR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FT Y,wave=(:eBin_qxqy_FT,:eBin_qxqy_FT)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FB Y,wave=(:eBin_qxqy_FB,:eBin_qxqy_FB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -709 +709 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR vs qBin_qxqy_FLR
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB vs qBin_qxqy_FTB
-                        ErrorBars/T=0 iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
-                        ErrorBars/T=0 iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -733 +733 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLRTB vs qBin_qxqy_FLRTB
-                        ErrorBars/T=0 iBin_qxqy_FLRTB Y,wave=(:eBin_qxqy_FLRTB,:eBin_qxqy_FLRTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLRTB Y,wave=(:eBin_qxqy_FLRTB,:eBin_qxqy_FLRTB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -758 +758 @@
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_FT vs qBin_qxqy_FT
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_FB vs qBin_qxqy_FB
-                        ErrorBars/T=0 iBin_qxqy_FL Y,wave=(:eBin_qxqy_FL,:eBin_qxqy_FL)
-                        ErrorBars/T=0 iBin_qxqy_FR Y,wave=(:eBin_qxqy_FR,:eBin_qxqy_FR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FL Y,wave=(:eBin_qxqy_FL,:eBin_qxqy_FL)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FR Y,wave=(:eBin_qxqy_FR,:eBin_qxqy_FR)
 //                      ErrorBars/T=0 iBin_qxqy_FT Y,wave=(:eBin_qxqy_FT,:eBin_qxqy_FT)
 //                      ErrorBars/T=0 iBin_qxqy_FB Y,wave=(:eBin_qxqy_FB,:eBin_qxqy_FB)
@@ -785 +785 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR vs qBin_qxqy_FLR
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB vs qBin_qxqy_FTB
-                        ErrorBars/T=0 iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
-                        ErrorBars/T=0 iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -809 +809 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLRTB vs qBin_qxqy_FLRTB
-                        ErrorBars/T=0 iBin_qxqy_FLRTB Y,wave=(:eBin_qxqy_FLRTB,:eBin_qxqy_FLRTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLRTB Y,wave=(:eBin_qxqy_FLRTB,:eBin_qxqy_FLRTB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -832 +832 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR vs qBin_qxqy_FLR
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB vs qBin_qxqy_FTB
-                        ErrorBars/T=0 iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
-                        ErrorBars/T=0 iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR Y,wave=(:eBin_qxqy_FLR,:eBin_qxqy_FLR)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB Y,wave=(:eBin_qxqy_FTB,:eBin_qxqy_FTB)
 
                         ModifyGraph/W=$winNameStr mode=4
@@ -878 +878 @@
         ClearIQIfDisplayed_AllFldr("B",winNameStr)
 
-
-        SetDataFolder $(fullPathToFolder)       
-
-//      if(binType==1 || binType==2 || binType==3)
-        if(binType==1 || binType==2 || binType==3)
+// skip everything if back detector is ignored
+        if(!root:Packages:NIST:VSANS:Globals:gIgnoreDetB)
         
                 SetDataFolder $(fullPathToFolder)       
-                CheckDisplayed/W=$winNameStr iBin_qxqy_B
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
-                        ErrorBars/T=0 iBin_qxqy_B Y,wave=(:eBin_qxqy_B,:eBin_qxqy_B)
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19,msize(iBin_qxqy_B)=2
-//                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=3,textMarker(iBin_qxqy_B)={"B","default",1,0,5,0.00,0.00}
-
+        
+                if(binType==1 || binType==2 || binType==3)
+                
+                        SetDataFolder $(fullPathToFolder)       
+                        CheckDisplayed/W=$winNameStr iBin_qxqy_B
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B Y,wave=(:eBin_qxqy_B,:eBin_qxqy_B)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19,msize(iBin_qxqy_B)=2
+        //                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=3,textMarker(iBin_qxqy_B)={"B","default",1,0,5,0.00,0.00}
+                        endif
+                        
                 endif
-                
-        endif
-
-        //nothing different here since there is ony a single detector to display, but for the future...
-        if(binType==4)
-        
-                SetDataFolder $(fullPathToFolder)                               // ClearIQIfDisplayed_AllFldr() resets to root:
-                CheckDisplayed/W=$winNameStr iBin_qxqy_B
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=2
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
+        
+                //nothing different here since there is ony a single detector to display, but for the future...
+                if(binType==4)
+                
+                        SetDataFolder $(fullPathToFolder)                               // ClearIQIfDisplayed_AllFldr() resets to root:
+                        CheckDisplayed/W=$winNameStr iBin_qxqy_B
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B Y,wave=(:eBin_qxqy_B,:eBin_qxqy_B)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=2
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                        endif
                 endif
-        endif
-
-        if(binType==5 || binType==6 || binType==7)
-        
-                SetDataFolder $(fullPathToFolder)       
-                CheckDisplayed/W=$winNameStr iBin_qxqy_B
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
-                        ErrorBars/T=0 iBin_qxqy_B Y,wave=(:eBin_qxqy_B,:eBin_qxqy_B)
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19,msize(iBin_qxqy_B)=2
-//                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=3,textMarker(iBin_qxqy_B)={"B","default",1,0,5,0.00,0.00}
-
+        
+                if(binType==5 || binType==6 || binType==7)
+                
+                        SetDataFolder $(fullPathToFolder)       
+                        CheckDisplayed/W=$winNameStr iBin_qxqy_B
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B vs qBin_qxqy_B
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B Y,wave=(:eBin_qxqy_B,:eBin_qxqy_B)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B)=4
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B)=19,msize(iBin_qxqy_B)=2
+        //                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B)=3,textMarker(iBin_qxqy_B)={"B","default",1,0,5,0.00,0.00}
+                        endif
+                        
                 endif
-                
-        endif
-
+
+        endif           // if (don't ignore back detector)
         
         SetDataFolder root:
@@ -964 +965 @@
         ClearIQIfDisplayed_AllFldr("B_trim",winNameStr)
 
-
-        SetDataFolder $(fullPathToFolder)       
-
-        if(binType==1 || binType==2 || binType==3)
+// skip everything if back detector is ignored
+        if(!root:Packages:NIST:VSANS:Globals:gIgnoreDetB)
         
                 SetDataFolder $(fullPathToFolder)       
-                CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
-                        ErrorBars/T=0 iBin_qxqy_B_trim Y,wave=(:eBin_qxqy_B_trim,:eBin_qxqy_B_trim)
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19,msize(iBin_qxqy_B_trim)=3
-//                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3,textMarker(iBin_qxqy_B_trim)={"B","default",1,0,5,0.00,0.00}
-
+        
+                if(binType==1 || binType==2 || binType==3)
+                
+                        SetDataFolder $(fullPathToFolder)       
+                        CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B_trim Y,wave=(:eBin_qxqy_B_trim,:eBin_qxqy_B_trim)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19,msize(iBin_qxqy_B_trim)=3
+        //                      ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3,textMarker(iBin_qxqy_B_trim)={"B","default",1,0,5,0.00,0.00}
+        
+                        endif
+                        
                 endif
-                
-        endif
-
-        //nothing different here since there is ony a single detector to display, but for the future...
-        if(binType==4)
-        
+        
+                //nothing different here since there is ony a single detector to display, but for the future...
+                if(binType==4)
+                
+                        SetDataFolder $(fullPathToFolder)       
+                        CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B_trim Y,wave=(:eBin_qxqy_B_trim,:eBin_qxqy_B_trim)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                        endif
+                endif
+        
+                if(binType==5 || binType==6 || binType==7)
+                
                 SetDataFolder $(fullPathToFolder)       
-                CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
+                                CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
+                        
+                        if(V_flag==0)
+                                AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
+                                ErrorBars/T=0/W=$winNameStr iBin_qxqy_B_trim Y,wave=(:eBin_qxqy_B_trim,:eBin_qxqy_B_trim)
+                                ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
+                                ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19
+                                ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
+                                ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3
+                                ModifyGraph/W=$winNameStr grid=1
+                                ModifyGraph/W=$winNameStr log=1
+                                ModifyGraph/W=$winNameStr mirror=2
+                        endif
                 endif
-        endif
-
-        if(binType==5 || binType==6 || binType==7)
-        
-        SetDataFolder $(fullPathToFolder)       
-                        CheckDisplayed/W=$winNameStr iBin_qxqy_B_trim
-                
-                if(V_flag==0)
-                        AppendtoGraph/W=$winNameStr iBin_qxqy_B_trim vs qBin_qxqy_B_trim
-                        ModifyGraph/W=$winNameStr mode(iBin_qxqy_B_trim)=4
-                        ModifyGraph/W=$winNameStr marker(iBin_qxqy_B_trim)=19
-                        ModifyGraph/W=$winNameStr rgb(iBin_qxqy_B_trim)=(1,52428,52428)
-                        ModifyGraph/W=$winNameStr msize(iBin_qxqy_B_trim)=3
-                        ModifyGraph/W=$winNameStr grid=1
-                        ModifyGraph/W=$winNameStr log=1
-                        ModifyGraph/W=$winNameStr mirror=2
-                endif
-        endif
+        
+        endif // if (don't ignore back detector)
         
         SetDataFolder root:
@@ -1074 +1081 @@
                         AppendToGraph/W=$winNameStr iBin_qxqy_MT_trim vs qBin_qxqy_MT_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_MB_trim vs qBin_qxqy_MB_trim
-                        ErrorBars/T=0 iBin_qxqy_ML_trim Y,wave=(:eBin_qxqy_ML_trim,:eBin_qxqy_ML_trim)
-                        ErrorBars/T=0 iBin_qxqy_MR_trim Y,wave=(:eBin_qxqy_MR_trim,:eBin_qxqy_MR_trim)
-                        ErrorBars/T=0 iBin_qxqy_MT_trim Y,wave=(:eBin_qxqy_MT_trim,:eBin_qxqy_MT_trim)
-                        ErrorBars/T=0 iBin_qxqy_MB_trim Y,wave=(:eBin_qxqy_MB_trim,:eBin_qxqy_MB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_ML_trim Y,wave=(:eBin_qxqy_ML_trim,:eBin_qxqy_ML_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MR_trim Y,wave=(:eBin_qxqy_MR_trim,:eBin_qxqy_MR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MT_trim Y,wave=(:eBin_qxqy_MT_trim,:eBin_qxqy_MT_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MB_trim Y,wave=(:eBin_qxqy_MB_trim,:eBin_qxqy_MB_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_ML_trim)=4
@@ -1118 +1125 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR_trim vs qBin_qxqy_MLR_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_MTB_trim vs qBin_qxqy_MTB_trim
-                        ErrorBars/T=0 iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
-                        ErrorBars/T=0 iBin_qxqy_MTB_trim Y,wave=(:eBin_qxqy_MTB_trim,:eBin_qxqy_MTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MTB_trim Y,wave=(:eBin_qxqy_MTB_trim,:eBin_qxqy_MTB_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_MLR_trim)=4
@@ -1156 +1163 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLRTB_trim vs qBin_qxqy_MLRTB_trim
-                        ErrorBars/T=0 iBin_qxqy_MLRTB_trim Y,wave=(:eBin_qxqy_MLRTB_trim,:eBin_qxqy_MLRTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLRTB_trim Y,wave=(:eBin_qxqy_MLRTB_trim,:eBin_qxqy_MLRTB_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_MLRTB_trim)=4
@@ -1193 +1200 @@
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_MT_trim vs qBin_qxqy_MT_trim
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_MB_trim vs qBin_qxqy_MB_trim
-                        ErrorBars/T=0 iBin_qxqy_ML_trim Y,wave=(:eBin_qxqy_ML_trim,:eBin_qxqy_ML_trim)
-                        ErrorBars/T=0 iBin_qxqy_MR_trim Y,wave=(:eBin_qxqy_MR_trim,:eBin_qxqy_MR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_ML_trim Y,wave=(:eBin_qxqy_ML_trim,:eBin_qxqy_ML_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MR_trim Y,wave=(:eBin_qxqy_MR_trim,:eBin_qxqy_MR_trim)
 //                      ErrorBars/T=0 iBin_qxqy_MT_trim Y,wave=(:eBin_qxqy_MT_trim,:eBin_qxqy_MT_trim)
 //                      ErrorBars/T=0 iBin_qxqy_MB_trim Y,wave=(:eBin_qxqy_MB_trim,:eBin_qxqy_MB_trim)
@@ -1239 +1246 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLRTB_trim vs qBin_qxqy_MLRTB_trim
-                        ErrorBars/T=0 iBin_qxqy_MLRTB_trim Y,wave=(:eBin_qxqy_MLRTB_trim,:eBin_qxqy_MLRTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLRTB_trim Y,wave=(:eBin_qxqy_MLRTB_trim,:eBin_qxqy_MLRTB_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_MLRTB_trim)=4
@@ -1272 +1279 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR_trim vs qBin_qxqy_MLR_trim
-                        ErrorBars/T=0 iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_MLR_trim)=4
@@ -1306 +1313 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_MLR_trim vs qBin_qxqy_MLR_trim
-                        ErrorBars/T=0 iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_MLR_trim Y,wave=(:eBin_qxqy_MLR_trim,:eBin_qxqy_MLR_trim)
                         
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_MLR_trim)=4
@@ -1365 +1372 @@
                         AppendToGraph/W=$winNameStr iBin_qxqy_FT_trim vs qBin_qxqy_FT_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_FB_trim vs qBin_qxqy_FB_trim
-                        ErrorBars/T=0 iBin_qxqy_FL_trim Y,wave=(:eBin_qxqy_FL_trim,:eBin_qxqy_FL_trim)
-                        ErrorBars/T=0 iBin_qxqy_FR_trim Y,wave=(:eBin_qxqy_FR_trim,:eBin_qxqy_FR_trim)
-                        ErrorBars/T=0 iBin_qxqy_FT_trim Y,wave=(:eBin_qxqy_FT_trim,:eBin_qxqy_FT_trim)
-                        ErrorBars/T=0 iBin_qxqy_FB_trim Y,wave=(:eBin_qxqy_FB_trim,:eBin_qxqy_FB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FL_trim Y,wave=(:eBin_qxqy_FL_trim,:eBin_qxqy_FL_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FR_trim Y,wave=(:eBin_qxqy_FR_trim,:eBin_qxqy_FR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FT_trim Y,wave=(:eBin_qxqy_FT_trim,:eBin_qxqy_FT_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FB_trim Y,wave=(:eBin_qxqy_FB_trim,:eBin_qxqy_FB_trim)
 
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_FL_trim)=4
@@ -1400 +1407 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR_trim vs qBin_qxqy_FLR_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB_trim vs qBin_qxqy_FTB_trim
-                        ErrorBars/T=0 iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
-                        ErrorBars/T=0 iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
 
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_FLR_trim)=4
@@ -1427 +1434 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLRTB_trim vs qBin_qxqy_FLRTB_trim
-                        ErrorBars/T=0 iBin_qxqy_FLRTB_trim Y,wave=(:eBin_qxqy_FLRTB_trim,:eBin_qxqy_FLRTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLRTB_trim Y,wave=(:eBin_qxqy_FLRTB_trim,:eBin_qxqy_FLRTB_trim)
 
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_FLRTB_trim)=4
@@ -1452 +1459 @@
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_FT_trim vs qBin_qxqy_FT_trim
 //                      AppendToGraph/W=$winNameStr iBin_qxqy_FB_trim vs qBin_qxqy_FB_trim
-                        ErrorBars/T=0 iBin_qxqy_FL_trim Y,wave=(:eBin_qxqy_FL_trim,:eBin_qxqy_FL_trim)
-                        ErrorBars/T=0 iBin_qxqy_FR_trim Y,wave=(:eBin_qxqy_FR_trim,:eBin_qxqy_FR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FL_trim Y,wave=(:eBin_qxqy_FL_trim,:eBin_qxqy_FL_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FR_trim Y,wave=(:eBin_qxqy_FR_trim,:eBin_qxqy_FR_trim)
 //                      ErrorBars/T=0 iBin_qxqy_FT_trim Y,wave=(:eBin_qxqy_FT_trim,:eBin_qxqy_FT_trim)
 //                      ErrorBars/T=0 iBin_qxqy_FB_trim Y,wave=(:eBin_qxqy_FB_trim,:eBin_qxqy_FB_trim)
@@ -1489 +1496 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR_trim vs qBin_qxqy_FLR_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB_trim vs qBin_qxqy_FTB_trim
-                        ErrorBars/T=0 iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
-                        ErrorBars/T=0 iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
 
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_FLR_trim)=4
@@ -1516 +1523 @@
                 if(V_flag==0)
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLRTB_trim vs qBin_qxqy_FLRTB_trim
-                        ErrorBars/T=0 iBin_qxqy_FLRTB_trim Y,wave=(:eBin_qxqy_FLRTB_trim,:eBin_qxqy_FLRTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLRTB_trim Y,wave=(:eBin_qxqy_FLRTB_trim,:eBin_qxqy_FLRTB_trim)
 
 
@@ -1540 +1547 @@
                         AppendtoGraph/W=$winNameStr iBin_qxqy_FLR_trim vs qBin_qxqy_FLR_trim
                         AppendToGraph/W=$winNameStr iBin_qxqy_FTB_trim vs qBin_qxqy_FTB_trim
-                        ErrorBars/T=0 iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
-                        ErrorBars/T=0 iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FLR_trim Y,wave=(:eBin_qxqy_FLR_trim,:eBin_qxqy_FLR_trim)
+                        ErrorBars/T=0/W=$winNameStr iBin_qxqy_FTB_trim Y,wave=(:eBin_qxqy_FTB_trim,:eBin_qxqy_FTB_trim)
 
                         ModifyGraph/W=$winNameStr mode(iBin_qxqy_FLR_trim)=4

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

@@ -160 +160 @@
 // both beam conditions (+/- 0.0 mm). FTB was +/- 0.8 mm, MTB +/- 2 mm
         if(cmpstr(detStr,"FL") == 0 || cmpstr(detStr,"FR") == 0)
-                gap = 3.8               //mm (measured, JB 1/4/18)
+                gap = 3.5               //mm (measured, JB 1/4/18)
         endif
         if(cmpstr(detStr,"FT") == 0 || cmpstr(detStr,"FB") == 0)
-                gap = 8         //mm
+                gap = 3.3               //mm (measured, JB 2/1/18)
         endif
         if(cmpstr(detStr,"ML") == 0 || cmpstr(detStr,"MR") == 0)
@@ -169 +169 @@
         endif
         if(cmpstr(detStr,"MT") == 0 || cmpstr(detStr,"MB") == 0)
-                gap = 5         //mm
+                gap = 18.3              //mm (measured, JB 2/1/18)
         endif
 // TODO: this is the line to keep, to replace the hard-wired values
@@ -179 +179 @@
                 // adjust the x postion based on the beam center being nominally (0,0) in units of cm, not pixels
                 if(cmpstr(fname,"VCALC")== 0 )
-                        offset = VCALC_getPanelSeparation(detStr)
+                        offset = VCALC_getPanelTranslation(detStr)
                         offset *= 10                    // convert to units of mm
-                        offset /= 2                     // 1/2 the total separation
-                        if(cmpstr("L",detStr[1]) == 0)
-                                offset *= -1            //negative value for L
-                        endif
+//                      if(cmpstr("L",detStr[1]) == 0)
+//                              offset *= -1            //negative value for L
+//                      endif
                 else
                         //normal case
@@ -213 +212 @@
 
                 if(cmpstr(fname,"VCALC")== 0 )
-                        offset = VCALC_getPanelSeparation(detStr)
+                        offset = VCALC_getPanelTranslation(detStr)
                         offset *= 10                    // convert to units of mm
-                        offset /= 2                     // 1/2 the total separation
-                        if(cmpstr("B",detStr[1]) == 0)
-                                offset *= -1    // negative value for Bottom det
-                        endif
+//                      if(cmpstr("B",detStr[1]) == 0)
+//                              offset *= -1    // negative value for Bottom det
+//                      endif
                 else
                         //normal case

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

@@ -54 +54 @@
 // - Aug 07 - added input to switch calculation based on lenses (==1 if in)
 //
-// - called by CircSectAvg.ipf and RectAnnulAvg.ipf
-//
-// passed values are read from RealsRead
-// except DDet and apOff, which are set from globals before passing
+// - SANS -- called by CircSectAvg.ipf and RectAnnulAvg.ipf
+//
+// - VSANS -- called in VC_fDoBinning_QxQy2D(folderStr, binningType)
 //
 // DDet is the detector pixel resolution
@@ -85 +84 @@
 Function V_getResolution(inQ,lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,del_r,usingLenses,SigmaQ,QBar,fSubS)
         Variable inQ, lambda, lambdaWidth, DDet, apOff, S1, S2, L1, L2, BS, del_r,usingLenses
-        Variable &fSubS, &QBar, &SigmaQ         //these are the output quantities at the input Q value
+        Variable &SigmaQ, &QBar, &fSubS         //these are the output quantities at the input Q value
         
         //lots of calculation variables

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

@@ -18 +18 @@
         "Data Display",DoWindow/F VSANS_Data
         "VCALC",VCALC_Panel()
+        "VSANS Preferences",Show_VSANSPreferences_Panel()
         "-"
         Submenu "In Progress Panels"
-                "VSANS Preferences",Show_VSANSPreferences_Panel()
                 "Beam Center Panel",V_FindBeamCenter()
                 "Patch Beam Center XY",V_PatchDet_xyCenters_Panel()

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

@@ -61 +61 @@
                 
                 // returns the total separation (assumed symmetric) in cm
-                val = VCALC_getPanelSeparation(detStr)          
-                val /= 2                // to get half of the separation, and cm for the data file
+                val = VCALC_getPanelTranslation(detStr)         
                 // it's OK to call both of these. these functions check detStr for the correct value
-                if(cmpstr("L",detStr[1]) == 0 || cmpstr("B",detStr[1]) == 0)
-                        val *= -1       // negative separation position for L and Bottom
-                endif
-                V_writeDet_LateralOffset(fileName,detStr,val)
-                V_writeDet_VerticalOffset(fileName,detStr,val)
-
+                if(cmpstr("T",detStr[1]) == 0 || cmpstr("B",detStr[1]) == 0)
+                        V_writeDet_LateralOffset(fileName,detStr,val)           // T/B panels
+                else
+                        V_writeDet_VerticalOffset(fileName,detStr,val)          //  L/R panels, or back detector
+                endif
                 // x and y pixel sizes for each detector should be correct in the "base" file - but if not...
                 //Function VCALC_getPixSizeX(type)              // returns the pixel X size, in [cm]