Skip to content

Commit e059331

Browse files
Adjusting the logic for the rate limiting in split wf
1 parent 9943c5b commit e059331

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

DATA/production/configurations/asyncReco/async_pass.sh

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,15 @@ else
586586
echo "WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS"
587587
echo "Step 3) matching, calib, AOD, potentially QC"
588588
echo -e "\nStep 3) matching, calib, AOD, potentially QC" >> workflowconfig.log
589-
export TIMEFRAME_RATE_LIMIT=${ALIEN_JDL_TIMEFRAMERATELIMITSSPLITWF:-0}
589+
# This uses the same time frame rate limiting as in full wf, unless differently specified in the JDL
590+
export TIMEFRAME_RATE_LIMIT=${ALIEN_JDL_TIMEFRAMERATELIMITSSPLITWF:-${TIMEFRAME_RATE_LIMIT}}
590591
echo "Removing detectors $DETECTORS_EXCLUDE"
591-
READER_DELAY=${ALIEN_JDL_READERDELAY:-30}
592-
export ARGS_EXTRA_PROCESS_o2_global_track_cluster_reader+=" --reader-delay $READER_DELAY "
592+
if [[ $ALIEN_JDL_USEREADERDELAY == 1 ]]; then
593+
# if we add a delay, the rate limiting should be disabled
594+
TIMEFRAME_RATE_LIMIT=0
595+
READER_DELAY=${ALIEN_JDL_READERDELAY:-30}
596+
export ARGS_EXTRA_PROCESS_o2_global_track_cluster_reader+=" --reader-delay $READER_DELAY "
597+
fi
593598
echo "extra args are $ARGS_EXTRA_PROCESS_o2_global_track_cluster_reader"
594599
env $SETTING_ROOT_OUTPUT IS_SIMULATED_DATA=0 WORKFLOWMODE=print TFDELAY=$TFDELAYSECONDS WORKFLOW_DETECTORS=ALL WORKFLOW_DETECTORS_EXCLUDE=$DETECTORS_EXCLUDE WORKFLOW_DETECTORS_USE_GLOBAL_READER_TRACKS=ALL WORKFLOW_DETECTORS_USE_GLOBAL_READER_CLUSTERS=ALL WORKFLOW_DETECTORS_EXCLUDE_GLOBAL_READER_TRACKS=HMP WORKFLOW_DETECTORS_EXCLUDE_QC=CPV,$DETECTORS_EXCLUDE ./run-workflow-on-inputlist.sh $INPUT_TYPE list.list >> workflowconfig.log
595600
# run it
@@ -620,8 +625,8 @@ else
620625
echo "WORKFLOW_PARAMETERS=$WORKFLOW_PARAMETERS"
621626
echo "Step 4) QC"
622627
echo -e "\nStep 4) QC" >> workflowconfig.log
623-
export TIMEFRAME_RATE_LIMIT=${ALIEN_JDL_TIMEFRAMERATELIMITSSPLITWF:-0}
624628
echo "Removing detectors $DETECTORS_EXCLUDE"
629+
echo "The rate limiting will be the same as in step 3: TIMEFRAME_RATE_LIMIT = ${TIMEFRAME_RATE_LIMIT}"
625630
env $SETTING_ROOT_OUTPUT IS_SIMULATED_DATA=0 WORKFLOWMODE=print TFDELAY=$TFDELAYSECONDS WORKFLOW_DETECTORS=ALL WORKFLOW_DETECTORS_EXCLUDE=$DETECTORS_EXCLUDE WORKFLOW_DETECTORS_USE_GLOBAL_READER_TRACKS=ALL WORKFLOW_DETECTORS_USE_GLOBAL_READER_CLUSTERS=ALL WORKFLOW_DETECTORS_EXCLUDE_GLOBAL_READER_TRACKS=HMP WORKFLOW_DETECTORS_EXCLUDE_QC=CPV,$DETECTORS_EXCLUDE ./run-workflow-on-inputlist.sh $INPUT_TYPE list.list >> workflowconfig.log
626631
# run it
627632
if [[ "0$RUN_WORKFLOW" != "00" ]]; then

0 commit comments

Comments
 (0)