.ci/online/Dockerfile

+ARG TAG=12-fair202211.4-rocm5.4
+ARG REGISTRY=hub.cbm.gsi.de/computing/images/online
+
+FROM ${REGISTRY}/dev:${TAG} as build
+  ARG SOURCE_DIR=/opt/cbm/src
+  WORKDIR ${SOURCE_DIR}
+  # Kaniko doesn't support RUN --mount, so we have to copy the source code instead
+  COPY . .
+  RUN .ci/online/scripts/install.sh
+
+FROM ${REGISTRY}/runtime:${TAG}
+  ARG CBMROOT_PATH=/opt/cbm/cbmroot
+  ARG FAIRSOFT_PATH=/opt/cbm/fairsoft
+  COPY --from=build ${CBMROOT_PATH}/bin ${CBMROOT_PATH}/bin
+  COPY --from=build ${CBMROOT_PATH}/lib/*.so ${CBMROOT_PATH}/lib/
+  # FIXME HACK FOR DC OCT 23
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so ${FAIRSOFT_PATH}/lib/.
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26 ${FAIRSOFT_PATH}/lib/.
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libGenVector.so.6.26.10 ${FAIRSOFT_PATH}/lib/.
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so ${FAIRSOFT_PATH}/lib/.
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26 ${FAIRSOFT_PATH}/lib/.
+  COPY --from=build ${FAIRSOFT_PATH}/lib/libCore.so.6.26.10 ${FAIRSOFT_PATH}/lib/.
+
+  ENV LD_LIBRARY_PATH=${CBMROOT_PATH}/lib:${FAIRSOFT_PATH}/lib:/opt/rocm/lib:${LD_LIBRARY_PATH}
+  ENV PATH=${CBMROOT_PATH}/bin:${PATH}
+  CMD ["cbmreco"]

.ci/online/DockerfileBuild

+FROM gcr.io/kaniko-project/executor:v1.16.0-debug
+    ARG USERNAME="username"
+    ARG PASSWORD="your_password"
+    ARG REGISTRY="hub.cbm.gsi.de"
+    ARG IMAGE="${REGISTRY}/computing/cbmroot/cbm_online"
+    ARG TAG="${USER}-debug"
+    RUN mkdir -p /kaniko/.docker
+    RUN echo "{\"auths\":{\"${REGISTRY}\":{\"username\":\"${USERNAME}\",\"password\":\"${PASSWORD}\"}}}" > /kaniko/.docker/config.json
+    # TODO: Mount CbmRoot source instead of copying it into the container (-> same with authentification...)
+    COPY . /workspace
+    ENV IMAGE=${IMAGE}
+    ENV TAG=${TAG}
+    ENTRYPOINT ["/bin/sh" , "-xc", "/kaniko/executor --context dir:///workspace --dockerfile /workspace/algo/containers/cbm_online/Dockerfile --destination $IMAGE:$TAG"]

.ci/online/make_build_image.sh

+#!/bin/bash
+
+set -e
+
+user="$1"
+password="$2"
+
+script=$(readlink -f "$0")
+
+function check_arg() {
+    if [ -z "$1" ]; then
+        echo "Error: No $2 specified."
+        echo "Usage: $script <user> <password>"
+        exit 1
+    fi
+}
+
+check_arg "$user" "user"
+check_arg "$password" "password"
+
+# Set tag as optional third argument
+if [ -z "$3" ]; then
+    tag="$user-debug"
+else
+    tag="$3"
+fi
+
+# This script must be run from the CbmRoot top level directory.
+# Check for .git, .clang-format, and .gitlab-ci.yml
+if [ ! -d .git ] || [ ! -f .clang-format ] || [ ! -f .gitlab-ci.yml ]; then
+    echo "Error: This script must be run from the CbmRoot top level directory."
+    exit 1
+fi
+
+registry="hub.cbm.gsi.de/computing/cbmroot"
+image="cbm_online"
+
+build_args=" \
+    --build-arg="USERNAME=$user" \
+    --build-arg="PASSWORD=$password" \
+    --build-arg="TAG=$tag" \
+"
+dockerfile="algo/containers/cbm_online/DockerfileBuild"
+docker build --progress plain $build_args -f $dockerfile -t cbm_online_builder .

.ci/online/scripts/install.sh

+#!/bin/bash
+
+set -e
+
+srcdir=cbmroot
+build_type=RelWithDebInfo
+install_prefix=/opt/cbm/cbmroot
+fairsoft_path=/opt/cbm/fairsoft
+enable_hip=ON
+rocm_root=/opt/rocm
+hip_archs="gfx906;gfx908" # MI50;MI100
+n_jobs=16
+
+cmake_args="-DCMAKE_INSTALL_PREFIX=$install_prefix \
+    -DCMAKE_BUILD_TYPE=$build_type \
+    -DSIMPATH=$fairsoft_path \
+    -DXPU_ENABLE_HIP=$enable_hip \
+    -DXPU_ROCM_ROOT=$rocm_root \
+    -DXPU_HIP_ARCH=$hip_archs \
+"
+
+ln -s ../cmake algo/cmake
+cmake -S algo -B build $cmake_args
+cmake --build build -j$n_jobs --target install

.ci/online/test_run.sh

+#! /bin/bash
+
+set -e
+
+IMAGE=hub.cbm.gsi.de/fweig/containers/cbm_online:online-container
+DOCKER_FLAGS=" \
+    --rm \
+    -it \
+    --mount type=bind,source=$HOME/cbm/params,target=/opt/cbm/params \
+    --mount type=bind,source=/home/cbmdata/mcbm22/2391,target=/opt/cbm/data \
+"
+
+CMD="cbmreco"
+CMD_FLAGS=" \
+    -p /opt/cbm/params \
+    -i /opt/cbm/data/2391_node8_1_0000.tsa \
+    -n 1 \
+    --omp 1 \
+"
+
+docker run $DOCKER_FLAGS $IMAGE $CMD $CMD_FLAGS
+# docker run $DOCKER_FLAGS $IMAGE ls -l /opt/cbm/data

.ci/online/test_run_gpu.sh

+#! /bin/bash
+
+set -e
+
+IMAGE=hub.cbm.gsi.de/fweig/containers/cbm_online:online-container
+DOCKER_FLAGS=" \
+    --rm \
+    -it \
+    --mount type=bind,source=$HOME/cbm/params,target=/opt/cbm/params \
+    --mount type=bind,source=/home/cbmdata/mcbm22/2391,target=/opt/cbm/data \
+    --device=/dev/kfd \
+    --device=/dev/dri \
+    --security-opt seccomp=unconfined \
+    --group-add video
+"
+
+CMD="cbmreco"
+CMD_FLAGS=" \
+    -p /opt/cbm/params \
+    -i /opt/cbm/data/2391_node8_1_0000.tsa \
+    -n 1 \
+    --omp 1\
+    -l info \
+    -d hip1 \
+"
+# CMD=xpuinfo
+# CMD_FLAGS=
+
+docker run $DOCKER_FLAGS $IMAGE $CMD $CMD_FLAGS
+# docker run $DOCKER_FLAGS $IMAGE ls -l /opt/cbm/data

.clang-format

 ---
-AccessModifierOffset: -2
+AccessModifierOffset: -1
 
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: true
@@ -14,11 +14,11 @@ AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 
-AllowShortBlocksOnASingleLine: Always
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Always
+AllowShortIfStatementsOnASingleLine: WithoutElse
 AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
 
@@ -80,8 +80,14 @@ IncludeCategories:
     Priority:        1
   - Regex:           '^("|<).*/Cbm'
     Priority:        1
