Changeset 1108 for sans

Timestamp:

Jun 21, 2018 9:42:24 AM (5 years ago)

Author:

srkline

Message:

changes mostly to VCALC to add in what bits of information I have about the instrument dimensions. Added in stubs (based on NG3 SANS) for the beam intensity. Added in a preset condition for Front+Middle. Still need a more uniform way to do this.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VC_DetectorBinning_Q.ipf (modified) (2 diffs)
• VC_DetectorBinning_Utils.ipf (modified) (3 diffs)
• VC_UtilityProcedures.ipf (modified) (1 diff)
• VC_VCALCPanel_MockUp.ipf (modified) (12 diffs)
• V_DataPlotting.ipf (modified) (1 diff)
• V_Menu.ipf (modified) (4 diffs)
• V_RAW_Data_Panel.ipf (modified) (3 diffs)
• V_Utilities_General.ipf (modified) (1 diff)
• V_Write_VSANS_QIS.ipf (modified) (1 diff)

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

@@ -620 +620 @@
         SetDataFolder root:
                 
-        // set any "shadowed" area of the T/B detectors to NaN to get a realitic
+        // set any "shadowed" area of the T/B detectors to NaN to get a realistic
         // view of how much of the detectors are actually collecting data
         // -- I can get the separation L/R from the panel - only this "open" width is visible.
@@ -1268 +1268 @@
         qz_B = 0        
         
-// TODO - these are to be set from globals, not hard-wired. N and pixelSize will be known (or pre-measured)
+// (DONE) - these are set from globals, not hard-wired. N and pixelSize will be known (or pre-measured)
 // pixel sizes are in cm
+// beam center for the back detector is in PIXELS. always.
         pixSizeX = VCALC_getPixSizeX("B")
         pixSizeY = VCALC_getPixSizeY("B")
 
-        if(kBCTR_CM)
-                xCtr = trunc( DimSize(det_B,0)/2 ) *pixSizeX * 10
-                yCtr = trunc( DimSize(det_B,1)/2 ) *pixSizeY * 10       //values in mm -- beam is nominally at 0,0 in space
-        else    
-                xCtr = trunc( DimSize(det_B,0)/2 )              //
-                yCtr = trunc( DimSize(det_B,1)/2 )              //
-        endif
-        
-                //put these  beam center values into the local folder
-        V_putDet_beam_center_x("VCALC","B",xCtr)
-        V_putDet_beam_center_y("VCALC","B",yCtr)
+        xCtr = V_getDet_beam_center_x("VCALC","B")
+        yCtr = V_getDet_beam_center_y("VCALC","B")
+
+//      if(kBCTR_CM)
+//              xCtr = trunc( DimSize(det_B,0)/2 ) *pixSizeX * 10
+//              yCtr = trunc( DimSize(det_B,1)/2 ) *pixSizeY * 10       //values in mm -- beam is nominally at 0,0 in space
+//      else    
+//              xCtr = trunc( DimSize(det_B,0)/2 )              //
+//              yCtr = trunc( DimSize(det_B,1)/2 )              //
+//      endif
+//      
+//              //put these  beam center values into the local folder
+//      V_putDet_beam_center_x("VCALC","B",xCtr)
+//      V_putDet_beam_center_y("VCALC","B",yCtr)
         
 //      VC_Detector_2Q(det_B,qTot_B,qx_B,qy_B,qz_B,xCtr,yCtr,sdd,lam,pixSizeX,pixSizeY)

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

@@ -265 +265 @@
                 // and for the back detector "B"
                 Make/O/D/N=3 tmpCalibX,tmpCalibY
-                tmpCalibX[0] = VCALC_getPixSizeX(detStr)*10                     // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm]
+                tmpCalibX[0] = VCALC_getPixSizeX(detStr)                        // pixel size in [cm]  VCALC_getPixSizeX(detStr) is [cm]
                 tmpCalibX[1] = 1
                 tmpcalibX[2] = 10000
-                tmpCalibY[0] = VCALC_getPixSizeY(detStr)*10                     // pixel size in mm  VCALC_getPixSizeX(detStr) is [cm]
+                tmpCalibY[0] = VCALC_getPixSizeY(detStr)                        // pixel size in [cm]  VCALC_getPixSizeX(detStr) is [cm]
                 tmpCalibY[1] = 1
                 tmpcalibY[2] = 10000
