Changeset 1083 for sans

Timestamp:

Feb 9, 2018 3:47:28 PM (5 years ago)

Author:

srkline

Message:

minor changes to allow patching of more incorrect metadata

added simple way to estimate beam centers from a single measurement (stiil to be thoroughly verified!)

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_BeamCenter.ipf (modified) (1 diff)
• V_DetectorCorrections.ipf (modified) (3 diffs)
• V_HDF5_Write.ipf (modified) (1 diff)
• V_Menu.ipf (modified) (2 diffs)
• V_PatchFiles.ipf (modified) (2 diffs)
• V_RAW_Data_Panel.ipf (modified) (7 diffs)
• V_Transmission.ipf (modified) (3 diffs)

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

@@ -838 +838 @@
         
 End
+
+
+
+
+//////////////////
+//
+// Simple utility to calculate beam centers [cm] based on a single measurement
+//  and empirical relations between the panel zero positions
+//
+// Empirical relations are derived from beam center measurements using 6A data and WB data (9/10/17)
+// only measurements on L, R, and x-coordinate of B were used. T panel cannot be translated down far enough
+// to reach the direct beam.
+//
+// Start with the (default) case of a beam center measured on R (MR or FR)
+//
+// Empirical values are averaged as noted
+//
+
+Proc V_DeriveBeamCenters()
+
+        Make/O/T panelWave = {"FL","FR","FT","FB","ML","MR","MT","MB","B"}
+        Make/O/D/N=9 newXCtr_cm,newYCtr_cm
+        
+        Edit panelWave,newXCtr_cm,newYCtr_cm
+        
+        DoAlert 0, "enter the measured beam center for FR and MR panels"
+        V_fDeriveBeamCenters()
+        
+End
+
+
+Proc V_fDeriveBeamCenters(xFR,yFR,xMR,yMR)
+        Variable xFR,yFR,xMR,yMR
+        
+        // start with the front
+        // FR
+        newXCtr_cm[1] = xFR
+        newYCtr_cm[1] = yFR
+        // FL
+        newXCtr_cm[0] = xFR - (0.03 + 0.03)/2
+        newYCtr_cm[0] = yFR + (0.34 + 0.32)/2
+        // FB
+        newXCtr_cm[3] = xFR - (2.02 + 2.06)/2
+        newYCtr_cm[3] = yFR - (0.12 + 0.19)/2
+        // FT (duplicate FB)
+        newXCtr_cm[2] = newXCtr_cm[3]
+        newYCtr_cm[2] = newYCtr_cm[3]
+        
+        // MR
+        newXCtr_cm[5] = xMR
+        newYCtr_cm[5] = yMR
+        // ML
+        newXCtr_cm[4] = xMR - (0.06 + 0.05)/2
+        newYCtr_cm[4] = yMR + (0.14 + 0.01)/2
+        // MB
+        newXCtr_cm[7] = xMR - (0.51 + 0.62)/2
+        newYCtr_cm[7] = yMR + (0.79 + 0.74)/2
+        // MT (duplicate MB)
+        newXCtr_cm[6] = newXCtr_cm[7]
+        newYCtr_cm[6] = newYCtr_cm[7]   
+        
+        
+        // dummy value for B
+        newXCtr_cm[8] = 50
+        newYCtr_cm[8] = 50
+
+                
+        return
+End

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

@@ -156 +156 @@
 // kPanelTouchingGap is in mm   
 // the gap is split equally between the panel pairs
