From e618211e4d765a4e5486e237b0278036568c1319 Mon Sep 17 00:00:00 2001 From: gac-x10da Date: Tue, 30 Aug 2022 13:20:21 +0200 Subject: [PATCH] Script execution --- script/CalibrateGonio.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/script/CalibrateGonio.py b/script/CalibrateGonio.py index cf775e4..32a5eff 100644 --- a/script/CalibrateGonio.py +++ b/script/CalibrateGonio.py @@ -15,24 +15,17 @@ def GetEnergies(): Offset=caget("X10DA-OP1-MO1:ROTX.OFF") print ("Gonio, Absolut, Offset", EnergyGonio,EnergyAbsolut, Offset) +def CalibrateGonio(): + GetEnergies() + BraggGonio1=caget("X10DA-OP1-MO1:BraggThetaAO.VAL") + caput("X10DA-OP1-MO1:BraggEAO",EnergyAbsolut) + time.sleep(sleepTime) + BraggGonio2=caget("X10DA-OP1-MO1:BraggThetaAO.VAL") + NewOffset=Offset+BraggGonio2-BraggGonio1 + caput("X10DA-OP1-MO1:ROTX.OFF", NewOffset) + time.sleep(sleepTime) + #GetEnergies() -GetEnergies() -#for i in range(0,5): -# caput("X10DA-OP1-MO1:BraggEAO",start+step*i) -# time.sleep(sleepTime) -#EnergyGonio=caget("X10DA-OP1-MO1:BraggERdbkAO") -#EnergyAbsolut=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL") -#OldOffset=caget("X10DA-OP1-MO1:ROTX.OFF") -#print ("BeforeCalibration", EnergyGonio,EnergyAbsolut, OldOffset) - -BraggGonio1=caget("X10DA-OP1-MO1:BraggThetaAO.VAL") -caput("X10DA-OP1-MO1:BraggEAO",EnergyAbsolut) -time.sleep(sleepTime) -BraggGonio2=caget("X10DA-OP1-MO1:BraggThetaAO.VAL") - -NewOffset=Offset+BraggGonio2-BraggGonio1 -caput("X10DA-OP1-MO1:ROTX.OFF", NewOffset) -time.sleep(sleepTime) - -GetEnergies() +CalibrateGonio() +xscan("/sls/X10DA/data/x10daop/operation/fda/scans/users/20220826-Baur/XANES_fluo_E-relative_FALCON_MO1_ae_v2.xml")