@@ -277 +277 @@
         if(cmpstr(detStr,"B") == 0)
                 V_NonLinearCorrection_B("VCALC",data,tmpCalibX,tmpCalibY,detStr,destPath)
+                // beam center is in pixels, so use the old routine
+                V_ConvertBeamCtr_to_mmB("VCALC","B",destPath)
         else
                 V_NonLinearCorrection("VCALC",data,tmpCalib,tube_width,detStr,destPath)
@@ -285 +287 @@
         NVAR gUseNonLinearDet = root:Packages:NIST:VSANS:VCALC:gUseNonLinearDet
 
-        if(kBCTR_CM)
+        if(kBCTR_CM && cmpstr(detStr,"B") != 0)
                 if(gUseNonLinearDet && WaveExists(data_realDistX) && WaveExists(data_realDistY))
                         // beam ctr is in cm already

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

@@ -395 +395 @@
 
 
-/////////// procedure to concatenate I(q) files into a single file
-//
-// currently, no rescaling is done, no trimming is done, just crude concatentate and sort
-//
+
+//////////////////////////////////
+//
+// Actions for the VCALC controls
+//
+//////////////////////////////////
+
+// read the number of guides from the slider
+// return the Source to Sample Distance in [cm]
+Function VC_calcSSD()
+
+        Variable ng,ssd
+        ControlInfo VCALCCtrl_0a
+        ng = V_Value
+        
+        ssd = 2388 - ng*200
+        print "SSD (cm) = ",ssd
+        return(ssd)
+End
+
+
+// read the number of guides from the slider
+// return the Source aperture diameter [cm]
+// TODO - needs a case statement since a1 can depend on Ng
+Function VC_sourceApertureDiam()
+
+        Variable ng,a1
+        ControlInfo VCALCCtrl_0a
+        ng = V_Value
+        
+        a1 = 6          // 60 mm diameter
+
+        Print "Source Ap diam (cm) = ",a1
+        return(a1)
+End
+
+
+
+///////////////////
+//
+// Presets
+//
+///////////////////
+
+
+// for Front+Middle Only
+// x F SDD=120
+// x (L=-20, R=20) (T=4, B=-4)
+//
+// x M SDD = 1900
+// x (L=0, R=0)
+//
+// x Velocity selector
+// x Ng = 0
+// x Lam = 8
+// x delLam = 0.12
+// source ap = ? (circular)
+//
+// ignore back detector
+// x set plot type to F2-M2xTB-B
+//
+// 
+Function VC_FrontMiddlePreset()
+
+        // front carriage
+        SetVariable VCALCCtrl_2a,value=_NUM:-20         //Left offset
+        SetVariable VCALCCtrl_2aa,value=_NUM:20         //Right offset
+        SetVariable VCALCCtrl_2b,value=_NUM:4                   //Top offset
+        SetVariable VCALCCtrl_2bb,value=_NUM:-4         //Bottom offset
+
+        SetVariable VCALCCtrl_2d,value=_NUM:120         //SDD
+
+        // middle carriage
+        SetVariable VCALCCtrl_3a,value=_NUM:0           //Left offset
+        SetVariable VCALCCtrl_3aa,value=_NUM:0          //Right offset
+        SetVariable VCALCCtrl_3b,value=_NUM:4                   //Top offset (doesn't matter)
+        SetVariable VCALCCtrl_3bb,value=_NUM:-4         //Bottom offset (doesn't matter)
+
+        SetVariable VCALCCtrl_3d,value=_NUM:1900                //SDD
+        
+        
+        // monochromator
+        PopupMenu VCALCCtrl_0c,mode=1,popvalue="Velocity Selector"
+        
+        // wavelength spread
+        SVAR DLStr = root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+        DLStr = "0.12;"
+        PopupMenu VCALCCtrl_0d,mode=1,popvalue="0.12",value= root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+        
+        // wavelength
+        SetVariable VCALCCtrl_0b,value=_NUM:8,disable=0 ,noedit=0       // allow user editing again
+
+        //number of guides
+        Slider VCALCCtrl_0a,value= 0
+
+
+// binning mode
+        PopupMenu popup_b,mode=1,popValue="F2-M2xTB-B"
+
+
+        return(0)
+End
+
+//
+//direction = one of "vertical;horizontal;maximum;"
+// all of this is bypassed if the lenses are in
+//
+// carrNum = 1,2,3 for F,M,B
+//
+// returns a value in [cm]
+Function VC_beamDiameter(direction,carrNum)
+        String direction
+        Variable carrNum
+
+//      NVAR lens = root:Packages:NIST:SAS:gUsingLenses
+//      if(lens)
+//              return sourceApertureDiam()
+//      endif
+        
+        Variable l1,l2,l2Diff
+        Variable d1,d2,bh,bv,bm,umbra,a1,a2
+        Variable lambda,lambda_width,bs_factor
+    
+//    NVAR L2diff = root:Packages:NIST:SAS:L2diff
+
+// TODO: proper value for l2Diff, bs_factor
+        l2Diff = 0
+        bs_factor = 1.05
+        
+        l1 = VC_calcSSD()
+        lambda = VCALC_getWavelength()
+        ControlInfo VCALCCtrl_0d
+        lambda_width = str2num(S_Value)
+        
+        
+        l2 = VC_getSDD(carrNum) + L2diff
+    
+    // TODO verify that these values are in cm
+        a1 = VC_sourceApertureDiam()
+    
+        // sample aperture diam [cm]
+        ControlInfo VCALCCtrl_1c
+        a2 = V_Value
+    
+    d1 = a1*l2/l1
+    d2 = a2*(l1+l2)/l1
+    bh = d1+d2          //beam size in horizontal direction
+    umbra = abs(d1-d2)
+    //vertical spreading due to gravity
+    bv = bh + 1.25e-8*(l1+l2)*l2*lambda*lambda*lambda_width
+    bm = (bs_factor*bh > bv) ? bs_factor*bh : bv //use the larger of horiz*safety or vertical
+    
+    strswitch(direction)        // string switch
+        case "vertical":                // execute if case matches expression
+                return(bv)
+                break                                           // exit from switch
+        case "horizontal":              // execute if case matches expression
+                return(bh)
+                break
+        case "maximum":         // execute if case matches expression
+                return(bm)
+                break
+        default:                                                        // optional default expression executed
+                return(bm)                                              // when no case matches
+    endswitch
+    
+    return(0)
+    
+End
+
+// 1=front
+// 2=middle
+// 3=back
+// return value is in cm
+Function VC_getSDD(carrNum)
+        Variable carrNum
+        
+        if(carrNum == 1)
+                ControlInfo VCALCCtrl_2d
+        endif
+        if(carrNum == 2)
+                ControlInfo VCALCCtrl_3d
+        endif
+        if(carrNum == 3)
+                ControlInfo VCALCCtrl_4b
+        endif
+        
+        return(V_Value)
+end
+        
+
+// these are numbers from NG3, when it was a SANS instrument
+//      
+// updated with new flux numbers from John Barker
+// NG3 - Feb 2009
+// NG7 - July 2009
+//
+// guide loss has been changed to 0.95 rather than the old value of 0.95
+//
+// other values are changed in the initialization routines
+//
+Function beamIntensity()
+
+        Variable alpha,f,t,t4,t5,t6,as,solid_angle,l1,d2_phi
+        Variable a1,a2,retVal
+        Variable l_gap,guide_width,ng
+        Variable lambda_t,b,c
+        Variable lambda,t1,t2,t3,phi_0
+        Variable lambda_width
+        Variable guide_loss
+
+        NVAR gBeamInten = root:Packages:NIST:VSANS:VCALC:gBeamIntensity
+
+ 
 // TODO
