Merge branch 'AliceO2Group:master' into master

Author: motomioya

.github/workflows/clean-ci.yml

@@ -0,0 +1,39 @@
+---
+name: Clean PR builds
+
+'on':
+  workflow_dispatch:
+    inputs:
+      pr:
+        description: PR number in this repo to be cleaned
+        type: string   # can't use number here
+        required: true
+
+      # Warning: GitHub limits the total number of inputs to 10, so a maximum of
+      # 9 checks is allowed here!
+      # Warning: the check_* keys are magic and must consist of the string
+      # "check_" followed by the applicable check name exactly. The
+      # "description" field is only the human-readable label for the input.
+      'check_build/O2DPG/sim/o2':
+        description: build/O2DPG/sim/o2
+        type: boolean
+        default: true
+      'check_build/O2DPG/O2fst/o2':
+        description: build/O2DPG/O2fst/o2
+        type: boolean
+        default: true
+
+permissions: {}
+
+jobs:
+  clean:
+    name: Clean PR checks
+    uses: alisw/ali-bot/.github/workflows/clean-pr-checks.yml@master
+    with:
+      owner: ${{ github.event.repository.owner.login }}
+      repo: ${{ github.event.repository.name }}
+      pr: ${{ github.event.inputs.pr }}
+      checks: ${{ toJSON(github.event.inputs) }}
+    permissions:
+      pull-requests: read  # to get last commit for pr (octokit/graphql-action)
+      statuses: write      # for set-github-status

.github/workflows/syntax-checks.yml

@@ -92,6 +92,19 @@ jobs:
           done
           exit "$error"
 
+      - name: Run .C configs check
+        run: |
+          error=0
+          readarray -d '' files < \
+            <(find . -path ./.git -prune -false -or -type f -name '*.C' -print0)
+          for cfg in "${files[@]}"; do
+            if grep -q "\$O2DPG_ROOT" "$cfg" || grep -q "\${O2DPG_ROOT}" "$cfg"; then
+              error=1
+              echo "Deprecated O2DPG_ROOT detected in $cfg, replace with O2DPG_MC_CONFIG_ROOT" >&2
+            fi
+          done
+          exit "$error"   
+
   pylint:
     name: Pylint
     runs-on: ubuntu-latest

CODEOWNERS

@@ -1,5 +1,5 @@
-* @davidrohr @martenole @shahor02 @chiarazampolli @sawenzel @benedikt-voelkel
-/DATA/production @davidrohr @martenole @shahor02 @chiarazampolli
+* @davidrohr @shahor02 @chiarazampolli @sawenzel @benedikt-voelkel
+/DATA/production @davidrohr @shahor02 @chiarazampolli
 
 /DATA/testing/detectors/CPV
 /DATA/testing/detectors/EMC
@@ -14,7 +14,7 @@
 /DATA/testing/detectors/PHS
 /DATA/testing/detectors/TOF @noferini @chiarazampolli
 /DATA/testing/detectors/TPC @wiechula
-/DATA/testing/detectors/TRD @martenole
+/DATA/testing/detectors/TRD
 /DATA/testing/detectors/ZDC
 
 /MC @sawenzel @chiarazampolli @benedikt-voelkel

DATA/common/gen_topo_helper_functions.sh

@@ -49,6 +49,11 @@ has_detector_matching()
   [[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"ALL"(,|$) ]] || [[ $WORKFLOW_DETECTORS_MATCHING =~ (^|,)"$1"(,|$) ]]
 }
 
