Merge branch 'AliceO2Group:master' into master

Author: Rrantu

DATA/common/setenv_calib.sh

@@ -40,7 +40,7 @@ if [[ $SYNCMODE != 1 ]] && has_detector_reco TPC; then CAN_DO_CALIB_ASYNC_EXTRAC
 if has_detector CTP; then export CALIB_TPC_SCDCALIB_CTP_INPUT="--enable-ctp"; else export CALIB_TPC_SCDCALIB_CTP_INPUT=""; fi
 if [[ ${DISABLE_TRD_PH:-} == 1 ]]; then CAN_DO_CALIB_TRD_T0=0; fi
 
-: ${CALIB_TPC_SCDCALIB_SLOTLENGTH:=600} # the slot length needs to be known both on the aggregator and the processing nodes, therefore it is defined (in seconds!) here
+: ${CALIB_TPC_SCDCALIB_SLOTLENGTH:=300} # the slot length needs to be known both on the aggregator and the processing nodes, therefore it is defined (in seconds!) here
 : ${CALIB_TPC_SCDCALIB_SENDTRKDATA:=1}  # by default, we want to write the track information in addition to unbinned residuals to allow finer filtering offline
 
 if [[ $BEAMTYPE != "cosmic" ]] || [[ ${FORCECALIBRATIONS:-} == 1 ]] ; then # Calibrations enabled in non-COSMIC runs
