Changeset 1062

Timestamp:

Aug 29, 2017 12:55:04 PM (5 years ago)

Author:

srkline

Message:

many changes to the VCALC code and a few changes to the main code to get the units consistent, and centimeters everywhere possible. The real space distance array and the non-linear calibrations are still defined and calculated in mm. This can hopefully be changed in the future. Some constants in the data file will need to be updated to cm, such as the T/B setback, which has been confirmed to be 41.0 cm

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VC_DetectorBinning_Q.ipf (modified) (10 diffs)
• VC_DetectorBinning_Utils.ipf (modified) (13 diffs)
• VC_FrontView_Deg.ipf (modified) (6 diffs)
• VC_SideView.ipf (modified) (13 diffs)
• VC_UtilityProcedures.ipf (modified) (7 diffs)
• VC_VCALCPanel_MockUp.ipf (modified) (4 diffs)
• V_DetectorCorrections.ipf (modified) (4 diffs)
• V_RAW_Data_Panel.ipf (modified) (1 diff)
• V_Testing_Data_Procs.ipf (modified) (1 diff)
• Vx_NexusFromIgor.ipf (modified) (4 diffs)
• Vx_Nexus_VSANS_Write.ipf (modified) (4 diffs)

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

@@ -125 +125 @@
 
         Variable xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY,nPix_X,nPix_Y
-        Variable F_LR_sep,F_TB_sep,F_offset,F_sdd_offset
+        Variable F_LR_sep,F_TB_sep,F_offset,F_sdd_setback
 
         String folderPath = "root:Packages:NIST:VSANS:VCALC"
@@ -136 +136 @@
         F_offset = VCALC_getLateralOffset("FL")
         
-        SDD = VCALC_getSDD("FL")                //nominal SDD - need offset for TB
+        SDD = VCALC_getSDD("FL")                //nominal SDD [cm] - need offset for TB
         lam = VCALC_getWavelength()
 
-//separations are in mm -- need to watch the units, convert to cm
-        F_LR_sep /= 10
-        F_TB_sep /= 10
+//separations are in cm -- 
+//      F_LR_sep /= 10
+//      F_TB_sep /= 10
 // TODO - I'm treating the separation as the TOTAL width - so the difference
 //      from the "center" to the edge is 1/2 of the separation
@@ -147 +147 @@
 // TODO (make the N along the tube length a variable, since this can be reset @ acquisition)
 
-        F_sdd_offset = VCALC_getTopBottomSDDOffset("FT")        //T/B are 300 mm farther back  //TODO: make all detector parameters global, not hard-wired
+        F_sdd_setback = VCALC_getTopBottomSDDSetback("FT")      //T/B are 41 cm farther back  //TODO: make all detector parameters global, not hard-wired
 
 // detector data to bin
@@ -274 +274 @@
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation
 //      VC_Detector_2Q(det_FT,qTot_FT,qx_FT,qy_FT,qz_FT,xCtr,yCtr,sdd+F_sdd_offset/1000,lam,pixSizeX,pixSizeY)
-        VC_Detector_2Q_NonLin(det_FT,qTot_FT,qx_FT,qy_FT,qz_FT,xCtr,yCtr,sdd+F_sdd_offset/1000,lam,pixSizeX,pixSizeY,"FT")
+        VC_Detector_2Q_NonLin(det_FT,qTot_FT,qx_FT,qy_FT,qz_FT,xCtr,yCtr,sdd+F_sdd_setback,lam,pixSizeX,pixSizeY,"FT")
 
 //      Print "xy for FT = ",xCtr,yCtr
@@ -315 +315 @@
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation
 //      VC_Detector_2Q(det_FB,qTot_FB,qx_FB,qy_FB,qz_FB,xCtr,yCtr,sdd+F_sdd_offset/1000,lam,pixSizeX,pixSizeY)
-        VC_Detector_2Q_NonLin(det_FB,qTot_FB,qx_FB,qy_FB,qz_FB,xCtr,yCtr,sdd+F_sdd_offset/1000,lam,pixSizeX,pixSizeY,"FB")
+        VC_Detector_2Q_NonLin(det_FB,qTot_FB,qx_FB,qy_FB,qz_FB,xCtr,yCtr,sdd+F_sdd_setback,lam,pixSizeX,pixSizeY,"FB")
 
 //      Print "xy for FB = ",xCtr,yCtr
@@ -347 +347 @@
                 LR_sep = V_Value        
         endif           
-//separations on panel are in mm -- need to watch the units, convert to cm
-        LR_sep /= 10
+//separations on panel are in cm -- need to watch the units, convert to cm
+//      LR_sep /= 10
 
 //detector data
@@ -570 +570 @@
 
         Variable xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY,nPix_X,nPix_Y
-        Variable M_LR_sep,M_TB_sep,M_offset, M_sdd_offset
+        Variable M_LR_sep,M_TB_sep,M_offset, M_sdd_setback
 
 
@@ -581 +581 @@
         M_offset = VCALC_getLateralOffset("ML")
         
