From f93fcc7774d1fb3059924c1b06489aba06a997b2 Mon Sep 17 00:00:00 2001
From: Pieter Donker <donker@astron.nl>
Date: Mon, 4 Feb 2019 10:05:07 +0000
Subject: [PATCH] #2272, changed sc4 recording
---
.../tests/dish_wg_sweep_data_path.py | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/applications/apertif/commissioning/tests/dish_wg_sweep_data_path.py b/applications/apertif/commissioning/tests/dish_wg_sweep_data_path.py
index 9125434de0..fd9ae9c7a0 100755
--- a/applications/apertif/commissioning/tests/dish_wg_sweep_data_path.py
+++ b/applications/apertif/commissioning/tests/dish_wg_sweep_data_path.py
@@ -145,7 +145,7 @@ def start_recording_sc4(start_bsn):
# clear destination folder on arts cluster
_user = 'arts'
if args.rec_dir != '':
- _cmd = 'ssh {0}@arts001 "cd /home/{0}/test/sweeptest_sc4/; ./remove_test_dirs.sh {1}" >> remove_log 2>&1'.format(_user, args.rec_dir)
+ _cmd = 'ssh {0}@arts001.apertif "cd /home/{0}/test/sweeptest_sc4/; ./remove_test_dirs.sh {1}" >> remove_log 2>&1'.format(_user, args.rec_dir)
term.run_cmd(_cmd)
# it takes about 15 unb second (1 unb-sec = 1.024 sec) to connect to arts001 and roll out the recording script over the cluster
@@ -153,18 +153,17 @@ def start_recording_sc4(start_bsn):
logger.info('==== SC4: SET UP RECORDING ====')
# start recording on arts001.apertif cluster
- record_script = 'record_data_multinode_halfrate.sh'
- #record_script = 'record_data_halfrate.sh'
+ _cmd = 'ssh {0}@arts001.apertif "cd /home/{0}/record/; ./record_data_multinode.sh -bsn {1} -nblock {2}'.format(_user, start_bsn, args.rec_time)
+
+ if args.rec_dir != '':
+ _cmd += ' -folder {0}'.format(args.rec_dir)
if args.fullrate:
- record_script = 'record_data_multinode_fullrate.sh'
+ _cmd += ' -fullrate'
- if args.rec_dir != '':
- _cmd = 'ssh {0}@arts001 "cd /home/{0}/record/; ./{1} -bsn {2} -nblock {3} -folder {4}" >> record_log 2>&1 &'\
- .format(_user, record_script, start_bsn, args.rec_time, args.rec_dir)
- else:
- _cmd = 'ssh {0}@arts001 "cd /home/{0}/record/; ./{1} -bsn {2} -nblock {3}" >> record_log 2>&1 &'\
- .format(_user, record_script, start_bsn, args.rec_time)
+ _cmd += '" >> record_log 2>&1 &'
+
+ logger.info('send "%s"', _cmd)
term.run_cmd(_cmd)
return
@@ -323,6 +322,7 @@ if __name__ == "__main__":
bsn_now = get_bsn(args.tel)
if not bsn_now:
sys.exit('No BSN available')
+ rec_start_bsn = bsn_now + 800000
###############################################################################
# Start recording on SC4 cluster
--
GitLab