-// -- all of this needs to be done. There's nothing here...
-//
-
-
-
-
+// these are numbers from NG3, when it was a SANS instrument
+        
+        lambda_t = 5.50
+
+        t1 = 0.63
+        t2 = 1.0
+        t3 = 0.75
+        l_gap = 100.0
+        guide_width = 6.0
+ 
+        //new values, from 11/2009 --- BeamFluxReport_2009.ifn
+        phi_0 = 2.42e13
+        b = 0.0
+        c = -0.0243
+        guide_loss = 0.924
+         
+         
+         
+        ControlInfo VCALCCtrl_0a
+        ng = V_Value
+ 
+        lambda = VCALC_getWavelength()
+        ControlInfo VCALCCtrl_0d
+        lambda_width = str2num(S_Value)
+ 
+    
+        l1 = VC_calcSSD()
+    
+    // TODO verify that these values are in cm
+        a1 = VC_sourceApertureDiam()
+    
+        // sample aperture diam [cm]
+        ControlInfo VCALCCtrl_1c
+        a2 = V_Value
+    
+    
+        alpha = (a1+a2)/(2*l1)  //angular divergence of beam
+        f = l_gap*alpha/(2*guide_width)
+        t4 = (1-f)*(1-f)
+        t5 = exp(ng*ln(guide_loss))     // trans losses of guides in pre-sample flight
+        t6 = 1 - lambda*(b-(ng/8)*(b-c))                //experimental correction factor
+        t = t1*t2*t3*t4*t5*t6
+    
+        as = pi/4*a2*a2         //area of sample in the beam
+        d2_phi = phi_0/(2*pi)
+        d2_phi *= exp(4*ln(lambda_t/lambda))
+        d2_phi *= exp(-1*(lambda_t*lambda_t/lambda/lambda))
+
+        solid_angle = pi/4* (a1/l1)*(a1/l1)
+
+        retVal = as * d2_phi * lambda_width * solid_angle * t
+
+        // set the global for display
+        gBeamInten = retVal
+        return (retVal)
+end
+
+//
+Function VC_figureOfMerit()
+
+        Variable bi = beamIntensity()
+        Variable lambda = VCALC_getWavelength()
+        
+   return (lambda*lambda*bi)
+End
+
+// return a beamstop diameter (cm) larger than maximum beam dimension
+Function VC_beamstopDiam(carrNum)
+        Variable carrNum
+        
+        Variable bm=0
+        Variable bs=0.0
+   Variable yesLens=0
+   
+        if(yesLens)
+                //bm = sourceApertureDiam()             //ideal result, not needed
+                bs = 1                                                          //force the diameter to 1"
+        else
+                bm = VC_beamDiameter("maximum",carrNum)
+                do
+                bs += 1
+           while ( (bs*2.54 < bm) || (bs > 30.0))                       //30 = ridiculous limit to avoid inf loop
+        endif
+
+        return (bs*2.54)                //return diameter in cm, not inches for txt
+End
+
+

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