-        SDD = VCALC_getSDD("ML")                //nominal SDD - need offset for TB
+        SDD = VCALC_getSDD("ML")                //nominal SDD [cm] - need offset for TB
         lam = VCALC_getWavelength()
 
-//separations are in mm -- need to watch the units, convert to cm
-        M_LR_sep /= 10
-        M_TB_sep /= 10
+//separations are in cm -- need to watch the units, convert to cm
+//      M_LR_sep /= 10
+//      M_TB_sep /= 10
 // TODO - I'm treating the separation as the TOTAL width - so the difference
 //      from the "center" to the edge is 1/2 of the separation
 
 // TODO (make the N along the tube length a variable, since this can be reset @ acquisition)
-        M_sdd_offset = VCALC_getTopBottomSDDOffset("MT")        //T/B are 30 cm farther back  //TODO: make all detector parameters global, not hard-wired
+        M_sdd_setback = VCALC_getTopBottomSDDSetback("MT")      //T/B are 41 cm farther back  //TODO: make all detector parameters global, not hard-wired
 
 
@@ -723 +723 @@
         // global sdd_offset is in (mm), convert to meters here for the Q-calculation  
 //      VC_Detector_2Q(det_MT,qTot_MT,qx_MT,qy_MT,qz_MT,xCtr,yCtr,sdd+M_sdd_offset/1000,lam,pixSizeX,pixSizeY)
-        VC_Detector_2Q_NonLin(det_MT,qTot_MT,qx_MT,qy_MT,qz_MT,xCtr,yCtr,sdd+M_sdd_offset/1000,lam,pixSizeX,pixSizeY,"MT")
+        VC_Detector_2Q_NonLin(det_MT,qTot_MT,qx_MT,qy_MT,qz_MT,xCtr,yCtr,sdd+M_sdd_setback,lam,pixSizeX,pixSizeY,"MT")
 
 //      Print "xy for MT = ",xCtr,yCtr
@@ -764 +764 @@
                 // global sdd_offset is in (mm), convert to meters here for the Q-calculation
 //      VC_Detector_2Q(det_MB,qTot_MB,qx_MB,qy_MB,qz_MB,xCtr,yCtr,sdd+M_sdd_offset/1000,lam,pixSizeX,pixSizeY)
-        VC_Detector_2Q_NonLin(det_MB,qTot_MB,qx_MB,qy_MB,qz_MB,xCtr,yCtr,sdd+M_sdd_offset/1000,lam,pixSizeX,pixSizeY,"MB")
+        VC_Detector_2Q_NonLin(det_MB,qTot_MB,qx_MB,qy_MB,qz_MB,xCtr,yCtr,sdd+M_sdd_setback,lam,pixSizeX,pixSizeY,"MB")
 
 //      Print "xy for MB = ",xCtr,yCtr

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

@@ -36 +36 @@
         // need SDD
         // need pixel dimensions
-        // nominal sdd in meters, offset in mm, want result in cm !
-        sdd = VCALC_getSDD(type)*100    +  VCALC_getTopBottomSDDOffset(type) / 10               // result is sdd in [cm]
+        // nominal sdd in cm, offset in cm, want result in cm !
+        sdd = VCALC_getSDD(type)        +  VCALC_getTopBottomSDDSetback(type)           // result is sdd in [cm]
 
         pixSizeX = VCALC_getPixSizeX(type)              // cm
@@ -193 +193 @@
 //
 //
-// -- sdd in meters
+// -- sdd in cm
 // -- lambda in Angstroms
 Function VC_Detector_2Q(data,qTot,qx,qy,qz,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)
@@ -215 +215 @@
 // reverts to the "regular" linear detector if waves not found or a flag is set
 //
-// need to convert the beam center to mm
 // need to call the VSANS V_CalcQval routines (these use the real-space distance, not pixel dims)
+//
+// ***** everything passed in is [cm], except for wavelength [A]
+//
+// ****  TODO :: calibration constants are still in [mm]
+//
 //
 // TODO:
@@ -267 +271 @@
         
 //      Wave w_calib = V_getDetTube_spatialCalib("VCALC",detStr)
-        Variable tube_width = 8.4                       // TODO: Hard-wired value!!
+        Variable tube_width = 8.4                       // TODO: UNITS!!! Hard-wired value in [mm]
         if(cmpstr(detStr,"B") == 0)
                 V_NonLinearCorrection_B("VCALC",data,tmpCalib,tmpCalib,detStr,destPath)
@@ -280 +284 @@
         if(kBCTR_CM)
                 if(gUseNonLinearDet && WaveExists(data_realDistX) && WaveExists(data_realDistY))
-                        // no need to convert the beam centers to real space, just to mm
-                        xCtr *= 10              // convert from cm to mm
-                        yCtr *= 10              
+                        // beam ctr is in cm already
+
                         // calculate all of the q-values
                         qTot = V_CalcQval(p,q,xCtr,yCtr,sdd,lam,data_realDistX,data_realDistY)
