Changeset 1243 for sans/Dev/trunk

Timestamp:

Mar 12, 2020 6:23:22 PM (3 years ago)

Author:

srkline

Message:

added some test procedures to make it easier to calculate and patch the corrected beam center to a series of files. This new method can be found under the VSANS menu.

Changed the mask drawing objects to be semi-transparent to allow easier masking of bad spots - since you can see what you're doing now.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_BeamCenter.ipf (modified) (1 diff)
• V_Marquee_Operations.ipf (modified) (6 diffs)
• V_MaskUtils.ipf (modified) (1 diff)
• V_Menu.ipf (modified) (1 diff)
• V_PatchFiles.ipf (modified) (1 diff)
• V_Utilities_General.ipf (modified) (1 diff)

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

@@ -1071 +1071 @@
         return(0)
 End
+
+
+
+//////////////////////
+// different way to get the corrected beam centers
+//
+// find the centroid for each file with the marquee as usual
+// then run the macro (to pick each open beam file name)
+// - values for centroid are read from the file
+//
+// - patch xy panel is filled in
+//
+//
+Function V_AutoBeamCenter()
+
+        String emptyFileName_F="",emptyFileName_M="",emptyFileName_B=""
+        
+        
+        NVAR gIgnoreBack = root:Packages:NIST:VSANS:Globals:gIgnoreDetB
+        
+
+// TODO -- can I auto-identify which is the F, M, B?
+// -- can I determine whether the reference beam center has been found already?
+// -- since the centroid was already picked, can the file be flagged at this time?
+// -- is it easier to have a single panel with three popups? or just two??
+//
+
+//
+// - to figure out which is F, M, B
+// try WaveMax(root:Packages:NIST:VSANS:RAW:entry:instrument:detector_MR:data)
+// and pick the panel with the largest value
+//
+// or display the file label along with the file name
+//
+//
+        
+// get the file names   
+        Prompt emptyFileName_F,"Empty Beam File, Front Carriage",popup,V_PickEMPBeamButton("")
+        DoPrompt "Select File",emptyFileName_F
+        if (V_Flag)
+                return 0                                                                        // user canceled
+        endif
+
+        Prompt emptyFileName_M,"Empty Beam File, Middle Carriage",popup,V_PickEMPBeamButton("")
+        DoPrompt "Select File",emptyFileName_M
+        if (V_Flag)
+                return 0                                                                        // user canceled
+        endif
+
+        if(!gIgnoreBack)
+                Prompt emptyFileName_B,"Empty Beam File, Back Carriage",popup,V_PickEMPBeamButton("")
+                DoPrompt "Select File",emptyFileName_B
+                if (V_Flag)
+                        return 0                                                                        // user canceled
+                endif
+        endif
+
+// read the values from the Reduction/comment block
+// "XREF=%g;YREF=%g;"
+        String refStr=""
+        Variable xRef_F,xRef_M,xRef_B
+        Variable yRef_F,yRef_M,yRef_B
+
+
+        //force a cleanup of these three data sets so they are read from disk
+        KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:"+ParseFilePath(0, emptyFileName_F, ".", 0, 0))
+        KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:"+ParseFilePath(0, emptyFileName_M, ".", 0, 0))
+        KillDataFolder/Z $("root:Packages:NIST:VSANS:RawVSANS:"+ParseFilePath(0, emptyFileName_B, ".", 0, 0))
+
+//
+// TODO -- need to verify that the values are actually good
+// -- if they aren't, I need to do something about this...
+//
+        
+        refStr = V_getReductionComments(emptyFileName_F)
+        xRef_F = NumberByKey("XREF", refStr ,"=",";")
+        yRef_F = NumberByKey("YREF", refStr ,"=",";")
+
+        if(numtype(xRef_F)!=0 || numtype(yRef_F)!=0)            //not a normal number
+                Abort "Centroid has not been set for the Front carriage. Open the file and use the Marquee to find the centroid."
+        endif
+        
+        refStr = V_getReductionComments(emptyFileName_M)
+        xRef_M = NumberByKey("XREF", refStr ,"=",";")
+        yRef_M = NumberByKey("YREF", refStr ,"=",";")
+
+        if(numtype(xRef_M)!=0 || numtype(yRef_M)!=0)            //not a normal number
+                Abort "Centroid has not been set for the Middle carriage. Open the file and use the Marquee to find the centroid."
+        endif
+//
+//      either read the values or set default values
+        if(!gIgnoreBack)
+                refStr = V_getReductionComments(emptyFileName_B)
+                xRef_B = NumberByKey("XREF", refStr ,"=",";")
+                yRef_B = NumberByKey("YREF", refStr ,"=",";")
+                if(numtype(xRef_B)!=0 || numtype(yRef_B)!=0)            //not a normal number
+                        Abort "Centroid has not been set for the Back carriage. Open the file and use the Marquee to find the centroid."
+                endif
+        else
+                //default values
+                xref_B = 340
+                yRef_B = 828
+        endif
+
+        Print xRef_F,xRef_M,xRef_B
+        Print yRef_F,yRef_M,yRef_B
+
+// pass these values to the procedure
+// but what if some of the values are bad?
+// these are both procedures, not functions...
+//      V_DeriveBeamCenters()
+//      Make/O/T newPanelWave = {"FL","FR","FT","FB","ML","MR","MT","MB","B"}
+        Make/O/D/N=9 newXCtr_cm,newYCtr_cm
+        
+//      Wave/T newPanelWave
+        Wave newXCtr_cm,newYCtr_cm
+        
+//      Edit newXCtr_cm,newYCtr_cm
+        
+//      V_fDeriveBeamCenters(x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference)
+        // start with the front
+        // FR
+        newXCtr_cm[1] = xRef_F
+        newYCtr_cm[1] = yRef_F
+        // FL
+        newXCtr_cm[0] = xRef_F + kBCtrOffset_FL_x                               //NEW Dec 2018
+        newYCtr_cm[0] = yRef_F + kBCtrOffset_FL_y
+        // FB
+        newXCtr_cm[3] = xRef_F + kBCtrOffset_FB_x                                       // NEW Dec 2018
+        newYCtr_cm[3] = yRef_F + kBCtrOffset_FB_y
+        // FT 
+        newXCtr_cm[2] = xRef_F + kBCtrOffset_FT_x                               // NEW Dec 2018 (not a duplicate of FB anymore)
+        newYCtr_cm[2] = yRef_F + kBCtrOffset_FT_y
+        
+        // MR
+        newXCtr_cm[5] = xRef_M
+        newYCtr_cm[5] = yRef_M
+        // ML
+        newXCtr_cm[4] = xRef_M + kBCtrOffset_ML_x
+        newYCtr_cm[4] = yRef_M + kBCtrOffset_ML_y
+        // MB
+        newXCtr_cm[7] = xRef_M + kBCtrOffset_MB_x
+        newYCtr_cm[7] = yRef_M + kBCtrOffset_MB_y
+        // MT 
+        newXCtr_cm[6] = xRef_M + kBCtrOffset_MT_x
+        newYCtr_cm[6] = yRef_M + kBCtrOffset_MT_y
+        
+        // default value for B (approx center) in pixels
+        newXCtr_cm[8] = xref_B
+        newYCtr_cm[8] = yref_B
+
+
+// XY patch panel values are located at:
+//      SetVariable setvar0,value= root:Packages:NIST:VSANS:Globals:Patch:gFileNum_Lo
+//      SetVariable setvar1,value= root:Packages:NIST:VSANS:Globals:Patch:gFileNum_Hi
+
+//      SetDataFolder root:Packages:NIST:VSANS:Globals:Patch
+// display the wave     
+//      Edit/W=(180,40,500,370)/HOST=#  panelW,xCtr_cm,yCtr_cm
+        
+        // and the panel   Proc V_Patch_xyCtr_Panel() : Panel
+
+        Variable lo,hi
+        V_Find_LoHi_RunNum(lo,hi)
+        NVAR gFileNum_Lo=root:Packages:NIST:VSANS:Globals:Patch:gFileNum_Lo
+        NVAR gFileNum_Hi=root:Packages:NIST:VSANS:Globals:Patch:gFileNum_Hi
+
+        gFileNum_Lo = lo
+        gFileNum_Hi = hi
+
+//      wave/T panelW = root:Packages:NIST:VSANS:Globals:Patch:panelW
+        wave xCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:xCtr_cm
+        wave yCtr_cm = root:Packages:NIST:VSANS:Globals:Patch:yCtr_cm
+
+//      panelW = newPanelW
+        xCtr_cm = newXCtr_cm
+        yCtr_cm = newYCtr_cm
+
+        // open the panel
+        Execute "V_PatchDet_xyCenters_Panel()"
+        
+        DoAlert 0,"These are the new beam centers. Nothing has been written to files. You need to check the file numbers and click Write."
+        
+        return(0)
+End
+
+
+
+
+

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