-// TODO -- replace all of this with V_getDet_panel_gap(fname,detStr) once it is added to the file
-// these hard-wired values were determined from 6A and WB beam centers. LR values were exactly the same for
-// 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.5               //mm (measured, JB 1/4/18)
-        endif
-        if(cmpstr(detStr,"FT") == 0 || cmpstr(detStr,"FB") == 0)
-                gap = 3.3               //mm (measured, JB 2/1/18)
-        endif
-        if(cmpstr(detStr,"ML") == 0 || cmpstr(detStr,"MR") == 0)
-                gap = 5.9               //mm (measured, JB 1/4/18)
-        endif
-        if(cmpstr(detStr,"MT") == 0 || cmpstr(detStr,"MB") == 0)
-                gap = 18.3              //mm (measured, JB 2/1/18)
-        endif
-// TODO: this is the line to keep, to replace the hard-wired values
-//      gap = V_getDet_panel_gap(fname,detStr)
+// (DONE) -- replace all of this with V_getDet_panel_gap(fname,detStr) once it is added to the file
+
+        gap = V_getDet_panel_gap(fname,detStr)
+
+// TODO:
+// -- once the gap fields have been verified, this check can be removed
+// -- it should only apply to data pre-2018 when the field did not exist in the file
+// -- any VSANS data from 2018+ should read gap from the file.
+
+        if(gap < -100)          //-999999 returned if field is missing from file
+        
+                if(cmpstr(detStr,"FL") == 0 || cmpstr(detStr,"FR") == 0)
+                        gap = 3.5               //mm (measured, JB 1/4/18)
+                endif
+                if(cmpstr(detStr,"FT") == 0 || cmpstr(detStr,"FB") == 0)
+                        gap = 3.3               //mm (measured, JB 2/1/18)
+                endif
+                if(cmpstr(detStr,"ML") == 0 || cmpstr(detStr,"MR") == 0)
+                        gap = 5.9               //mm (measured, JB 1/4/18)
+                endif
+                if(cmpstr(detStr,"MT") == 0 || cmpstr(detStr,"MB") == 0)
+                        gap = 18.3              //mm (measured, JB 2/1/18)
+                endif
+        
+        endif
+
         
         if(cmpstr(orientation,"vertical")==0)
@@ -1355 +1364 @@
         //check for DIV
         // if the DIV workfile doesn't exist, let the user know,and abort
-
-        WAVE/Z div_data_err = V_getDetectorDataErrW("DIV",detStr)
-        WAVE/Z div_data = V_getDetectorDataW("DIV",detStr)
-
+        // !! be sure to check first, before trying to access the wave
+        
 //      WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data")
-        if(WaveExists(div_data) == 0)
+        if(WaveExists($("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data")) == 0)
                 Print "The DIV wave does not exist in V_DIVCorrection()"
                 Return(1)               //error condition
         Endif