@@ -365 +368 @@
 //and are in detector coordinates (1,128) rather than axis values
 //the pixel locations need not be integers, reals are ok inputs
-//sdd is in meters
+//sdd is in [cm]
 //wavelength is in Angstroms
 //
@@ -376 +379 @@
         Variable dx,dy,qval,two_theta,dist
                 
-        sdd *=100               //convert to cm
+
         dx = (xaxval - xctr)*pixSizeX           //delta x in cm
         dy = (yaxval - yctr)*pixSizeY           //delta y in cm
@@ -392 +395 @@
 //ALL inputs are in detector coordinates
 //
-//sdd is in meters
+//sdd is in [cm]
 //wavelength is in Angstroms
 //
@@ -405 +408 @@
         qval = VC_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         
-        sdd *=100               //convert to cm
+//      sdd *=100               //convert to cm
         dx = (xaxval - xctr)*pixSizeX           //delta x in cm
         dy = (yaxval - yctr)*pixSizeY           //delta y in cm
@@ -422 +425 @@
 //input/output is the same as CalcQval()
 //ALL inputs are in detector coordinates
-//sdd is in meters
+//sdd is in [cm]
 //wavelength is in Angstroms
 //
@@ -435 +438 @@
         qval = VC_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         
-        sdd *=100               //convert to cm
+//      sdd *=100               //convert to cm
         dx = (xaxval - xctr)*pixSizeX           //delta x in cm
         dy = (yaxval - yctr)*pixSizeY           //delta y in cm
@@ -452 +455 @@
 //input/output is the same as CalcQval()
 //ALL inputs are in detector coordinates
-//sdd is in meters
+//sdd is in [cm]
 //wavelength is in Angstroms
 //
@@ -464 +467 @@
         qval = VC_CalcQval(xaxval,yaxval,xctr,yctr,sdd,lam,pixSizeX,pixSizeY)
         
-        sdd *=100               //convert to cm
+//      sdd *=100               //convert to cm
         
         //get scattering angle to project onto flat detector => Qr = qval*cos(theta)

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

@@ -41 +41 @@
         Variable axisRange
         
-// these offset values are in mm !!
-//in mm !!  distance T/B are behind L/R - not to be confused with lateral offset
-        NVAR front_SDDOffset = root:Packages:NIST:VSANS:VCALC:gFront_SDDOffset
-        NVAR middle_SDDOffset = root:Packages:NIST:VSANS:VCALC:gMiddle_SDDOffset
+// these offset values are in cm !!
+//in cm !!  distance T/B are behind L/R - not to be confused with lateral offset
+        NVAR front_SDDsetback = root:Packages:NIST:VSANS:VCALC:gFront_SDDsetback
+        NVAR middle_SDDsetback = root:Packages:NIST:VSANS:VCALC:gMiddle_SDDsetback
         
         
@@ -95 +95 @@
 
         //start drawing from the back, and work to the front as would be visible
-        // ********* all of the dimensions are converted to mm
+        // ********* all of the dimensions are in cm
         Variable tmp_x1,tmp_x2,tmp_y1,tmp_y2
         
         // back detector +/- degrees
-        tmp_x1 = -atan(B_w/2/(B_SDD*1000)) *(180/pi)
+        tmp_x1 = -atan(B_w/2/(B_SDD)) *(180/pi)
         tmp_x2 = -tmp_x1
-        tmp_y1 = -atan(B_h/2/(B_SDD*1000)) *(180/pi)
+        tmp_y1 = -atan(B_h/2/(B_SDD)) *(180/pi)
         tmp_y2 = -tmp_y1
         
@@ -113 +113 @@
 // TO DO -- add in the additional offset (backwards) to the SDD of the T/B panels
 // TOP
-        tmp_x1 = -atan(M_TB_w/2/(M_SDD*1000+middle_SDDOffset))*(180/pi)         // x symmetric y is not
+        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*1000+middle_SDDOffset))*(180/pi)
-        tmp_y2 = atan((M_TB_sep/2+M_TB_h)/(M_SDD*1000+middle_SDDOffset))*(180/pi)
+        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)
         
 //      Print tmp_x1,tmp_x2,tmp_y1,tmp_y2
@@ -124 +124 @@
                 
 // BOTTOM (x unchanged, negate and swap y1,y2)
-        tmp_y1 = -atan((M_TB_sep/2+M_TB_h)/(M_SDD*1000+middle_SDDOffset))*(180/pi)
-        tmp_y2 = -atan(M_TB_sep/2/(M_SDD*1000+middle_SDDOffset))*(180/pi)
+        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)
         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*1000))*(180/pi)               // y symmetric x is not