+  - Regex:          '".*"'
+    Priority:        1
   - Regex:           '^("|<).*slice'
     Priority:        2
+  - Regex:           '^("|<)Monitor.hpp'
+    Priority:        2
+  - Regex:           '^("|<)System.hpp'
+    Priority:        2
   - Regex:           '^("|<)Fair'
     Priority:        3
   - Regex:           '^("|<)Logger.h'
@@ -92,6 +98,8 @@ IncludeCategories:
     Priority:        4
   - Regex:           '^("|<)boost'
     Priority:        5
+  - Regex:           '^<.*[^\.]h>'
+    Priority:        6
   - Regex:           '^<.*[^\.h]>'
     Priority:        6
   - Regex:           '^<.*>'
@@ -126,7 +134,7 @@ SpaceAfterCStyleCast: true
 #SpaceAfterLogicalNot: true
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
-SpaceBeforeCpp11BracedList: true
+SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
@@ -142,6 +150,9 @@ SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 
+WhitespaceSensitiveMacros: ['CBM_ENUM_DICT', 'CBM_YAML_PROPERTIES']
+StatementMacros: ['CBM_PARALLEL_FOR']
+
 Standard: c++11
 
 TabWidth: 8

.clang-tidy

+Checks:          '-*,modernize-deprecated-headers'
+WarningsAsErrors: ''
+HeaderFilterRegex: '.*'
+AnalyzeTemporaryDtors: false
+FormatStyle:     file
+CheckOptions:
+  - key:             modernize-deprecated-headers.CheckHeaderFile
+    value:           'true'
+...

.dockerignore

+.git
+.vscode
+
+/geometry
+/input
+/parameters
+/build
+/algo/external

.gitignore

@@ -5,7 +5,9 @@
 /geometry
 /input
 /parameters
+/qa_data
 /build
+/algo/external
 
 # Comment some single files
 Dart*.cfg
@@ -13,5 +15,8 @@ Dart*.cfg
 # gdb Crash dumps
 **/core_dump_*
 
