Merge branch 'AliceO2Group:master' into flowtest

ddobrigk · Jul 20, 2024 · 80f3505 · 80f3505
2 parents 9922d24 + fb25410
commit 80f3505
Show file tree

Hide file tree

Showing 23 changed files with 490 additions and 136 deletions.
diff --git a/DATA/common/gen_topo_helper_functions.sh b/DATA/common/gen_topo_helper_functions.sh
@@ -272,7 +272,11 @@ add_QC_from_consul()
 add_QC_from_apricot()
 {
   if [[ ! -z ${GEN_TOPO_QC_JSON_FILE:-} ]]; then
-    curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
+	if [[ ${1} =~ "?" ]]; then
+		curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}\&process=true"
+	else
+		curl -s -o $GEN_TOPO_QC_JSON_FILE "${GEN_TOPO_QC_APRICOT_SERVER}/${1}?process=true"
+	fi
     if [[ $? != 0 ]]; then
       echo "Error fetching QC JSON $1"
       exit 1

diff --git a/DATA/production/calib/tpc-laser-aggregator.sh b/DATA/production/calib/tpc-laser-aggregator.sh
@@ -14,7 +14,7 @@ CCDB_PATH="http://o2-ccdb.internal"
 
 HOST=localhost
 
-QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
+QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn?run_type=${RUNTYPE:-}"
 
 QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"
 max_events=300

diff --git a/DATA/production/calib/tpc-laser-filter.sh b/DATA/production/calib/tpc-laser-filter.sh
@@ -46,7 +46,7 @@ PROXY_OUTSPEC="A:TPC/LASERTRACKS;B:TPC/CEDIGITS;D:TPC/CLUSREFS"
 
 HOST=localhost
 
-QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn"
+QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-laser-calib-qcmn?run_type=${RUNTYPE:-}"
 QC_CONFIG="components/qc/ANY/any/tpc-laser-calib-qcmn"
 
 

diff --git a/DATA/production/calib/tpc-laser.sh b/DATA/production/calib/tpc-laser.sh
@@ -47,7 +47,7 @@ CCDB_PATH="http://o2-ccdb.internal"
 HOST=localhost
 
 
-QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
+QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn?run_type=${RUNTYPE:-}"
 QC_CONFIG="components/qc/ANY/any/tpc-raw-qcmn"
 
 max_events=300

diff --git a/DATA/production/calib/tpc-pedestal.sh b/DATA/production/calib/tpc-pedestal.sh
@@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
 HOST=localhost
 
 #QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-pedestal-calib-qcmn"
-QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn"
+QC_CONFIG="components/qc/ANY/any/tpc-pedestal-calib-qcmn?run_type=${RUNTYPE:-}"
 CALIB_CONFIG="TPCCalibPedestal.ADCMin=20"
 
 

diff --git a/DATA/production/calib/tpc-pulser-long.sh b/DATA/production/calib/tpc-pulser-long.sh
@@ -18,7 +18,7 @@ CCDB_PATH="http://o2-ccdb.internal"
 HOST=localhost
 
 #QC_CONFIG="consul-json://alio2-cr1-hv-con01.cern.ch:8500/o2/components/qc/ANY/any/tpc-raw-qcmn"
-QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
+QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn?run_type=${RUNTYPE:-}"
 max_events=1000000
 publish_after=200
 

diff --git a/DATA/production/calib/tpc-pulser.sh b/DATA/production/calib/tpc-pulser.sh
@@ -19,7 +19,7 @@ CCDB_PATH="http://o2-ccdb.internal"
 
 HOST=localhost
 
-QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn"
+QC_CONFIG="components/qc/ANY/any/tpc-pulser-calib-qcmn?run_type=${RUNTYPE:-}"
 
 max_events=200
 publish_after=230
@@ -35,7 +35,6 @@ fi
 
 #################################################################################################################################
 
-
 WORKFLOW=
 add_W o2-dpl-raw-proxy "--dataspec \"$PROXY_INSPEC\" --inject-missing-data --channel-config \"name=readout-proxy,type=pull,method=connect,address=ipc://@tf-builder-pipe-0,transport=shmem,rateLogging=1\"" "" 0
 add_W o2-tpc-calib-pad-raw "--input-spec \"$CALIB_INSPEC\" --calib-type pulser --publish-after-tfs ${publish_after} --max-events ${max_events} --lanes 36 --check-calib-infos" "${CALIB_CONFIG}" 

