Adapt FST to HBFUtils loaded from digitization ini file

Author: shahor02

prodtests/full_system_test.sh

@@ -33,6 +33,8 @@ NOMCLABELS="--disable-mc"
 O2SIMSEED=${O2SIMSEED:--1}
 SPLITTRDDIGI=${SPLITTRDDIGI:-1}
 NHBPERTF=${NHBPERTF:-128}
+RUNFIRSTORBIT=${RUNFIRSTORBIT:-0}
+FIRSTSAMPLEDORBIT=${FIRSTSAMPLEDORBIT:-0}
 
 # allow skipping
 JOBUTILS_SKIPDONE=ON
@@ -51,6 +53,9 @@ echo "versions,${TAG} alidist=\"${ALIDISTCOMMIT}\",O2=\"${O2COMMIT}\" " > ${METR
 
 GLOBALDPLOPT="-b" #  --monitoring-backend no-op:// is currently removed due to https://alice.its.cern.ch/jira/browse/O2-1887
 
+HBFUTILPARAMS="HBFUtils.nHBFPerTF=${NHBPERTF};HBFUtils.orbitFirst=${RUNFIRSTORBIT};HBFUtils.orbitFirstSampled=${FIRSTSAMPLEDORBIT}"
+[ "0$ALLOW_MULTIPLE_TF" != "01" ] && HBFUTILPARAMS+=";HBFUtils.maxNOrbits=${NHBPERTF};"
+
 ulimit -n 4096 # Make sure we can open sufficiently many files
 [ $? == 0 ] || (echo Failed setting ulimit && exit 1)
 mkdir -p qed
@@ -61,9 +66,9 @@ QED2HAD=$(awk "BEGIN {printf \"%.2f\",`grep xSectionQED qedgenparam.ini | cut -d
 echo "Obtained ratio of QED to hadronic x-sections = $QED2HAD" >> qedsim.log
 cd ..
 
-DIGITRDOPTREAL="--configKeyValues \"TRDSimParams.digithreads=${NJOBS}\" "
+DIGITRDOPTREAL="--configKeyValues \"${HBFUTILPARAMS};TRDSimParams.digithreads=${NJOBS}\" --enable-trd-trapsim"
 if [ $SPLITTRDDIGI == "1" ]; then
-  DIGITRDOPT="--skipDet TRD"
+  DIGITRDOPT="--configKeyValues \"${HBFUTILPARAMS}\" --skipDet TRD"
 else
   DIGITRDOPT=$DIGITRDOPTREAL
 fi
@@ -81,21 +86,19 @@ if [ "0$GENERATE_ITS_DICTIONARY" == "01" ]; then
 fi
 
 mkdir -p raw
-HBFUTILPARAMS="HBFUtils.nHBFPerTF=${NHBPERTF};HBFUtils.orbitFirst=0;"
-[ "0$ALLOW_MULTIPLE_TF" != "01" ] && HBFUTILPARAMS+="HBFUtils.maxNOrbits=${NHBPERTF};"
-taskwrapper itsraw.log o2-its-digi2raw --file-for link --configKeyValues \"$HBFUTILPARAMS\" -o raw/ITS
-taskwrapper mftraw.log o2-mft-digi2raw --file-for link --configKeyValues \"$HBFUTILPARAMS\" -o raw/MFT
-taskwrapper ft0raw.log o2-ft0-digi2raw --file-per-link --configKeyValues \"$HBFUTILPARAMS\" -o raw/FT0
-taskwrapper fv0raw.log o2-fv0-digi2raw --file-per-link --configKeyValues \"$HBFUTILPARAMS\" -o raw/FV0
-taskwrapper fddraw.log o2-fdd-digit2raw --file-per-link --configKeyValues \"$HBFUTILPARAMS\" -o raw/FDD
-taskwrapper tpcraw.log o2-tpc-digits-to-rawzs  --file-for link --configKeyValues \"$HBFUTILPARAMS\" -i tpcdigits.root -o raw/TPC
-taskwrapper tofraw.log o2-tof-reco-workflow ${GLOBALDPLOPT} --tof-raw-file-for link --configKeyValues \"$HBFUTILPARAMS\" --output-type raw --tof-raw-outdir raw/TOF
-taskwrapper midraw.log o2-mid-digits-to-raw-workflow ${GLOBALDPLOPT} --mid-raw-outdir raw/MID --mid-raw-perlink  --configKeyValues \"$HBFUTILPARAMS\"
-taskwrapper emcraw.log o2-emcal-rawcreator --file-for link --configKeyValues \"$HBFUTILPARAMS\" -o raw/EMC
-taskwrapper phsraw.log o2-phos-digi2raw  --file-for link --configKeyValues \"$HBFUTILPARAMS\" -o raw/PHS
-taskwrapper cpvraw.log o2-cpv-digi2raw  --file-for link --configKeyValues \"$HBFUTILPARAMS\" -o raw/CPV
-taskwrapper zdcraw.log o2-zdc-digi2raw  --file-per-link --configKeyValues \"$HBFUTILPARAMS\" -o raw/ZDC
-taskwrapper hmpraw.log o2-hmpid-digits-to-raw-workflow --file-for link --configKeyValues \"$HBFUTILPARAMS\" --outdir raw/HMP
+taskwrapper itsraw.log o2-its-digi2raw --file-for link  -o raw/ITS
+taskwrapper mftraw.log o2-mft-digi2raw --file-for link  -o raw/MFT
+taskwrapper ft0raw.log o2-ft0-digi2raw --file-per-link  -o raw/FT0
+taskwrapper fv0raw.log o2-fv0-digi2raw --file-per-link  -o raw/FV0
+taskwrapper fddraw.log o2-fdd-digit2raw --file-per-link  -o raw/FDD
+taskwrapper tpcraw.log o2-tpc-digits-to-rawzs  --file-for link  -i tpcdigits.root -o raw/TPC
+taskwrapper tofraw.log o2-tof-reco-workflow ${GLOBALDPLOPT} --tof-raw-file-for link --output-type raw --tof-raw-outdir raw/TOF
+taskwrapper midraw.log o2-mid-digits-to-raw-workflow ${GLOBALDPLOPT} --mid-raw-outdir raw/MID --mid-raw-perlink 
+taskwrapper emcraw.log o2-emcal-rawcreator --file-for link -o raw/EMC
+taskwrapper phsraw.log o2-phos-digi2raw  --file-for link -o raw/PHS
+taskwrapper cpvraw.log o2-cpv-digi2raw  --file-for link -o raw/CPV
+taskwrapper zdcraw.log o2-zdc-digi2raw  --file-per-link -o raw/ZDC
+taskwrapper hmpraw.log o2-hmpid-digits-to-raw-workflow --file-for link --outdir raw/HMP
 cat raw/*/*.cfg > rawAll.cfg
 
 if [ "0$DISABLE_PROCESSING" == "01" ]; then