-        tmp_x2 = -atan((M_LR_sep/2)/(M_SDD*1000))*(180/pi)
-        tmp_y1 = atan(M_LR_h/2/(M_SDD*1000))*(180/pi)
+        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_y1 = atan(M_LR_h/2/(M_SDD))*(180/pi)
         tmp_y2 = -tmp_y1
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (65535,0,0)
         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*1000))*(180/pi)               // y symmetric x is not
-        tmp_x2 = atan((M_LR_w+M_LR_sep/2)/(M_SDD*1000))*(180/pi)
+        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)
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (65535,0,0)
         DrawRect/W=VCALC#FrontView tmp_x1,tmp_y2,tmp_x2,tmp_y1  
@@ -148 +148 @@
 // TO DO -- add in the additional offset (backwards) to the SDD of the T/B panels
 // TOP
-        tmp_x1 = -atan(F_TB_w/2/(F_SDD*1000+front_SDDOffset))*(180/pi)          // x symmetric y is not
+        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*1000+front_SDDOffset))*(180/pi)
-        tmp_y2 = atan((F_TB_sep/2+F_TB_h)/(F_SDD*1000+front_SDDOffset))*(180/pi)
+        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)
         
 //      Print tmp_x1,tmp_x2,tmp_y1,tmp_y2
@@ -159 +159 @@
                 
 // BOTTOM (x unchanged, negate and swap y1,y2)
-        tmp_y1 = -atan((F_TB_sep/2+F_TB_h)/(F_SDD*1000+front_SDDOffset))*(180/pi)
-        tmp_y2 = -atan(F_TB_sep/2/(F_SDD*1000+front_SDDOffset))*(180/pi)
+        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)
         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*1000))*(180/pi)               // y symmetric x is not
-        tmp_x2 = -atan((F_LR_sep/2)/(F_SDD*1000))*(180/pi)
-        tmp_y1 = atan(F_LR_h/2/(F_SDD*1000))*(180/pi)
+        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_y1 = atan(F_LR_h/2/(F_SDD))*(180/pi)
         tmp_y2 = -tmp_y1
         SetDrawEnv/W=VCALC#FrontView xcoord= bottom,ycoord= left,fillfgc= (39321,26208,1)
         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*1000))*(180/pi)               // y symmetric x is not
-        tmp_x2 = atan((F_LR_w+F_LR_sep/2)/(F_SDD*1000))*(180/pi)
+        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)
         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

@@ -81 +81 @@
         Variable B_SDD, B_offset
 
-        NVAR TB_SDD_offset = gFront_SDDOffset           //in mm !!  distance T/B are behind L/R - not to be confused with lateral offset
+        NVAR TB_SDD_setback = gFront_SDDsetback         //in [cm]  distance T/B are behind L/R - not to be confused with lateral offset
         
         //front
@@ -115 +115 @@
 
 // FRONT
-        FT_profileX = F_SDD+TB_SDD_offset/1000          //SDD in meters, set back from L/R      ---- convert to meters for the plot
+        FT_profileX = (F_SDD+TB_SDD_setback)            //SDD in [cm], set back from L/R        ---- convert to meters for the plot?
         FB_profileX = FT_profileX
         
-        FT_profileY[0] = F_TB_sep               // separation in mm
-        FT_profileY[1] = FT_profileY[0] + F_TB_h        // add in height of T/B panel in mm
+        FT_profileY[0] = F_TB_sep               // separation in cm
+        FT_profileY[1] = FT_profileY[0] + F_TB_h        // add in height of T/B panel in cm
         
         FB_profileY = -FT_profileY
@@ -125 +125 @@
         //angles (not calculating anything, just connect the dots)
         FT_rayX[0] = 0
-        FT_rayX[1] = F_SDD+TB_SDD_offset/1000
-        FT_rayX[2] = F_SDD+TB_SDD_offset/1000
+        FT_rayX[1] = F_SDD+TB_SDD_setback
+        FT_rayX[2] = F_SDD+TB_SDD_setback
         FT_rayX[3] = 0
         
@@ -136 +136 @@
         
         FB_rayX[0] = 0
-        FB_rayX[1] = F_SDD+TB_SDD_offset/1000
-        FB_rayX[2] = F_SDD+TB_SDD_offset/1000
+        FB_rayX[1] = F_SDD+TB_SDD_setback
+        FB_rayX[2] = F_SDD+TB_SDD_setback
         FB_rayX[3] = 0
         
@@ -147 +147 @@
 
 // MIDDLE       
-        MT_profileX = M_SDD+TB_SDD_offset/1000          //SDD in meters
+        MT_profileX = M_SDD+TB_SDD_setback              //SDD in [cm]
         MB_profileX = MT_profileX
         
-        MT_profileY[0] = M_TB_sep               // separation in mm
-        MT_profileY[1] = MT_profileY[0] + M_TB_h        // add in height of T/B panel in mm
+        MT_profileY[0] = M_TB_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
@@ -157 +157 @@
         //angles (not calculating anything, just connect the dots)
         MT_rayX[0] = 0
