Merge branch 'main' into navigator-check-inside-volume

acts-project · Aug 5, 2024 · de57c9b · de57c9b
2 parents 6b822b6 + 9d520f2
commit de57c9b
Show file tree

Hide file tree

Showing 125 changed files with 1,891 additions and 1,152 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -46,21 +46,10 @@ jobs:
         run: >
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          --preset=github-ci
           -DCMAKE_BUILD_TYPE=Debug
           -DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
-          -DACTS_BUILD_UNITTESTS=on
-          -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-          -DACTS_BUILD_EVERYTHING=ON
           -DACTS_BUILD_ODD=OFF
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       - name: Build
         run: cmake --build build
       - name: ccache stats
@@ -106,11 +95,9 @@ jobs:
       - name: Configure
         run: >
           cmake -B build -S .
-          -GNinja
+          --preset=github-ci
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
           -DCMAKE_CXX_FLAGS="-Werror"
-          -DACTS_BUILD_EVERYTHING=ON
-          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
       - name: Measure
         run: cmakeperf collect build/compile_commands.json -o perf.csv
       - name: Results

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
@@ -56,22 +56,9 @@ jobs:
           git config --global user.email '<>' &&
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=20
+          --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_ANALYSIS_APPS=ON
           -DACTS_BUILD_PLUGIN_ONNX=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
           -DACTS_BUILD_PLUGIN_GEOMODEL=ON
 
       - name: Build
@@ -276,21 +263,9 @@ jobs:
         run: >
           ccache -z &&
           cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
+          --preset=github-ci
           -DCMAKE_CXX_STANDARD=${{ matrix.std }}
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_FORCE_ASSERTIONS=OFF
-          -DACTS_BUILD_ANALYSIS_APPS=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
 
       - name: Build
         run: cmake --build build
@@ -335,7 +310,7 @@ jobs:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8e12bbf.tar.zst
+      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macOS/cmake/deps.8a95213.tar.zst
       # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
       DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
     steps:
@@ -352,11 +327,9 @@ jobs:
           brew install cmake ninja ccache xerces-c
           && wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.zst ${{ env.DEPENDENCY_URL }}
           && mkdir ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}
           && tar -xf deps.tar.zst -C ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}