+# Git rebase backoup files
+**/*.orig
+
 # IDEs
 .vscode

.gitlab-ci.yml

@@ -2,6 +2,8 @@ stages:
   - checkRepository
   - checkFormat
   - build
+  - package
+  - verify
   - finalise
   - documentation
 
@@ -17,6 +19,7 @@ RebaseCheck:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -25,8 +28,8 @@ RebaseCheck:
     - apk update && apk add git bash
     - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
     - git fetch upstream
-    - hash1=$(git show-ref upstream/master | cut -f1 -d' ')
-    - hash2=$(git merge-base upstream/master HEAD)
+    - hash1=$(git show-ref upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME | cut -f1 -d' ')
+    - hash2=$(git merge-base upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD)
     - echo "${hash1}"
     - echo "${hash2}"
     - if [ "${hash1}" = "${hash2}" ]; then
@@ -50,6 +53,7 @@ LinearHistCheck:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -58,7 +62,7 @@ LinearHistCheck:
     - apk update && apk add git bash
     - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
     - git fetch upstream
-    - count=$(git rev-list --min-parents=2 --count upstream/master..HEAD)
+    - count=$(git rev-list --min-parents=2 --count upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME..HEAD)
     - echo "${count}"
     - if [ 0 = "${count}" ]; then
     -   echo "History introduced in fork is linear"
@@ -72,12 +76,13 @@ LinearHistCheck:
 CodeFormatCheck:
   stage: checkFormat
   tags:
-    - CbmRoot
+    - CbmRoot_apptainer
   only:
     refs:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -89,10 +94,55 @@ CodeFormatCheck:
     - echo "export FAIRROOTPATH=/cvmfs/fairsoft.gsi.de/debian10/fairroot/\${FAIRROOT_VERSION}_fs_\${FAIRSOFT_VERSION}" >> env.sh
     - echo "export BUILDDIR=$PWD/build" >> env.sh
     - echo "export SOURCEDIR=$PWD" >> env.sh
-    - echo "export PATH=/cvmfs/fairroot.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
+    - echo "export PATH=/cvmfs/cbm.gsi.de/debian10/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
     - echo "export LABEL=format-check_MR-\${CI_MERGE_REQUEST_IID}" >> env.sh
     - echo "export FAIRROOT_FORMAT_BASE=upstream/\${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
     - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
+  variables:
+    CONTAINER: "/cvmfs/vae.gsi.de/debian10/containers/user_container-production.sif"
+    OS: debian10
+#    FAIRSOFT_VERSION: nov22p1
+#    FAIRROOT_VERSION: v18.8.0
+#    BASE_PATH: "/opt"
+#    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+#    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+
+#CodeTidyCheck:
+#  stage: checkFormat
+#  tags:
+#    - CbmRoot_apptainer
+#  only:
+#    refs:
+#      - merge_requests
+#    variables:
+#      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+#  script:
+#    # Get the upstream repository manually. I did not find any other way to have it for
+#    # comparison
+#    - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
+#    - git fetch upstream
+#    - echo "export FAIRSOFT_VERSION=$FAIRSOFT_VERSION" > env.sh
+#    - echo "export FAIRROOT_VERSION=$FAIRROOT_VERSION" >> env.sh
+#    - echo "export SIMPATH=/opt/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
+#    - echo "export FAIRROOTPATH=/opt/fairroot/\${FAIRROOT_VERSION}_\${FAIRSOFT_VERSION}" >> env.sh
+#    - echo "export BUILDDIR=$PWD/build" >> env.sh
+#    - echo "export SOURCEDIR=$PWD" >> env.sh
+#    - echo "export PATH=/cvmfs/cbm.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
+#    - echo "export LABEL=tidy-check_MR-${CI_MERGE_REQUEST_IID}" >> env.sh
+#    - echo "export FAIRROOT_TIDY_BASE=upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
+#    - echo "export NCPU=8"
+#    - . ./env.sh && ctest -S cmake/scripts/checktidy.cmake -VV
+#  after_script:
+#    - rm -rf build
+#  variables:
+#    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1_1.sif"
+#    OS: debian12
+#    FAIRSOFT_VERSION: nov22p1
+#    FAIRROOT_VERSION: v18.8.0
+#    BASE_PATH: "/opt"
+#    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+#    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+
 FileFormatCheck:
   stage: checkFormat
   image: alpine
@@ -103,6 +153,7 @@ FileFormatCheck:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -121,6 +172,7 @@ FileEndCheck:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -129,6 +181,24 @@ FileEndCheck:
     - git fetch upstream
     - scripts/check-file-ending.sh upstream
 
+CheckForNonASCII:
+  stage: checkFormat
+  image: alpine
+  tags:
+    - docker
+  only:
+    refs:
+      - merge_requests
+    variables:
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
+  script:
+    # Get the upstream repository manually. I did not find any other way to have it for
+    # comparison
+    - apk update && apk add git bash file pcre-tools
+    - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
+    - git fetch upstream
+    - scripts/check-non-ascii-characters.sh upstream
 
 FileLicenceCheck:
   stage: checkFormat
@@ -140,6 +210,7 @@ FileLicenceCheck:
       - merge_requests
     variables:
       - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^DC_.*$/
   script:
     # Get the upstream repository manually. I did not find any other way to have it for
     # comparison
@@ -153,6 +224,7 @@ FileLicenceCheck:
 # job template
 #
 .build_and_test: &build_and_test
+  timeout: 1h # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
   before_script:
     - if [ "$CI_MERGE_REQUEST_PROJECT_PATH" != "computing/cbmroot" ]; then
     -   if [ "$CI_PROJECT_PATH" != "computing/cbmroot" ]; then
@@ -179,6 +251,10 @@ FileLicenceCheck:
     - if [[ -n $INSTALL_PROJECT ]]; then
     -   echo "export INSTALL_PROJECT=TRUE" >> Dart.cfg
     - fi
+    - ./scripts/find_cijob_ctest_stop_time.sh Dart.cfg
+    - if [[ -n $CI_TEST_STAGE_TOTAL_TIME_LIMIT ]]; then
+    -   echo "export CI_TEST_STAGE_TOTAL_TIME_LIMIT=$CI_TEST_STAGE_TOTAL_TIME_LIMIT"  >> Dart.cfg
+    - fi
     - if [[ -n $CONFIGFILE ]]; then
     -   source $CONFIGFILE $FAIRSOFT_VERSION
     - fi
@@ -195,43 +271,72 @@ FileLicenceCheck:
     - CbmRoot_realData
 
 .realData_variables: &realData_variables
-    OS: "Debian10"
-    EXTRA_PATH: /opt/cmake/3.20.1/bin
+    OS: "Debian12"
     NCPU: 16
     RAW_DATA_PATH: "/opt/cbmsoft/beamtime-test-data/reduced/"
-    FAIRSOFT_VERSION: "apr21p2_root6"
+    FAIRSOFT_VERSION: "apr21p2"
     FAIRROOT_VERSION: "v18.6.7"
-    BASE_PATH: "/opt/cbmsoft"
-    SIMPATH: "$BASE_PATH/fairsoft_$FAIRSOFT_VERSION/installation"
-    FAIRROOTPATH: "$BASE_PATH/fairroot_${FAIRROOT_VERSION}-fairsoft_${FAIRSOFT_VERSION}"
+    BASE_PATH: "/opt/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    CHECK_GEO_HASH_CHANGE: "1"
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1500 # in seconds = 25 minutes
 
-.singularity_tag: &singularity_tag
+.apptainer_tag: &apptainer_tag
   stage: build
   tags:
-    - CbmRoot_singularity
+    - CbmRoot_apptainer
 
-.singularity_debian10_variables_apr21: &singularity_debian10_variables_apr21
-    OS: debian10
+.apptainer_vae23_variables_apr21: &apptainer_vae23_variables_apr21
+    CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
+    OS: vae23
     FAIRSOFT_VERSION: apr21p2
     FAIRROOT_VERSION: v18.6.7
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
-    CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment.sh"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/bin/setup_development_environment.sh"
     INSTALL_PROJECT: "TRUE"
     EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
-.singularity_centos7_variables_apr21: &singularity_centos7_variables_apr21
-    OS: centos7
-    FAIRSOFT_VERSION: apr21p2
-    FAIRROOT_VERSION: v18.6.7
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS/gcc8"
+.apptainer_vae23_variables_nov22p1: &apptainer_vae23_variables_nov22p1
+    CONTAINER: "/cvmfs/vae.gsi.de/vae23/containers/user_container-production.sif"
+    OS: vae23
+    FAIRSOFT_VERSION: nov22p1
+    FAIRROOT_VERSION: v18.8.0
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10/"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
-    CONFIGFILE: "/cvmfs/cbm.gsi.de/$OS/bin/setup_development_environment_test.sh"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian10/bin/setup_development_environment.sh"
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
+.apptainer_vae24_variables_nov22p3: &apptainer_vae24_variables_nov22p3
+    CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+    OS: vae24
+    FAIRSOFT_VERSION: nov22p3
+    FAIRROOT_VERSION: v18.8.0
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
-.singularity_debian11_variables_apr21: &singularity_debian11_variables_apr21
-    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2.sif"
+.apptainer_vae24_variables_jan24p1: &apptainer_vae24_variables_jan24p1
+    CONTAINER: "/cvmfs/vae.gsi.de/vae24/containers/user_container-production.sif"
+    OS: vae24
+    FAIRSOFT_VERSION: jan24p1
+    FAIRROOT_VERSION: v18.8.2
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian11/"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    CONFIGFILE: "/cvmfs/cbm.gsi.de/debian11/bin/setup_development_environment.sh"
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
+.apptainer_debian11_variables_apr21: &apptainer_debian11_variables_apr21
+    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian11_v18.6.7_apr21p2_1.sif"
     OS: debian11
     FAIRSOFT_VERSION: apr21p2
     FAIRROOT_VERSION: v18.6.7
@@ -241,28 +346,72 @@ FileLicenceCheck:
     INSTALL_PROJECT: "TRUE"
     EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
 
+.apptainer_debian12_variables_nov22p1: &apptainer_debian12_variables_nov22p1
+    CONTAINER: "/cvmfs/cbm.gsi.de/containers/debian12_v18.8.0_nov22p1_2.sif"
+    OS: debian12
+    FAIRSOFT_VERSION: nov22p1
+    FAIRROOT_VERSION: v18.8.0
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    INSTALL_PROJECT: "TRUE"
+    EXTRA_FLAGS: '"-DCBM_TEST_INSTALL=TRUE"'
+
 .linux_tag: &linux_tag
   stage: build
   tags:
     - CbmRoot
+  # Possible since Gitlab 15.7, job-level timeout can exceed project timeout but not Runner timeout
+  timeout: 1h 30m # Continuous tests after merge need more time than the pre-merge CI
 
 .linux_variables: &linux_variables
-    OS: "Debian10.11"
+    OS: "Debian12"
     NCPU: 5
-    FAIRSOFT_VERSION: "apr21p2"
-    FAIRROOT_VERSION: "v18.6.7"
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10"
+    FAIRSOFT_VERSION: "nov22p1"
+    FAIRROOT_VERSION: "v18.8.0"
+    BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian12"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
     EXTRA_PATH: "${SIMPATH}/bin"
+    CI_TEST_STAGE_TOTAL_TIME_LIMIT: 1800 # in seconds = 30 m, Continuous tests after merge need longer than pre-merge CI
 
 .macosx_tag: &macosx_tag
   stage: build
   tags:
     - qemu_macosx
 
-.macosx_12_variables: &macosx_12_variables
+.macosx_13_variables_nov22p1: &macosx_13_variables_nov22p1
+    OS: "macOS13"
+    FAIRSOFT_VERSION: "nov22p1"
+    FAIRROOT_VERSION: "v18.8.0"
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    EXTRA_PATH: /usr/local/bin
+
+.macosx_12_variables_nov22p1: &macosx_12_variables_nov22p1
     OS: "macOS12"
+    FAIRSOFT_VERSION: "nov22p1"
+    FAIRROOT_VERSION: "v18.8.0"
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    EXTRA_PATH: /usr/local/bin
+
+.macosx_11_variables_nov22p1: &macosx_11_variables_nov22p1
+    OS: "macOS11"
+    FAIRSOFT_VERSION: "nov22p1"
+    FAIRROOT_VERSION: "v18.8.0"
+    BASE_PATH: "/opt"
+    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
+    EXTRA_PATH: /usr/local/bin
+
+.macosx_1015_variables: &macosx_1015_variables
+    OS: "macOS1015"
     FAIRSOFT_VERSION: "apr21p2"
     FAIRROOT_VERSION: "v18.6.7"
     BASE_PATH: "/opt"
@@ -271,8 +420,8 @@ FileLicenceCheck:
     IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     EXTRA_PATH: /usr/local/bin
 
-.macosx_11_variables: &macosx_11_variables
-    OS: "macOS11"
+.macosx_12_variables: &macosx_12_variables
+    OS: "macOS12"
     FAIRSOFT_VERSION: "apr21p2"
     FAIRROOT_VERSION: "v18.6.7"
     BASE_PATH: "/opt"
@@ -281,8 +430,8 @@ FileLicenceCheck:
     IMAGE_NAME: "${OS}_${FAIRROOT_VERSION}_${FAIRSOFT_VERSION}"
     EXTRA_PATH: /usr/local/bin
 
-.macosx_1015_variables: &macosx_1015_variables
-    OS: "macOS1015"
+.macosx_11_variables: &macosx_11_variables
+    OS: "macOS11"
     FAIRSOFT_VERSION: "apr21p2"
     FAIRROOT_VERSION: "v18.6.7"
     BASE_PATH: "/opt"
@@ -320,41 +469,157 @@ CbmRoot_Merge_realData:
   variables:
     <<: [*mergeRequestVariables, *realData_variables]
 
-CbmRoot_Merge_Singularity_debian10_apr21:
-  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+CbmRoot_Merge_Apptainer_debian12_nov22p1:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *singularity_debian10_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_debian12_variables_nov22p1]
 
-CbmRoot_Merge_Singularity_debian11_apr21:
-  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+CbmRoot_Merge_Apptainer_debian11_apr21:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *singularity_debian11_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_debian11_variables_apr21]
 
-CbmRoot_Merge_Singularity_centos7_apr21:
-  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+CbmRoot_Merge_Apptainer_vae23_apr21:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
+    <<: [*mergeRequestVariables, *apptainer_vae23_variables_apr21]
 
-CbmRoot_Merge_macosx_12:
+CbmRoot_Merge_Apptainer_vae23_nov22p1:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *apptainer_vae23_variables_nov22p1]
+
+CbmRoot_Merge_Apptainer_vae24_nov22p3:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *apptainer_vae24_variables_nov22p3]
+
+CbmRoot_Merge_Apptainer_vae24_jan24p1:
+  <<: [*apptainer_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *apptainer_vae24_variables_jan24p1]
+
+CbmRoot_Merge_macosx_13_nov22p1:
   <<: [*macosx_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *macosx_12_variables]
+    <<: [*mergeRequestVariables, *macosx_13_variables_nov22p1]
 
-CbmRoot_Merge_macosx_11:
+CbmRoot_Merge_macosx_12_nov22p1:
   <<: [*macosx_tag, *check_merge_request, *build_and_test]
   variables:
-    <<: [*mergeRequestVariables, *macosx_11_variables]
+    <<: [*mergeRequestVariables, *macosx_12_variables_nov22p1]
+
+CbmRoot_Merge_macosx_11_nov22p1:
+  <<: [*macosx_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *macosx_11_variables_nov22p1]
 
 CbmRoot_Merge_macosx_1015:
   <<: [*macosx_tag, *check_merge_request, *build_and_test]
   variables:
     <<: [*mergeRequestVariables, *macosx_1015_variables]
 
+CbmRoot_Merge_macosx_11:
+  <<: [*macosx_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *macosx_11_variables]
+
+CbmRoot_Merge_macosx_12:
+  <<: [*macosx_tag, *check_merge_request, *build_and_test]
+  variables:
+    <<: [*mergeRequestVariables, *macosx_12_variables]
+
 CbmRoot_Continuous:
   <<: [*linux_tag, *check_merge, *build_and_test]
   variables:
     <<: [*mergeVariables, *linux_variables]
 
+BuildOnlineContainerMR:
+  stage: package
+  only:
+    refs:
+      - merge_requests
+    variables:
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+  needs:
+    - CodeFormatCheck
+    - FileFormatCheck
+    - FileEndCheck
+    - FileLicenceCheck
+  tags:
+    - docker
+  image:
+    name: $CI_REGISTRY/computing/images/base/kaniko/executor:v1.20.1-debug
+    entrypoint: [""]
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/cbm_online
+    IMAGE_TAG: mr$CI_MERGE_REQUEST_IID
+    DOCKERFILE: $CI_PROJECT_DIR/.ci/online/Dockerfile
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context dir://$CI_PROJECT_DIR --dockerfile $DOCKERFILE --destination $IMAGE_NAME:$IMAGE_TAG
+    # Cache settings suggested by Copilot: --cache=true --cache-repo=${IMAGE_NAME} --cache-ttl=168h --cache-shared=true --cache-dir=/cache
+    # TODO: Test if these work
+
+# Ensure the container we just build is usable, and not missing any dependencies
+VerifyOnlineContainerMR:
+  stage: verify
+  only:
+    refs:
+      - merge_requests
+    variables:
+      - $CI_MERGE_REQUEST_PROJECT_PATH == "computing/cbmroot" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+  needs:
+    - BuildOnlineContainerMR
+  tags:
+    - docker
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/cbm_online
+    IMAGE_TAG: mr$CI_MERGE_REQUEST_IID
+  image: $IMAGE_NAME:$IMAGE_TAG
+  script:
+    - cbmreco --help
+
+# Create container for master and DC_* branches on merge
+BuildOnlineContainerBranch:
+  stage: package
+  only:
+    - master@computing/cbmroot
+    - nightly_master@computing/cbmroot
+    - /^DC_.*$/@computing/cbmroot
+  needs: [] # Don't wait for continuous build, start immediately
+  tags:
+    - docker
+  image:
+    name: $CI_REGISTRY/computing/images/base/kaniko/executor:v1.20.1-debug
+    entrypoint: [""]
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/cbm_online
+    IMAGE_TAG: $CI_COMMIT_BRANCH
+    DOCKERFILE: $CI_PROJECT_DIR/.ci/online/Dockerfile
+  script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor --context dir://$CI_PROJECT_DIR --dockerfile $DOCKERFILE --destination $IMAGE_NAME:$IMAGE_TAG
+
+VerifyOnlineContainerBranch:
+  stage: verify
+  only:
+    - master@computing/cbmroot
+    - nightly_master@computing/cbmroot
+    - /^DC_.*$/@computing/cbmroot
+  needs:
+    - BuildOnlineContainerBranch
+  tags:
+    - docker
+  variables:
+    IMAGE_NAME: $CI_REGISTRY_IMAGE/cbm_online
+    IMAGE_TAG: $CI_COMMIT_BRANCH
+  image: $IMAGE_NAME:$IMAGE_TAG
+  script:
+    - cbmreco --help
+
 InformCodeOwners:
   stage: finalise
   tags:

CMakeLists.txt

@@ -30,6 +30,18 @@ set(CBMROOT_MAJOR_VERSION 22)
 set(CBMROOT_MINOR_VERSION 2)
 set(CBMROOT_PATCH_VERSION 99)
 
+execute_process(
+COMMAND bash "-c" "cd ${CMAKE_SOURCE_DIR} && git log | head -n 1 | sed 's_commit \\(.[^ ]*\\)_\\1_' && cd ${OLDPWD}"
+OUTPUT_VARIABLE CBMROOT_BUILD_HASH
+OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(
+COMMAND bash "-c" "cd ${CMAKE_SOURCE_DIR} && git log | sed -n '3 s/Date:[ ]*//p' && cd ${OLDPWD}"
+OUTPUT_VARIABLE CBMROOT_BUILD_HASH_DATE
+OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+message("CBMROOT BUILD HASH is ${CBMROOT_BUILD_HASH} dated on ${CBMROOT_BUILD_HASH_DATE}.")
+
 # Set name of our project to "CBMROOT"
 # This also sets ${CBMROOT_VERSION} to the provided VERSION value, which would be empty if not set here explicitly
 project(CBMROOT
@@ -54,12 +66,13 @@ include(CbmGenerateConfig)
 include(CbmMacros)
 include(CbmTargets)
 include(CbmCompilerSettings)
-include(ROOTMacros)
 
 include(FairMacros)
 include(WriteConfigFile)
 include(CheckCompiler)
 
+include(WriteGeant4Data_jupy)
+include(WriteKernelFile)
 
 # Do some basic checks
 # out-of-source build, unix system and
@@ -71,11 +84,13 @@ list(PREPEND CMAKE_PREFIX_PATH ${SIMPATH})
 
 unset(packages)
 
+find_package(Python3)
+MESSAGE("Python3_EXECUTABLE=${Python3_EXECUTABLE}")
+
 #Searches for ROOT Package
 find_package(ROOT 6.22 CONFIG REQUIRED)
 if(ROOT_FOUND)
   list(APPEND packages ROOT)
-  # The following CMake variables are needed until the modernization is done
 endif()
 
 find_package(FairCMakeModules REQUIRED)
@@ -98,7 +113,7 @@ if(FairLogger_FOUND)
     INTERFACE_INCLUDE_DIRECTORIES "${_incDirs}/fairlogger"
     )
 endif()
