From d3fa2f131aae3b2f40d378641a97c12f3e30472e Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Fri, 4 Oct 2019 17:56:09 +0200 Subject: [PATCH] Script execution --- script/test/otf_NCM111.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/script/test/otf_NCM111.py b/script/test/otf_NCM111.py index 99ef17a..a79b9b3 100644 --- a/script/test/otf_NCM111.py +++ b/script/test/otf_NCM111.py @@ -12,32 +12,37 @@ #caput('X11MA-KEI12:RANGE', 10) #otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_Ni', folder='data/2019_10/20191004') -''' long acquisition edges in loop during galvanostatic +#''' long acquisition edges in loop during galvanostatic nr_loops=1 loop_count = 0 while loop_count < nr_loops: + caput('X11MA-KEI10:RANGE', 7) + caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI12:RANGE', 9) + otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_C', folder='data/2019_10/20191004') + caput('X11MA-KEI10:RANGE', 6) -# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) otf(start=520, end=570, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_O', folder='data/2019_10/20191004') caput('X11MA-KEI10:RANGE', 7) -# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) otf(start=630, end=670, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_Mn', folder='data/2019_10/20191004') caput('X11MA-KEI10:RANGE', 7) -# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 10) otf(start=772, end=805, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_Co', folder='data/2019_10/20191004') caput('X11MA-KEI10:RANGE', 7) -# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 10) otf(start=845, end=885, time=2, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_Ni', folder='data/2019_10/20191004') caput('X11MA-KEI10:RANGE', 6) -# caput('X11MA-KEI11:RANGE', 8) + caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) otf(start=500, end=900, time=3, delay=30, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_gs_Survey', folder='data/2019_10/20191004') loop_count = loop_count + 1 @@ -65,12 +70,12 @@ loop_count = 0 while loop_count < nr_loops: otf(start=772, end=805, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_Co', folder='data/2019_10/20191004') loop_count = loop_count + 1 -''' + # repeating scans Mn caput('X11MA-KEI10:RANGE', 7) caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) -nr_loops=2 +nr_loops=6 loop_count = 0 while loop_count < nr_loops: otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='oXAS-NCM_endPS_Mn', folder='data/2019_10/20191004')