From 90c6bf0ca051f3d9e6485ca88e6419ed01ec7566 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 22 May 2026 09:06:15 +0200 Subject: [PATCH 1/2] chore!: Remove deprecated API --- Core/include/Acts/Definitions/Algebra.hpp | 26 ------------------- .../Acts/Definitions/TrackParametrization.hpp | 6 ----- .../Acts/EventData/BoundTrackParameters.hpp | 9 ------- Core/include/Acts/EventData/Charge.hpp | 20 -------------- Core/include/Acts/EventData/ChargeConcept.hpp | 20 -------------- .../EventData/GenericBoundTrackParameters.hpp | 23 ---------------- .../EventData/GenericFreeTrackParameters.hpp | 23 ---------------- .../EventData/GenericParticleHypothesis.hpp | 23 ---------------- .../MultiComponentTrackParameters.hpp | 9 ------- .../Acts/EventData/MultiTrajectory.hpp | 23 ---------------- .../Acts/EventData/TrackParameters.hpp | 22 ---------------- .../include/Acts/Geometry/GeometryContext.hpp | 9 +++---- .../ActsExamples/Framework/IAlgorithm.hpp | 8 ------ .../Framework/src/Framework/IAlgorithm.cpp | 3 --- .../include/ActsPlugins/Gnn/ModuleMapCuda.hpp | 3 --- 15 files changed, 3 insertions(+), 224 deletions(-) delete mode 100644 Core/include/Acts/EventData/Charge.hpp delete mode 100644 Core/include/Acts/EventData/ChargeConcept.hpp delete mode 100644 Core/include/Acts/EventData/GenericBoundTrackParameters.hpp delete mode 100644 Core/include/Acts/EventData/GenericFreeTrackParameters.hpp delete mode 100644 Core/include/Acts/EventData/GenericParticleHypothesis.hpp delete mode 100644 Core/include/Acts/EventData/TrackParameters.hpp diff --git a/Core/include/Acts/Definitions/Algebra.hpp b/Core/include/Acts/Definitions/Algebra.hpp index 8a8b185a363..dbff4de717f 100644 --- a/Core/include/Acts/Definitions/Algebra.hpp +++ b/Core/include/Acts/Definitions/Algebra.hpp @@ -66,32 +66,6 @@ using DynamicVector = Eigen::Matrix; /// @brief Dynamic-sized matrix type using DynamicMatrix = Eigen::Matrix; -/// @brief Fixed-size vector type for N-dimensional vectors -/// @tparam kSize The dimension of the vector -/// @deprecated Use Vector instead -template -using ActsVector [[deprecated("Use Vector instead")]] = Vector; -/// @brief Fixed-size matrix type for NxM matrices -/// @tparam kRows Number of rows -/// @tparam kCols Number of columns -/// @deprecated Use Matrix instead -template -using ActsMatrix [[deprecated("Use Matrix instead")]] = Matrix; -/// @brief Fixed-size square matrix type for NxN matrices -/// @tparam kSize The dimension of the square matrix -/// @deprecated Use SquareMatrix instead -template -using ActsSquareMatrix [[deprecated("Use SquareMatrix instead")]] = - SquareMatrix; -/// @brief Dynamic-sized vector type -/// @deprecated Use DynamicVector instead -using ActsDynamicVector [[deprecated("Use DynamicVector instead")]] = - DynamicVector; -/// @brief Dynamic-sized matrix type -/// @deprecated Use DynamicMatrix instead -using ActsDynamicMatrix [[deprecated("Use DynamicMatrix instead")]] = - DynamicMatrix; - /// @brief 2-dimensional vector type for 2D coordinates using Vector2 = Vector<2>; /// @brief 3-dimensional vector type for e.g. spatial coordinates and momenta diff --git a/Core/include/Acts/Definitions/TrackParametrization.hpp b/Core/include/Acts/Definitions/TrackParametrization.hpp index e7d6f58be27..0dc0aa61f75 100644 --- a/Core/include/Acts/Definitions/TrackParametrization.hpp +++ b/Core/include/Acts/Definitions/TrackParametrization.hpp @@ -118,9 +118,6 @@ static_assert(eFreeDir2 == eFreeDir0 + 2u, "Direction must be continuous"); using BoundVector = Vector; /// @brief Matrix type for bound track parameter transformations using BoundMatrix = Matrix; -/// @brief Square matrix type for bound track parameter covariance -using BoundSquareMatrix [[deprecated("Use BoundMatrix instead")]] = - SquareMatrix; /// @brief Matrix type for mapping from bound to free track parameters using BoundToFreeMatrix = Matrix; @@ -129,9 +126,6 @@ using BoundToFreeMatrix = Matrix; using FreeVector = Vector; /// @brief Matrix type for free track parameter transformations using FreeMatrix = Matrix; -/// @brief Square matrix type for free track parameter covariance -using FreeSquareMatrix [[deprecated("Use FreeMatrix instead")]] = - SquareMatrix; /// @brief Matrix type for mapping from free to bound track parameters using FreeToBoundMatrix = Matrix; /// @brief Matrix type for mapping from free parameters to path length diff --git a/Core/include/Acts/EventData/BoundTrackParameters.hpp b/Core/include/Acts/EventData/BoundTrackParameters.hpp index adbafc3eb67..ef7cd1a7b37 100644 --- a/Core/include/Acts/EventData/BoundTrackParameters.hpp +++ b/Core/include/Acts/EventData/BoundTrackParameters.hpp @@ -136,15 +136,6 @@ class BoundTrackParameters { normalizePhiTheta(); } - /// Convert this track parameter object to the general type-erased one - /// @return Type-erased bound track parameters - [[deprecated( - "You already have a universal bound track parameter at hand. You can " - "drop `toBound()`.")]] - BoundTrackParameters toBound() const { - return BoundTrackParameters{*this}; - } - /// Parameters vector. /// @return Mutable reference to the parameters vector BoundVector& parameters() { return m_params; } diff --git a/Core/include/Acts/EventData/Charge.hpp b/Core/include/Acts/EventData/Charge.hpp deleted file mode 100644 index fc2e698ab5f..00000000000 --- a/Core/include/Acts/EventData/Charge.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/ParticleHypothesis.hpp" - -namespace { -[[deprecated( - "This header is deprecated. Please include the particle hypothesis header " - "instead.")]] -constexpr static int Acts_EventData_Charge_hpp_is_deprecated = 0; -constexpr static int please_dont_use_Acts_EventData_Charge_hpp = - Acts_EventData_Charge_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/EventData/ChargeConcept.hpp b/Core/include/Acts/EventData/ChargeConcept.hpp deleted file mode 100644 index 2fe66839ae1..00000000000 --- a/Core/include/Acts/EventData/ChargeConcept.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/ParticleHypothesis.hpp" - -namespace { -[[deprecated( - "This header is deprecated. There is no replacement as the charge " - "hypothesis is now one concrete type.")]] -constexpr static int Acts_EventData_ChargeConcept_hpp_is_deprecated = 0; -constexpr static int please_dont_use_Acts_EventData_ChargeConcept_hpp = - Acts_EventData_ChargeConcept_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp b/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp deleted file mode 100644 index ecf2feef6c0..00000000000 --- a/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/BoundTrackParameters.hpp" - -namespace { -[[deprecated( - "This header is deprecated. Please include the bound track parameters " - "header " - "instead.")]] -constexpr static int - Acts_EventData_GenericBoundTrackParameters_hpp_is_deprecated = 0; -constexpr static int - please_dont_use_Acts_EventData_GenericBoundTrackParameters_hpp = - Acts_EventData_GenericBoundTrackParameters_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp b/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp deleted file mode 100644 index ed548499a14..00000000000 --- a/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/FreeTrackParameters.hpp" - -namespace { -[[deprecated( - "This header is deprecated. Please include the free track parameters " - "header " - "instead.")]] -constexpr static int - Acts_EventData_GenericFreeTrackParameters_hpp_is_deprecated = 0; -constexpr static int - please_dont_use_Acts_EventData_GenericFreeTrackParameters_hpp = - Acts_EventData_GenericFreeTrackParameters_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/EventData/GenericParticleHypothesis.hpp b/Core/include/Acts/EventData/GenericParticleHypothesis.hpp deleted file mode 100644 index 88f258f2565..00000000000 --- a/Core/include/Acts/EventData/GenericParticleHypothesis.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/ParticleHypothesis.hpp" - -namespace { -[[deprecated( - "This header is deprecated. Please include the particle hypothesis " - "header " - "instead.")]] -constexpr static int - Acts_EventData_GenericParticleHypothesis_hpp_is_deprecated = 0; -constexpr static int - please_dont_use_Acts_EventData_GenericParticleHypothesis_hpp = - Acts_EventData_GenericParticleHypothesis_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp b/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp index 0db08b30b36..289e7a07989 100644 --- a/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp +++ b/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp @@ -213,15 +213,6 @@ class MultiComponentBoundTrackParameters { MultiComponentBoundTrackParameters& operator=( MultiComponentBoundTrackParameters&&) = default; - /// Comply with bound convertible, in this case return a copy - /// @return Copy of this multi-component track parameters - [[deprecated( - "You already have a universal bound track parameter at hand. You can " - "drop `toBound()`.")]] - MultiComponentBoundTrackParameters toBound() const { - return *this; - } - /// Size of the multi-component parameters /// @return Number of components in the multi-component parameters std::size_t size() const { return m_weights.size(); } diff --git a/Core/include/Acts/EventData/MultiTrajectory.hpp b/Core/include/Acts/EventData/MultiTrajectory.hpp index 2c83058d5b5..e5b8a4cf950 100644 --- a/Core/include/Acts/EventData/MultiTrajectory.hpp +++ b/Core/include/Acts/EventData/MultiTrajectory.hpp @@ -126,29 +126,6 @@ concept VisitorConcept = requires(T& t, TS& ts) { } // namespace detail_lt -/// This namespace contains typedefs and constant values that are used by -/// other parts of the @c MultiTrajectory implementation. It extracts these -/// from @c TrackStateTraits using the default maximum measurement dimension. -/// @deprecated Use aliased types and constants directly -namespace MultiTrajectoryTraits { - -/// Maximum number of measurement dimensions supported by trajectory -/// @deprecated Use @ref Acts::kMeasurementSizeMax instead. -[[deprecated("Use Acts::kMeasurementSizeMax instead.")]] -constexpr unsigned int MeasurementSizeMax = kMeasurementSizeMax; - -/// Type alias for trajectory index type -/// @deprecated Use @ref Acts::TrackIndexType instead. -using IndexType [[deprecated("Use Acts::TrackIndexType instead.")]] = - TrackIndexType; - -/// Invalid track state index constant -/// @deprecated Use @ref Acts::kTrackIndexInvalid instead. -[[deprecated("Use Acts::kTrackIndexInvalid instead.")]] -constexpr IndexType kInvalid = kTrackIndexInvalid; - -} // namespace MultiTrajectoryTraits - template struct IsReadOnlyMultiTrajectory; diff --git a/Core/include/Acts/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp deleted file mode 100644 index 81e40c627fb..00000000000 --- a/Core/include/Acts/EventData/TrackParameters.hpp +++ /dev/null @@ -1,22 +0,0 @@ -// This file is part of the ACTS project. -// -// Copyright (C) 2016 CERN for the benefit of the ACTS project -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/BoundTrackParameters.hpp" -#include "Acts/EventData/FreeTrackParameters.hpp" -#include "Acts/EventData/ParticleHypothesis.hpp" - -namespace { -[[deprecated( - "This header is deprecated. Please include the specific track parameters " - "header instead.")]] -constexpr static int Acts_EventData_TrackParameters_hpp_is_deprecated = 0; -constexpr static int please_dont_use_Acts_EventData_TrackParameters_hpp = - Acts_EventData_TrackParameters_hpp_is_deprecated; -} // namespace diff --git a/Core/include/Acts/Geometry/GeometryContext.hpp b/Core/include/Acts/Geometry/GeometryContext.hpp index eba1a22d468..9eae4cc2b78 100644 --- a/Core/include/Acts/Geometry/GeometryContext.hpp +++ b/Core/include/Acts/Geometry/GeometryContext.hpp @@ -55,12 +55,6 @@ class GeometryContext : public ContextType { ACTS_POP_IGNORE_DEPRECATED() } - /// Default constructor - /// @deprecated Use GeometryContext::dangerouslyDefaultConstruct() instead - /// to make empty context construction explicit - [[deprecated("Use GeometryContext::dangerouslyDefaultConstruct() instead")]] - GeometryContext() = default; - /// Move construct from arbitrary type (inherited from ContextType) /// @tparam T The type of the value to construct from /// @param value The value to construct from @@ -79,6 +73,9 @@ class GeometryContext : public ContextType { /// Inherit assignment operators using ContextType::operator=; + + private: + GeometryContext() = default; }; /// Helper struct that stores an object and a context, and will print it to diff --git a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp index de79dcabb83..a9f6f09feec 100644 --- a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp +++ b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp @@ -24,14 +24,6 @@ namespace ActsExamples { /// Algorithm implementations only need to implement the `execute` method. class IAlgorithm : public SequenceElement { public: - /// Constructor - /// - /// @name The algorithm name - /// @level The logging level for this algorithm - /// @deprecated Use the constructor with a logger instead - [[deprecated("Use the constructor with a logger instead")]] - explicit IAlgorithm(const std::string& name, Acts::Logging::Level level); - /// Constructor /// /// @name The algorithm name diff --git a/Examples/Framework/src/Framework/IAlgorithm.cpp b/Examples/Framework/src/Framework/IAlgorithm.cpp index 0ac82102e24..feafa57cd85 100644 --- a/Examples/Framework/src/Framework/IAlgorithm.cpp +++ b/Examples/Framework/src/Framework/IAlgorithm.cpp @@ -14,9 +14,6 @@ namespace ActsExamples { -IAlgorithm::IAlgorithm(const std::string& name, Acts::Logging::Level level) - : IAlgorithm(name, Acts::getDefaultLogger(name, level)) {} - IAlgorithm::IAlgorithm(const std::string& name, std::unique_ptr logger) : m_name(name), diff --git a/Plugins/Gnn/include/ActsPlugins/Gnn/ModuleMapCuda.hpp b/Plugins/Gnn/include/ActsPlugins/Gnn/ModuleMapCuda.hpp index f5f27d83eed..8085c8f7fa4 100644 --- a/Plugins/Gnn/include/ActsPlugins/Gnn/ModuleMapCuda.hpp +++ b/Plugins/Gnn/include/ActsPlugins/Gnn/ModuleMapCuda.hpp @@ -35,9 +35,6 @@ class ModuleMapCuda : public GraphConstructionBase { /// Pseudorapidity scaling factor float etaScale = 1.0; - /// @deprecated Has no effect and will be removed in a future release. - [[deprecated("moreParallel has no effect and will be removed")]] - bool moreParallel = true; /// CUDA device ID int gpuDevice = 0; /// Number of GPU blocks From 7eee7721c7c3ad0fd0f467fbf7113900a02d6846 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 22 May 2026 09:08:19 +0200 Subject: [PATCH 2/2] couple more --- .../Acts/EventData/SpacePointColumns.hpp | 6 ------ .../include/Acts/EventData/TrackStateType.hpp | 21 ------------------- 2 files changed, 27 deletions(-) diff --git a/Core/include/Acts/EventData/SpacePointColumns.hpp b/Core/include/Acts/EventData/SpacePointColumns.hpp index b864ea8358c..65c65fb411c 100644 --- a/Core/include/Acts/EventData/SpacePointColumns.hpp +++ b/Core/include/Acts/EventData/SpacePointColumns.hpp @@ -50,12 +50,6 @@ enum class SpacePointColumns : std::uint32_t { TopStripVector | BottomStripVector | StripCenterDistance | TopStripCenter | CopyFromIndex | PackedXY | PackedZR | PackedXYZ | PackedXYZR | PackedVarianceZR, - - XY [[deprecated("Use PackedXY instead")]] = 1 << 15, - ZR [[deprecated("Use PackedZR instead")]] = 1 << 16, - XYZ [[deprecated("Use PackedXYZ instead")]] = 1 << 17, - XYZR [[deprecated("Use PackedXYZR instead")]] = 1 << 18, - VarianceZR [[deprecated("Use PackedVarianceZR instead")]] = 1 << 19, }; /// Enable bitwise operators for SpacePointColumns enum diff --git a/Core/include/Acts/EventData/TrackStateType.hpp b/Core/include/Acts/EventData/TrackStateType.hpp index 6dc4674445b..e0516423fb0 100644 --- a/Core/include/Acts/EventData/TrackStateType.hpp +++ b/Core/include/Acts/EventData/TrackStateType.hpp @@ -28,27 +28,6 @@ namespace Acts { /// recommended to start from bit position 16 or in reverse from 63 to avoid /// conflicts with future additions. enum class TrackStateFlag { - MeasurementFlag [[deprecated("Replaced by HasMeasurement; consider to use " - "isMeasurement()/setIsMeasurement() instead")]] = - 0, - ParameterFlag [[deprecated("Replaced by HasParameters; consider to use " - "hasParameters()/setHasParameters() instead")]] = - 1, - OutlierFlag [[deprecated("Replaced by IsOutlier; consider to use " - "isOutlier()/setIsOutlier() instead")]] = 2, - HoleFlag [[deprecated("Replaced by IsHole; consider to use " - "isHole()/setIsHole() instead")]] = 3, - MaterialFlag [[deprecated("Replaced by HasMaterial; consider to use " - "hasMaterial()/setHasMaterial() instead")]] = 4, - SharedHitFlag [[deprecated("Replaced by IsSharedHit; consider to use " - "isSharedHit()/setIsSharedHit() instead")]] = 5, - SplitHitFlag [[deprecated("Replaced by IsSplitHit; consider to use " - "isSplitHit()/setIsSplitHit() instead")]] = 6, - NoExpectedHitFlag - [[deprecated("Replaced by HasNoExpectedHit; consider to use " - "hasNoExpectedHit()/setHasNoExpectedHit() instead")]] = 7, - NumTrackStateFlags [[deprecated("Replaced by NumFlags")]] = 8, - /// Indicates that the track state has an associated measurement. /// Note that an outlier also has a measurement. HasMeasurement = 0,