-  
+
 #Searches for VMC Package
 if(ROOT_vmc_FOUND)
   set(VMCLIB ROOT::VMC)
@@ -112,7 +127,6 @@ if(VMC_FOUND)
 endif()
 
 #Searches for FairROOT Package
-include(FairRootTargets)
 find_package(FairRoot REQUIRED)
 if(FAIRROOT_FOUND)
   list(APPEND packages FairRoot)
@@ -121,7 +135,16 @@ endif()
 
 
 #Searching for Boost Package
-find_package(Boost COMPONENTS serialization regex filesystem log log_setup container program_options thread)
+find_package(ZeroMQ)
+if(ZeroMQ_FOUND)
+  list(APPEND packages ZeroMQ)
+endif()
+
+
+#Searching for Boost Package
+find_package(Boost CONFIG
+             COMPONENTS serialization regex filesystem log log_setup container program_options thread iostreams system
+            )
 if(Boost_FOUND)
   list(APPEND packages Boost)
 endif()
@@ -162,6 +185,17 @@ if(SSE_FOUND)
   list(APPEND packages SSE)
 endif()
 
+#Searching for format package
+find_package(fmt CONFIG REQUIRED)
+if(fmt_FOUND)
+  list(APPEND packages fmt)
+endif()
+
+#Searching for ONNXRuntime
+find_package(ONNXRuntime CONFIG)
+if (ONNXRuntime_FOUND)
+  list(APPEND packages ONNXRuntime)
+endif()
 
 #Searching for FairMQ
 find_package(FairMQ CONFIG REQUIRED)
