Skip to content

Commit a1fbce3

Browse files
shahor02shahor02
committed
full_system_test will use NHBFs per orbit from env.var
1 parent d552e5d commit a1fbce3

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

‎prodtests/full-system-test/dpl-workflow.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ if [ $CTFINPUT == 1 ]; then
8484
elif [ $EXTINPUT == 1 ]; then
8585
WORKFLOW="o2-dpl-raw-proxy $ARGS_ALL --dataspec \"B:TPC/RAWDATA;C:ITS/RAWDATA;D:TOF/RAWDATA;D:MFT/RAWDATA;E:FT0/RAWDATA;F:MID/RAWDATA;G:EMC/RAWDATA;H:PHS/RAWDATA;I:CPV/RAWDATA\" --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@stfb-to-dpl,transport=shmem,rateLogging=0\" | "
8686
else
87-
WORKFLOW="o2-raw-file-reader-workflow $ARGS_ALL --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF;\" --delay $TFDELAY --loop $NTIMEFRAMES --max-tf 0 --input-conf rawAll.cfg | "
87+
WORKFLOW="o2-raw-file-reader-workflow --detect-tf0 $ARGS_ALL --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF;\" --delay $TFDELAY --loop $NTIMEFRAMES --max-tf 0 --input-conf rawAll.cfg | "
8888
fi
8989

9090
#Decoder workflows
@@ -97,17 +97,17 @@ if [ $CTFINPUT == 0 ]; then
9797
fi
9898

9999
# Common workflows
100-
WORKFLOW+="o2-its-reco-workflow $ARGS_ALL --trackerCA $DISABLE_MC --clusters-from-upstream --disable-root-output $ITS_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=128;$ITS_CONFIG_KEY\" | "
100+
WORKFLOW+="o2-its-reco-workflow $ARGS_ALL --trackerCA $DISABLE_MC --clusters-from-upstream --disable-root-output $ITS_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};$ITS_CONFIG_KEY\" | "
101101
WORKFLOW+="o2-tpc-reco-workflow ${ARGS_ALL/--severity $SEVERITY/--severity $SEVERITY_TPC} --input-type=$TPC_INPUT $DISABLE_MC --output-type $TPC_OUTPUT --pipeline tpc-tracker:$NGPUS,tpc-entropy-encoder:$N_TPCENT $TPC_CONFIG --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF;GPU_global.deviceType=$GPUTYPE;GPU_proc.debugLevel=0;$TPC_CONFIG_KEY\" | "
102-
WORKFLOW+="o2-tpcits-match-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --pipeline itstpc-track-matcher:$N_TPCITS --configKeyValues \"HBFUtils.nHBFPerTF=128;\" | "
103-
WORKFLOW+="o2-ft0-reco-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --configKeyValues \"HBFUtils.nHBFPerTF=128;\" | "
102+
WORKFLOW+="o2-tpcits-match-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --pipeline itstpc-track-matcher:$N_TPCITS --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};\" | "
103+
WORKFLOW+="o2-ft0-reco-workflow $ARGS_ALL --disable-root-input --disable-root-output $DISABLE_MC --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};\" | "
104104
WORKFLOW+="o2-tof-reco-workflow $ARGS_ALL --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF\" --input-type $TOF_INPUT --output-type $TOF_OUTPUT --disable-root-input --disable-root-output $DISABLE_MC | "
105105

106106
# Workflows disabled in sync mode
107107
if [ $SYNCMODE == 0 ]; then
108108
WORKFLOW+="o2-tof-matcher-tpc $ARGS_ALL --configKeyValues \"HBFUtils.nHBFPerTF=$NHBPERTF\" --disable-root-input --disable-root-output $DISABLE_MC | "
109109
WORKFLOW+="o2-mid-reco-workflow $ARGS_ALL --disable-root-output $DISABLE_MC | "
110-
WORKFLOW+="o2-mft-reco-workflow $ARGS_ALL --clusters-from-upstream $DISABLE_MC --disable-root-output --configKeyValues \"HBFUtils.nHBFPerTF=128;\" | "
110+
WORKFLOW+="o2-mft-reco-workflow $ARGS_ALL --clusters-from-upstream $DISABLE_MC --disable-root-output --configKeyValues \"HBFUtils.nHBFPerTF=${NHBPERTF};\" | "
111111
WORKFLOW+="o2-primary-vertexing-workflow $ARGS_ALL $DISABLE_MC --disable-root-input --disable-root-output --validate-with-ft0 | "
112112
WORKFLOW+="o2-secondary-vertexing-workflow $ARGS_ALL --disable-root-input --disable-root-output | "
113113
fi