-        if(WaveExists(div_data_err) == 0)
+        if(WaveExists($("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":linear_data_error")) == 0)
                 Print "The DIV error wave does not exist in V_DIVCorrection()"
                 Return(1)               //error condition
@@ -1370 +1377 @@
         //files exist, proceed
 
+        WAVE/Z div_data_err = V_getDetectorDataErrW("DIV",detStr)
+        WAVE/Z div_data = V_getDetectorDataW("DIV",detStr)
+
+
+
 // do the error propagation first, since data is changed by the correction
         data_err = sqrt(data_err^2/div_data^2 + div_data_err^2 * data^2/div_data^4 )

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

@@ -4425 +4425 @@
         String groupName = "/entry/instrument/detector_"+detStr 
         String varName = "setback"
+        wTmpWrite[0] = val
+
+        variable err
+        err = V_WriteWaveToHDF(fname, groupName, varName, wTmpWrite)
+        if(err)
+                Print "HDF write err = ",err
+        endif
+        // now be sure to kill the data folder to force a re-read of the data next time this file is read in
+//      err = V_KillNamedDataFolder(fname)
+//      if(err)
+//              Print "DataFolder kill err = ",err
+//      endif
+        return(err)
+End
+
+// gap when panels are "touching"
+// units are mm
+// writes panel gap for detector panel specified
+// does not write anything if "B" is passed (no such field for this detector)
+//
+Function V_writeDet_panel_gap(fname,detStr,val)
+        String fname,detStr
+        Variable val
+
+        if(cmpstr(detStr,"B") == 0)
+                return(0)
+        endif
+        
+//      String path = "entry:instrument:detector_"+detStr+":panel_gap"
+
+        Make/O/D/N=1 wTmpWrite
+//      Make/O/R/N=1 wTmpWrite
+        String groupName = "/entry/instrument/detector_"+detStr 
+        String varName = "panel_gap"
         wTmpWrite[0] = val
 

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

@@ -28 +28 @@
                 "Annular Binning",Annular_Binning()
                 "Write Annular Data",V_Write1DAnnular()
+                "-"
+                "Derive Beam Centers",V_DeriveBeamCenters()
         End
         Submenu "Work Files"
@@ -50 +52 @@
                 "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()
+                "Patch Detector Distance",V_PatchDet_Distance()
                 "-"
                 "Setup_VSANS_DIV_Struct"

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

@@ -2354 +2354 @@
 end
 
-
+Proc V_PatchDet_Gap(lo,hi)
+        Variable lo,hi
+        
+        V_fPatchDet_Gap(lo,hi)
+End
+
+Proc V_ReadDet_Gap(lo,hi)
+        Variable lo,hi
+        
+        V_fReadDet_Gap(lo,hi)
+
+Proc V_PatchDet_Distance(lo,hi,dist_f,dist_m,dist_b)
+        Variable lo,hi,dist_f=400,dist_m=1900,dist_b=2200
+        
+        V_fPatchDet_distance(lo,hi,dist_f,dist_m,dist_b)
+End
 // simple utility to patch the offset values in the file headers
 //
@@ -2498 +2513 @@
         return(0)
 End
+
+
+
+// simple utility to patch the detector gap values in the file headers
+//
+// values are measured values in [mm], not estimated
+//
+// lo is the first file number
+// hi is the last file number (inclusive)
+//
+Function V_fPatchDet_Gap(lo,hi)
+        Variable lo,hi
+
+        
+        Variable ii,jj
+        String fname,detStr
+                
+        //loop over all files
+        for(jj=lo;jj<=hi;jj+=1)
+                fname = V_FindFileFromRunNumber(jj)
+                if(strlen(fname) != 0)
+                
+                // write gap values
+                        V_writeDet_panel_gap(fname,"FL",3.5)
+                        V_writeDet_panel_gap(fname,"FR",3.5)
+
+                        V_writeDet_panel_gap(fname,"FT",3.3)
+                        V_writeDet_panel_gap(fname,"FB",3.3)
+
+                        V_writeDet_panel_gap(fname,"ML",5.9)
+                        V_writeDet_panel_gap(fname,"MR",5.9)
+
+                        V_writeDet_panel_gap(fname,"MT",18.3)
+                        V_writeDet_panel_gap(fname,"MB",18.3)           
+                
+                else
+                        printf "run number %d not found\r",jj
+                endif
+        endfor
+        
+        return(0)
+End
+
+// simple utility to read the detector gap values stored in the file header
+Function V_fReadDet_Gap(lo,hi)
+        Variable lo,hi
+
+        String fname,detStr
+        Variable jj
+        Variable gap_FL,gap_FR,gap_FT,gap_FB,gap_ML,gap_MR,gap_MT,gap_MB
+        
+        for(jj=lo;jj<=hi;jj+=1)
+                fname = V_FindFileFromRunNumber(jj)
+                if(strlen(fname) != 0)
+                
+                        gap_FL = V_getDet_panel_gap(fname,"FL")
+                        gap_FR = V_getDet_panel_gap(fname,"FR")
+                        gap_FT = V_getDet_panel_gap(fname,"FT")
+                        gap_FB = V_getDet_panel_gap(fname,"FB")
+
+                        gap_ML = V_getDet_panel_gap(fname,"ML")
+                        gap_MR = V_getDet_panel_gap(fname,"MR")
+                        gap_MT = V_getDet_panel_gap(fname,"MT")
+                        gap_MB = V_getDet_panel_gap(fname,"MB")
+                        
+                        print fname     
+                        Print "FL, FR, FT, FB = ",gap_FL,gap_FR,gap_FT,gap_FB
+                        Print "ML, MR, MT, MB = ",gap_ML,gap_MR,gap_MT,gap_MB
+                
+                
+                else
+                        printf "run number %d not found\r",jj
+                endif
+                
+        endfor
+
+        
+        return(0)
+End
+
+
+// simple utility to patch the detector distance values in the file headers
+//
+// values are in [cm]
+//
+// lo is the first file number
+// hi is the last file number (inclusive)
+//
+Function V_fPatchDet_distance(lo,hi,d_f,d_m,d_b)
+        Variable lo,hi,d_f,d_m,d_b
+
+        
+        Variable ii,jj
+        String fname,detStr
+                
+        //loop over all files
+        for(jj=lo;jj<=hi;jj+=1)
+                fname = V_FindFileFromRunNumber(jj)
+                if(strlen(fname) != 0)
+                
+                // write gap values
+                        V_writeDet_distance(fname,"FL",d_f)
+                        V_writeDet_distance(fname,"FR",d_f)
+                        V_writeDet_distance(fname,"FT",d_f)
+                        V_writeDet_distance(fname,"FB",d_f)
+
+                        V_writeDet_distance(fname,"ML",d_m)
+                        V_writeDet_distance(fname,"MR",d_m)
+                        V_writeDet_distance(fname,"MT",d_m)
+                        V_writeDet_distance(fname,"MB",d_m)             
+
+                        V_writeDet_distance(fname,"B",d_b)              
+                
+                else
+                        printf "run number %d not found\r",jj
+                endif
+        endfor
+        
+        return(0)
+End

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

@@ -219 +219 @@
         
         Make/O/D tmp_asdf
-        // for back panels (in pixels?) 
+        // for back panels (in pixels)  
 //      Display/W=(50,185,545,620)/HOST=# tmp_asdf 
         Display/W=(50,185,517,620)/HOST=# tmp_asdf 
@@ -227 +227 @@
         ModifyGraph rgb=(0,0,0)
         ModifyGraph tick=2,mirror=1
-        Label left "pixels"
-        Label bottom "pixels"   
+//      Label left "pixels"                     //don't bother labeling pixels here - it will get redrawn, do it 
+//      Label bottom "pixels"                   // when the selected tab is resized to be the focus
         SetActiveSubwindow ##
         
@@ -238 +238 @@
         ModifyGraph rgb=(0,0,0)
         ModifyGraph tick=2,mirror=1
-        Label left "pixels"
-        Label bottom "pixels"   
+//      Label left "pixels"
+//      Label bottom "pixels"   
         SetActiveSubwindow ##
         
@@ -249 +249 @@
         ModifyGraph rgb=(0,0,0)
         ModifyGraph tick=2,mirror=1
-        Label left "pixels"
-        Label bottom "pixels"   
+//      Label left "pixels"
+//      Label bottom "pixels"   
         SetActiveSubwindow ##
         
@@ -552 +552 @@
                                 
                                 SetActiveSubWindow VSANS_Data#det_panelsB
+                                Label left "pixels"
+                                Label bottom "pixels"
                                 SetDataFolder root:
                         endif
@@ -608 +610 @@
                                                         
                                 SetActiveSubWindow VSANS_Data#det_panelsM
+                                Label left "pixels"
+                                Label bottom "pixels"
                                 SetDataFolder root:
                         endif
@@ -664 +668 @@
         
                                 SetActiveSubWindow VSANS_Data#det_panelsF
+                                Label left "pixels"
+                                Label bottom "pixels"
                                 SetDataFolder root:
                         endif

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

@@ -10 +10 @@
 // ?? redesign the panel based on the CATALOG?
 // -- refresh the catalog, then work with those waves?
+//
+// -- this still seems to be very awkward to use. Come up with something better
+//
+// -- need more checks - be sure that the files match
+// -- SDD, wavelength, beam on proper panel, etc.
+//
+// -- need popups (transmission, open) to respond to popup changes and
+//   update their fields, since they may be auto-located incorrectly.
 // 
 
@@ -34 +42 @@
         PopupMenu popup_1,pos={102,248},size={72.00,23.00},proc=V_TTransmFilePopMenuProc,title="Transmission"
         PopupMenu popup_1,mode=1,value= V_getFilePurposeList("TRANSMISSION",0)
-        PopupMenu popup_2,pos={164,353},size={72.00,23.00},proc=V_TEmpBeamPopMenuProc,title="Empty Beam"
-        PopupMenu popup_2,mode=1,value= V_getFileIntentList("EMPTY BEAM",0)
+        PopupMenu popup_2,pos={164,353},size={72.00,23.00},proc=V_TEmpBeamPopMenuProc,title="Open Beam"
+//      PopupMenu popup_2,mode=1,value= V_getFileIntentList("EMPTY BEAM",0)
+        PopupMenu popup_2,mode=1,value= V_getFileIntentList("OPEN BEAM",0)
         Button button_0,pos={37,193},size={100.00,20.00},proc=V_CalcTransmButtonProc,title="Calculate"
 //      Button button_1,pos={23.00,491.00},size={100.00,20.00},proc=V_WriteTransmButtonProc,title="Write"
@@ -124 +133 @@
                 // x- fill in the XY box
                 // x-  Detector Panel field is hard-wired for "B"
+                // -- do I use "EMPTY BEAM", "OPEN BEAM" or both?? I think "OPEN BEAM" is what NICE will use in a drop-down menu
                 //      
-                        list = V_getFileIntentList("EMPTY BEAM",0)
+//                      list = V_getFileIntentList("EMPTY BEAM",0)
+                        list = V_getFileIntentList("OPEN BEAM",0)
                         
                         for(ii=0;ii<np;ii+=1)
-                                if(cmpstr(intentW[ii],"EMPTY BEAM")==0)
-                                        Print "empty beam match at ",filenameW[ii]
+                                if(cmpstr(intentW[ii],"OPEN BEAM")==0)
+                                        Print "Open beam match at ",filenameW[ii]
                                         SetVariable setvar_4,value=labelW[ii]
                                         PopupMenu popup_2,mode=WhichListItem(fileNameW[ii], list )+1,popValue=fileNameW[ii]