From bc55f3c053d729ef9e9fbba588dfbfdeee82e012 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Fri, 31 Aug 2018 21:35:05 +0200 Subject: [PATCH] Script execution --- script/MultiScan.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/MultiScan.py b/script/MultiScan.py index 4e0be21..fc14fc3 100644 --- a/script/MultiScan.py +++ b/script/MultiScan.py @@ -17,10 +17,10 @@ E8 = [700, 740, 6, 0] # Fe L-edge #run('EnergyMultiScan.py',E) -''' + caput("X11MA-VME-ES4:TRX", 5.5) -caput("X11MA-VME-ES4:TRY", -3.5) -caput("X11MA-VME-ES4:TRZ", 16.7) +caput("X11MA-VME-ES4:TRY", -3.7) +caput("X11MA-VME-ES4:TRZ", 7.5) time.sleep(1.0) @@ -65,7 +65,7 @@ run('EnergyMultiScan.py',E3) # Mn caput("X11MA-KEI11:RANGE", 9) caput("X11MA-KEI12:RANGE", 8) -''' + Eset = 520 error = 10.0 caput("X11MA-PHS:E_SP",Eset) @@ -75,7 +75,7 @@ while (abs(error)) > 1.2: error = Eset-Ecurr run('EnergyMultiScan.py',E2) # O -''' + caput("X11MA-KEI11:RANGE", 10) caput("X11MA-KEI12:RANGE", 8) @@ -103,7 +103,7 @@ while (abs(error)) > 1.2: error = Eset-Ecurr run('EnergyMultiScan.py',E7) # Survey -''' + #n_scans=6 #for i in range(0,n_scans):