-        MT_rayX[1] = M_SDD+TB_SDD_offset/1000
-        MT_rayX[2] = M_SDD+TB_SDD_offset/1000
+        MT_rayX[1] = M_SDD+TB_SDD_setback
+        MT_rayX[2] = M_SDD+TB_SDD_setback
         MT_rayX[3] = 0
         
@@ -168 +168 @@
         
         MB_rayX[0] = 0
-        MB_rayX[1] = M_SDD+TB_SDD_offset/1000
-        MB_rayX[2] = M_SDD+TB_SDD_offset/1000
+        MB_rayX[1] = M_SDD+TB_SDD_setback
+        MB_rayX[2] = M_SDD+TB_SDD_setback
         MB_rayX[3] = 0
         
@@ -178 +178 @@
 
 // BACK
-        B_S_profileX = B_SDD            //SDDb in meters
+        B_S_profileX = B_SDD            //SDDb in [cm]
         
         B_S_profileY[0] = B_h/2         // half-height
@@ -230 +230 @@
                 ModifyGraph/W=VCALC#SideView mirror=2
                 ModifyGraph/W=VCALC#SideView nticks(left)=8
-                Label/W=VCALC#SideView left "\\Z10Vertical position (mm)"
-                Label/W=VCALC#SideView bottom "\\Z10SDD (meters)"
-                SetAxis/W=VCALC#SideView left -800,800
-                SetAxis/W=VCALC#SideView bottom 0,25
+                Label/W=VCALC#SideView left "\\Z10Vertical position (cm)"
+                Label/W=VCALC#SideView bottom "\\Z10SDD (cm)"
+                SetAxis/W=VCALC#SideView left -80.0,80.0
+                SetAxis/W=VCALC#SideView bottom 0,2500
 //              TextBox/W=VCALC#SideView/C/N=text0/A=MC/X=22.54/Y=42.04 "\\JCSIDE VIEW\rOnly the Top/Bottom panels are shown"
                 TextBox/W=VCALC#SideView/C/N=text0/A=MC/X=40.15/Y=43.62 "\\JCSIDE VIEW\r= Top/Bottom panels"
@@ -337 +337 @@
 
 // FRONT
-        FL_profileX = F_SDD             //SDD in meters
+        FL_profileX = F_SDD             //SDD in [cm]
         FR_profileX = FL_profileX
         
-        FL_profileY[0] = F_LR_sep               // separation in mm
-        FL_profileY[1] = FL_profileY[0] + F_LR_w        // add in width of L/R panel in mm
+        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
@@ -369 +369 @@
 
 // MIDDLE       
-        ML_profileX = M_SDD             //SDD in meters
+        ML_profileX = M_SDD             //SDD in [cm]
         MR_profileX = ML_profileX
         
-        ML_profileY[0] = M_LR_sep               // separation in mm
-        ML_profileY[1] = ML_profileY[0] + M_LR_w        // add in width of L/R panel in mm
+        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
@@ -400 +400 @@
 
 // BACK
-        B_T_profileX = B_SDD            //SDDb in meters
+        B_T_profileX = B_SDD            //SDDb in [cm]
         
         B_T_profileY[0] = B_h/2         // half-height
@@ -452 +452 @@
                 ModifyGraph/W=VCALC#TopView mirror=2
                 ModifyGraph/W=VCALC#TopView nticks(left)=8
-                Label/W=VCALC#TopView left "\\Z10Horizontal position (mm)"
-                Label/W=VCALC#TopView bottom "\\Z10SDD (meters)"
-                SetAxis/W=VCALC#TopView left -800,800
-                SetAxis/W=VCALC#TopView bottom 0,25
+                Label/W=VCALC#TopView left "\\Z10Horizontal position (cm)"
+                Label/W=VCALC#TopView bottom "\\Z10SDD (cm)"
+                SetAxis/W=VCALC#TopView left -80.0,80.0
+                SetAxis/W=VCALC#TopView bottom 0,2500
                 TextBox/W=VCALC#TopView/C/N=text0/A=MC/X=41.61/Y=43.62 "\\JCTOP VIEW\r= Left/Right panels"
         endif

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

@@ -19 +19 @@
 
 
-// returns the nominal SDD from the panel -- value is METERS
-// Does NOT include the set back (offset) of the T/B panels. This is a separate value
+// returns the nominal SDD from the panel -- value is [cm]
+// Does NOT include the setback of the T/B panels. This is a separate value
 Function VCALC_getSDD(type)
         String type
@@ -62 +62 @@
 end
 
-// returns the panel separation [mm]
+// returns the panel separation [cm]
 Function VCALC_getPanelSeparation(type)
         String type
@@ -107 +107 @@
 end
 
-// returns the lateral panel offset [mm]
+// returns the lateral panel offset [cm]
 Function VCALC_getLateralOffset(type)
         String type
@@ -381 +381 @@
 
 // SDD offset of the top/bottom panels