@@ -71 +71 @@
         PopupMenu popup_a,pos={50,40},size={142,20},title="Presets"
         PopupMenu popup_a,mode=1,popvalue="Low Q",value= root:Packages:NIST:VSANS:VCALC:gPresetPopStr
-
-        PopupMenu popup_b,pos={690,310},size={142,20},title="Binning type",proc=VC_RebinIQ_PopProc
+        PopupMenu popup_a,proc=VC_PresetConfigPopup
+
+        PopupMenu popup_b,pos={670,311},size={142,20},title="Binning type",proc=VC_RebinIQ_PopProc
         PopupMenu popup_b,mode=1,value= root:Packages:NIST:VSANS:VCALC:gBinTypeStr
-        
+        SetVariable setVar_b,pos={476,313},size={120,15},title="axis Q",proc=Front2DQ_Range_SetVarProc
+        SetVariable setVar_b,limits={0.02,1,0.02},value=_NUM:0.3
+        CheckBox check_0a title="Log?",size={60,20},pos={619,313},proc=Front2DQ_Log_CheckProc
+                
         SetVariable setVar_a,pos={476,26},size={120,15},title="axis degrees",proc=FrontView_Range_SetVarProc
         SetVariable setVar_a,limits={0.3,30,0.2},value=_NUM:20
+
+        ValDisplay valDisp_a,pos={50,100},size={150,15},title="Beam Intensity",value=root:Packages:NIST:VSANS:VCALC:gBeamIntensity
+
+
 
         // for panels (in degrees)      
@@ -97 +105 @@
         ModifyGraph rgb=(0,0,0)
         ModifyGraph tick=2,mirror=1