@@ -275 +275 @@
 End
 
-Function V_FindCentroid() :  GraphMarquee
+
+
+Function V_Find_BeamCentroid() :  GraphMarquee
 
 //      //get the current displayed data (so the correct folder is used)
@@ -284 +286 @@
         Variable left,right,bottom,top,ii,jj,counts
         Variable x_mm_sum,y_mm_sum,x_mm,y_mm
+        Variable xRef,yRef
 
         
@@ -383 +386 @@
                         Print "FRONT Reference X-center (cm) = ",x_mm/10
                         Print "FRONT Reference Y-center (cm) = ",y_mm/10 + yCorrection*yPixSize
+                        xRef = x_mm/10
+                        yRef = y_mm/10 + yCorrection*yPixSize
                 endif
 
@@ -393 +398 @@
                         Print "MIDDLE Reference X-center (cm) = ",x_mm/10
                         Print "MIDDLE Reference Y-center (cm) = ",y_mm/10 + yCorrection*yPixSize
+                        xRef = x_mm/10
+                        yRef = y_mm/10 + yCorrection*yPixSize
                 endif
                 
@@ -400 +407 @@
                         Print "FRONT Reference X-center (cm) = ",x_mm/10 - kBCtrOffset_FL_x     // NEW Dec 2018 values
                         Print "FRONT Reference Y-center (cm) = ",y_mm/10 - kBCtrOffset_FL_y