-// value returned is in mm (so beware)
-//
-Function VCALC_getTopBottomSDDOffset(type)
+// value returned is in [cm] 
+//
+Function VCALC_getTopBottomSDDSetback(type)
         String type
 
@@ -396 +396 @@
                 case "FT":
                 case "FB":              
-                        NVAR sdd_offset = gFront_SDDOffset      //T/B are 300 mm farther back 
+                        NVAR sdd_setback = gFront_SDDsetback    //T/B are 41 cm farther back 
                         break
                         
@@ -406 +406 @@
                 case "MT":
                 case "MB":
-                        NVAR sdd_offset = gMiddle_SDDOffset     //T/B are 300 mm farther back
+                        NVAR sdd_setback = gMiddle_SDDsetback   //T/B are 41 cm farther back
                         break   
                                                 
@@ -415 +415 @@
                         
                 default:
-                        Print "Error -- type not found in        VCALC_getTopBottomSDDOffset(type)"                                     
-                        sdd_offset = 0          //no match for type             
+                        Print "Error -- type not found in        VCALC_getTopBottomSDDSetback(type)"                                    
+                        sdd_setback = 0         //no match for type             
         endswitch
 
         SetDataFolder root:
                 
-        return(sdd_offset)      
+        return(sdd_setback)     
 End
 

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

@@ -166 +166 @@
 
 // tab(2) - Front detector panels, initially not visible
-        SetVariable VCALCCtrl_2a,pos={30,260},size={150,15},title="L/R Separation (mm)",proc=VC_FDet_LR_SetVarProc
-        SetVariable VCALCCtrl_2a,limits={0,400,1},disable=1,value=_NUM:100
-        SetVariable VCALCCtrl_2b,pos={30,290},size={150,15},title="T/B Separation (mm)",proc=VC_FDet_LR_SetVarProc
-        SetVariable VCALCCtrl_2b,limits={0,400,1},disable=1,value=_NUM:100
-        SetVariable VCALCCtrl_2c,pos={205,290},size={150,15},title="Lateral Offset (mm)"
-        SetVariable VCALCCtrl_2c,limits={0,200,0.1},disable=1,value=_NUM:0
-        SetVariable VCALCCtrl_2d,pos={205,260},size={230,15},title="Sample to Detector Distance (m)",proc=VC_FDet_SDD_SetVarProc
-        SetVariable VCALCCtrl_2d,limits={1,8,0.1},disable=1     ,value=_NUM:1.5
+        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_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
         
 
 // tab(3) - Middle detector panels, initially not visible
-        SetVariable VCALCCtrl_3a,pos={30,260},size={150,15},title="L/R Separation (mm)",proc=VC_MDet_LR_SetVarProc
-        SetVariable VCALCCtrl_3a,limits={0,400,1},disable=1,value=_NUM:100
-        SetVariable VCALCCtrl_3b,pos={30,290},size={150,15},title="T/B Separation (mm)",proc=VC_MDet_LR_SetVarProc
-        SetVariable VCALCCtrl_3b,limits={0,400,1},disable=1,value=_NUM:100
-        SetVariable VCALCCtrl_3c,pos={205,290},size={150,15},title="Lateral Offset (mm)"
-        SetVariable VCALCCtrl_3c,limits={0,200,0.1},disable=1,value=_NUM:0
-        SetVariable VCALCCtrl_3d,pos={205,260},size={230,15},title="Sample to Detector Distance (m)",proc=VC_MDet_SDD_SetVarProc
-        SetVariable VCALCCtrl_3d,limits={8,20,0.1},disable=1,value=_NUM:15
+        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_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
-        SetVariable VCALCCtrl_4a,pos={188,290},size={150,15},title="Lateral Offset (mm)"
-        SetVariable VCALCCtrl_4a,limits={0,200,0.1},disable=1,value=_NUM:0
-        SetVariable VCALCCtrl_4b,pos={188,260},size={230,15},title="Sample to Detector Distance (m)",proc=VC_BDet_SDD_SetVarProc
-        SetVariable VCALCCtrl_4b,limits={20,25,0.1},disable=1,value=_NUM:20
-        PopupMenu VCALCCtrl_4c,pos={40,260},size={180,20},title="Detector type",disable=1
-        PopupMenu VCALCCtrl_4c,mode=1,popvalue="2D",value= root:Packages:NIST:VSANS:VCALC:gBackDetType
+        SetVariable VCALCCtrl_4a,pos={188,290},size={150,15},title="Lateral Offset (cm)"
+        SetVariable VCALCCtrl_4a,limits={0,20,0.1},disable=1,value=_NUM:0
+        SetVariable VCALCCtrl_4b,pos={188,260},size={230,15},title="Sample to Detector Distance (cm)",proc=VC_BDet_SDD_SetVarProc
+        SetVariable VCALCCtrl_4b,limits={2000,2500,1},disable=1,value=_NUM:2000
+//      PopupMenu VCALCCtrl_4c,pos={40,260},size={180,20},title="Detector type",disable=1
+//      PopupMenu VCALCCtrl_4c,mode=1,popvalue="2D",value= root:Packages:NIST:VSANS:VCALC:gBackDetType
 
 // tab(5) - Simulation setup