+has_secvtx_source()
+{
+  [[ $SVERTEXING_SOURCES =~ (^|,)"ALL"(,|$) ]] || [[ $SVERTEXING_SOURCES =~ (^|,)"$1"(,|$) ]]
+}
+
 has_detector_qc()
 {
   has_detector $1 && [[ $WORKFLOW_DETECTORS_QC =~ (^|,)"$1"(,|$) ]]

DATA/common/getCommonArgs.sh

@@ -25,6 +25,7 @@ fi
 [[ $NORATELOG == 1 ]] && ARGS_ALL+=" --fairmq-rate-logging 0"
 
 [[ ! -z ${O2_DPL_EXIT_TRANSITION_TIMEOUT_DEFAULT:-} ]] && ARGS_ALL+=" --exit-transition-timeout $O2_DPL_EXIT_TRANSITION_TIMEOUT_DEFAULT"
+[[ ! -z ${O2_DPL_PROCESSING_TRANSITION_TIMEOUT_DEFAULT:-} ]] && ARGS_ALL+=" --data-processing-timeout $O2_DPL_PROCESSING_TRANSITION_TIMEOUT_DEFAULT"
 
 true
 

DATA/production/configurations/asyncReco/setenv_extra.sh

@@ -126,6 +126,17 @@ export ADD_EXTRA_WORKFLOW=
 
 # other ad-hoc settings for CTF reader
 export ARGS_EXTRA_PROCESS_o2_ctf_reader_workflow+=" --allow-missing-detectors $REMAPPING"
+
+# possibility to only process some TFs
+if [[ ! -z ${ALIEN_JDL_RUN_TIME_SPAN_FILE} ]]; then
+  export ARGS_EXTRA_PROCESS_o2_ctf_reader_workflow+=" --run-time-span-file $ALIEN_JDL_RUN_TIME_SPAN_FILE "
+  # the following option makes sense only if we have the previous
+  if [[ ${ALIEN_JDL_INVERT_IRFRAME_SELECTION} == 1 ]]; then
+    export ARGS_EXTRA_PROCESS_o2_ctf_reader_workflow+=" --invert-irframe-selection "
+  fi
+fi
+
+# other settings
 echo RUN = $RUNNUMBER
 if [[ $RUNNUMBER -ge 521889 ]]; then
   export ARGS_EXTRA_PROCESS_o2_ctf_reader_workflow+=" --its-digits --mft-digits"
@@ -330,7 +341,7 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
     [[ $APPLYS11 == 1 ]] && export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[11]=78;" || export ITSTPCMATCH="${ITSTPCMATCH};tpcitsMatch.askMinTPCRow[11]=20;"
   fi
   # 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;"
+  export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow+=";GPU_rec_tpc.trackletMinSharedNormFactor=1.;GPU_rec_tpc.trackletMaxSharedFraction=0.3;GPU_rec_tpc.globalTrackingRowRange=100;GPU_rec_tpc.rejectIFCLowRadiusCluster=1;"
 
   #-------------------------------------- TPC corrections -----------------------------------------------
   # we need to provide to TPC
@@ -420,7 +431,7 @@ elif [[ $ALIGNLEVEL == 1 ]]; then
     export TPC_CORR_SCALING+=" --enable-M-shape-correction "
   fi
 
-  if [[ $ALIEN_JDL_LPMANCHORYEAR == "2023" ]] && [[ $BEAMTYPE == "PbPb" ]] ; then
+  if [[ $ALIEN_JDL_LPMANCHORYEAR -ge 2023 ]] && [[ $BEAMTYPE == "PbPb" ]] ; then
     # adding additional cluster errors
     # the values below should be squared, but the validation of those values (0.01 and 0.0225) is ongoing
     TPCEXTRAERR=";GPU_rec_tpc.clusterError2AdditionalYSeeding=0.1;GPU_rec_tpc.clusterError2AdditionalZSeeding=0.15;"
@@ -463,7 +474,7 @@ export ITSEXTRAERR="ITSCATrackerParam.sysErrY2[0]=$ERRIB;ITSCATrackerParam.sysEr
 # ad-hoc options for ITS reco workflow
 EXTRA_ITSRECO_CONFIG=
 if [[ $BEAMTYPE == "PbPb" ]]; then
-  EXTRA_ITSRECO_CONFIG="ITSCATrackerParam.deltaRof=1;ITSVertexerParam.clusterContributorsCut=16;ITSVertexerParam.lowMultBeamDistCut=0;ITSCATrackerParam.nROFsPerIterations=12;ITSCATrackerParam.perPrimaryVertexProcessing=true;"
+  EXTRA_ITSRECO_CONFIG="ITSCATrackerParam.deltaRof=0;ITSVertexerParam.clusterContributorsCut=16;ITSVertexerParam.lowMultBeamDistCut=0;ITSCATrackerParam.nROFsPerIterations=12;ITSCATrackerParam.perPrimaryVertexProcessing=false;"
   if [[ -z "$ALIEN_JDL_DISABLE_UPC" || $ALIEN_JDL_DISABLE_UPC != 1 ]]; then
     EXTRA_ITSRECO_CONFIG+=";ITSVertexerParam.nIterations=2;ITSCATrackerParam.doUPCIteration=true;"
   fi
@@ -701,7 +712,10 @@ fi
 if [[ $ALIEN_JDL_QCOFF != "1" ]]; then
   export WORKFLOW_PARAMETERS="QC,${WORKFLOW_PARAMETERS}"
 fi
-export QC_CONFIG_PARAM="--local-batch=QC.root --override-values \"qc.config.Activity.number=$RUNNUMBER;qc.config.Activity.passName=$PASS;qc.config.Activity.periodName=$PERIOD\""
+
+export QC_CONFIG_OVERRIDE+=";qc.config.Activity.number=$RUNNUMBER;qc.config.Activity.type=PHYSICS;qc.config.Activity.passName=$PASS;qc.config.Activity.periodName=$PERIOD;qc.config.Activity.beamType=$BEAMTYPE;"
+
+export QC_CONFIG_PARAM+=" --local-batch=QC.root "
 export GEN_TOPO_WORKDIR="./"
 #export QC_JSON_FROM_OUTSIDE="QC-20211214.json"
 

DATA/production/o2dpg_qc_postproc_workflow.py

@@ -69,6 +69,7 @@ def add_QC_postprocessing(taskName, qcConfigPath, needs, runSpecific, periodSpec
     task = createTask(name=taskName, needs=needs, cwd=qcdir, lab=["QC"], cpu=1, mem='2000')
     overrideValues = '--override-values "'
     overrideValues += f'qc.config.database.host={qcdbUrl};'
+    overrideValues += f'qc.config.Activity.type=PHYSICS;'
     overrideValues += f'qc.config.Activity.number={runNumber};' if runSpecific else 'qc.config.Activity.number=0;'
     overrideValues += f'qc.config.Activity.periodName={periodName};' if periodSpecific else 'qc.config.Activity.periodName=;'
     overrideValues += f'qc.config.Activity.passName={passName};' if passSpecific else 'qc.config.Activity.passName=;'

DATA/production/qc-async/emc.json

@@ -79,7 +79,7 @@
         "cycleDurationSeconds": "60",
         "dataSource": {
           "type": "direct",
-          "query": "emcal-triggers:EMC/CELLSTRGR/0;ctp-digits:CTP/DIGITS;ctp-config:CTP/CONFIG/0?lifetime=condition&ccdb-path=CTP/Config/Config&ccdb-run-dependent=true"
+          "query": "emcal-triggers:EMC/CELLSTRGR/0;ctp-digits:CTP/DIGITS;ctp-config:CTP/CONFIG/0?lifetime=condition&ccdb-path=CTP/Config/Config&ccdb-run-dependent=1"
         },
         "taskParameters": {
         }

DATA/production/qc-async/emc_PbPb.json

@@ -93,7 +93,7 @@
         "cycleDurationSeconds": "60",
         "dataSource": {
           "type": "direct",
-          "query": "emcal-triggers:EMC/CELLSTRGR/0;ctp-digits:CTP/DIGITS;ctp-config:CTP/CONFIG/0?lifetime=condition&ccdb-path=CTP/Config/Config&ccdb-run-dependent=true"
+          "query": "emcal-triggers:EMC/CELLSTRGR/0;ctp-digits:CTP/DIGITS;ctp-config:CTP/CONFIG/0?lifetime=condition&ccdb-path=CTP/Config/Config&ccdb-run-dependent=1"
         },
         "taskParameters": {
           "AliasMB" : "CMTVXTSC,C0TVXTSC,C0TVXTCE"

DATA/production/qc-async/its.json

@@ -31,6 +31,15 @@
         "detectorName": "ITS",
         "cycleDurationSeconds": "180",
         "maxNumberCycles": "-1",
+	"movingWindows": [
+              "Layer0/ClusterOccupation",
+              "Layer1/ClusterOccupation",
+              "Layer2/ClusterOccupation",
+              "Layer3/ClusterOccupation",
+              "Layer4/ClusterOccupation",
+              "Layer5/ClusterOccupation",
+              "Layer6/ClusterOccupation"
+        ],
         "dataSource_comment": "The other type of dataSource is \"direct\", see basic-no-sampling.json.",
         "dataSource": {
           "type": "direct",
@@ -52,8 +61,13 @@
         "className": "o2::quality_control_modules::its::ITSTrackTask",
         "moduleName": "QcITS",
         "detectorName": "ITS",
-        "cycleDurationSeconds": "30",
+        "cycleDurationSeconds": "180",
         "maxNumberCycles": "-1",
+	"movingWindows": [
+          "Ntracks",
+          "NClusters",
+          "AngularDistribution"
+        ],
         "dataSource_comment": "The other type of dataSource is \"direct\", see basic-no-sampling.json.",
         "dataSource": {
           "type": "direct",