From 6ce051167c5c6d2a9b610db0a43e3ffd3daecc86 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Sun, 6 Oct 2019 02:28:39 +0200 Subject: [PATCH] Script execution --- script/test/otf_post_mortem.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/script/test/otf_post_mortem.py b/script/test/otf_post_mortem.py index 3d2b490..acccc56 100644 --- a/script/test/otf_post_mortem.py +++ b/script/test/otf_post_mortem.py @@ -133,13 +133,13 @@ while loop_count < nr_loops: #'''# sample NaMFA - NSS # scans C -'''caput('X11MA-KEI10:RANGE', 7) +caput('X11MA-KEI10:RANGE', 7) caput('X11MA-KEI11:RANGE', 7) caput('X11MA-KEI12:RANGE', 10) nr_loops=3 loop_count = 0 while loop_count < nr_loops: - otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s3_NaMFA_NSS_charge-C', folder='data/2019_10/postmortem') + otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-C', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans Survey @@ -149,7 +149,7 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=2 loop_count = 0 while loop_count < nr_loops: - otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s3_NaMFA_NSS_charge-Survey', folder='data/2019_10/postmortem') + otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-Survey', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans Sb @@ -159,7 +159,7 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=6 loop_count = 0 while loop_count < nr_loops: - otf(start=750, end=850, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s3_NaMFA_NSS_charge-Sb', folder='data/2019_10/postmortem') + otf(start=750, end=850, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-Sb', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans Fe @@ -169,9 +169,8 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=3 loop_count = 0 while loop_count < nr_loops: -''' -otf(start=700, end=740, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s3_NaMFA_NSS_charge-Fe', folder='data/2019_10/postmortem') - #loop_count = loop_count + 1 + otf(start=700, end=740, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-Fe', folder='data/2019_10/postmortem') + loop_count = loop_count + 1 # scans Mn caput('X11MA-KEI10:RANGE', 7) @@ -180,7 +179,7 @@ caput('X11MA-KEI12:RANGE', 9) 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='s3_NaMFA_NSS_charge-Mn', folder='data/2019_10/postmortem') + otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-Mn', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans O/Sb @@ -190,6 +189,6 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=2 loop_count = 0 while loop_count < nr_loops: - otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s3_NaMFA_NSS_charge-O', folder='data/2019_10/postmortem') + otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s4_NaMFA_NSS_discharge-O', folder='data/2019_10/postmortem') loop_count = loop_count + 1 ''' \ No newline at end of file