‎prodtests/full_system_test.sh‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,19 @@ if [ "0$GENERATE_ITS_DICTIONARY" == "01" ]; then
8686
fi
8787

8888
mkdir -p raw
89-
taskwrapper itsraw.log o2-its-digi2raw --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/ITS
90-
taskwrapper mftraw.log o2-mft-digi2raw --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/MFT
91-
taskwrapper ft0raw.log o2-ft0-digi2raw --file-per-link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/FT0
92-
taskwrapper fv0raw.log o2-fv0-digi2raw --file-per-link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/FV0
93-
taskwrapper fddraw.log o2-fdd-digit2raw --file-per-link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/FDD
94-
taskwrapper tpcraw.log o2-tpc-digits-to-rawzs --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -i tpcdigits.root -o raw/TPC
95-
taskwrapper tofraw.log o2-tof-reco-workflow ${GLOBALDPLOPT} --tof-raw-file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' --output-type raw --tof-raw-outdir raw/TOF
96-
taskwrapper midraw.log o2-mid-digits-to-raw-workflow ${GLOBALDPLOPT} --mid-raw-outdir raw/MID --mid-raw-perlink --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"'
97-
taskwrapper emcraw.log o2-emcal-rawcreator --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/EMC
98-
taskwrapper phsraw.log o2-phos-digi2raw --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/PHS
99-
taskwrapper cpvraw.log o2-cpv-digi2raw --file-for link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/CPV
100-
taskwrapper zdcraw.log o2-zdc-digi2raw --file-per-link --configKeyValues '"HBFUtils.nHBFPerTF=128;HBFUtils.orbitFirst=0"' -o raw/ZDC
89+
HBFUTILPARAMS="\"HBFUtils.nHBFPerTF=${NHBPERTF};HBFUtils.orbitFirst=0\""
90+
taskwrapper itsraw.log o2-its-digi2raw --file-for link --configKeyValues $HBFUTILPARAMS -o raw/ITS
91+
taskwrapper mftraw.log o2-mft-digi2raw --file-for link --configKeyValues $HBFUTILPARAMS -o raw/MFT
92+
taskwrapper ft0raw.log o2-ft0-digi2raw --file-per-link --configKeyValues $HBFUTILPARAMS -o raw/FT0
93+
taskwrapper fv0raw.log o2-fv0-digi2raw --file-per-link --configKeyValues $HBFUTILPARAMS -o raw/FV0
94+
taskwrapper fddraw.log o2-fdd-digit2raw --file-per-link --configKeyValues $HBFUTILPARAMS -o raw/FDD
95+
taskwrapper tpcraw.log o2-tpc-digits-to-rawzs --file-for link --configKeyValues $HBFUTILPARAMS -i tpcdigits.root -o raw/TPC
96+
taskwrapper tofraw.log o2-tof-reco-workflow ${GLOBALDPLOPT} --tof-raw-file-for link --configKeyValues $HBFUTILPARAMS --output-type raw --tof-raw-outdir raw/TOF
97+
taskwrapper midraw.log o2-mid-digits-to-raw-workflow ${GLOBALDPLOPT} --mid-raw-outdir raw/MID --mid-raw-perlink --configKeyValues $HBFUTILPARAMS
98+
taskwrapper emcraw.log o2-emcal-rawcreator --file-for link --configKeyValues $HBFUTILPARAMS -o raw/EMC
99+
taskwrapper phsraw.log o2-phos-digi2raw --file-for link --configKeyValues $HBFUTILPARAMS -o raw/PHS
100+
taskwrapper cpvraw.log o2-cpv-digi2raw --file-for link --configKeyValues $HBFUTILPARAMS -o raw/CPV
101+
taskwrapper zdcraw.log o2-zdc-digi2raw --file-per-link --configKeyValues $HBFUTILPARAMS -o raw/ZDC
101102
cat raw/*/*.cfg > rawAll.cfg
102103

103104
if [ "0$DISABLE_PROCESSING" == "01" ]; then

0 commit comments

Comments
 (0)