@@ -675 +675 @@
 // Width and height are not part of the Nexus file definition, but are needed for VCALC drawing
 // so keep them as variables
-        Variable/G gFront_LR_w = 384            //front bank, nominal LR panel width (mm)
-        Variable/G gFront_LR_h = 1000
-        Variable/G gFront_TB_w = 500
-        Variable/G gFront_TB_h = 384
-
-// SDD offset of T/B (decide on units??)
+        Variable/G gFront_LR_w = 38.4           //front bank, nominal LR panel width [cm]
+        Variable/G gFront_LR_h = 100.0
+        Variable/G gFront_TB_w = 50.0
+        Variable/G gFront_TB_h = 38.4
+
+// SDD setback of T/B (decide on units??)
 // for the Nexus file, the detector distance should already be corrected for the "setback"
 // of the T/B panels. keep as VCALC variable
-        Variable/G gFront_SDDOffset = 300                       // (mm)
+        Variable/G gFront_SDDsetback = 41.0                     // [cm]
         
         
@@ -741 +741 @@
 // Width and height are not part of the Nexus file definition, but are needed for VCALC drawing
 // so keep them as variables
-        Variable/G gMiddle_LR_w = 384           //middle bank, nominal LR panel width (mm)
-        Variable/G gMiddle_LR_h = 1000
-        Variable/G gMiddle_TB_w = 500
-        Variable/G gMiddle_TB_h = 384
+        Variable/G gMiddle_LR_w = 38.4          //middle bank, nominal LR panel width (cm)
+        Variable/G gMiddle_LR_h = 100.0
+        Variable/G gMiddle_TB_w = 50.0
+        Variable/G gMiddle_TB_h = 38.4
 // SDD offset of T/B (decide on units??)
 // for the Nexus file, the detector distance should already be corrected for the "setback"
 // of the T/B panels. keep as VCALC variable
-        Variable/G gMiddle_SDDOffset = 300                      // (mm)
+        Variable/G gMiddle_SDDsetback = 41.0                    // [cm]
         
 // detector resolution (xy for each bank!)
@@ -804 +804 @@
 
 //// BACK DETECTOR
-        Variable/G gBack_w = 150                                //w and h for the back detector, (mm) 150 pix * 1mm/pix
-        Variable/G gBack_h = 150
+        Variable/G gBack_w = 15.0                               //w and h for the back detector, (cm) 150 pix * 1mm/pix
+        Variable/G gBack_h = 15.0
         
         Make/O/D/N=1 :entry:instrument:detector_B:x_pixel_size = 0.1            // 1 mm resolution (units of cm here)

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

@@ -155 +155 @@
 
 // kPanelTouchingGap is in mm   
-        gap = kPanelTouchingGap/10              //cm
+        gap = kPanelTouchingGap
         
         if(cmpstr(orientation,"vertical")==0)
@@ -165 +165 @@
                 if(cmpstr(fname,"VCALC")== 0 )
                         offset = VCALC_getPanelSeparation(detStr)
-                        offset /= 2                     // units of mm
+                        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
                 else
                         //normal case
-                offset = V_getDet_LateralOffset(fname,detStr)
-                offset *= 10 //convert cm to mm
+                        offset = V_getDet_LateralOffset(fname,detStr)
+                        offset *= 10 //convert cm to mm
                 endif
                 
         // calculation is in mm, not cm
+        // offset will be a negative value for the L panel, and positive for the R panel
                 if(kBCTR_CM)
                         if(cmpstr("L",detStr[1]) == 0)
-                                data_realDistX[][] = -offset - (dimX - p)*tube_width                    // TODO should this be dimX-1-p = 47-p?
+                                data_realDistX[][] = offset - (dimX - p)*tube_width                     // TODO should this be dimX-1-p = 47-p?
+//                              data_realDistX[][] = -offset - (dimX - p)*tube_width                    // TODO should this be dimX-1-p = 47-p?
                         else
                                 data_realDistX[][] += offset + gap + tube_width                 //add to the Right det, not recalculate
@@ -189 +195 @@
                 if(cmpstr(fname,"VCALC")== 0 )
                         offset = VCALC_getPanelSeparation(detStr)
-                        offset /= 2                     // units of mm
+                        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
                 else
                         //normal case
@@ -200 +210 @@
                                 data_realDistY[][] += offset + gap + tube_width                 
                         else
-                                data_realDistY[][] = -offset - (dimY - q)*tube_width    // TODO should this be dimY-1-q = 47-q?
+                                data_realDistY[][] = offset - (dimY - q)*tube_width     // TODO should this be dimY-1-q = 47-q?
                         endif
                 endif

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