+                        xRef = x_mm/10 - kBCtrOffset_FL_x
+                        yRef = y_mm/10 - kBCtrOffset_FL_y
                 endif
                 
@@ -405 +414 @@
                         Print "MIDDLE Reference X-center (cm) = ",x_mm/10 - kBCtrOffset_ML_x
                         Print "MIDDLE Reference Y-center (cm) = ",y_mm/10 - kBCtrOffset_ML_y
-                endif
-        endif
+                        xRef = x_mm/10 - kBCtrOffset_ML_x
+                        yRef = y_mm/10 - kBCtrOffset_ML_y
+                endif
+        endif
+
+// TODO
+// ?? store the xy reference values somewhere so that the conversion to proper
+// beam center values can be done automatically, rather than copying numbers into a procedure
+//
+// - either I need 6 globals for the three panels, or I need to store the values in the 
+// reduction block of the file (comment?) - but I don't have the fileName here - could I find it
+// somewhere? gFileList in the current data folder?
+//
+        String ctrStr=""
+        if(cmpstr(detStr,"B") == 0)
+                xRef = xCtr
+                yRef = yCtr                     //these are in pixels
+        endif
+        sprintf ctrStr,"XREF=%g;YREF=%g;",xRef,yRef
+        SVAR gFileList = $("root:Packages:NIST:VSANS:"+gCurDispType+":gFileList")
+        
+        V_writeReductionComments(gFileList,ctrStr)
+        
+        
         
         //back to root folder (redundant)

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

@@ -429 +429 @@
                         SetDrawLayer/W=MaskEditPanel ProgFront
                         SetDrawEnv/W=MaskEditPanel xcoord= bottom,ycoord= left,save     //be sure to use axis coordinate mode
-                        SetDrawEnv/W=MaskEditPanel fillPat=1    
+                        SetDrawEnv/W=MaskEditPanel fillPat=1    ,fillfgc= (65535,65535,65535,39000)             //set the draw fill to translucent white
+                        SetDrawEnv/W=MaskEditPanel save
                         
                         break

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

@@ -32 +32 @@
                 "-"
                 "Derive Beam Centers From Reference",V_DeriveBeamCenters()
+                "Derive Beam Centers From Open Beam Files",V_AutoBeamCenter()
                 "-"
                 "Back Detector Saturation",Vm_NumberSaturated()

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

@@ -2357 +2357 @@
                 Make/O/D/N=9 xCtr_cm,yCtr_cm
                 Make/O/T/N=9 panelW
+                
+                PanelW = {"FL","FR","FT","FB","ML","MR","MT","MB","B"}
                 
                 Variable/G gFileNum_Lo,gFileNum_Hi

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

@@ -1570 +1570 @@
 End
 
-
-
 ///
 
+
+Function V_PrintLoHiNum()
+
+        Variable lo,hi
+        V_Find_LoHi_RunNum(lo,hi)
+        Print "lo = ",lo
+        Print "hi = ",hi
+        
+End
+
+//
+// returns the lo, hi run numbers in the current directory
+// (passed by reference)
+//
+//
+// note that 1111 (is a special number for the ReadNoise file, ignore this run)
+//
+Function V_Find_LoHi_RunNum(lo,hi)
+        Variable &lo,&hi
+        
+        String fileList="",fname=""
+        Variable ii,num,runNum
+        
+        // set to values that will change
+        lo = 1e8
+        hi = 0
+        
+        // get a file listing of all raw data files
+        fileList = V_GetRawDataFileList()
+        num = itemsInList(fileList)
+        
+        for(ii=0;ii<num;ii+=1)
+                fname = stringFromList(ii,fileList)
+                runNum = V_GetRunNumFromFile(fname)
+
+                if(runNum != 1111)              //ignore this run
+                        lo = runNum < lo ? runNum : lo          // if runNum < lo, update
+                        hi = runNum > hi ? runNum : hi          // if runNum > hi, update
+                endif
+        endfor
+        
+        return(0)
+End
+
+