diff --git a/script/MultiScan.py b/script/MultiScan.py index 5116ba3..f21b391 100644 --- a/script/MultiScan.py +++ b/script/MultiScan.py @@ -17,9 +17,9 @@ E8 = [700, 740, 6, 0] # Fe L-edge #run('EnergyMultiScan.py',E) -caput("X11MA-VME-ES4:TRX", 6.5) -caput("X11MA-VME-ES4:TRY", 3.4) -caput("X11MA-VME-ES4:TRZ", 15.8) +caput("X11MA-VME-ES4:TRX", 5.5) +caput("X11MA-VME-ES4:TRY", 2.3) +caput("X11MA-VME-ES4:TRZ", 7.9) time.sleep(1.0) @@ -33,8 +33,25 @@ while (abs(error)) > 0.2: run('EnergyMultiScan.py',E5) # Ni +caput("X11MA-KEI11:RANGE", 8) +caput("X11MA-KEI12:RANGE", 7) -Eset = 630 +Eset = 680 #F +error = 10.0 +caput("X11MA-PHS:E_SP",Eset) +while (abs(error)) > 0.2: + time.sleep(1.0) + Ecurr = caget("X11MA-PGM:rbkenergy",'i') + error = Eset-Ecurr + + +run('EnergyMultiScan.py',E4) # F + +caput("X11MA-KEI11:RANGE", 9) +caput("X11MA-KEI12:RANGE", 8) + + +Eset = 630 #Mn error = 10.0 caput("X11MA-PHS:E_SP",Eset) while (abs(error)) > 0.2: @@ -45,19 +62,6 @@ while (abs(error)) > 0.2: run('EnergyMultiScan.py',E3) # Mn -caput("X11MA-KEI11:RANGE", 8) -caput("X11MA-KEI12:RANGE", 7) - -Eset = 680 -error = 10.0 -caput("X11MA-PHS:E_SP",Eset) -while (abs(error)) > 0.2: - time.sleep(1.0) - Ecurr = caget("X11MA-PGM:rbkenergy",'i') - error = Eset-Ecurr - - -run('EnergyMultiScan.py',E4) # F caput("X11MA-KEI11:RANGE", 9) caput("X11MA-KEI12:RANGE", 8)