Merge branch 'main' into explicit-core

.github/workflows/analysis.yml

@@ -22,7 +22,7 @@ env:
   CCACHE_MAXSIZE: 1.25G
   CCACHE_KEY_SUFFIX: r2
   ACTS_LOG_FAILURE_THRESHOLD: WARNING
-  DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
+  DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v5.tar.zst
 
 # NOTE this only builds core unittests to reduce the output size. if we
 #      found a way to have Github actions not fail regularly with this job

.github/workflows/builds.yml

@@ -20,6 +20,7 @@ env:
   CCACHE_DIR: ${{ github.workspace }}/ccache
   CCACHE_MAXSIZE: 500M
   CCACHE_KEY_SUFFIX: r2
+  DEPENDENCY_TAG: v5
 
 jobs:
   linux_ubuntu:
@@ -28,14 +29,16 @@ jobs:
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: CI/dependencies.sh
 
@@ -114,14 +117,16 @@ jobs:
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: CI/dependencies.sh
 
@@ -152,7 +157,6 @@ jobs:
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v4.tar.zst
 
     steps:
       - uses: actions/checkout@v4
@@ -161,6 +165,10 @@ jobs:
           lfs: true
 
       - run: apt-get update && apt-get install -y time
+
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: CI/dependencies.sh
 
@@ -246,13 +254,16 @@ jobs:
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.v4.tar.zst
+
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: CI/dependencies.sh
 
@@ -320,7 +331,7 @@ jobs:
     env:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v4.tar.zst
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -330,6 +341,9 @@ jobs:
       - name: Print architecture
         run: uname -p
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/macos-14/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: >
           brew install cmake ninja ccache xerces-c

.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   CCACHE_KEY_SUFFIX: r2
   CTEST_OUTPUT_ON_FAILURE: 1
 
-  DEPENDENCY_TAG: v4
+  DEPENDENCY_TAG: v5
 
 clang_tidy:
   stage: build

CI/check_unused_files.py

@@ -41,8 +41,6 @@ def main():
         ".gitignore",
         "README.md",
         "CMakeLists.txt",
-        "DetUtils.h",
-        "CommandLineArguments.h",
         # Filename not completed in source
         "vertexing_event_mu20_beamspot.csv",
         "vertexing_event_mu20_tracks.csv",

Core/include/Acts/EventData/GenericBoundTrackParameters.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/EventData/detail/PrintParameters.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -18,7 +19,6 @@
 #include <cassert>
 #include <cmath>
 #include <memory>