diff --git a/DATA/production/configurations/asyncReco/async_pass.sh b/DATA/production/configurations/asyncReco/async_pass.sh
@@ -12,8 +12,51 @@
 
 # function to run AOD merging
 run_AOD_merging() {
-  o2-aod-merger --input list_$1.list --verbosity 1 --output $1/AO2D_merged.root > $1/merging.log
-  exitcode=$?
+  cd $1
+  if [[ -f "AO2D.root" ]]; then
+    ls "AO2D.root" > list_$1.list
+    echo "Checking AO2Ds with un-merged DFs in $1"
+    timeStartCheck=`date +%s`
+    time root -l -b -q $O2DPG_ROOT/DATA/production/common/readAO2Ds.C > checkAO2D.log
+    exitcode=$?
+    timeEndCheck=`date +%s`
+    timeUsedCheck=$(( $timeEndCheck-$timeStartCheck ))
+    echo "Time spent to check unmerged AODs in dir $1 = $timeUsedCheck s"
+    if [[ $exitcode -ne 0 ]]; then
+      echo "exit code from AO2D check is " $exitcode > validation_error.message
+      echo "exit code from AO2D check is " $exitcode
+      echo "This means that the check for unmerged AODs in $1 FAILED, we'll make the whole processing FAIL"
+      return $exitcode
+    fi
+    if [[ -z $ALIEN_JDL_DONOTMERGEAODS ]] || [[ $ALIEN_JDL_DONOTMERGEAODS == 0 ]]; then
+      echo "Merging AOD from the list list_$1.list"
+      o2-aod-merger --input list_$1.list --verbosity 1 --output AO2D_merged.root > merging.log
+      exitcode=$?
+      if [[ $exitcode -ne 0 ]]; then
+	echo "Exit code from the process merging DFs inside AO2D for $1 is " $exitcode > validation_error.message
+	echo "Exit code from the process merging DFs inside AO2D for $1 is " $exitcode
+	echo "This means that the merging of DFs for $1 FAILED, we'll make the whole processing FAIL"
+	return $exitcode
+      fi
+      # now checking merged AODs
+      echo "Checking AO2Ds with merged DFs in $AOD_DIR"
+      timeStartCheckMergedAOD=`date +%s`
+      time root -l -b -q '$O2DPG_ROOT/DATA/production/common/readAO2Ds.C("AO2D_merged.root")' > checkAO2D_merged.log
+      exitcode=$?
+      timeEndCheckMergedAOD=`date +%s`
+      timeUsedCheckMergedAOD=$(( $timeEndCheckMergedAOD-$timeStartCheckMergedAOD ))
+      echo "Time spent to check unmerged AODs in dir $1 = $timeUsedCheckMergedAOD s"
+      if [[ $exitcode -ne 0 ]]; then
+	echo "exit code from AO2D in $1 with merged DFs check is " $exitcode > validation_error.message
+	echo "exit code from AO2D in $1 with merged DFs check is " $exitcode
+	echo "This means that the check for merged AODs in $1 FAILED, we'll make the whole processing FAIL"
+      else
+	echo "All ok, replacing initial AO2D.root file in $1 with the one with merged DFs"
+	mv AO2D_merged.root AO2D.root
+      fi
+      cd ..
+    fi
+  fi
   return $exitcode
 }
 
@@ -716,12 +759,12 @@ if [[ $ALIEN_JDL_AODOFF != 1 ]]; then
   if [[ $AOD_LIST_COUNT -ge 2 ]]; then
     AOD_LAST=`find . -name AO2D.root | sort | tail -1`
     CURRENT_SIZE=`wc -c $AOD_LAST | awk '{print $1}'`
-    echo current size = $CURRENT_SIZE
+    echo "current size of last AOD file = $CURRENT_SIZE"
     PERCENT=`echo "scale=2; $CURRENT_SIZE/($AOD_FILE_SIZE*10^6)*100" | bc -l`