@@ -175,11 +209,23 @@ endif()
 # Check for the minimum required versions of FairSoft and FairRoot
 check_external_stack()
 
+if(NOT CBM_TEST_MODEL)
+  set(CBM_TEST_MODEL Experimental)
+endif()
+# Special case for GCC 10.2.1 with Profiling enabled: optimization of L1 has to be disabled to avoid errors
+If((${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile)
+   AND ${CMAKE_CXX_COMPILER_ID} MATCHES GNU
+   AND ${CMAKE_CXX_COMPILER_VERSION} MATCHES 10.2.1)
+  Message(STATUS "Detected Profiling build with GCC 10.2.1")
+  Message(STATUS "=> Disabling L1 optimization to avoid compilation errors")
+  Set(L1_NO_OPT ON CACHE BOOL "Detected Profiling build with GCC 10.2.1 => Disabling L1 opti to avoid comp. errors")
+EndIf()
+
 # Set the compiler flags
 set_compiler_flags()
 
 # Define where the produced targets are placed in the binary directory
-Set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+Set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 Set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
 Set(INCLUDE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/include")
 set(CMAKE_INSTALL_LIBDIR lib)
@@ -202,7 +248,7 @@ If(DEFINED ENV{OMP_NUM_THREADS} )
 endif()
 
 set(CBMLIBDIR ${CMAKE_BINARY_DIR}/lib)
-set(LD_LIBRARY_PATH  ${CBMLIBDIR} ${Boost_LIBRARY_DIRS} ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
+set(LD_LIBRARY_PATH  ${CBMLIBDIR} ${SIMPATH}/lib ${LD_LIBRARY_PATH} ${FAIRROOT_LIBRARY_DIR})
 set(ROOT_INCLUDE_PATH ${FAIRROOT_INCLUDE_DIR})
 
 # Recurse into the given subdirectories.  This does not actually
@@ -216,6 +262,7 @@ If(BUILD_UNITTESTS)
   Include(external/InstallGtest.cmake)
 endif()
 
+
 ### Subdirectories to be compiled #####
 
 ### Externals included and build from several sources
@@ -223,6 +270,21 @@ endif()
 # following targets
 add_subdirectory (external)
 
+option(BUILD_FOR_TIDY "Create compile commands database needed by clang-tidy" OFF)
+# Add the default compiler include paths needed for our static standalone clang-tidy
+# binary. The paths are only added to the compilation units in the generated file
+# compile_commands.json which is used as input for clang-tidy. Without the
+# paths clang-tidy can't find the standard C and C++ header files.
+# Also add special compile options to use the scalar version of VC.
+# Otherwise hardware and compiler dependent header files may not be found.
+# Since we want to check our code and not some system headers this is
+# acceptable.
+if(BUILD_FOR_TIDY)
+  ADD_DEFINITIONS(-DVc_IMPL=Scalar)
+  set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES
+      ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
+  )
+endif()
 
 ### Base directories
 add_subdirectory (core)
@@ -230,17 +292,11 @@ add_subdirectory (algo)
 add_subdirectory (sim)
 add_subdirectory (reco)
 add_subdirectory (analysis)
-
-### Detector directories
-add_subdirectory (mvd)
+add_subdirectory (services)
 
 ### Others
 Option(LARGE_TEST_STATISTIC "Run the test suite with large statistic (100 events)" OFF)
 
-if(NOT CBM_TEST_MODEL)
-  set(CBM_TEST_MODEL Experimental)
-endif()
-
 add_subdirectory (macro)
 add_subdirectory(fles)
 
@@ -271,5 +327,5 @@ generate_config_files()
 Install(DIRECTORY geometry input parameters
         DESTINATION share/cbmroot
         PATTERN ".git" EXCLUDE)
-        
+
 print_info()

CODEOWNERS

@@ -10,42 +10,45 @@
 /fles/  @f.uhlig @p.-a.loizeau
 /macro/ @f.uhlig @p.-a.loizeau
 
-/macro/C2F/      @i.selyuzhenkov
-/macro/analysis/ @i.selyuzhenkov
-/macro/KF/       @se.gorbunov @v.akishina
+/macro/C2F/      @a.andronic @k.piasecki
+/macro/analysis/ @a.andronic @k.piasecki
+/macro/KF/       @se.gorbunov
 
 # Core
 /core/             @f.uhlig @v.friese @p.-a.loizeau
-/core/qa/          @se.gorbunov
+/core/qa/          @se.gorbunov @s.zharko
 /core/data/test/   @f.uhlig
 /core/data/raw/    @p.-a.loizeau
-/core/base/utils/  @f.uhlig @s.lebedev
-/core/base/report/ @s.lebedev
-/core/base/draw/   @s.lebedev
+/core/base/utils/  @f.uhlig
+/core/base/report/ @f.uhlig
+/core/base/draw/   @f.uhlig
+
+# Algo
+/algo/ @d.smith @fweig
 
 # Simulation
 /sim/                    @f.uhlig @v.friese @p.-a.loizeau
-/sim/transport/geosetup/ @e.lavrik
+#/sim/transport/geosetup/ @e.lavrik
 
 # Reco
 /reco/              @f.uhlig @v.friese @p.-a.loizeau
-/reco/littrack/     @s.lebedev @andrey.lebedev
-/reco/L1/           @se.gorbunov @v.akishina
+/reco/littrack/     @se.gorbunov
+/reco/L1/           @se.gorbunov @s.zharko
 /reco/eventbuilder/ @d.smith
-/reco/KF/           @se.gorbunov @v.akishina
+/reco/KF/           @se.gorbunov @s.zharko
 
 # Analysis
-/analysis/                                 @i.selyuzhenkov
+/analysis/                                 @a.andronic @k.piasecki
 /analysis/PWGC2F/femtoscopy/               @wielanek_AT_if.pw.edu.pl
-/analysis/common/                          @i.selyuzhenkov
-/analysis/PWGHAD/                          @i.selyuzhenkov
-/analysis/PWGCHA/                          @i.selyuzhenkov
-/analysis/PWGDIL/                          @i.selyuzhenkov
+/analysis/common/                          @a.andronic @k.piasecki
+/analysis/PWGHAD/                          @a.andronic @k.piasecki
+/analysis/PWGCHA/                          @a.andronic @k.piasecki
+/analysis/PWGDIL/                          @a.andronic @k.piasecki
 /analysis/PWGDIL/dielectron/pi0eta/        @c.pauly
 /analysis/PWGDIL/dielectron/papaframework/ @a_meye37_AT_uni-muenster.de
-/analysis/PWGDIL/dielectron/lmvm/          @i.selyuzhenkov
+/analysis/PWGDIL/dielectron/lmvm/          @a.andronic @k.piasecki
 /analysis/PWGDIL/dielectron/conversion/    @c.pauly
-/analysis/PWGDIL/dimuon/                   @i.selyuzhenkov
+/analysis/PWGDIL/dimuon/                   @a.andronic @k.piasecki
 
 ## Detectors
 
@@ -56,15 +59,23 @@
 /macro/trd/           @a.bercuci @p.kaehler
 /sim/detectors/trd/   @a.bercuci @p.kaehler
 /reco/detectors/trd/  @a.bercuci @p.kaehler
+/algo/detectors/trd/  @a.bercuci @p.kaehler
 
 # PSD
-/analysis/detectors/psd/ @karpushkin_AT_inr.ru
-/core/data/psd/          @karpushkin_AT_inr.ru
-/core/data/test/psd/     @karpushkin_AT_inr.ru
-/core/detectors/psd/     @karpushkin_AT_inr.ru
-/macro/psd/              @karpushkin_AT_inr.ru
-/sim/detectors/psd/      @karpushkin_AT_inr.ru
-/reco/detectors/psd/     @karpushkin_AT_inr.ru
+/analysis/detectors/psd/ @v.friese
+/core/data/psd/          @v.friese
+/core/data/test/psd/     @v.friese
+/core/detectors/psd/     @v.friese
+/macro/psd/              @v.friese
+/sim/detectors/psd/      @v.friese
+/reco/detectors/psd/     @v.friese
+
+# FSD
+/analysis/detectors/fsd/ @dvorar10_AT_fjfi.cvut.cz
+/core/data/fsd/          @dvorar10_AT_fjfi.cvut.cz
+/core/detectors/fsd/     @dvorar10_AT_fjfi.cvut.cz
+/sim/detectors/fsd/      @dvorar10_AT_fjfi.cvut.cz
+/reco/detectors/fsd/     @dvorar10_AT_fjfi.cvut.cz
 
 # MUCH
 /core/data/much/         @v.singhal
@@ -73,6 +84,8 @@
 /macro/much/             @v.singhal
 /sim/detectors/much/     @v.singhal
 /reco/detectors/much/    @v.singhal
+/algo/detectors/much/    @v.singhal
+/macro/analysis/much/    @v.singhal
 
 # TOF
 /analysis/detectors/tof/ @n.herrmann @i.deppner
@@ -85,14 +98,16 @@
 /reco/detectors/tof/     @n.herrmann @i.deppner
 /MQ/eTOF/                @n.herrmann @i.deppner
 /MQ/hitbuilder/          @n.herrmann @i.deppner
+/algo/detectors/tof/     @n.herrmann @i.deppner
 
 # RICH
-/core/data/rich/      @s.lebedev
-/core/data/test/rich/ @s.lebedev
-/core/detectors/rich/ @s.lebedev
-/macro/rich/          @s.lebedev
-/sim/detectors/rich/  @s.lebedev
-/reco/detectors/rich/ @s.lebedev
+/core/data/rich/      @ma.beyer
+/core/data/test/rich/ @ma.beyer
+/core/detectors/rich/ @ma.beyer
+/macro/rich/          @ma.beyer
+/sim/detectors/rich/  @ma.beyer
+/reco/detectors/rich/ @ma.beyer
+/algo/detectors/rich/ @ma.beyer
 
 # STS
 /analysis/detectors/sts/ @v.friese
@@ -103,8 +118,13 @@
 /sim/detectors/sts/      @v.friese
 /reco/detectors/sts/     @v.friese
 /MQ/sts/                 @v.friese
+/algo/detectors/sts/     @v.friese
+/algo/data/sts/          @v.friese
 
 # MVD
-/core/data/mvd/ @c.muentz @m.deveaux
-/macro/mvd/     @c.muentz @m.deveaux
-/mvd/           @c.muentz @m.deveaux
+/reco/detectors/mvd/     @c.muentz @m.deveaux @j.stroth
+/core/detectors/mvd/     @c.muentz @m.deveaux @j.stroth
+/core/data/mvd/          @c.muentz @m.deveaux @j.stroth
+/analysis/detectors/mvd/ @c.muentz @m.deveaux @j.stroth
+/macro/mvd/              @c.muentz @m.deveaux @j.stroth
+/sim/detectors/mvd/      @c.muentz @m.deveaux @j.stroth

CTestCustom.cmake

@@ -3,8 +3,13 @@
 message(" -- Read CTestCustom.cmake --")
 
 # Maximum size of uploaded test output of failed tests is 100kB
+# or 10MB in case of weekly tests
 # Larger output is cutted
-set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "102400")
+if(${CBM_TEST_MODEL} MATCHES Weekly)
+  set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "10240000")
+else()
+  set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "102400")
+endif()
 
 # Maximum size of uploaded test output of passed tests is 1kB
 # Larger output is cutted

