Skip to content

Commit e4bb1d8

Browse files
committed
Add o2-tpc-cmv-aggragate-task
1 parent 8540902 commit e4bb1d8

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

prodtests/full-system-test/aggregator-workflow.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ nTFs=$((1000 * 128 / ${NHBPERTF}))
310310
nTFs_SAC=$((10000 * 128 / ${NHBPERTF}))
311311
nBuffer=$((100 * 128 / ${NHBPERTF}))
312312
nBuffer_cmv=$((300 * 128 / ${NHBPERTF}))
313+
lanesCMVaggreagte=${O2_TPC_IDC_FACTORIZE_NLANES:-2}
313314
IDC_DELTA="--disable-IDCDelta true" # off by default
314315
# deltas are on by default; you need to request explicitly to switch them off;
315316
if [[ "${DISABLE_IDC_DELTA:-}" == "1" ]]; then IDC_DELTA=""; fi
@@ -324,12 +325,13 @@ if ! workflow_has_parameter CALIB_LOCAL_INTEGRATED_AGGREGATOR; then
324325
add_W o2-tpc-idc-ft-aggregator "--rangeIDC 200 --inputLanes ${lanesFactorize} --nFourierCoeff 40 --nthreads 8"
325326
fi
326327
if [[ $CALIB_TPC_CMV == 1 ]] && [[ $AGGREGATOR_TASKS == TPC_IDCBOTH_SAC || $AGGREGATOR_TASKS == ALL ]]; then
327-
if [[ -z ${O2_TPC_CMV_ZERO_THRESHOLD:-} ]]; then O2_TPC_CMV_ZERO_THRESHOLD="--cmv-zero-threshold 1.0"; fi
328-
if [[ -z ${O2_TPC_CMV_DYNAMIC_PRECISION_MEAN:-} ]]; then O2_TPC_CMV_DYNAMIC_PRECISION_MEAN="--cmv-dynamic-precision-mean 1.0"; fi
329-
if [[ -z ${O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA:-} ]]; then O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA="--cmv-dynamic-precision-sigma 8.0"; fi
328+
if [[ -z ${O2_TPC_CMV_ZERO_THRESHOLD:-} ]]; then O2_TPC_CMV_ZERO_THRESHOLD="1.0"; fi
329+
if [[ -z ${O2_TPC_CMV_DYNAMIC_PRECISION_MEAN:-} ]]; then O2_TPC_CMV_DYNAMIC_PRECISION_MEAN="1.0"; fi
330+
if [[ -z ${O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA:-} ]]; then O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA="8.0"; fi
330331
if [[ -z ${O2_TPC_CMV_USE_HUFFMANN:-} ]]; then O2_TPC_CMV_USE_HUFFMANN="--use-compression-huffman"; fi
331-
if [[ -z ${O2_TPC_CMV_TIMEFRAMES:-} ]]; then O2_TPC_CMV_TIMEFRAMES="--timeframes 20000"; fi
332-
add_W o2-tpc-cmv-distribute "--crus ${crus} --lanes 4 --n-TFs-buffer ${nBuffer_cmv} ${O2_TPC_CMV_TIMEFRAMES} --enable-CCDB-output {O2_TPC_CMV_ZERO_THRESHOLD} {O2_TPC_CMV_DYNAMIC_PRECISION_MEAN} {O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA} --use-sparse ${O2_TPC_CMV_USE_HUFFMANN}"
332+
if [[ -z ${O2_TPC_CMV_TIMEFRAMES:-} ]]; then O2_TPC_CMV_TIMEFRAMES="2400"; fi
333+
add_W o2-tpc-cmv-distribute "--crus ${crus} --lanes 4 --output-lanes ${lanesCMVaggreagte} --n-TFs-buffer ${nBuffer_cmv} --timeframes ${O2_TPC_CMV_TIMEFRAMES} --send-precise-timestamp "
334+
add_W o2-tpc-cmv-aggregate "--crus ${crus} --input-lanes ${lanesCMVaggreagte} --n-TFs-buffer ${nBuffer_cmv} --nthreads-compression 4 --timeframes ${O2_TPC_CMV_TIMEFRAMES} --use-precise-timestamp --enable-CCDB-output --cmv-zero-threshold ${O2_TPC_CMV_ZERO_THRESHOLD} --cmv-dynamic-precision-mean ${O2_TPC_CMV_DYNAMIC_PRECISION_MEAN} --cmv-dynamic-precision-sigma ${O2_TPC_CMV_DYNAMIC_PRECISION_SIGMA} --use-sparse ${O2_TPC_CMV_USE_HUFFMANN}"
333335
fi
334336
if [[ $CALIB_TPC_SAC == 1 ]] && [[ $AGGREGATOR_TASKS == TPC_IDCBOTH_SAC || $AGGREGATOR_TASKS == ALL ]]; then
335337
add_W o2-tpc-sac-distribute "--timeframes ${nTFs_SAC} --output-lanes 1 "

0 commit comments

Comments
 (0)