-    echo percent = $PERCENT
+    echo "percentage compared to AOD_FILE_SIZE (= $AOD_FILE_SIZE) = $PERCENT"
     if (( $(echo "$PERCENT < $MIN_ALLOWED_AOD_PERCENT_SIZE" | bc -l) )); then
       AOD_LAST_BUT_ONE=`find . -name AO2D.root | sort | tail -2 | head -1`
-      echo "Too small, merging $AOD_LAST with previous file $AOD_LAST_BUT_ONE"
+      echo "Last AOD file too small, merging $AOD_LAST with previous file $AOD_LAST_BUT_ONE"
       ls $PWD/$AOD_LAST > listAOD.list
       ls $PWD/$AOD_LAST_BUT_ONE >> listAOD.list
       echo "List of files for merging:"
@@ -730,7 +773,7 @@ if [[ $ALIEN_JDL_AODOFF != 1 ]]; then
       cd tmpAOD
       ln -s ../listAOD.list .
       timeStart=`date +%s`
-      time o2-aod-merger --input listAOD.list
+      time o2-aod-merger --input listAOD.list > merging_lastAOD.log
       exitcode=$?
       timeEnd=`date +%s`
       timeUsed=$(( $timeUsed+$timeEnd-$timeStart ))
@@ -776,90 +819,44 @@ if [[ $ALIEN_JDL_AODOFF != 1 ]]; then
   for (( i = 1; i <=$AOD_LIST_COUNT; i++)); do
     AOD_FILE=`echo $AOD_LIST | cut -d' ' -f$i`
     AOD_DIR=`dirname $AOD_FILE | sed -e 's|./||'`
-    cd $AOD_DIR
-    if [[ -f "AO2D.root" ]]; then
-      echo "Checking AO2Ds with un-merged DFs in $AOD_DIR"
-      timeStartCheck=`date +%s`
-      time root -l -b -q $O2DPG_ROOT/DATA/production/common/readAO2Ds.C > checkAO2D.log
-      exitcode=$?
-      timeEndCheck=`date +%s`
-      timeUsedCheck=$(( $timeUsedCheck+$timeEndCheck-$timeStartCheck ))
-      if [[ $exitcode -ne 0 ]]; then
-        echo "exit code from AO2D check is " $exitcode > validation_error.message
-        echo "exit code from AO2D check is " $exitcode
-      fi
-    fi
-    cd -
-    ls $AOD_FILE > list_$AOD_DIR.list
     echo "$AOD_DIR" >> $JOB_LIST
   done
-  if [[ -z $ALIEN_JDL_DONOTMERGEAODS ]] || [[ $ALIEN_JDL_DONOTMERGEAODS == 0 ]]; then
-    # spawning the parallel merging
-    timeStartMerge=`date +%s`
-    arr=()
-    aods=()
-    mergedok=()
-    i=0
-    while IFS= read -r line; do
-      while [[ $CURRENT_POOL_SIZE -ge $MAX_POOL_SIZE ]]; do
-        CURRENT_POOL_SIZE=`jobs -r | wc -l`
-        sleep 1
-      done
-      run_AOD_merging $line &
-      arr[$i]=$!
-      aods[$i]=$line
-      i=$((i+1))
+  # spawning the parallel merging
+  timeStartMerge=`date +%s`
+  arr=()
+  aods=()
+  mergedok=()
+  i=0
+  while IFS= read -r line; do
+    while [[ $CURRENT_POOL_SIZE -ge $MAX_POOL_SIZE ]]; do
       CURRENT_POOL_SIZE=`jobs -r | wc -l`
