Changeset 1118 for sans/Dev/trunk


Ignore:
Timestamp:
Nov 8, 2018 9:19:04 AM (4 years ago)
Author:
srkline
Message:

adding patch procedure to adjust the number of attenuators - which may have been incorrect for one of Yun's experiments.

Adding updated beam center offsets for the Front carriage. These values are fitted to the AgBeh? arcs, and should be an improvement. Similar values were derived for the graphite monchromator. Separate procedures are necessary for the graphite vs. Velocity selector since the beam axis is shifted when the graphite is in place. These new graphite values are also included.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1117 r1118  
    795795// 
    796796 
    797 Proc V_DeriveBeamCenters() 
     797Proc V_DeriveBeamCenters_VelSel() 
    798798 
    799799        Make/O/T panelWave = {"FL","FR","FT","FB","ML","MR","MT","MB","B"} 
    … …  
    803803         
    804804        DoAlert 0, "enter the measured beam center reference for Front and Middle panels" 
    805         V_fDeriveBeamCenters() 
     805        V_fDeriveBeamCenters_VelSel() 
    806806         
    807807End 
    … …  
    810810// if I change any of these values, I need to also change them in the V_FindCentroid function  
    811811// in V_Marquee_Operation.ipf 
    812 Proc V_fDeriveBeamCenters(x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference) 
     812// 
     813// ** updated these values for the FRONT only with fitted arcs of AgBeh (March 2018 data, run 4494) 
     814// 
     815Proc V_fDeriveBeamCenters_VelSel(x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference) 
    813816        Variable x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference 
    814817         
    … …  
    818821        newYCtr_cm[1] = y_FrontReference 
    819822        // FL 
    820         newXCtr_cm[0] = x_FrontReference - (0.03 + 0.03)/2 
    821         newYCtr_cm[0] = y_FrontReference + (0.34 + 0.32)/2 
     823//      newXCtr_cm[0] = x_FrontReference - (0.03 + 0.03)/2              //OLD, pre Nov 2018 
     824//      newYCtr_cm[0] = y_FrontReference + (0.34 + 0.32)/2 
     825        newXCtr_cm[0] = x_FrontReference + 0.26 
     826        newYCtr_cm[0] = y_FrontReference + 0.33 
    822827        // FB 
    823         newXCtr_cm[3] = x_FrontReference - (2.02 + 2.06)/2 
    824         newYCtr_cm[3] = y_FrontReference - (0.12 + 0.19)/2              // (-) is correct here 
    825         // FT (duplicate FB) 
    826         newXCtr_cm[2] = newXCtr_cm[3] 
    827         newYCtr_cm[2] = newYCtr_cm[3] 
     828//      newXCtr_cm[3] = x_FrontReference - (2.02 + 2.06)/2              // OLD, pre Nov 2018 
     829//      newYCtr_cm[3] = y_FrontReference - (0.12 + 0.19)/2              // (-) is correct here 
     830        newXCtr_cm[3] = x_FrontReference - 1.84 
     831        newYCtr_cm[3] = y_FrontReference + 0.41 
     832        // FT (not a duplicate of FB anymore) 
     833        newXCtr_cm[2] = x_FrontReference - 1.33 
     834        newYCtr_cm[2] = y_FrontReference - 0.30 
    828835         
    829836        // MR 
    … …  
    842849         
    843850        // default value for B 
    844         newXCtr_cm[8] = 0 
    845         newYCtr_cm[8] = 0 
     851        newXCtr_cm[8] = 50 
     852        newYCtr_cm[8] = 50 
    846853 
    847854                 
    … …  
    849856End 
    850857 
     858// 
     859// these values for FRONT use improved, fitted arcs from AgBeh. Data was fitted in pixels and converted to cm 
     860// data from Sept 2018 (run 17994) 
     861Proc V_DeriveBeamCenters_Graphite() 
     862 
     863        Make/O/T panelWave = {"FL","FR","FT","FB","ML","MR","MT","MB","B"} 
     864        Make/O/D/N=9 newXCtr_cm,newYCtr_cm 
     865         
     866        Edit panelWave,newXCtr_cm,newYCtr_cm 
     867         
     868        DoAlert 0, "enter the measured beam center reference for Front and Middle panels" 
     869        V_fDeriveBeamCenters_Graphite() 
     870         
     871End 
     872 
     873// units are in [cm] 
     874Proc V_fDeriveBeamCenters_Graphite(x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference) 
     875        Variable x_FrontReference,y_FrontReference,x_MiddleReference,y_MiddleReference 
     876         
     877        // start with the front 
     878        // FR 
     879        newXCtr_cm[1] = x_FrontReference - 0.08 
     880        newYCtr_cm[1] = y_FrontReference - 0.08 
     881        // FL 
     882        newXCtr_cm[0] = x_FrontReference - 0.03 
     883        newYCtr_cm[0] = y_FrontReference + 0.28 
     884        // FB 
     885        newXCtr_cm[3] = x_FrontReference + 1.42 
     886        newYCtr_cm[3] = y_FrontReference + 0.55 
     887        // FT  
     888        newXCtr_cm[2] = x_FrontReference + 1.92 
     889        newYCtr_cm[2] = y_FrontReference + 0.05 
     890         
     891        // no new data for the middle detector + graphite, so these values don't change 
     892        // MR 
     893        newXCtr_cm[5] = x_MiddleReference 
     894        newYCtr_cm[5] = y_MiddleReference 
     895        // ML 
     896        newXCtr_cm[4] = x_MiddleReference - (0.06 + 0.05)/2 
     897        newYCtr_cm[4] = y_MiddleReference + (0.14 + 0.01)/2 
     898        // MB 
     899        newXCtr_cm[7] = x_MiddleReference - (0.51 + 0.62)/2 
     900        newYCtr_cm[7] = y_MiddleReference + (0.79 + 0.74)/2 
     901        // MT (duplicate MB) 
     902        newXCtr_cm[6] = newXCtr_cm[7] 
     903        newYCtr_cm[6] = newYCtr_cm[7]    
     904         
     905         
     906        // default value for B 
     907        newXCtr_cm[8] = 50 
     908        newYCtr_cm[8] = 50 
     909 
     910                 
     911        return 
     912End 
     913 

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

    r1113 r1118  
    367367// these corrections are exactly the opposite of what is done in V_fDeriveBeamCenters(xFR,yFR,xMR,yMR) 
    368368                if(cmpstr(detStr,"FL") == 0) 
    369                         Print "FRONT Reference X-center (cm) = ",x_mm/10 + (0.03 + 0.03)/2 
    370                         Print "FRONT Reference Y-center (cm) = ",y_mm/10 - (0.34 + 0.32)/2 
     369                        Print "FRONT Reference X-center (cm) (Velocity Selector) = ",x_mm/10 - 0.26 
     370                        Print "FRONT Reference Y-center (cm) (Velocity Selector) = ",y_mm/10 - 0.33 
     371                         
     372                        Print "FRONT Reference X-center (cm) (Graphite) = ",x_mm/10 + 0.03 
     373                        Print "FRONT Reference Y-center (cm) (Graphite) = ",y_mm/10 - 0.28 
    371374                endif 
    372375                 
    373376                if(cmpstr(detStr,"ML") == 0) 
    374                         Print "MIDDLE Reference X-center (cm) = ",x_mm/10 + (0.06 + 0.05)/2 
    375                         Print "MIDDLE Reference Y-center (cm) = ",y_mm/10 - (0.14 + 0.01)/2 
     377                        Print "MIDDLE Reference X-center (cm) (Velocity Selector) = ",x_mm/10 + (0.06 + 0.05)/2 
     378                        Print "MIDDLE Reference Y-center (cm) (Velocity Selector) = ",y_mm/10 - (0.14 + 0.01)/2 
     379                         
     380                        Print "MIDDLE Reference X-center (cm) (Graphite) = ",x_mm/10 + (0.06 + 0.05)/2 
     381                        Print "MIDDLE Reference Y-center (cm) (Graphite) = ",y_mm/10 - (0.14 + 0.01)/2 
    376382                endif 
    377383        endif 

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

    r1112 r1118  
    2828                "Trim I(q) points",V_CombineDataGraph() 
    2929                "-" 
    30                 "Derive Beam Centers",V_DeriveBeamCenters() 
     30                "Derive Beam Centers - VelSel",V_DeriveBeamCenters_VelSel() 
     31                "Derive Beam Centers - Graphite",V_DeriveBeamCenters_Graphite() 
    3132                "-" 
    3233                "Back Detector Saturation",Vm_NumberSaturated() 
    … …  
    4647                "Read Detetcor Panel Gap",V_ReadDet_Gap() 
    4748                "Patch Detector Distance",V_PatchDet_Distance() 
     49                "Patch XY Pixel Size",V_Patch_XYPixelSize() 
    4850                "-" 
    4951                "Patch Back Detector Values",V_Patch_Back_Detector() 

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

    r1117 r1118  
    24592459 
    24602460 
     2461Proc V_Patch_XYPixelSize(lo,hi) 
     2462        Variable lo,hi 
     2463         
     2464        V_fPatch_XYPixelSize(lo,hi) 
     2465End 
     2466 
    24612467// simple utility to patch the offset values in the file headers 
    24622468// 
Note: See TracChangeset for help on using the changeset viewer.