-        Label left "Vertical position (mm)"
-        Label bottom "SDD (m)"  
+        Label left "Vertical position (cm)"
+        Label bottom "SDD (cm)" 
         SetActiveSubwindow ##   
         
@@ -108 +116 @@
         ModifyGraph rgb=(0,0,0)
         ModifyGraph tick=2,mirror=1
-        Label left "Horizontal position (mm)"
-        Label bottom "SDD (m)"  
+        Label left "Horizontal position (cm)"
+        Label bottom "SDD (cm)" 
         SetActiveSubwindow ##   
 
@@ -124 +132 @@
         SetActiveSubwindow ##
 
-        SetVariable setVar_b,pos={476,314},size={120,15},title="axis Q",proc=Front2DQ_Range_SetVarProc
-        SetVariable setVar_b,limits={0.02,1,0.02},value=_NUM:0.3
-        CheckBox check_0a title="Log?",size={60,20},pos={619,313},proc=Front2DQ_Log_CheckProc
+
 
         // for averaged I(Q)
@@ -148 +154 @@
         PopupMenu VCALCCtrl_0c,pos={26,257},size={150,20},title="monochromator"
         PopupMenu VCALCCtrl_0c,mode=1,popvalue="Velocity Selector",value= root:Packages:NIST:VSANS:VCALC:gMonochromatorType
+        PopupMenu VCALCCtrl_0c,proc=VC_MonochromSelectPopup
         PopupMenu VCALCCtrl_0d,pos={26,321},size={115,20},title="delta lambda"
         PopupMenu VCALCCtrl_0d,mode=1,popvalue="0.10",value= root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+        PopupMenu VCALCCtrl_0d,proc=VC_DeltaLamSelectPopup
         PopupMenu VCALCCtrl_0e,pos={291,262},size={132,20},title="source shape"
         PopupMenu VCALCCtrl_0e,mode=1,popvalue="circular",value= root:Packages:NIST:VSANS:VCALC:gSourceShape
+        PopupMenu VCALCCtrl_0e,proc=VC_SourceApShapeSelectPopup
         PopupMenu VCALCCtrl_0f,pos={283,293},size={141,20},title="source aperture"
         PopupMenu VCALCCtrl_0f,mode=1,popvalue="1.0 cm",value= root:Packages:NIST:VSANS:VCALC:gSourceDiam
-        
+        PopupMenu VCALCCtrl_0f,proc=VC_SourceAperDiamSelectPopup
+
 
 // tab(1) - Sample conditions, initially not visible
@@ -220 +230 @@
         fPlotFrontPanels()
 
+        Print "Beam Intensity = ",beamIntensity()
+        
         return(0)
 End
@@ -303 +315 @@
 End
 