CbmRoot_test.cmake

@@ -33,6 +33,9 @@ Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
 #Include(CbmMacros)
 #FairRootVersion()
 
+message("Compiling with $ENV{number_of_processors} jobs in parallel.")
+message("Testing with $ENV{number_of_processors_for_test} jobs in parallel.")
+
 Set(CTEST_USE_LAUNCHERS 1)
 
 If(${CBM_TEST_MODEL} MATCHES MergeRequest OR ${CBM_TEST_MODEL} MATCHES Continuous)
@@ -55,7 +58,7 @@ Else()
 EndIf()
 
 #If(${CBM_TEST_MODEL} MATCHES Nightly OR ${CBM_TEST_MODEL} MATCHES Weekly OR ${CBM_TEST_MODEL} MATCHES Profile)
-If(NOT ${_BuildType} MATCHES Experimental)
+If(NOT ${_BuildType} MATCHES EXPERIMENTAL)
 
   Find_Program(GCOV_COMMAND gcov)
   If(GCOV_COMMAND)
@@ -73,11 +76,20 @@ unset(repeat)
 if(${_CMakeModel} MATCHES Continuous)
   if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.17)
     set(repeat REPEAT UNTIL_PASS:2)
-  endif()        
+  endif()
 EndIf()
 
+# The stop time should be a date compatible string without day nor timezone
+# Examples:
+# => CTEST_END_TIME_LIMIT=`date -d "${END_TIME}CET -5minutes" +"%H:%M:%S"`
+# => CTEST_END_TIME_LIMIT=`date -d "now +25minutes" +"%H:%M:%S"`
+unset(stop_time)
+If(DEFINED ENV{CTEST_END_TIME_LIMIT})
+  set(stop_time STOP_TIME "$ENV{CTEST_END_TIME_LIMIT}")
+  message(STATUS " End time for the ctest test runs set to ${stop_time}")
+EndIf()
 