-          && ls ${{ env.DEPENDENCY_DIR }}/python
-          && ${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3 -m pip install pyyaml jinja2
+          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
+          && python3 -m pip install pyyaml jinja2
 
       - name: Restore ccache
         uses: actions/cache/restore@v4
@@ -373,24 +346,13 @@ jobs:
         # versions such as the one installed via homebrew
         run: >
           ccache -z
-          && source ${{ env.DEPENDENCY_DIR }}/setup.sh
+          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build -S .
-          -GNinja
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/python/3.12.2/bin/python3
-          -DDD4HEP_DEBUG_CMAKE=ON
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_CXX_FLAGS=-Werror
-          -DCMAKE_CXX_STANDARD=20
+          --preset=github-ci
+          -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
+          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
-          -DCMAKE_PREFIX_PATH=/usr/local/acts
-          -DACTS_BUILD_EVERYTHING=ON
-          -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-          -DACTS_BUILD_ODD=ON
-          -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-          -DACTS_FORCE_ASSERTIONS=ON
-          -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-          -DACTS_BUILD_PLUGIN_ACTSVG=ON
+          -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF
       - name: Build
         run: cmake --build build
       - name: ccache stats
@@ -413,7 +375,7 @@ jobs:
           path: ${{ env.INSTALL_DIR }}
       - name: Downstream configure
         run: >
-          source ${{ env.DEPENDENCY_DIR }}/setup.sh
+          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build-downstream -S Tests/DownstreamProject
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
@@ -423,7 +385,6 @@ jobs:
       - name: Downstream build
         run: cmake --build build-downstream
       - name: Downstream run
-        run: |
-          source ${{ env.DEPENDENCY_DIR }}/setup.sh
-          source ${{ env.DEPENDENCY_DIR}}/dd4hep/*/bin/thisdd4hep.sh
-          ./build-downstream/bin/ShowActsVersion
+        run: >
+          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
+          && ./build-downstream/bin/ShowActsVersion
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -26,14 +26,11 @@ clang_tidy:
         && ln -sf /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
     - >
         cmake -B build -S .
-        -GNinja
+        --preset=gitlab-ci-clangtidy
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_C_COMPILER=clang
-        -DCMAKE_BUILD_TYPE=Release
-        -DCMAKE_CXX_FLAGS="-Werror"
-        -DACTS_BUILD_EVERYTHING=on
-        -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-        -DACTS_RUN_CLANG_TIDY=on
+        -DACTS_RUN_CLANG_TIDY=ON
+        -DACTS_BUILD_ODD=OFF
 
     # Main clang-tidy run during cmake compilation
     - CI/clang_tidy/run_clang_tidy.sh clang-tidy build
@@ -48,6 +45,7 @@ clang_tidy:
         clang-tidy/clang-tidy.json
         --exclude "*thirdparty*"
         --exclude "*ActsPodioEdm*"
+        --exclude "*build/_deps/*"
 
     # Check the combined report against the defined limits
     - CI/clang_tidy/check_clang_tidy.py --report clang-tidy/clang-tidy.json --config CI/clang_tidy/limits.yml
@@ -79,18 +77,8 @@ build_exatrkx_cpu:
     # Here we only do a minimal build without examples to save ressources
     - >
       cmake -B build -S src
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -GNinja
-      -DCMAKE_BUILD_TYPE=Release
-      -DCMAKE_CXX_FLAGS=-w
-      -DACTS_BUILD_PLUGIN_EXATRKX=ON
-      -DACTS_BUILD_EXAMPLES_EXATRKX=OFF
-      -DACTS_BUILD_UNITTESTS=OFF
-      -DACTS_EXATRKX_ENABLE_TORCH=ON
-      -DACTS_EXATRKX_ENABLE_ONNX=OFF
+      --preset=gitlab-ci-exatrkx
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
-      -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=OFF
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
 
     - ccache -z
     - cmake --build build -- -j2
@@ -127,20 +115,8 @@ build_exatrkx:
     - mkdir build
     - >
       cmake -B build -S src
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -GNinja
-      -DCMAKE_BUILD_TYPE=Release
-      -DCMAKE_CXX_FLAGS=-w
-      -DCMAKE_CUDA_FLAGS=-w
+      --preset=gitlab-ci-exatrkx
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
-      -DACTS_BUILD_PLUGIN_EXATRKX=ON
-      -DACTS_BUILD_EXAMPLES_EXATRKX=ON
-      -DACTS_BUILD_UNITTESTS=ON
-      -DACTS_EXATRKX_ENABLE_TORCH=ON
-      -DACTS_EXATRKX_ENABLE_ONNX=OFF
-      -DACTS_EXATRKX_ENABLE_CUDA=ON
-      -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
 
     - ccache -z
     - cmake --build build -- -j2
@@ -206,21 +182,8 @@ build_linux_ubuntu:
     - mkdir build
     - >
       cmake -B build -S src
-      -GNinja
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      -DCMAKE_CXX_FLAGS=-Werror
-      -DCMAKE_CXX_STANDARD=20
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-      -DACTS_BUILD_EVERYTHING=ON
-      -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-      -DACTS_BUILD_ODD=ON
-      -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-      -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-      -DACTS_FORCE_ASSERTIONS=ON
-      -DACTS_BUILD_ANALYSIS_APPS=ON
+      --preset=gitlab-ci
       -DACTS_BUILD_PLUGIN_ONNX=ON
-      -DACTS_BUILD_PLUGIN_ACTSVG=ON
 
     - ccache -z
     - cmake --build build -- -j2
@@ -245,7 +208,7 @@ linux_test_examples:
     - source build/this_acts_withdeps.sh
     - cd src
     - pip3 install -r Examples/Python/tests/requirements.txt
-    - pytest -rFsv -k "not exatrkx" -v
+    - pytest -rFsv -k "not exatrkx" -v -s
 
 linux_physmon:
   stage: test
@@ -304,20 +267,8 @@ linux_physmon:
     - mkdir build
     - >
       cmake -B build -S src
-      -GNinja
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -DCMAKE_BUILD_TYPE=Release
-      -DCMAKE_CXX_FLAGS=-Werror
+      --preset=gitlab-ci
       -DCMAKE_CXX_STANDARD=${CXXSTD}
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-      -DACTS_BUILD_EVERYTHING=ON
-      -DACTS_BUILD_EXAMPLES_UNITTESTS=ON
-      -DACTS_BUILD_ODD=ON
-      -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-      -DACTS_BUILD_EXAMPLES_EDM4HEP=ON
-      -DACTS_FORCE_ASSERTIONS=ON
-      -DACTS_BUILD_ANALYSIS_APPS=ON
-      -DACTS_BUILD_PLUGIN_ACTSVG=ON
 
     - ccache -z
     - cmake --build build -- -j2
@@ -411,35 +362,8 @@ linux_ubuntu_2204_clang:
   script:
     - >
       cmake -B build -S src
-      -GNinja
-      -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-      -DCMAKE_BUILD_TYPE=Release
-      -DCMAKE_CXX_FLAGS=-Werror
-      -DCMAKE_CXX_STANDARD=20
+      --preset=gitlab-ci
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-      -DACTS_ENABLE_LOG_FAILURE_THRESHOLD=ON
-      -DACTS_BUILD_EXAMPLES_PYTHON_BINDINGS=ON
-      -DACTS_FORCE_ASSERTIONS=OFF
-      -DACTS_BUILD_UNITTESTS=ON
-      -DACTS_BUILD_INTEGRATIONTESTS=ON
-      -DACTS_BUILD_BENCHMARKS=ON
-      -DACTS_BUILD_EXAMPLES=ON
-      -DACTS_BUILD_PLUGIN_DD4HEP=OFF
-      -DACTS_BUILD_PLUGIN_TGEO=ON
-      -DACTS_BUILD_PLUGIN_IDENTIFICATION=ON
-      -DACTS_BUILD_PLUGIN_JSON=ON
-      -DACTS_BUILD_FATRAS=ON
-      -DACTS_BUILD_PLUGIN_LEGACY=ON
-      -DACTS_BUILD_EXAMPLES_DD4HEP=OFF
-      -DACTS_BUILD_PLUGIN_EDM4HEP=OFF
-      -DACTS_BUILD_EXAMPLES_GEANT4=ON
-      -DACTS_BUILD_EXAMPLES_HEPMC3=ON
-      -DACTS_BUILD_EXAMPLES_PYTHIA8=ON
-      -DACTS_BUILD_FATRAS_GEANT4=ON
-      -DACTS_BUILD_FATRAS=ON
-      -DACTS_BUILD_ALIGNMENT=ON
-      -DACTS_BUILD_ANALYSIS_APPS=ON
-      -DACTS_BUILD_PLUGIN_ACTSVG=ON
 
     - ccache -z
     - cmake --build build -- -j2

diff --git a/CI/physmon/reference/performance_ambi_orthogonal.root b/CI/physmon/reference/performance_ambi_orthogonal.root
diff --git a/CI/physmon/reference/performance_ambi_seeded.root b/CI/physmon/reference/performance_ambi_seeded.root
diff --git a/CI/physmon/reference/performance_ambi_ttbar.root b/CI/physmon/reference/performance_ambi_ttbar.root
diff --git a/CI/physmon/reference/performance_amvf_gridseeder_seeded_hist.root b/CI/physmon/reference/performance_amvf_gridseeder_seeded_hist.root
diff --git a/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root b/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root
diff --git a/CI/physmon/reference/performance_amvf_orthogonal_hist.root b/CI/physmon/reference/performance_amvf_orthogonal_hist.root
diff --git a/CI/physmon/reference/performance_amvf_seeded_hist.root b/CI/physmon/reference/performance_amvf_seeded_hist.root
diff --git a/CI/physmon/reference/performance_amvf_truth_estimated_hist.root b/CI/physmon/reference/performance_amvf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/performance_amvf_truth_smeared_hist.root b/CI/physmon/reference/performance_amvf_truth_smeared_hist.root
diff --git a/CI/physmon/reference/performance_amvf_ttbar_hist.root b/CI/physmon/reference/performance_amvf_ttbar_hist.root
diff --git a/CI/physmon/reference/performance_ckf_orthogonal.root b/CI/physmon/reference/performance_ckf_orthogonal.root
diff --git a/CI/physmon/reference/performance_ckf_seeded.root b/CI/physmon/reference/performance_ckf_seeded.root
diff --git a/CI/physmon/reference/performance_ckf_truth_estimated.root b/CI/physmon/reference/performance_ckf_truth_estimated.root
diff --git a/CI/physmon/reference/performance_ckf_truth_smeared.root b/CI/physmon/reference/performance_ckf_truth_smeared.root
diff --git a/CI/physmon/reference/performance_ckf_ttbar.root b/CI/physmon/reference/performance_ckf_ttbar.root
diff --git a/CI/physmon/reference/performance_gsf.root b/CI/physmon/reference/performance_gsf.root
diff --git a/CI/physmon/reference/performance_gx2f.root b/CI/physmon/reference/performance_gx2f.root
diff --git a/CI/physmon/reference/performance_ivf_orthogonal_hist.root b/CI/physmon/reference/performance_ivf_orthogonal_hist.root
diff --git a/CI/physmon/reference/performance_ivf_seeded_hist.root b/CI/physmon/reference/performance_ivf_seeded_hist.root
diff --git a/CI/physmon/reference/performance_ivf_truth_estimated_hist.root b/CI/physmon/reference/performance_ivf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/performance_ivf_truth_smeared_hist.root b/CI/physmon/reference/performance_ivf_truth_smeared_hist.root
diff --git a/CI/physmon/reference/performance_truth_tracking.root b/CI/physmon/reference/performance_truth_tracking.root
diff --git a/CI/physmon/reference/tracksummary_ckf_orthogonal_hist.root b/CI/physmon/reference/tracksummary_ckf_orthogonal_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_seeded_hist.root b/CI/physmon/reference/tracksummary_ckf_seeded_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_truth_estimated_hist.root b/CI/physmon/reference/tracksummary_ckf_truth_estimated_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_truth_smeared_hist.root b/CI/physmon/reference/tracksummary_ckf_truth_smeared_hist.root
diff --git a/CI/physmon/reference/tracksummary_ckf_ttbar_hist.root b/CI/physmon/reference/tracksummary_ckf_ttbar_hist.root
diff --git a/CI/physmon/workflows/physmon_ckf_tracking.py b/CI/physmon/workflows/physmon_ckf_tracking.py
@@ -91,9 +91,19 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
             setup.trackingGeometry,
             setup.field,
             TruthSeedRanges(pt=(500 * u.MeV, None), nHits=(9, None)),
-            ParticleSmearingSigmas(
-                pRel=0.01
-            ),  # only used by SeedingAlgorithm.TruthSmeared
+            ParticleSmearingSigmas(  # only used by SeedingAlgorithm.TruthSmeared
+                # zero eveything so the CKF has a chance to find the measurements
+                d0=0,
+                d0PtA=0,
+                d0PtB=0,
+                z0=0,
+                z0PtA=0,
+                z0PtB=0,
+                t0=0,
+                phi=0,
+                theta=0,
+                ptRel=0,
+            ),
             SeedFinderConfigArg(
                 r=(33 * u.mm, 200 * u.mm),
                 deltaR=(1 * u.mm, 60 * u.mm),
@@ -125,9 +135,10 @@ def run_ckf_tracking(truthSmearedSeeded, truthEstimatedSeeded, label):
                 1 * u.mm,
                 1 * u.degree,
                 1 * u.degree,
-                0.1 / u.GeV,
+                0.1 * u.e / u.GeV,
                 1 * u.ns,
             ],
+            initialSigmaPtRel=0.01,
             initialVarInflation=[1.0] * 6,
             geoSelectionConfigFile=setup.geoSel,
             rnd=rnd,  # only used by SeedingAlgorithm.TruthSmeared

diff --git a/CI/physmon/workflows/physmon_vertexing.py b/CI/physmon/workflows/physmon_vertexing.py
@@ -105,9 +105,10 @@ def run_vertexing(fitter, mu, events):
                 1 * u.mm,
                 1 * u.degree,
                 1 * u.degree,
-                0.1 / u.GeV,
+                0.1 * u.e / u.GeV,
                 1 * u.ns,
             ],
+            initialSigmaPtRel=0.1,
             initialVarInflation=[1.0] * 6,
             geoSelectionConfigFile=setup.geoSel,
         )