From 54ce2d1d307b68f45a91116e444e7d870f605c17 Mon Sep 17 00:00:00 2001 From: gac-x11ma Date: Sat, 5 Oct 2019 22:41:03 +0200 Subject: [PATCH] Script execution --- script/test/otf_post_mortem.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/script/test/otf_post_mortem.py b/script/test/otf_post_mortem.py index fb07ef4..a48d6d8 100644 --- a/script/test/otf_post_mortem.py +++ b/script/test/otf_post_mortem.py @@ -123,11 +123,11 @@ 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=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') +#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') @@ -144,18 +144,18 @@ while loop_count < nr_loops: # scans Survey caput('X11MA-KEI10:RANGE', 6) -caput('X11MA-KEI11:RANGE', 8) +caput('X11MA-KEI11:RANGE', 7) caput('X11MA-KEI12:RANGE', 9) nr_loops=2 loop_count = 0 while loop_count < nr_loops: - 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') + otf(start=500, end=900, time=3, 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 Sb caput('X11MA-KEI10:RANGE', 7) caput('X11MA-KEI11:RANGE', 8) -caput('X11MA-KEI12:RANGE', 10) +caput('X11MA-KEI12:RANGE', 9) nr_loops=6 loop_count = 0 while loop_count < nr_loops: @@ -164,7 +164,7 @@ while loop_count < nr_loops: # scans Fe caput('X11MA-KEI10:RANGE', 7) -caput('X11MA-KEI11:RANGE', 8) +caput('X11MA-KEI11:RANGE', 7) caput('X11MA-KEI12:RANGE', 9) nr_loops=3 loop_count = 0 @@ -174,17 +174,17 @@ while loop_count < nr_loops: # scans Mn caput('X11MA-KEI10:RANGE', 7) -caput('X11MA-KEI11:RANGE', 8) +caput('X11MA-KEI11:RANGE', 7) caput('X11MA-KEI12:RANGE', 9) -nr_loops=3 +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='s1_NaSbS_pellet-Mn', folder='data/2019_10/postmortem') loop_count = loop_count + 1 # scans O/Sb -caput('X11MA-KEI10:RANGE', 6) -caput('X11MA-KEI11:RANGE', 8) +caput('X11MA-KEI10:RANGE', 7) +caput('X11MA-KEI11:RANGE', 7) caput('X11MA-KEI12:RANGE', 9) nr_loops=2 loop_count = 0