-If(NOT ${_BuildType} MATCHES Experimental)
+If(NOT ${_BuildType} MATCHES EXPERIMENTAL)
   Ctest_Update(SOURCE "${CTEST_SOURCE_DIRECTORY}")
 EndIf()
 
@@ -110,9 +122,29 @@ If(NOT _RETVAL)
     endif()
   EndIf()
 
+  If(DEFINED ENV{CI_TEST_STAGE_TOTAL_TIME_LIMIT})
+    # Compute test stage timeout based on current time + limit from environment variable
+    If(DEFINED ENV{CTEST_END_TIME_LIMIT})
+      # If also full DASH run timeout defined, also compare the two and keep the earliest one
+      execute_process (
+        COMMAND scripts/find_citests_ctest_stop_time.sh $ENV{CTEST_END_TIME_LIMIT}
+        OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
+      )
+    Else()
+      # Else just get the CI jpb timeout
+      execute_process (
+        COMMAND scripts/find_citests_ctest_stop_time.sh
+        OUTPUT_VARIABLE CI_TESTS_TOTAL_END_TIME_DATE
+      )
+    EndIf()
+    set(stop_time STOP_TIME "${CI_TESTS_TOTAL_END_TIME_DATE}")
+    message(STATUS "Due to CI mode, Set end time for the ctest test runs to ${stop_time}")
+  EndIf()
+
   Ctest_Test(BUILD "${CTEST_BINARY_DIRECTORY}"
-             PARALLEL_LEVEL $ENV{number_of_processors}
+             PARALLEL_LEVEL $ENV{number_of_processors_for_test}
              ${repeat}
+             ${stop_time}
              RETURN_VALUE _ctest_test_ret_val
             )
 