-    done < $JOB_LIST
-    # collecting return codes of the merging processes
-    for i in "${!arr[@]}"; do
-      wait ${arr[$i]}
-      exitcode=$?
-      if [[ $exitcode -ne 0 ]]; then
-        echo "Exit code from the process merging DFs inside AO2D for ${aods[$i]} is " $exitcode > validation_error.message
-        echo "Exit code from the process merging DFs inside AO2D for ${aods[$i]} is " $exitcode
-        echo "This means that the merging of DFs for ${aods[$i]} FAILED, we make the whole processing FAIL"
-        exit $exitcode
-        mergedok[$((10#${aods[$i]}))]=0
-      else
-        echo "Merging of DFs inside the AO2D in ${aods[$i]} worked correctly"
-        mergedok[$((10#${aods[$i]}))]=1
-      fi
+      sleep 1
     done
-    timeEndMerge=`date +%s`
-    timeUsedMerge=$(( $timeUsedMerge+$timeEndMerge-$timeStartMerge ))
-    # Checking the merged AODs, and replacing the original ones with the merged ones if all is ok
-    # This loop could be merged with the above, but for now we keep them separate
-    for (( i = 1; i <=$AOD_LIST_COUNT; i++)); do
-      AOD_FILE=`echo $AOD_LIST | cut -d' ' -f$i`
-      AOD_DIR=`dirname $AOD_FILE | sed -e 's|./||'`
-      echo "Inspecting $AOD_DIR:"
-      if [[ ${mergedok[$((10#$AOD_DIR))]} == 0 ]]; then
-        echo "Merging for $AOD_DIR DID NOT work, we will do nothing for this file - BUT IT SHOULD HAVE NOT HAPPENED, PLEASE CHECK"
-        exit 8 
-        continue
-      else
-        echo "Merging for $AOD_DIR DID work, let's continue"
-      fi
-      cd $AOD_DIR
-      # now checking them
-      echo "Checking AO2Ds with merged DFs in $AOD_DIR"
-      timeStartCheckMergedAOD=`date +%s`
-      time root -l -b -q '$O2DPG_ROOT/DATA/production/common/readAO2Ds.C("AO2D_merged.root")' > checkAO2D_merged.log
-      exitcode=$?
-      timeEndCheckMergedAOD=`date +%s`
-      timeUsedCheckMergedAOD=$(( $timeUsedCheckMergedAOD+$timeEndCheckMergedAOD-$timeStartCheckMergedAOD ))
-      if [[ $exitcode -ne 0 ]]; then
-        echo "exit code from AO2D with merged DFs check is " $exitcode > validation_error.message
-        echo "exit code from AO2D with merged DFs check is " $exitcode
-        echo "We will keep the AO2Ds with unmerged DFs"
-      else
-        echo "All ok, replacing initial AO2D.root file with the one with merged DFs"
-        mv AO2D_merged.root AO2D.root
-      fi
-      cd ..
-    done
-  fi
+    run_AOD_merging $line &
+    arr[$i]=$!
+    aods[$i]=$line
+    i=$((i+1))
+    CURRENT_POOL_SIZE=`jobs -r | wc -l`
+  done < $JOB_LIST
+  # collecting return codes of the merging processes
+  for i in "${!arr[@]}"; do
+    wait ${arr[$i]}
+    exitcode=$?
+    if [[ $exitcode -ne 0 ]]; then
+      echo "Exit code from the process check+merging+check_mergedAODs for ${aods[$i]} is " $exitcode > validation_error.message
+      echo "Exit code from the process check+merging+check_mergedAODs for ${aods[$i]} is " $exitcode
+      echo "This means that the process check+merging+check_mergedAODs for ${aods[$i]} FAILED, we make the whole processing FAIL"
+      exit $exitcode
+      mergedok[$((10#${aods[$i]}))]=0
+    else
+      echo "Merging of DFs inside the AO2D in ${aods[$i]} worked correctly"
+      mergedok[$((10#${aods[$i]}))]=1
+    fi
+  done
+  timeEndMerge=`date +%s`
+  timeUsedMerge=$(( $timeUsedMerge+$timeEndMerge-$timeStartMerge ))
+  echo "--> Total Time spent in checking and merging AODs = $timeUsedMerge s"
+
   # running analysis QC if requested
   if [[ $ALIEN_JDL_RUNANALYSISQC == 1 ]]; then
     for (( i = 1; i <=$AOD_LIST_COUNT; i++)); do
@@ -890,26 +887,18 @@ if [[ $ALIEN_JDL_AODOFF != 1 ]]; then
       fi
       cd ..
     done
-  else
-    echo "Analysis QC will not be run, ALIEN_JDL_RUNANALYSISQC = $ALIEN_JDL_RUNANALYSISQC"
-  fi
-  echo "Time spent in checking initial AODs = $timeUsedCheck s"
-  if [[ -z $ALIEN_JDL_DONOTMERGEAODS ]] || [[ $ALIEN_JDL_DONOTMERGEAODS == 0 ]]; then
-    echo "Time spent in merging AODs = $timeUsedMerge s"
-    echo "Time spent in checking final AODs = $timeUsedCheckMergedAOD s"
-  fi
-  if [[ $ALIEN_JDL_RUNANALYSISQC == 1 ]]; then
     echo "Time spent in AnalysisQC = $timeUsedAnalysisQC s"
   else
+    echo "Analysis QC will not be run, ALIEN_JDL_RUNANALYSISQC = $ALIEN_JDL_RUNANALYSISQC"
     echo "No timing reported for Analysis QC, since it was not run"
   fi
 fi
 
 
 timeEndFullProcessing=`date +%s`
-timeUsedFullProcessing=$(( $timeEndFullProcessing+$timeStartFullProcessing ))
+timeUsedFullProcessing=$(( $timeEndFullProcessing-$timeStartFullProcessing ))
 
-echo "Time used for processing = $timeUsedFullProcessing s"
+echo "Total time used for processing = $timeUsedFullProcessing s"
 
 if [[ $ALIEN_JDL_QCOFF != 1 ]]; then
   # copying the QC json file here

diff --git a/DATA/production/configurations/asyncReco/setenv_extra.sh b/DATA/production/configurations/asyncReco/setenv_extra.sh
@@ -312,7 +312,14 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
   [[ -z $ITS_CONFIG || "$ITS_CONFIG" != *"--tracking-mode"* ]] && export ITS_CONFIG+=" --tracking-mode async"
   [[ $ALIEN_JDL_LPMANCHORYEAR == "2023" ]] && [[ $BEAMTYPE == "PbPb" ]] && CUT_MATCH_CHI2=80 || CUT_MATCH_CHI2=100
   export ITSTPCMATCH="tpcitsMatch.safeMarginTimeCorrErr=2.;tpcitsMatch.XMatchingRef=60.;tpcitsMatch.cutMatchingChi2=$CUT_MATCH_CHI2;;tpcitsMatch.crudeAbsDiffCut[0]=6;tpcitsMatch.crudeAbsDiffCut[1]=6;tpcitsMatch.crudeAbsDiffCut[2]=0.3;tpcitsMatch.crudeAbsDiffCut[3]=0.3;tpcitsMatch.crudeAbsDiffCut[4]=2.5;tpcitsMatch.crudeNSigma2Cut[0]=64;tpcitsMatch.crudeNSigma2Cut[1]=64;tpcitsMatch.crudeNSigma2Cut[2]=64;tpcitsMatch.crudeNSigma2Cut[3]=64;tpcitsMatch.crudeNSigma2Cut[4]=64;"
+  export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[0]=20;tpcitsMatch.askMinTPCRow[1]=20;tpcitsMatch.askMinTPCRow[2]=20;tpcitsMatch.askMinTPCRow[3]=20;tpcitsMatch.askMinTPCRow[4]=20;tpcitsMatch.askMinTPCRow[5]=20;tpcitsMatch.askMinTPCRow[6]=20;tpcitsMatch.askMinTPCRow[7]=20;tpcitsMatch.askMinTPCRow[8]=20;tpcitsMatch.askMinTPCRow[9]=20;tpcitsMatch.askMinTPCRow[10]=20;tpcitsMatch.askMinTPCRow[11]=20;tpcitsMatch.askMinTPCRow[12]=20;tpcitsMatch.askMinTPCRow[13]=20;tpcitsMatch.askMinTPCRow[14]=20;"
+  export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[15]=20;tpcitsMatch.askMinTPCRow[16]=20;tpcitsMatch.askMinTPCRow[17]=20;tpcitsMatch.askMinTPCRow[18]=20;tpcitsMatch.askMinTPCRow[19]=20;tpcitsMatch.askMinTPCRow[20]=20;tpcitsMatch.askMinTPCRow[21]=20;tpcitsMatch.askMinTPCRow[22]=20;tpcitsMatch.askMinTPCRow[23]=20;tpcitsMatch.askMinTPCRow[24]=20;tpcitsMatch.askMinTPCRow[25]=20;tpcitsMatch.askMinTPCRow[26]=20;tpcitsMatch.askMinTPCRow[27]=20;tpcitsMatch.askMinTPCRow[28]=20;tpcitsMatch.askMinTPCRow[29]=20;"
+  export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[30]=20;tpcitsMatch.askMinTPCRow[31]=20;tpcitsMatch.askMinTPCRow[32]=20;tpcitsMatch.askMinTPCRow[33]=20;tpcitsMatch.askMinTPCRow[34]=20;tpcitsMatch.askMinTPCRow[35]=20;"
+  [[ $RUNNUMBER -ge 544511 ]] && [[ $RUNNUMBER -le 544886 ]] && export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[11]=78;"
 
+  # settings to improve inner pad-rows contribution
+  export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";GPU_rec_tpc.trackletMinSharedNormFactor=1.;GPU_rec_tpc.trackletMaxSharedFraction=0.3;GPU_rec_tpc.globalTrackingRowRange=100;"
+
   #-------------------------------------- TPC corrections -----------------------------------------------
   # we need to provide to TPC
   # 1) interaction rate info (lumi) used for scaling or errors and possible of the corrections : INST_IR_FOR_TPC
@@ -671,6 +678,10 @@ if [[ $PERIOD == "LHC22c" ]] || [[ $PERIOD == "LHC22d" ]] || [[ $PERIOD == "LHC2
   export ARGS_EXTRA_PROCESS_o2_aod_producer_workflow+=" --ctpreadout-create 1"
 fi
 
+if [[ $ALIEN_JDL_THINAODS == "1" ]] ; then
+  export ARGS_EXTRA_PROCESS_o2_aod_producer_workflow+=" --thin-tracks"
+fi
+
 # Enabling QC
 if [[ $ALIEN_JDL_QCOFF != "1" ]]; then
   export WORKFLOW_PARAMETERS="QC,${WORKFLOW_PARAMETERS}"

diff --git a/DATA/production/workflow-multiplicities.sh b/DATA/production/workflow-multiplicities.sh
@@ -16,6 +16,8 @@ SOURCE_GUARD_MULTIPLICITIES=1
 : ${ITSTRK_THREADS:=1}
 : ${ITSTPC_THREADS:=1}
 
+: ${TPCTIMESERIES_THREADS:=1}
+
 : ${TOFMATCH_THREADS:=1}
 
 : ${HIGH_RATE_PP:=0}
@@ -98,6 +100,7 @@ if [[ ! -z ${OPTIMIZED_PARALLEL_ASYNC:-} ]]; then
     ITSTRK_THREADS=2
     ITSTPC_THREADS=2
     SVERTEX_THREADS=4
+    TPCTIMESERIES_THREADS=2
     NGPUS=4
     N_TPCTRK=4
     N_FWDMATCH=2

diff --git a/MC/analysis_testing/o2dpg_analysis_test_utils.py b/MC/analysis_testing/o2dpg_analysis_test_utils.py
@@ -30,6 +30,10 @@
 def adjust_configuration_line(line, data_or_mc, collision_system):
     line = line.replace('!ANALYSIS_QC_is_mc!', str(data_or_mc == ANALYSIS_VALID_MC).lower())
     line = line.replace('!ANALYSIS_QC_is_data!', str(data_or_mc == ANALYSIS_VALID_DATA).lower())
+    if collision_system == "pp":
+        line = line.replace('!OVERWRITEAXISRANGEFORPBPBVALUE!', "false")
+    else:
+        line = line.replace('!OVERWRITEAXISRANGEFORPBPBVALUE!', "true")
     return line
 
 

diff --git a/MC/config/PWGHF/ini/GeneratorHF_D2H_bbbar_Bforced_gap5_Mode2.ini b/MC/config/PWGHF/ini/GeneratorHF_D2H_bbbar_Bforced_gap5_Mode2.ini
@@ -0,0 +1,8 @@
+### The external generator derives from GeneratorPythia8.
+[GeneratorExternal]
+fileName=${O2DPG_ROOT}/MC/config/PWGHF/external/generator/generator_pythia8_gaptriggered_hf.C
+funcName=GeneratorPythia8GapTriggeredBeauty(5, -1.5, 1.5)
+
+[GeneratorPythia8]
+config=${O2DPG_ROOT}/MC/config/PWGHF/pythia8/generator/pythia8_beautyhadronic_with_decays_Mode2.cfg
+includePartonEvent=true