@@ -62 +62 @@
         V_FakeStatusButtonClick()
 
+// NOTE: This is where the beam center is picked up so that the panel array scaling is reset
+// so that the images will automatically display in relation to the beam center
         V_FakeRestorePanelsButtonClick()                //so the panels display correctly
 

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

@@ -51 +51 @@
                 V_writeDetectorData(fileName,detStr,tmpData)
                 
-                val = VCALC_getSDD(detStr)*100          // make sure value is in cm
+                val = VCALC_getSDD(detStr)              // make sure value is in cm
                 print val
                 V_writeDet_distance(fileName,detStr,val)
                 
-                val = VCALC_getTopBottomSDDOffset(detStr)               //val is in mm, as for data file
+                val = VCALC_getTopBottomSDDSetback(detStr)*10           //val is in mm, as for data file
                 if(val != 0)
                         V_writeDet_TBSetback(fileName,detStr,val)
                 endif
                 
-                // returns the total separation (assumed symmetric) in mm
+                // returns the total separation (assumed symmetric) in cm
                 val = VCALC_getPanelSeparation(detStr)          
-                val /= 2*10                     // to get half of the separation, and convert to cm for the data file
+                val /= 2                // to get half of the separation, and cm for the data file
                 // 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)

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

@@ -2168 +2168 @@
                                 data    = root:Packages:NIST:VSANS:VCALC:Middle:det_MT
                                 nx_distance     = VCALC_getSDD("MT")
-                                sdd_offset = VCALC_getTopBottomSDDOffset("MT")
+                                sdd_offset = VCALC_getTopBottomSDDSetback("MT")
                                 separation = VCALC_getPanelSeparation("MT")
                                 spatial_calibration[0][] = 1.072
@@ -2176 +2176 @@
                                 data    = root:Packages:NIST:VSANS:VCALC:Middle:det_MB
                                 nx_distance     = VCALC_getSDD("MB")
-                                sdd_offset = VCALC_getTopBottomSDDOffset("MB")
+                                sdd_offset = VCALC_getTopBottomSDDSetback("MB")
                                 separation = VCALC_getPanelSeparation("MB") 
                                 spatial_calibration[0][] = 1.072
@@ -2198 +2198 @@
                                 data    = root:Packages:NIST:VSANS:VCALC:Front:det_FT
                                 nx_distance     = VCALC_getSDD("FT")
-                                sdd_offset = VCALC_getTopBottomSDDOffset("FT")
+                                sdd_offset = VCALC_getTopBottomSDDSetback("FT")
                                 separation = VCALC_getPanelSeparation("FT")
                                 spatial_calibration[0][] = 1.072
@@ -2206 +2206 @@
                                 data    = root:Packages:NIST:VSANS:VCALC:Front:det_FB
                                 nx_distance     = VCALC_getSDD("FB")
-                                sdd_offset = VCALC_getTopBottomSDDOffset("FB")
+                                sdd_offset = VCALC_getTopBottomSDDSetback("FB")
                                 separation = VCALC_getPanelSeparation("FB")
                                 spatial_calibration[0][] = 1.072

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

@@ -97 +97 @@
 //                              data    = root:Packages:NIST:VSANS:VCALC:Middle:det_MT
 //                              nx_distance     = VCALC_getSDD("MT")
-//                              sdd_offset = VCALC_getTopBottomSDDOffset("MT")
+//                              sdd_offset = VCALC_getTopBottomSDDSetback("MT")
 //                              separation = VCALC_getPanelSeparation("MT")
 //                              spatial_calibration[0][] = 1.072
@@ -105 +105 @@
 //                              data    = root:Packages:NIST:VSANS:VCALC:Middle:det_MB
 //                              nx_distance     = VCALC_getSDD("MB")
-//                              sdd_offset = VCALC_getTopBottomSDDOffset("MB")
+//                              sdd_offset = VCALC_getTopBottomSDDSetback("MB")
 //                              separation = VCALC_getPanelSeparation("MB") 
 //                              spatial_calibration[0][] = 1.072
@@ -127 +127 @@
 //                              data    = root:Packages:NIST:VSANS:VCALC:Front:det_FT
 //                              nx_distance     = VCALC_getSDD("FT")
-//                              sdd_offset = VCALC_getTopBottomSDDOffset("FT")
+//                              sdd_offset = VCALC_getTopBottomSDDSetback("FT")
 //                              separation = VCALC_getPanelSeparation("FT")
 //                              spatial_calibration[0][] = 1.072
@@ -135 +135 @@
 //                              data    = root:Packages:NIST:VSANS:VCALC:Front:det_FB
 //                              nx_distance     = VCALC_getSDD("FB")
-//                              sdd_offset = VCALC_getTopBottomSDDOffset("FB")
+//                              sdd_offset = VCALC_getTopBottomSDDSetback("FB")
 //                              separation = VCALC_getPanelSeparation("FB")
 //                              spatial_calibration[0][] = 1.072