Merge branch 'main' of github.com:acts-project/acts into ex-split-par…

…ticle-selection

.gitignore

@@ -15,7 +15,7 @@ genConf
 x86_64-slc6-gcc48-opt
 x86_64-slc6-gcc49-opt
 .*
-build*
+/build*
 .asetup.save
 
 #json output
@@ -30,7 +30,7 @@ build*
 
 # dont ignore hidden configs
 !.clang-format
-!.github/**
+!.github
 !.gitignore
 !.gitlab-ci.yml
 !.clang-tidy

CI/codespell_ignore.txt

@@ -1,24 +1,21 @@
+aline
+ans
+boxs
 bu
-strack
-compres
 coner
+dependees
 dthe
-iself
-sortings
+exprot
 gaus
-te
-parm
-writet
-localy
+iself
 lastr
-exprot
+localy
+millepede
+parm
+pixelx
 pring
-aline
-boxs
-ans
-dthe
-dthe
+sortings
+strack
+te
 vart
-pixelx
-millepede
-dependees
+writet

Core/include/Acts/Definitions/Algebra.hpp

@@ -77,8 +77,8 @@ using Translation2 = Eigen::Translation<double, 2>;
 using Translation3 = Eigen::Translation<double, 3>;
 
 // linear (rotation) matrices
-using RotationMatrix2 = ActsMatrix<2, 2>;
-using RotationMatrix3 = ActsMatrix<3, 3>;
+using RotationMatrix2 = SquareMatrix2;
+using RotationMatrix3 = SquareMatrix3;
 
 // pure rotation defined by a rotation angle around a rotation axis
 using AngleAxis3 = Eigen::AngleAxis<double>;

Core/include/Acts/Definitions/Units.hpp

@@ -201,12 +201,12 @@ constexpr double mol = 1.0;
 
 namespace UnitLiterals {
 // define user literal functions for the given unit constant
-#define ACTS_DEFINE_UNIT_LITERAL(name)                        \
-  constexpr double operator"" _##name(long double x) {        \
-    return ::Acts::UnitConstants::name * x;                   \
-  }                                                           \
-  constexpr double operator"" _##name(unsigned long long x) { \
-    return ::Acts::UnitConstants::name * x;                   \
+#define ACTS_DEFINE_UNIT_LITERAL(name)                       \
+  constexpr double operator""_##name(long double x) {        \
+    return ::Acts::UnitConstants::name * x;                  \
+  }                                                          \
+  constexpr double operator""_##name(unsigned long long x) { \
+    return ::Acts::UnitConstants::name * x;                  \
   }
 ACTS_DEFINE_UNIT_LITERAL(fm)
 ACTS_DEFINE_UNIT_LITERAL(pm)

Core/include/Acts/EventData/GenericBoundTrackParameters.hpp

@@ -123,10 +123,10 @@ class GenericBoundTrackParameters {
   /// Parameters vector.
   const ParametersVector& parameters() const { return m_params; }
   /// Vector of spatial impact parameters (i.e., d0 and z0)
-  ActsVector<2> spatialImpactParameters() const { return m_params.head<2>(); }
+  Vector2 spatialImpactParameters() const { return m_params.head<2>(); }
   /// Vector of spatial and temporal impact parameters (i.e., d0, z0, and t)
-  ActsVector<3> impactParameters() const {
-    ActsVector<3> ip;
+  Vector3 impactParameters() const {
+    Vector3 ip;
     ip.template head<2>() = m_params.template head<2>();
     ip(2) = m_params(eBoundTime);
     return ip;

Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp

@@ -56,7 +56,7 @@ concept CommonMultiTrajectoryBackend =
 
       {
         cv.template calibrated_impl<2>(istate)
-      } -> std::same_as<Eigen::Map<const ActsVector<2>>>;
+      } -> std::same_as<Eigen::Map<const Vector2>>;
 
       {
         cv.template calibratedCovariance_impl<2>(istate)
@@ -86,7 +86,7 @@ concept ConstMultiTrajectoryBackend =
 
       {
         v.template calibrated_impl<2>(istate)
-      } -> std::same_as<Eigen::Map<const ActsVector<2>>>;
+      } -> std::same_as<Eigen::Map<const Vector2>>;
 
       {
         v.template calibratedCovariance_impl<2>(istate)
@@ -107,7 +107,7 @@ concept MutableMultiTrajectoryBackend =
 
       {
         v.template calibrated_impl<2>(istate)
-      } -> std::same_as<Eigen::Map<ActsVector<2>>>;
+      } -> std::same_as<Eigen::Map<Vector2>>;
 
       {
         v.template calibratedCovariance_impl<2>(istate)

Core/include/Acts/EventData/TrackStateProxy.hpp

@@ -16,6 +16,7 @@
 #include "Acts/EventData/TrackStateType.hpp"
 #include "Acts/EventData/Types.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/EigenConcepts.hpp"
 #include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 
@@ -782,12 +783,11 @@ class TrackStateProxy {
   template <typename val_t, typename cov_t>
   void allocateCalibrated(const Eigen::DenseBase<val_t>& val,
                           const Eigen::DenseBase<cov_t>& cov)
-    requires(Eigen::PlainObjectBase<val_t>::RowsAtCompileTime > 0 &&
-             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime <= eBoundSize &&
-             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime ==
-                 Eigen::PlainObjectBase<cov_t>::RowsAtCompileTime &&
-             Eigen::PlainObjectBase<cov_t>::RowsAtCompileTime ==
-                 Eigen::PlainObjectBase<cov_t>::ColsAtCompileTime)
+    requires(Concepts::eigen_base_is_fixed_size<val_t> &&
+             Concepts::eigen_bases_have_same_num_rows<val_t, cov_t> &&
+             Concepts::eigen_base_is_square<cov_t> &&
+             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime <=
+                 static_cast<std::underlying_type_t<BoundIndices>>(eBoundSize))
   {
     m_traj->template allocateCalibrated<
         Eigen::PlainObjectBase<val_t>::RowsAtCompileTime>(m_istate, val, cov);

Core/include/Acts/EventData/TrackStateProxyConcept.hpp

@@ -28,10 +28,10 @@ using Covariance = Eigen::Map<BoundMatrix>;
 using ConstParameters = Eigen::Map<const BoundVector>;
 using ConstCovariance = Eigen::Map<const BoundMatrix>;
 
-using Measurement = Eigen::Map<ActsVector<2>>;
+using Measurement = Eigen::Map<Vector2>;
 using MeasurementCovariance = Eigen::Map<ActsSquareMatrix<2>>;
 
-using ConstMeasurement = Eigen::Map<const ActsVector<2>>;
+using ConstMeasurement = Eigen::Map<const Vector2>;
 using ConstMeasurementCovariance = Eigen::Map<const ActsSquareMatrix<2>>;
 
 using DynamicMeasurement =

Core/include/Acts/EventData/VectorMultiTrajectory.hpp

@@ -16,6 +16,7 @@
 #include "Acts/EventData/Types.hpp"
 #include "Acts/EventData/detail/DynamicColumn.hpp"
 #include "Acts/EventData/detail/DynamicKeyIterator.hpp"
+#include "Acts/Utilities/EigenConcepts.hpp"
 #include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/ThrowAssert.hpp"
@@ -191,7 +192,7 @@ class VectorMultiTrajectoryBase {
     TrackStatePropMask allocMask = TrackStatePropMask::None;
   };
 
-  VectorMultiTrajectoryBase() = default;
+  VectorMultiTrajectoryBase() noexcept = default;
 
   VectorMultiTrajectoryBase(const VectorMultiTrajectoryBase& other)
       : m_index{other.m_index},
@@ -387,7 +388,7 @@ class VectorMultiTrajectory final
   VectorMultiTrajectory(const VectorMultiTrajectory& other)
       : VectorMultiTrajectoryBase{other} {}
 
-  VectorMultiTrajectory(VectorMultiTrajectory&& other)
+  VectorMultiTrajectory(VectorMultiTrajectory&& other) noexcept
       : VectorMultiTrajectoryBase{std::move(other)} {}
 
   Statistics statistics() const {
@@ -495,13 +496,11 @@ class VectorMultiTrajectory final
   void allocateCalibrated_impl(IndexType istate,
                                const Eigen::DenseBase<val_t>& val,
                                const Eigen::DenseBase<cov_t>& cov)
-
-    requires(Eigen::PlainObjectBase<val_t>::RowsAtCompileTime > 0 &&
-             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime <= eBoundSize &&
-             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime ==
-                 Eigen::PlainObjectBase<cov_t>::RowsAtCompileTime &&
-             Eigen::PlainObjectBase<cov_t>::RowsAtCompileTime ==
-                 Eigen::PlainObjectBase<cov_t>::ColsAtCompileTime)
+    requires(Concepts::eigen_base_is_fixed_size<val_t> &&
+             Concepts::eigen_bases_have_same_num_rows<val_t, cov_t> &&
+             Concepts::eigen_base_is_square<cov_t> &&
+             Eigen::PlainObjectBase<val_t>::RowsAtCompileTime <=
+                 static_cast<std::underlying_type_t<BoundIndices>>(eBoundSize))
   {
     constexpr std::size_t measdim = val_t::RowsAtCompileTime;
 

Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp

@@ -1235,7 +1235,7 @@ class MultiTrajectoryTestsCommon {
     auto [par2, cov2] = generateBoundParametersCovariance(rng, {});
 
     ts.allocateCalibrated(3);
-    BOOST_CHECK_EQUAL(ts.template calibrated<3>(), ActsVector<3>::Zero());
+    BOOST_CHECK_EQUAL(ts.template calibrated<3>(), Vector3::Zero());
     BOOST_CHECK_EQUAL(ts.template calibratedCovariance<3>(),
                       ActsSquareMatrix<3>::Zero());
 

Core/include/Acts/EventData/detail/TestSourceLink.hpp

@@ -41,7 +41,7 @@ struct TestSourceLink final {
   std::size_t sourceId = 0u;
   // use eBoundSize to indicate unused indices
   std::array<BoundIndices, 2> indices = {eBoundSize, eBoundSize};
-  Acts::ActsVector<2> parameters;
+  Acts::Vector2 parameters;
   Acts::ActsSquareMatrix<2> covariance;
 
   /// Construct a source link for a 1d measurement.
@@ -52,10 +52,10 @@ struct TestSourceLink final {
         sourceId(sid),
         indices{idx, eBoundSize},
         parameters(val, 0),
-        covariance(Acts::ActsVector<2>(var, 0).asDiagonal()) {}
+        covariance(Acts::Vector2(var, 0).asDiagonal()) {}
   /// Construct a source link for a 2d measurement.
   TestSourceLink(BoundIndices idx0, BoundIndices idx1,
-                 const Acts::ActsVector<2>& params,
+                 const Acts::Vector2& params,
                  const Acts::ActsSquareMatrix<2>& cov,
                  GeometryIdentifier gid = GeometryIdentifier(),
                  std::size_t sid = 0u)

Core/include/Acts/Geometry/CutoutCylinderVolumeBounds.hpp

@@ -15,7 +15,6 @@
 #include <array>
 #include <iosfwd>
 #include <memory>
-#include <stdexcept>
 #include <vector>
 
 namespace Acts {
@@ -47,8 +46,6 @@ class CutoutCylinderVolumeBounds : public VolumeBounds {
     eSize
   };
 
-  CutoutCylinderVolumeBounds() = delete;
-
   /// Constructor from defining parameters
   ///
   /// @param rmin Minimum radius at the "choke points"
@@ -73,8 +70,6 @@ class CutoutCylinderVolumeBounds : public VolumeBounds {
     buildSurfaceBounds();
   }
 
-  ~CutoutCylinderVolumeBounds() override = default;
-
   VolumeBounds::BoundsType type() const final {
     return VolumeBounds::eCutoutCylinder;
   }
@@ -151,24 +146,4 @@ class CutoutCylinderVolumeBounds : public VolumeBounds {
   void checkConsistency() noexcept(false);
 };
 
-inline std::vector<double> CutoutCylinderVolumeBounds::values() const {
-  std::vector<double> valvector;
-  valvector.insert(valvector.begin(), m_values.begin(), m_values.end());
-  return valvector;
-}
-
-inline void CutoutCylinderVolumeBounds::checkConsistency() noexcept(false) {
-  if (get(eMinR) < 0. || get(eMedR) <= 0. || get(eMaxR) <= 0. ||
-      get(eMinR) >= get(eMedR) || get(eMinR) >= get(eMaxR) ||
-      get(eMedR) >= get(eMaxR)) {
-    throw std::invalid_argument(
-        "CutoutCylinderVolumeBounds: invalid radial input.");
-  }
-  if (get(eHalfLengthZ) <= 0 || get(eHalfLengthZcutout) <= 0. ||
-      get(eHalfLengthZcutout) > get(eHalfLengthZ)) {
-    throw std::invalid_argument(
-        "CutoutCylinderVolumeBounds: invalid longitudinal input.");
-  }
-}
-
 }  // namespace Acts

Core/include/Acts/Geometry/GeometryHierarchyMap.hpp

@@ -79,10 +79,10 @@ class GeometryHierarchyMap {
   // defaulted constructors and assignment operators
   GeometryHierarchyMap() = default;
   GeometryHierarchyMap(const GeometryHierarchyMap&) = default;
-  GeometryHierarchyMap(GeometryHierarchyMap&&) = default;
+  GeometryHierarchyMap(GeometryHierarchyMap&&) noexcept = default;
   ~GeometryHierarchyMap() = default;
   GeometryHierarchyMap& operator=(const GeometryHierarchyMap&) = default;
-  GeometryHierarchyMap& operator=(GeometryHierarchyMap&&) = default;
+  GeometryHierarchyMap& operator=(GeometryHierarchyMap&&) noexcept = default;
 
   /// Return an iterator pointing to the beginning of the stored values.
   Iterator begin() const { return m_values.begin(); }

Core/include/Acts/Geometry/IConfinedTrackingVolumeBuilder.hpp

@@ -7,6 +7,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
+
 #include <memory>
 #include <vector>
 

Core/include/Acts/Geometry/ITrackingGeometryBuilder.hpp

@@ -7,6 +7,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
+
 #include "Acts/Geometry/GeometryContext.hpp"
 
 #include <memory>

Core/include/Acts/Geometry/ProtoLayer.hpp

@@ -7,6 +7,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
+
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/Surface.hpp"

Core/include/Acts/MagneticField/BFieldMapUtils.hpp

@@ -7,6 +7,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
+
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/MagneticField/InterpolatedBFieldMap.hpp"

Core/include/Acts/MagneticField/ConstantBField.hpp

@@ -7,6 +7,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
+
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/MagneticField/MagneticFieldProvider.hpp"
@@ -44,21 +45,6 @@ class ConstantBField final : public MagneticFieldProvider {
     return Result<Vector3>::success(m_BField);
   }
 
-  /// @copydoc MagneticFieldProvider::getFieldGradient(const Vector3&,ActsMatrix<3,3>&,MagneticFieldProvider::Cache&) const
-  ///
-  /// @note The @p position is ignored and only kept as argument to provide
-  ///       a consistent interface with other magnetic field services.
-  /// @note currently the derivative is not calculated
-  /// @todo return derivative
-  Result<Vector3> getFieldGradient(
-      const Vector3& position, ActsMatrix<3, 3>& derivative,
-      MagneticFieldProvider::Cache& cache) const override {
-    (void)position;
-    (void)derivative;
-    (void)cache;
-    return Result<Vector3>::success(m_BField);
-  }
-
   /// @copydoc MagneticFieldProvider::makeCache(const MagneticFieldContext&) const
   Acts::MagneticFieldProvider::Cache makeCache(
       const Acts::MagneticFieldContext& mctx) const override {

Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp

@@ -12,7 +12,6 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/MagneticField/MagneticFieldError.hpp"
 #include "Acts/MagneticField/MagneticFieldProvider.hpp"
-#include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Interpolation.hpp"
 #include "Acts/Utilities/Result.hpp"
 
@@ -309,18 +308,6 @@ class InterpolatedBFieldMap : public InterpolatedMagneticField {
     return Result<Vector3>::success((*lcache.fieldCell).getField(gridPosition));
   }
 
-  /// @copydoc MagneticFieldProvider::getFieldGradient(const Vector3&,ActsMatrix<3,3>&,MagneticFieldProvider::Cache&) const
-  ///
-  /// @note currently the derivative is not calculated
-  /// @note Cache is not used currently
-  /// @todo return derivative
-  Result<Vector3> getFieldGradient(
-      const Vector3& position, ActsMatrix<3, 3>& derivative,
-      MagneticFieldProvider::Cache& cache) const final {
-    (void)derivative;
-    return getField(position, cache);
-  }
-
  private:
   Config m_cfg;