-#include <type_traits>
 
 namespace Acts {
 
@@ -61,7 +61,10 @@ class GenericBoundTrackParameters {
         m_cov(std::move(cov)),
         m_surface(std::move(surface)),
         m_particleHypothesis(std::move(particleHypothesis)) {
-    assert(m_surface);
+    // TODO set `validateAngleRange` to `true` after fixing caller code
+    assert(isBoundVectorValid(m_params, false) &&
+           "Invalid bound parameters vector");
+    assert(m_surface != nullptr && "Reference surface must not be null");
     normalizePhiTheta();
   }
 

Core/include/Acts/EventData/GenericFreeTrackParameters.hpp

@@ -11,17 +11,16 @@
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/EventData/TrackParametersConcept.hpp"
 #include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/EventData/detail/PrintParameters.hpp"
 #include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
-#include <cassert>
 #include <cmath>
 #include <optional>
-#include <type_traits>
 
 namespace Acts {
 
@@ -55,7 +54,9 @@ class GenericFreeTrackParameters {
                              ParticleHypothesis particleHypothesis)
       : m_params(params),
         m_cov(std::move(cov)),
-        m_particleHypothesis(std::move(particleHypothesis)) {}
+        m_particleHypothesis(std::move(particleHypothesis)) {
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
+  }
 
   /// Construct from four-position, direction, absolute momentum, and charge.
   ///
@@ -78,6 +79,8 @@ class GenericFreeTrackParameters {
     m_params[eFreeDir1] = dir[eMom1];
     m_params[eFreeDir2] = dir[eMom2];
     m_params[eFreeQOverP] = qOverP;
+
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
   }
 
   /// Construct from four-position, angles, absolute momentum, and charge.
@@ -103,6 +106,8 @@ class GenericFreeTrackParameters {
     m_params[eFreeDir1] = dir[eMom1];
     m_params[eFreeDir2] = dir[eMom2];
     m_params[eFreeQOverP] = qOverP;
+
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
   }
 
   /// Converts a free track parameter with a different hypothesis.

Core/include/Acts/EventData/Seed.hpp

@@ -14,8 +14,9 @@
 namespace Acts {
 
 template <typename external_spacepoint_t, std::size_t N = 3ul>
-  requires(N >= 3ul)
 class Seed {
+  static_assert(N >= 3ul);
+
  public:
   using value_type = external_spacepoint_t;
   static constexpr std::size_t DIM = N;

Core/include/Acts/EventData/Seed.ipp

@@ -9,40 +9,34 @@
 namespace Acts {
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 template <typename... args_t>
   requires(sizeof...(args_t) == N) &&
           (std::same_as<external_spacepoint_t, args_t> && ...)
 Seed<external_spacepoint_t, N>::Seed(const args_t&... points)
     : m_spacepoints({&points...}) {}
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 void Seed<external_spacepoint_t, N>::setVertexZ(float vertex) {
   m_vertexZ = vertex;
 }
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 void Seed<external_spacepoint_t, N>::setQuality(float seedQuality) {
   m_seedQuality = seedQuality;
 }
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 const std::array<const external_spacepoint_t*, N>&
 Seed<external_spacepoint_t, N>::sp() const {
   return m_spacepoints;
 }
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 float Seed<external_spacepoint_t, N>::z() const {
   return m_vertexZ;
 }
 
 template <typename external_spacepoint_t, std::size_t N>
-  requires(N >= 3ul)
 float Seed<external_spacepoint_t, N>::seedQuality() const {
   return m_seedQuality;
 }

Core/include/Acts/EventData/TrackParameterHelpers.hpp

@@ -8,12 +8,41 @@
 
 #pragma once
 
-#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Utilities/detail/periodic.hpp"
 
+#include <limits>
+
 namespace Acts {
 
+/// Check if a bound vector is valid. This checks the following:
+/// - All values are finite
+/// - (optionally) The phi value is in the range [-pi, pi)
+/// - (optionally) The theta value is in the range [0, pi]
+///
+/// @param v The bound vector to check
+/// @param validateAngleRange If true, the phi and theta values are range checked
+/// @param epsilon The epsilon to use for the checks
+/// @param maxAbsEta The maximum allowed eta value
+///
+/// @return True if the bound vector is valid
+bool isBoundVectorValid(
+    const BoundVector& v, bool validateAngleRange, double epsilon = 1e-6,
+    double maxAbsEta = std::numeric_limits<double>::infinity());
+
+/// Check if a free vector is valid. This checks the following:
+/// - All values are finite
+/// - Direction is normalized
+///
+/// @param v The free vector to check
+/// @param epsilon The epsilon to use for the checks
+/// @param maxAbsEta The maximum allowed eta value
+///
+/// @return True if the free vector is valid
+bool isFreeVectorValid(
+    const FreeVector& v, double epsilon = 1e-6,
+    double maxAbsEta = std::numeric_limits<double>::infinity());
+
 /// Normalize the bound parameter angles
 ///
 /// @param boundParams The bound parameters to normalize
@@ -26,8 +55,20 @@ inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) {
   return result;
 }
 
+/// Add bound parameters and take care of angle periodicity for phi and theta.
+/// This is intended for small differences only i.e. KF updates.
+///
+/// @param lhs The left hand side bound parameters
+/// @param rhs The right hand side bound parameters
+///
+/// @return The sum of the bound parameters
+inline BoundVector addBoundParameters(const BoundVector& lhs,
+                                      const BoundVector& rhs) {
+  return normalizeBoundParameters(lhs + rhs);
+}
+
 /// Subtract bound parameters and take care of angle periodicity for phi and
-/// theta.
+/// theta. This is intended for small differences only i.e. KF updates.
 ///
 /// @param lhs The left hand side bound parameters
 /// @param rhs The right hand side bound parameters
@@ -36,8 +77,8 @@ inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) {
 inline BoundVector subtractBoundParameters(const BoundVector& lhs,
                                            const BoundVector& rhs) {
   BoundVector result = lhs - rhs;
-  result[eBoundPhi] =
-      detail::difference_periodic(lhs[eBoundPhi], rhs[eBoundPhi], 2 * M_PI);
+  result[eBoundPhi] = detail::radian_sym(result[eBoundPhi]);
+  result[eBoundTheta] = detail::radian_sym(result[eBoundTheta]);
   return result;
 }
 

Core/include/Acts/EventData/TrackParametersConcept.hpp

@@ -12,9 +12,7 @@
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 
-#include <concepts>
 #include <optional>
-#include <type_traits>
 
 namespace Acts {
 
@@ -68,4 +66,5 @@ concept BoundTrackParametersConcept =
         { p.position(c) } -> std::same_as<Vector3>;
       };
     };
+
 }  // namespace Acts