enable parallel world in anchored simulation

.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

DATA/production/configurations/asyncReco/setenv_extra.sh

@@ -420,7 +420,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;"

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/tpc.json

@@ -67,7 +67,8 @@
           "cutMaxpTPC": "20.",
           "cutMinpTPCMIPs": "0.45",
           "cutMaxpTPCMIPs": "0.55",
-          "turnOffHistosForAsync": "true"
+          "turnOffHistosForAsync": "true",
+          "getdEdxVspHypoHist": "true"
        }
       },
       "TPCTrackClusters": {

DATA/tools/epn/gen_topo_o2dpg.sh

@@ -82,15 +82,21 @@ while true; do
         break
       fi
     fi
-    if [[ ! -d O2DPG ]]; then git clone https://github.com/AliceO2Group/O2DPG.git 1>&2 || { echo O2DPG checkout failed 1>&2; exit 1; }; fi
-    cd O2DPG
+    for CHECKOUTATTEMPT in 1 2; do
+      if [[ ! -d O2DPG ]]; then git clone https://github.com/AliceO2Group/O2DPG.git 1>&2 || { echo O2DPG checkout failed 1>&2; exit 1; }; fi
+      cd O2DPG
+      rm -f DATA/core_dump_*
+      git reset --hard HEAD &> /dev/null && git clean -d -f &> /dev/null && break
+      [[ $CHECKOUTATTEMPT -eq 2 ]] && { echo git reset error 1>&2; exit 1; }
+      echo "Clean-up of O2DPG repository failed. Removing repository and cloning it from scratch" 1>&2
+      cd $GEN_TOPO_WORKDIR || { echo Cannot enter work dir 1>&2; exit 1; }
+      rm -rf O2DPG
+    done
     git checkout $GEN_TOPO_SOURCE &> /dev/null
     if [[ $? != 0 ]]; then
       git fetch --tags origin 1>&2 || { echo Repository update failed 1>&2; exit 1; }
       git checkout $GEN_TOPO_SOURCE &> /dev/null || { echo commit does not exist 1>&2; exit 1; }
     fi
-    git reset --hard $GEN_TOPO_SOURCE &> /dev/null  || { echo git reset error 1>&2; exit 1; }
-    rm -f DATA/core_dump_*
     # At a tag, or a detached non-dirty commit, but not on a branch
     if ! git describe --exact-match --tags HEAD &> /dev/null && ( git symbolic-ref -q HEAD &> /dev/null || ! git diff-index --quiet HEAD &> /dev/null ); then
       unset GEN_TOPO_CACHEABLE

GRID/utils/grid_submit.sh

@@ -194,7 +194,7 @@ ONGRID=0
 
 JOBTTL=82000
 CPUCORES=8
-PRODSPLIT=1
+PRODSPLIT=${PRODSPLIT:-1}
 # this tells us to continue an existing job --> in this case we don't create a new workdir
 while [ $# -gt 0 ] ; do
     case $1 in

MC/bin/o2_hybrid_gen.py

@@ -0,0 +1,118 @@
+#!/usr/bin/env python3
+
+# This script creates a template JSON file for the configuration of the hybrid generator
+# The generators to be used are passed as a list of strings via the --gen flag, while the
+# output filename is set using --output. All the generators available in O2sim are supported.
+# Example:
+# $O2DPG_ROOT/MC/bin/o2_hybrid_gen.py --gen pythia8 boxgen external extkinO2 hepmc pythia8hf \
+#                                     --output config.json
+
+import argparse
+import json
+
+def main():
+    parser = argparse.ArgumentParser(description='Create a JSON file from command line flags.')
+    parser.add_argument('--gen', type=str, nargs='+', required=True, help='List of generators to be used')
+    parser.add_argument('--output', type=str, required=True, help='Output JSON file path')
+
+    args = parser.parse_args()
+
+    # put in a list all the elementes in the gen flag
+    noConfGen = ["pythia8pp", "pythia8hf", "pythia8hi", "pythia8powheg"]
+    gens = []
+    for gen in args.gen:
+        if gen == "pythia8":
+            gens.append({
+                'name': 'pythia8',
+                'config': {
+                    "config": "$O2_ROOT/share/Generators/egconfig/pythia8_inel.cfg",
+                    "hooksFileName": "",
+                    "hooksFuncName": "",
+                    "includePartonEvent": False,
+                    "particleFilter": "",
+                    "verbose": 0
+                }
+            })
+        elif gen == "external":
+            gens.append({
+                'name': 'external',
+                'config': {
+                    "fileName": "${O2DPG_ROOT}/MC/config/PWGDQ/external/generator/GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV.C",
+                    "funcName": "GeneratorParamPromptJpsiToElectronEvtGen_pp13TeV()"
+                }
+            })
+        elif gen == "extkinO2": 
+            gens.append({
+                'name': 'extkinO2',
+                'config': {
+                    "skipNonTrackable": True,
+                    "continueMode": False,
+                    "roundRobin": False, 
+                    "randomize": False, 
+                    "rngseed": 0, 
+                    "randomphi": False, 
+                    "fileName": "/path/to/filename.root"
+                }
+            })
+        elif gen == "hepmc": 
+            gens.append({
+                "name": "hepmc",
+                "config": {
+                    "configcmd": {
+                    "fileNames": "",
+                    "cmd": ""
+                    },
+                    "confighepmc": {
+                    "version": 2,
+                    "eventsToSkip": 0,
+                    "fileName": "/path/to/filename.hepmc",
+                    "prune": False
+                    }
+                }
+            })
+        elif gen == "boxgen": 
+            gens.append({
+                "name": "boxgen",
+                "config": {
+                    "pdg": 13,
+                    "number": 1,
+                    "eta": [
+                    -4,
+                    -2.5
+                    ],
+                    "prange": [
+                    0.1,
+                    5
+                    ], 
+                    "phirange": [
+                    0,
+                    360
+                    ]
+                }
+            })
+        elif gen in noConfGen:
+            gens.append({
+                "name": gen,
+                "config": ""
+            })
+        else:
+            print(f"Generator {gen} not found in the list of available generators")
+            exit(1)
+
+    # fill fractions with 1 for each generator
+    fractions = [1] * len(gens)
+
+    # Put gens and fractions in the data dictionary
+    data = {
+        "generators": gens,
+        "fractions": fractions
+    }
+
+    # Write the data dictionary to a JSON file
+    with open(args.output, 'w') as f:
+        json.dump(data, f, indent=2)
+
+    print(f"JSON file created at {args.output}")
+
+if __name__ == "__main__":
+    main()