From 982dd80516d7562e614479dd8f23703afaa041a3 Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Mon, 17 Jul 2023 14:15:31 -0700 Subject: [PATCH 1/3] default to s3df even if no queue is passed --- scripts/makepeds | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/makepeds b/scripts/makepeds index 146715f0..ca24c7f7 100755 --- a/scripts/makepeds +++ b/scripts/makepeds @@ -160,7 +160,9 @@ EXP=${EXP:='xxx'} QUEUE=${QUEUE:='xxx'} INTERACTIVE=${INTERACTIVE:=0} -SDFQUEUES=('milano' 'roma') +# also put 'xxx' (default q name) as S3DF so that even if no queue is given, +# it goes to S3DF +SDFQUEUES=('milano' 'roma' 'xxx') for SDFQUEUE in ${SDFQUEUES[@]}; do if [[ $QUEUE == $SDFQUEUE ]]; then S3DF=1 From 7c6c683e106a42efdbd5fe10eeb36c460a596884 Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Mon, 17 Jul 2023 17:46:21 -0700 Subject: [PATCH 2/3] takepeds: make makepeds message clearer --- scripts/takepeds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/takepeds b/scripts/takepeds index ee1b184e..5bf20ce5 100755 --- a/scripts/takepeds +++ b/scripts/takepeds @@ -31,8 +31,8 @@ HUTCH=${EXP:0:3} echo $PYCMD -i "${HUTCH^^}" -u `whoami` -e "$EXP" -t DARK -r $RUN -m "$elogMessage" $PYCMD -i "${HUTCH^^}" -u `whoami` -p pcds -e "$EXP" -t DARK -r $RUN -m "$elogMessage"& -echo 'please call: makepeds -r '`get_lastRun`' -u ' -echo 'for gain-switching detectors we recommend: makepeds -u -q milano -r '`get_lastRun` +echo 'Please call: makepeds -q milano -r '`get_lastRun`' -u ' +echo 'To run job in the interactive node run (slower): makepeds -r '`get_lastRun`' -u ' #echo 'we need to use the offline data to process pedestals right now, make sure files have moved, otherwise a very silent failure might happen' #echo 'please call: makepeds -u -e '`get_curr_exp`' -r '`get_lastRun`' -q psfehhiprioq' From 445b12f27d9f166bf5951f7ddaa3c2d21bba059f Mon Sep 17 00:00:00 2001 From: Vincent Esposito Date: Wed, 24 Jan 2024 21:53:26 -0800 Subject: [PATCH 3/3] clean up takepeds message --- scripts/takepeds | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/takepeds b/scripts/takepeds index 5bf20ce5..5502fdb1 100755 --- a/scripts/takepeds +++ b/scripts/takepeds @@ -32,7 +32,3 @@ echo $PYCMD -i "${HUTCH^^}" -u `whoami` -e "$EXP" -t DARK -r $RUN -m "$elogMes $PYCMD -i "${HUTCH^^}" -u `whoami` -p pcds -e "$EXP" -t DARK -r $RUN -m "$elogMessage"& echo 'Please call: makepeds -q milano -r '`get_lastRun`' -u ' -echo 'To run job in the interactive node run (slower): makepeds -r '`get_lastRun`' -u ' -#echo 'we need to use the offline data to process pedestals right now, make sure files have moved, otherwise a very silent failure might happen' -#echo 'please call: makepeds -u -e '`get_curr_exp`' -r '`get_lastRun`' -q psfehhiprioq' -