@@ -143,10 +175,14 @@ If(NOT _RETVAL)
                     RESULTS_VARIABLE _install_ret_value
                    )
     if (NOT _install_ret_value)
-      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles mvd reco sim
+      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install with source folder available")
+      execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
+                      RESULTS_VARIABLE _install_ret_value
+                     )
+      execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E rm -R build MQ algo analysis core external fles reco sim
                       WORKING_DIRECTORY ${CTEST_SOURCE_DIRECTORY}
                      )
-      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install")
+      message("executing test suite in ${CTEST_BINARY_DIRECTORY}/install wihout source folder available")
       execute_process(COMMAND ${CTEST_SOURCE_DIRECTORY}/cmake/scripts/execute_installation_test.sh ${CTEST_SOURCE_DIRECTORY}/install
                       RESULTS_VARIABLE _install_ret_value
                      )

Dart.sh

@@ -119,15 +119,22 @@ then
   fi
 fi
 
+if [ -z $NCPU4TEST ]; then
+  export number_of_processors_for_test=$number_of_processors
+else
+  export number_of_processors_for_test=$NCPU4TEST
+fi
+
 echo "************************"
 date
 echo "LABEL: " $LABEL
 echo "SITE: " $SITE
 echo "Model: " ${ctest_model}
-echo "Nr. of processes: " $number_of_processors
+echo "Nr. of processes for build: " $number_of_processors
+echo "Nr. of processes for test: " $number_of_processors_for_test
 echo "************************"
 
 cd $SOURCEDIR
 
-ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV -DCBM_TEST_MODEL=${ctest_model}
+ctest -S $SOURCEDIR/CbmRoot_test.cmake -V -DCBM_TEST_MODEL=${ctest_model}
 #ctest -S $SOURCEDIR/CbmRoot_test.cmake -V --VV

MQ/histoServer/CMakeLists.txt

@@ -28,7 +28,6 @@ set(PUBLIC_DEPS
 set(PRIVATE_DEPS
   CbmFlibFlesTools
   FairRoot::Base
-  FairMQ::Tools
   FairMQ::FairMQ
   ROOT::Gpad
   ROOT::Hist

MQ/hitbuilder/CMakeLists.txt

@@ -30,8 +30,8 @@ set(PUBLIC_DEPENDENCIES
 set(PRIVATE_DEPENDENCIES
   CbmBase
   CbmTofReco  
-  FairMQ::Tools
   FairRoot::ParBase
+  FairRoot::Online
   ROOT::Core
   ROOT::Graf
   ROOT::Hist

MQ/mcbm/CMakeLists.txt

@@ -32,6 +32,7 @@ set(PUBLIC_DEPS
 
 set(PRIVATE_DEPS
   CbmFlibFlesTools
+  CbmBmonReco
   CbmMuchReco
   CbmPsdReco
   CbmRecoSts
@@ -40,7 +41,6 @@ set(PRIVATE_DEPS
   CbmTofReco
   CbmTrdReco
   CbmEventBuilder
-  FairMQ::Tools
   FairRoot::Base
   ROOT::Gpad
   ROOT::Hist
@@ -55,8 +55,8 @@ set(INTERFACE_DEPS
 set(EXE_NAME McbmUnpack)
 set(SRCS CbmDeviceMcbmUnpack.cxx runMcbmUnpack.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -64,8 +64,8 @@ generate_cbm_executable()
 set(EXE_NAME McbmMonitorPulser)
 set(SRCS CbmDeviceMcbmMonitorPulser.cxx runMcbmMonitorPulser.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -73,8 +73,8 @@ generate_cbm_executable()
 set(EXE_NAME BuildRawEvents)
 set(SRCS CbmDeviceBuildRawEvents.cxx runBuildRawEvents.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -83,8 +83,8 @@ generate_cbm_executable()
 set(EXE_NAME McbmEventBuilderWin)
 set(SRCS CbmDeviceMcbmEventBuilderWin.cxx runMcbmEvtBuilderWin.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES "${PRIVATE_DEPS};FairRoot::Online")
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -92,8 +92,8 @@ generate_cbm_executable()
 set(EXE_NAME McbmEventSink)
 set(SRCS CbmDeviceMcbmEventSink.cxx runMcbmEventSink.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES "${PRIVATE_DEPS};FairRoot::Online")
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -102,8 +102,8 @@ generate_cbm_executable()
 set(EXE_NAME MqUnpack)
 set(SRCS CbmDeviceUnpack.cxx runUnpack.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -111,8 +111,8 @@ generate_cbm_executable()
 set(EXE_NAME BuildDigiEvents)
 set(SRCS CbmDeviceBuildDigiEvents.cxx runBuildDigiEvents.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -120,8 +120,8 @@ generate_cbm_executable()
 set(EXE_NAME DigiEventSink)
 set(SRCS CbmDeviceDigiEventSink.cxx runDigiEventSink.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES "${PRIVATE_DEPS};FairRoot::Online")
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()
@@ -130,8 +130,8 @@ generate_cbm_executable()
 set(EXE_NAME BmonMonitor)
 set(SRCS CbmDeviceBmonMonitor.cxx runBmonMonitor.cxx)
 
-set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS}) 
-set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS}) 
+set(PUBLIC_DEPENDENCIES ${PUBLIC_DEPS})
+set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPS})
 set(INTERFACE_DEPENDENCIES ${INTERFACE_DEPS})
 
 generate_cbm_executable()

MQ/mcbm/CbmDeviceBmonMonitor.cxx

@@ -54,7 +54,7 @@ struct InitTaskError : std::runtime_error {
 
 using namespace std;
 
-//Bool_t bMcbm2018MonitorTaskT0ResetHistos = kFALSE;
+//Bool_t bMcbm2018MonitorTaskBmonResetHistos = kFALSE;
 
 CbmDeviceBmonMonitor::CbmDeviceBmonMonitor() {}
 
@@ -166,9 +166,9 @@ Bool_t CbmDeviceBmonMonitor::InitContainers()
     charPosDel++;
     int32_t iOffset = std::stoi((*itStrOffs).substr(charPosDel));
 
-    if ("kT0" == sSelDet && fBmonConfig) {  //
+    if ("kBmon" == sSelDet && fBmonConfig) {  //
       fBmonConfig->SetSystemTimeOffset(iOffset);
-    }  // else if( "kT0" == sSelDet )
+    }  // else if( "kBmon" == sSelDet )
     else {
       LOG(info) << "CbmDeviceBmonMonitor::InitContainers => Trying to set time "
                    "offset for unsupported detector, ignored! "
@@ -433,7 +433,7 @@ bool CbmDeviceBmonMonitor::SendUnpData()
 
   parts.AddPart(std::move(messTsHeader));
 
-  // ---- T0 ----
+  // ---- Bmon ----
   std::stringstream ossBmon;
   boost::archive::binary_oarchive oaBmon(ossBmon);
   if (fBmonConfig) {  //