From fa562c002d81266ae0012bec07c2d0d82bbebf27 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Sat, 5 Oct 2019 22:15:31 +0200 Subject: [PATCH] Script execution --- script/test/otf_post_mortem.py | 45 ++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/script/test/otf_post_mortem.py b/script/test/otf_post_mortem.py index ce73a96..fb07ef4 100644 --- a/script/test/otf_post_mortem.py +++ b/script/test/otf_post_mortem.py @@ -121,7 +121,14 @@ while loop_count < nr_loops: #otf(start=500, end=1000, time=4, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Survey', folder='data/2019_10/postmortem') -otf(start=750, end=850, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Sb', folder='data/2019_10/postmortem') +#otf(start=750, end=850, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Sb', folder='data/2019_10/postmortem') +otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-C', folder='data/2019_10/postmortem') +otf(start=500, end=900, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-Survey', folder='data/2019_10/postmortem') +otf(start=750, end=850, time=3, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-Sb', folder='data/2019_10/postmortem') +otf(start=700, end=740, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-Fe', folder='data/2019_10/postmortem') +otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-Mn', folder='data/2019_10/postmortem') +otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='test_NaMFA_NSS_pristine-O', folder='data/2019_10/postmortem') + '''# sample NaMFA - NSS @@ -132,7 +139,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='sample1_NCM111_LPS-Discharge-C', folder='data/2019_10/postmortem') + otf(start=270, end=320, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-C', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans Survey @@ -142,27 +149,27 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=2 loop_count = 0 while loop_count < nr_loops: - otf(start=500, end=1000, time=4, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='sample1_NCM111_LPS-Discharge-Survey', folder='data/2019_10/postmortem') + otf(start=500, end=900, time=4, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Survey', folder='data/2019_10/postmortem') loop_count = loop_count + 1 -# scans Ni +# scans Sb +caput('X11MA-KEI10:RANGE', 7) +caput('X11MA-KEI11:RANGE', 8) +caput('X11MA-KEI12:RANGE', 10) +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='s1_NaSbS_pellet-Sb', folder='data/2019_10/postmortem') + loop_count = loop_count + 1 + +# scans Fe caput('X11MA-KEI10:RANGE', 7) caput('X11MA-KEI11:RANGE', 8) caput('X11MA-KEI12:RANGE', 9) -nr_loops=2 +nr_loops=3 loop_count = 0 while loop_count < nr_loops: - otf(start=845, end=885, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='sample1_NCM111_LPS-Discharge-Ni', folder='data/2019_10/postmortem') - loop_count = loop_count + 1 - -# scans Co -caput('X11MA-KEI10:RANGE', 7) -caput('X11MA-KEI11:RANGE', 8) -caput('X11MA-KEI12:RANGE', 9) -nr_loops=2 -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='sample1_NCM111_LPS-Discharge-Co', folder='data/2019_10/20191005') + otf(start=700, end=740, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Fe', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans Mn @@ -172,16 +179,16 @@ caput('X11MA-KEI12:RANGE', 9) nr_loops=3 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='sample1_NCM111_LPS-Discharge-Mn', folder='data/2019_10/20191005') + otf(start=630, end=670, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-Mn', folder='data/2019_10/postmortem') loop_count = loop_count + 1 -# scans O +# scans O/Sb caput('X11MA-KEI10:RANGE', 6) caput('X11MA-KEI11:RANGE', 8) 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='sample1_NCM111_LPS-Discharge-O', folder='data/2019_10/20191005') + otf(start=520, end=570, time=2, delay=10, mode='LINEAR', alpha = 0.0, offset=0.0, name='s1_NaSbS_pellet-O', folder='data/2019_10/postmortem') loop_count = loop_count + 1 ''' \ No newline at end of file