+
+
+        
+
+
+
+
+Function VC_SourceAperDiamSelectPopup(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        
+                        Print "Not filled in yet"
+                        
+                        // a recalculation is needed after the change
+                        //Recalculate_AllDetectors()
+                                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function VC_SourceApShapeSelectPopup(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        
+                        Print "Not filled in yet"
+
+                        // a recalculation is needed after the change
+                        //Recalculate_AllDetectors()
+                                                                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+Function VC_DeltaLamSelectPopup(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        
+                        // a recalculation is needed after the change
+                        Recalculate_AllDetectors()
+                                                                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+// change the choices for deltaLam based on the
+// type of monochromator selected
+//
+// some cases force a change of the wavelength
+//
+// then recalculate
+Function VC_MonochromSelectPopup(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        
+                        SVAR DLStr = root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+                        
+                        strswitch(popStr)
+                                case "Velocity Selector":
+                                        DLStr = "0.12;"
+                                        PopupMenu VCALCCtrl_0d,mode=1,popvalue="0.12",value= root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+                                        
+                                        SetVariable VCALCCtrl_0b,disable=0,noedit=0             // allow user editing again
+
+                                        break
+                                case "Graphite":
+                                        DLStr = "0.01;"
+                                        PopupMenu VCALCCtrl_0d,mode=1,popvalue="0.01",value= root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+                                        
+                                        SetVariable VCALCCtrl_0b,value=_NUM:4.75,disable=2              // wavelength
+                                        break
+                                case "White Beam":
+                                        DLStr = "0.40;"
+                                        PopupMenu VCALCCtrl_0d,mode=1,popvalue="0.40",value= root:Packages:NIST:VSANS:VCALC:gDeltaLambda
+
+                                        SetVariable VCALCCtrl_0b,value=_NUM:5.3,disable=2               //wavelength
+                                        break           
+                                default:
+                                        Print "Error--No match in VC_MonochromSelectPopup"
+                                        return(0)
+                        endswitch
+                        
+
+                        // a recalculation is needed after the change
+                        Recalculate_AllDetectors()
+                                                                
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+Function VC_PresetConfigPopup(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        
+                
+                        strswitch(popStr)
+                                case "Low Q":
+                                        
+                                        break
+                                case "High Q":
+                                        
+                                        break
+                                case "White Beam":
+                                        
+                                        break   
+                                case "Narrow Slit":
+                                        
+                                        break
+                                case "Front+Middle Only":
+                                        VC_FrontMiddlePreset()
+                                        
+                                        break
+                                case "Converging Pinholes":
+                                        
+                                        break
+                                case "Polarizer":
+                                        
+                                        break
+                                        
+                                default:
+                                        Print "Error--No match in VC_PresetConfigPopup"
+                                        return(0)
+                        endswitch
+                        
+                        // update the views
+                        VC_UpdateViews()
+                        
+                        // a recalculation is needed after the change
+                        Recalculate_AllDetectors()
+                        
+                                                                        
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
+
+
+
+
+
 //
 // recalculate the detectors with a preset model function
@@ -652 +843 @@
 End
 
-
-
-
-// this all needs to be fixed and updated - it is all pertinent to SANS (SASCALC)
-// and not yet specific to VSANS
+// call to update the views (not the q-calculation, that is a separate call)
+Function VC_UpdateViews()
+
+        UpdateSideView()
+        UpdateTopView()
+        FrontView_1x()
+        
+        return(0)
+End
+
+// this all needs to be fixed and updated - not yet specific to VSANS
 //
 // -- all of the simulation stuff will need to be re-thought
@@ -806 +1003 @@
         Variable/G gBack_h = 50.4
         
-        Make/O/D/N=1 :entry:instrument:detector_B:x_pixel_size = 0.034          // 340 micron resolution (units of cm here)
+        Make/O/D/N=1 :entry:instrument:detector_B:x_pixel_size = 0.034          // 340 micron resolution (units of [cm] here)
         Make/O/D/N=1 :entry:instrument:detector_B:y_pixel_size = 0.034          
 
@@ -815 +1012 @@
 
 // pixel beam center - HDF style
-        Make/O/D/N=1 :entry:instrument:detector_B:beam_center_x = 340.1 // == x beam center, in pixels
+        Make/O/D/N=1 :entry:instrument:detector_B:beam_center_x = 340.1 // == x beam center, in pixels +0.1 so I know it's from here
         Make/O/D/N=1 :entry:instrument:detector_B:beam_center_y = 828.1         // == y beam center, in pixels
 
@@ -881 +1078 @@
 // to fill in:
 // values for always-visible items
-        String/G gPresetPopStr = "Low Q;High Q;Converging Pinholes;Narrow Slit Aperture;White Beam;Polarizer;"
+        String/G gPresetPopStr = "Low Q;High Q;Front+Middle Only;Converging Pinholes;Narrow Slit;White Beam;Polarizer;"
         String/G gBinTypeStr = ksBinTypeStr
-
+        Variable/G gBeamIntensity= 0
 
 
@@ -893 +1090 @@
         String/G gSourceDiam = "1.0 cm;2.0 cm;5.0 cm;"
         String/G gSourceDiam_0g = "0.75 cm;1.5 cm;3.0 cm;"              // values from John Mar 2018
-        String/G gDeltaLambda = "0.10;0.20;0.30;"
+        String/G gDeltaLambda = "0.01;0.10;0.20;0.30;0.40;"
         
 // tab 1 - sample conditions

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

@@ -38 +38 @@
 //    and to the function Draw_Plot1D() for the drawing of the plot
 //
-// If -9999 is passed in as the "binType", then read the proper value from the popup on the graph.
-//  otherwise, assume that a proper value has been passed in, say from the reduction protocol
 //
 Function V_PlotData_Panel()

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

@@ -19 +19 @@
         "VSANS Preferences",Show_VSANSPreferences_Panel()
         "-"
-        Submenu "In Progress Panels"
-                "Beam Center Panel",V_FindBeamCenter()
+        Submenu "Data Panels"
                 "Patch Beam Center XY",V_PatchDet_xyCenters_Panel()
                 "Patch Detector Deadtime",V_PatchDetectorDeadtimePanel()
@@ -27 +26 @@
                 "Annular Binning",Annular_Binning()
                 "Write Annular Data",V_Write1DAnnular()
+                "Trim I(q) points",V_CombineDataGraph()
                 "-"
                 "Derive Beam Centers",V_DeriveBeamCenters()
+                "-"
+                "Back Detector Saturation",Vm_NumberSaturated()
         End
-
         SubMenu "Nexus File Corrections"
+                "Patch GroupID using CatTable",V_Patch_GroupID_catTable()
+                "Patch Purpose using CatTable",V_Patch_Purpose_catTable()
+                "Patch Intent using CatTable",V_Patch_Intent_catTable()
+                "-"
                 "Flip Lateral Offset",V_PatchDet_Offset()
                 "Mark Lateral Flip Done",V_MarkLeftRightFlip_Done()
                 "Mark Lateral Flip NOT Done",V_MarkLeftRightFlip_Not_Done()
-                "-"
-                "Patch GroupID using CatTable",V_Patch_GroupID_catTable()
-                "Patch Purpose using CatTable",V_Patch_Purpose_catTable()
-                "Patch Intent using CatTable",V_Patch_Intent_catTable()
                 "Patch Detector Panel Gap",V_PatchDet_Gap()
                 "Read Detetcor Panel Gap",V_ReadDet_Gap()
@@ -48 +49 @@
                 "Copy_VCALC_to_VSANSFile",Copy_VCALC_to_VSANSFile()
                 "-"
-                "Setup_VSANS_DIV_Struct"
-                "Save_VSANS_DIV_Nexus"
-                "Setup_VSANS_MASK_Struct"
-                "Save_VSANS_MASK_Nexus"
-                "-"
                 "Read_Nexus with attributes",Read_Nexus_Xref()          //this will read with attributes
                 "Write_Nexus with attributes",Write_Nexus_Xref()                                //this will write out with attributes if read in by Read_Nexus_Xref
                 "-"
-                "Dump_V_getFP"
-                "Dump_V_getFP_Det"
-                "Dump_V_getSTR"
-                "Dump_V_getSTR_Det"
+                "Beam Center Panel",V_FindBeamCenter()
+                "Save I(Q) as ITX",Vm_Write1DData_ITX()
+                //
+//              "Setup_VSANS_DIV_Struct"
+//              "Save_VSANS_DIV_Nexus"
+//              "Setup_VSANS_MASK_Struct"
+//              "Save_VSANS_MASK_Nexus"
+//              "-"
+//              "Dump_V_getFP"
+//              "Dump_V_getFP_Det"
+//              "Dump_V_getSTR"
+//              "Dump_V_getSTR_Det"
 //              "Fill_Nexus_V_Template"
 //              "Save_Nexus_V_Template"
@@ -69 +73 @@
 //              "IgorOnly_Save_SANS_Struct"
         End
-        Submenu "Work File Operations"
-                "Convert to WORK",V_Convert_to_Workfile()
-                "Load Fake DIV Data"
-                "DIV a work file",V_DIV_a_Workfile()
-                "Load Fake MASK Data"
-                "Correct Data",V_CorrectData()
-        End
+//      Submenu "Work File Operations"
+//              "Convert to WORK",V_Convert_to_Workfile()
+//              "Load Fake DIV Data"
+//              "DIV a work file",V_DIV_a_Workfile()
+//              "Load Fake MASK Data"
+//              "Correct Data",V_CorrectData()
+//      End
 End
 

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

@@ -177 +177 @@
         Button button_toWork,pos={770,146},size={90,20},proc=V_ToWorkFileButtonProc,title="to WORK"
         Button button_annular,pos={770,114},size={90,20},proc=V_annularAvgButtonProc,title="Annular Avg"
+        Button button_SpreadPanels,pos={880,114},size={100,20},proc=V_SpreadPanelButtonProc,title="Spread Panels"
+        Button button_RestorePanels,pos={880,146},size={100,20},proc=V_RestorePanelButtonProc,title="Restore Panels"
+
 
         TitleBox title_file,pos={606,178},fsize=12,size={76,20},variable= root:Packages:NIST:VSANS:Globals:gLastLoadedFile
@@ -184 +187 @@
 //      Button button_tagFile,pos={720,412},size={70,20},proc=V_TagFileButtonProc,title="Tag File"
 //      Button button_tagFile,disable=2
-        Button button_saveIQ,pos={603,412},size={120,20},proc=V_SaveIQ_ButtonProc,title="Save I(Q) as ITX"
-        Button button_BeamCtr,pos={603,566},size={110,20},proc=V_BeamCtrButtonProc,title="Beam Center",disable=2
-        Button button_SpreadPanels,pos={603,488},size={100,20},proc=V_SpreadPanelButtonProc,title="Spread Panels"
-        Button button_RestorePanels,pos={603,526},size={100,20},proc=V_RestorePanelButtonProc,title="Restore Panels"
-
-        Button pick_trim,pos={603,450},size={120,20},proc=V_TrimDataProtoButton,title="Trim I(Q) Data"
-        Button pick_trim,help={"This button will prompt the user for trimming parameters"}      
+//      Button button_saveIQ,pos={603,412},size={120,20},proc=V_SaveIQ_ButtonProc,title="Save I(Q) as ITX"
+//      Button button_BeamCtr,pos={603,566},size={110,20},proc=V_BeamCtrButtonProc,title="Beam Center",disable=2
+//      Button pick_trim,pos={603,450},size={120,20},proc=V_TrimDataProtoButton,title="Trim I(Q) Data"
+//      Button pick_trim,help={"This button will prompt the user for trimming parameters"}      
         
 
@@ -1081 +1081 @@
 // and the data being saved is not "stale"
 
-                        V_PlotData_Panel()              //-9999 requests a read from the popup on the panel
+                        V_PlotData_Panel()              //
                         Variable binType = V_GetBinningPopMode()
-                        V_BinningModePopup("",binType,"")               // does default circular binning and updates the graph
+                        ControlInfo/W=V_1D_Data popup0
+                        V_BinningModePopup("",binType,S_Value)          // does default circular binning and updates the graph
         
                         SVAR type = root:Packages:NIST:VSANS:Globals:gCurDispType               //what folder

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

@@ -1523 +1523 @@
 
 
+//
+////// utilities for the back detector to diagnose saturation issues
+//
+
+Proc Vm_NumberSaturated(folderStr)
+        String folderStr="RAW"
+        V_NumberSaturated(folderStr)
+End
+
+Function V_NumberSaturated(folderStr)
+        String folderStr
+        
+        Variable num,saturationValue
+        Duplicate/O $("root:Packages:NIST:VSANS:"+folderStr+":entry:instrument:detector_B:data") tmpData
+        
+        saturationValue = 16383
+        
+        tmpData = (tmpData == saturationValue) ? NaN : tmpData
+        WaveStats/Q tmpData
+        num = V_numNaNs
+        
+        Printf "Number of saturated pixels = %d (%g %)\r",num,num/(680*1656)*100
+        KillWaves/Z tmpData
+        
+        V_ColorizeSaturated()
+        return(num)
+end
+
+// turns the saturated values to lime green
+Function V_ColorizeSaturated()
+        ModifyImage data ctab= {0,16382,ColdWarm,0},minRGB=0,maxRGB=(32792,65535,1)
+End
+
+
+
+///
+

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

@@ -330 +330 @@
 End
 
+// awkward, but can't call STRUCT from Proc
+Proc Vm_Write1DData_ITX()
+        Vf_FakeSaveIQITXClick() 
+End
+
+Function Vf_FakeSaveIQITXClick()
+        STRUCT WMButtonAction ba
+        ba.eventCode=2
+        V_SaveIQ_ButtonProc(ba)
+end