@@ -263,7 +263,10 @@ if [[ -z ${CALIBDATASPEC_BARREL_TF:-} ]]; then
   if [[ $CALIB_PRIMVTX_MEANVTX == 1 ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "pvtx:GLO/PVTX/0"; fi
 
   # ITS
-  if [[ $CALIB_ITS_DEADMAP_TIME == 1 ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "itsChipStatus:ITS/CHIPSSTATUS/0"; fi
+  if [[ $CALIB_ITS_DEADMAP_TIME == 1 ]]; then
+		add_semicolon_separated CALIBDATASPEC_BARREL_TF "itsChipStatus:ITS/CHIPSSTATUS/0"
+		add_semicolon_separated CALIBDATASPEC_BARREL_TF "itsErrorInfo:ITS/ErrorInfo/0"
+  fi
 
   # MFT
   if [[ $CALIB_MFT_DEADMAP_TIME == 1 ]]; then add_semicolon_separated CALIBDATASPEC_BARREL_TF "mftChipStatus:MFT/CHIPSSTATUS/0"; fi

DATA/production/configurations/asyncReco/async_pass.sh

@@ -308,7 +308,7 @@ fi
 if [[ $ALIEN_JDL_DOEMCCALIB == "1" ]]; then
   SETTING_ROOT_OUTPUT+="ENABLE_ROOT_OUTPUT_o2_emcal_emc_offline_calib_workflow= "
 fi
-if [[ $DO_TPC_RESIDUAL_EXTRACTION == "1" ]]; then
+if [[ -n "$DO_TPC_RESIDUAL_EXTRACTION" && $DO_TPC_RESIDUAL_EXTRACTION != "0" ]]; then
   SETTING_ROOT_OUTPUT+="ENABLE_ROOT_OUTPUT_o2_calibration_residual_aggregator= "
 fi
 if [[ $ALIEN_JDL_DOTRDVDRIFTEXBCALIB == "1" ]]; then

DATA/production/configurations/asyncReco/setenv_extra.sh

@@ -289,7 +289,7 @@ isFT0inDataTaking=`echo $RUN_DETECTOR_LIST | grep FT0`
 # For runs shorter than 10 minutes we have only a single slot.
 # In that case we have to adopt the slot length in order to
 # set the maximum number of processed tracks per TF correctly
-if (( RUN_DURATION < 600 )); then
+if (( RUN_DURATION < 300 )); then
   export CALIB_TPC_SCDCALIB_SLOTLENGTH=$RUN_DURATION
 fi
 
@@ -716,17 +716,21 @@ if [[ $ADD_CALIB == "1" ]]; then
   export CALIB_TOF_INTEGRATEDCURR=0
   export CALIB_ITS_DEADMAP_TIME=0
   export CALIB_MFT_DEADMAP_TIME=0
-  if [[ $DO_TPC_RESIDUAL_EXTRACTION == "1" ]]; then
+  if [[ -n "$DO_TPC_RESIDUAL_EXTRACTION" && $DO_TPC_RESIDUAL_EXTRACTION != "0" ]]; then
+    : ${ALIEN_JDL_TPCRESIDUALTRKSOURCESMAPEXTRACTION:="ITS-TPC"}
+    : ${ALIEN_JDL_TPCRESIDUALMAXTRACKSPERSLOT:=-1}
+    : ${ALIEN_JDL_TPCRESIDUALADDTRACKSMAP:=35000000}
     export CALIB_TPC_SCDCALIB=1
     export CALIB_TPC_SCDCALIB_SENDTRKDATA=1
-    export CONFIG_EXTRA_PROCESS_o2_tpc_scdcalib_interpolation_workflow+=";scdcalib.additionalTracksMap=35000000;scdcalib.minPtNoOuterPoint=0.2;scdcalib.maxQ2Pt=5;scdcalib.minITSNClsNoOuterPoint=6;scdcalib.minITSNCls=4;scdcalib.minTPCNClsNoOuterPoint=90;scdcalib.minTOFTRDPVContributors=2"
-    : ${TPC_RESIDUAL_TRK_SOURCES_MAP_EXTRACTION:="ITS-TPC"}
-    export ARGS_EXTRA_PROCESS_o2_tpc_scdcalib_interpolation_workflow+=" --tracking-sources-map-extraction $TPC_RESIDUAL_TRK_SOURCES_MAP_EXTRACTION"
-    # ad-hoc settings for TPC residual extraction
-    export ARGS_EXTRA_PROCESS_o2_calibration_residual_aggregator+=" --output-type trackParams,unbinnedResid"
-    if [[ $ALIEN_JDL_DEBUGRESIDUALEXTRACTION == "1" ]]; then
-      export CONFIG_EXTRA_PROCESS_o2_tpc_scdcalib_interpolation_workflow+=";scdcalib.maxTracksPerCalibSlot=-1;scdcalib.minPtNoOuterPoint=0.8;scdcalib.minTPCNClsNoOuterPoint=120"
-      export ARGS_EXTRA_PROCESS_o2_trd_global_tracking+=" --enable-qc"
+    export CONFIG_EXTRA_PROCESS_o2_tpc_scdcalib_interpolation_workflow+=";scdcalib.maxTracksPerCalibSlot=$ALIEN_JDL_TPCRESIDUALMAXTRACKSPERSLOT;scdcalib.additionalTracksMap=$ALIEN_JDL_TPCRESIDUALADDTRACKSMAP;scdcalib.minPtNoOuterPoint=0.2;scdcalib.maxQ2Pt=5;scdcalib.minITSNClsNoOuterPoint=6;scdcalib.minITSNCls=4;scdcalib.minTPCNClsNoOuterPoint=50;scdcalib.minTOFTRDPVContributors=2"
+    export ARGS_EXTRA_PROCESS_o2_tpc_scdcalib_interpolation_workflow+=" --tracking-sources-map-extraction $ALIEN_JDL_TPCRESIDUALTRKSOURCESMAPEXTRACTION"
+    if [[ ! $DO_TPC_RESIDUAL_EXTRACTION =~ "NOEXTCLROAD" ]]; then
+      clusterErrors=";GPU_rec_tpc.clusterError2AdditionalY=0.3;GPU_rec_tpc.clusterError2AdditionalZ=0.3"
+
+      export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";$clusterErrors"
+      export CONFIG_EXTRA_PROCESS_o2_tpcits_match_workflow+=";$clusterErrors"
+      export CONFIG_EXTRA_PROCESS_o2_tof_matcher_workflow+=";$clusterErrors"
+      export CONFIG_EXTRA_PROCESS_o2_trd_global_tracking+=";$clusterErrors"
     fi
   fi
   export CALIB_EMC_ASYNC_RECALIB="$ALIEN_JDL_DOEMCCALIB"
@@ -828,6 +832,11 @@ if [[ $ALIEN_JDL_PREPROPAGATE == "1" ]] ; then
   export ARGS_EXTRA_PROCESS_o2_aod_producer_workflow+=" --propagate-tracks --propagate-tracks-max-xiu 5"
 fi
 
+# possibility to bias the MeanVertex from the CCDB, see https://github.com/AliceO2Group/AliceO2/pull/15549
+if [[ -n $ALIEN_JDL_MVBIAS ]]; then
+  export O2_DPL_MVBIAS=$ALIEN_JDL_MVBIAS
+fi
+
 # Enabling QC
 if [[ $ALIEN_JDL_QCOFF != "1" ]]; then
   export WORKFLOW_PARAMETERS="QC,${WORKFLOW_PARAMETERS}"

GRID/utils/fetch_output_onfailure.sh

@@ -25,11 +25,11 @@ RecycleBase=""
 for ((i = 0; i < job_number; i++)); do
   jobid=${FAILEDSUBJOBIDS[i]}
   if [ ! "${RecycleBase}" ]; then
-    RecycleOutputDir=$(alien.py ps --trace ${jobid} | awk '/Going to uploadOutputFiles/' | sed 's/.*outputDir=//' | sed 's/)//')
+    RecycleOutputDir=$(alien.py ps --trace ${jobid} | awk '/Going to uploadOutputFiles/' | sed 's/.*outputDir=//' | sed 's/)//' | sort -u | head -n1)
     # /alice/cern.ch/user/a/aliprod/recycle/alien-job-2974093751
     RecycleBase=${RecycleOutputDir%-${jobid}} # Removes the ${jobid} and yields the recycle base path
   fi
-  $(alien.py registerOutput ${jobid}) 2> /dev/null
+  alien.py registerOutput ${jobid} > /dev/null 2>&1
 done
 
 # wait a bit to allow propagation of "registerOutput"

GRID/utils/grid_submit.sh

@@ -230,7 +230,13 @@ export JOBLABEL
 export MATTERMOSTHOOK
 export CONTROLSERVER
 
-[[ $PRODSPLIT -gt 100 ]] && echo "Production split needs to be smaller than 100 for the moment" && exit 1
+# Validate the production split level and derive the zero-padding width used for the
+# per-subjob OutputDir counter (#alien_counter_<W>i#) and for local fetching. The width
+# adapts to PRODSPLIT (minimum 3, so existing 3-digit layouts are unchanged), which lifts
+# the former hard cap of 100 while keeping OutputDir naming consistent at any scale.
+[[ ! $PRODSPLIT =~ ^[0-9]+$ || $PRODSPLIT -lt 1 ]] && echo "Production split must be a positive integer (got '${PRODSPLIT}')" && exit 1
+COUNTERWIDTH=${#PRODSPLIT}
+[[ $COUNTERWIDTH -lt 3 ]] && COUNTERWIDTH=3
 
 # check for presence of jq (needed in code path to fetch output files)
 [[ "$FETCHOUTPUT" ]] && { which jq &> /dev/null || { echo "Could not find jq command. Please load or install" && exit 1; }; }
@@ -371,7 +377,7 @@ ${DATACOLLECTION:+InputDataListFormat = ${QUOT}txt-list${QUOT};}
 ${DATACOLLECTION:+InputDataCollection = ${QUOT}LF:${MY_JOBWORKDIR}/collection.xml,nodownload${QUOT};}
 ${PRODSPLIT:+Split = ${QUOT}${SPLITMODE}${QUOT};}
 ${DATACOLLECTION:+SplitMaxInputFileNumber = 1;}
-OutputDir = "${MY_JOBWORKDIR}/${PRODSPLIT:+#alien_counter_03i#}";
+OutputDir = "${MY_JOBWORKDIR}/${PRODSPLIT:+#alien_counter_0${COUNTERWIDTH}i#}";
 Requirements = member(other.GridPartitions,"${GRIDPARTITION:-multicore_8}");
 CPUCores = "${CPUCORES}";
 MemorySize = "60GB";
@@ -504,7 +510,7 @@ EOF
             THIS_JOB=${SUBJOBIDS[jobindex]}
             echo "Fetching for job ${THIS_JOB}"
             if [ "${THIS_STATUS}" == "DONE" ]; then
-               SPLITOUTDIR=$(printf "%03d" ${splitcounter})
+               SPLITOUTDIR=$(printf "%0${COUNTERWIDTH}d" ${splitcounter})
                [ ! -f ${SPLITOUTDIR} ] && mkdir ${SPLITOUTDIR}
                echo "Fetching result files for subjob ${splitcounter} into ${PWD}"
 	             CPCMD="alien.py cp ${MY_JOBWORKDIR}/${SPLITOUTDIR}/* file:./${SPLITOUTDIR}"

GRID/utils/querymasterjob.sh

@@ -29,5 +29,5 @@ erroredjobs=${tokens[8]}
 echo "MasterID $masterid"
 echo "TotalJobs $totaljobs"
 echo "DoneJobs $donejobs"
-echo "RunningJobs $donejobs"
+echo "RunningJobs $runningjobs"
 echo "ErroredJobs $erroredjobs"

MC/bin/o2dpg_sim_config.py

@@ -97,10 +97,21 @@ def add(cfg, flatconfig):
         add(config, {"FwdMatching.cutFcn" : "cut3SigmaXYAngles"})
 
     # FIT digitizer settings
+    #2023 pp
+    if 534125 <= int(args.run) and int(args.run) <= 543113:
+        if COLTYPEIR == "pp":
+           # central and semicentral FT0 thresholds 
+           add(config, {"FT0DigParam.mtrg_central_trh": "40", "FT0DigParam.mtrg_semicentral_trh": "20"})
+           # FV0 trigger settings
+           add(config, {"FV0DigParam.NchannelsLevel": "2", "FV0DigParam.InnerChargeLevel": "4", "FV0DigParam.OuterChargeLevel": "4", "FV0DigParam.ChargeLevel": "8"})
     # 2023 PbPb
     if 543437 <= int(args.run) and int(args.run) <= 545367:
         add(config, {"FT0DigParam.mMip_in_V": "7", "FT0DigParam.mMV_2_Nchannels": "2", "FT0DigParam.mMV_2_NchannelsInverse": "0.5"})
         add(config, {"FV0DigParam.adcChannelsPerMip": "4"})
+        # central and semicentral FT0 thresholds 
+        add(config, {"FT0DigParam.mtrg_central_trh": "1433", "FT0DigParam.mtrg_semicentral_trh": "35"})
+        # FV0 trigger settings
+        add(config, {"FV0DigParam.NchannelsLevel": "2", "FV0DigParam.InnerChargeLevel": "4", "FV0DigParam.OuterChargeLevel": "4", "FV0DigParam.ChargeLevel": "1080"})
     # 2024
     # first and last run of 2024
     if 546088 <= int(args.run) and int(args.run) <= 560623:
@@ -111,6 +122,15 @@ def add(cfg, flatconfig):
         if COLTYPEIR == "PbPb":
             # 4 ADC channels / MIP
             add(config, {"FV0DigParam.adcChannelsPerMip": "4"})
+            # central and semicentral FT0 thresholds 
+            add(config, {"FT0DigParam.mtrg_central_trh": "1433", "FT0DigParam.mtrg_semicentral_trh": "35"})
+            # FV0 trigger settings
+            add(config, {"FV0DigParam.NchannelsLevel": "2", "FV0DigParam.InnerChargeLevel": "4", "FV0DigParam.OuterChargeLevel": "4", "FV0DigParam.ChargeLevel": "1080"})
+        if COLTYPEIR == "pp":
+            # central and semicentral FT0 thresholds 
+            add(config, {"FT0DigParam.mtrg_central_trh": "40", "FT0DigParam.mtrg_semicentral_trh": "20"})
+            # FV0 trigger settings
+            add(config, {"FV0DigParam.NchannelsLevel": "2", "FV0DigParam.InnerChargeLevel": "4", "FV0DigParam.OuterChargeLevel": "4", "FV0DigParam.ChargeLevel": "8"})
     # 2025
     # first and last run of 2025
     if 562260 <= int(args.run) and int(args.run) <= 568721:

MC/bin/o2dpg_sim_workflow.py

@@ -1798,6 +1798,12 @@ def getDigiTaskName(det):
    if created_by_option != '':
       created_by_option += ' ' + aod_creator
 
+   aod_parent_option = option_if_available('o2-aod-producer-workflow', '--aod-parent', envfile=async_envfile)
+   if aod_parent_option != '' and len(args.aod_parent_file) > 0:
+      aod_parent_option += ' ' + args.aod_parent_file
+   else:
+      aod_parent_option = ''
+
    aod_timeframe_id = f"${{ALIEN_PROC_ID}}{aod_df_id}" if not args.run_anchored else ""
    if len(args.aod_output_folder) > 0:
        aod_timeframe_id = args.aod_output_folder
@@ -1818,7 +1824,7 @@ def getDigiTaskName(det):
       "--anchor-pass ${ALIEN_JDL_LPMANCHORPASSNAME:-unknown}",
       "--anchor-prod ${ALIEN_JDL_LPMANCHORPRODUCTION:-unknown}",
       "--reco-pass ${ALIEN_JDL_LPMPASSNAME:-unknown}",
-      f"--aod-parent {args.aod_parent_file}",
+      aod_parent_option,
       created_by_option,
       "--combine-source-devices" if not args.no_combine_dpl_devices else "",
       "--disable-mc" if args.no_mc_labels else "",

MC/config/PWGDQ/external/generator/generator_pythia8_HadronTriggered_withGap.C

@@ -211,4 +211,42 @@ FairGenerator*
   // gen->PrintDebug();
 
   return gen;
-}
+}
+FairGenerator *
+GeneratorInclusiveJpsiPsi2SChiC_EvtGenMidY(int triggerGap, double rapidityMin = -1.5, double rapidityMax = 1.5, bool verbose = false)
+{
+    auto gen = new o2::eventgen::GeneratorEvtGen<o2::eventgen::GeneratorPythia8HadronTriggeredWithGap>();
+    gen->setTriggerGap(triggerGap);
+    gen->setRapidityRange(rapidityMin, rapidityMax);
+    gen->addHadronPDGs(443);
+    gen->addHadronPDGs(100443);
+    gen->addHadronPDGs(445);
+    gen->addHadronPDGs(200443);
+    gen->setVerbose(verbose);
+
+    TString pathO2table = gSystem->ExpandPathName("${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/decayer/switchOffJpsi.cfg");
+    gen->readFile(pathO2table.Data());
+    gen->setConfigMBdecays(pathO2table);
+    gen->PrintDebug(true);
+
+    gen->SetSizePdg(4);
+    gen->AddPdg(443, 0);
+    gen->AddPdg(100443, 1);
+    gen->AddPdg(443, 2);
+    gen->AddPdg(100443, 3);
+
+    gen->SetForceDecay(kEvtDiElectron);
+
+    // set random seed
+    gen->readString("Random:setSeed on");
+    uint random_seed;
+    unsigned long long int random_value = 0;
+    ifstream urandom("/dev/urandom", ios::in | ios::binary);
+    urandom.read(reinterpret_cast<char *>(&random_value), sizeof(random_seed));
+    gen->readString(Form("Random:seed = %llu", random_value % 900000001));
+
+    // print debug
+    // gen->PrintDebug();
+
+    return gen;
+}

MC/config/PWGDQ/ini/Generator_InjectedInclusiveJpsiPsi2SMidy_2026_Pythia8_TriggerGap.ini

@@ -0,0 +1,7 @@
+### The external generator derives from GeneratorPythia8.
+[GeneratorExternal]
+fileName=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/external/generator/generator_pythia8_HadronTriggered_withGap.C
+funcName=GeneratorInclusiveJpsiPsi2SChiC_EvtGenMidY(5,-1.5,1.5)
+
+[GeneratorPythia8]
+config=${O2DPG_MC_CONFIG_ROOT}/MC/config/PWGDQ/pythia8/generator/pythia8_inel_triggerGap.cfg