From 5a35ca4e743d1185d61984a431074b3506c2b30b Mon Sep 17 00:00:00 2001
From: Moritz Kiehn <msmk@cern.ch>
Date: Mon, 16 Mar 2020 13:27:52 +0100
Subject: [PATCH] Utilities: remove ..Dim values from enums
---
Core/include/Acts/Utilities/ParameterDefinitions.hpp | 6 ++++++
.../Acts/Utilities/detail/DefaultParameterDefinitions.hpp | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Core/include/Acts/Utilities/ParameterDefinitions.hpp b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
index cac0c8ab6..3a0ac2f2b 100644
--- a/Core/include/Acts/Utilities/ParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/ParameterDefinitions.hpp
@@ -191,4 +191,10 @@ using par_type = detail::BoundParameterTraits<kIndex>;
template <BoundParametersIndices kIndex>
using par_type_t = typename detail::BoundParameterTraits<kIndex>::type;
+// For backward compatibility. New code must use the
+// `e{BoundParameters,FreeParameters,SpacePoint}Size` enum values.
+inline constexpr unsigned int BoundParsDim = eBoundParametersSize;
+inline constexpr unsigned int FreeParsDim = eFreeParametersSize;
+inline constexpr unsigned int SpacePointDim = eSpacePointSize;
+
} // namespace Acts
diff --git a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
index 1d723b998..6882d1e6c 100644
--- a/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
+++ b/Core/include/Acts/Utilities/detail/DefaultParameterDefinitions.hpp
@@ -60,7 +60,6 @@ enum BoundParametersIndices : unsigned int {
eTHETA = eBoundTheta,
eQOP = eBoundQOverP,
eT = eBoundTime,
- BoundParsDim = eBoundParametersSize,
};
/// Underlying fundamental scalar type for bound track parameters.
@@ -90,8 +89,6 @@ enum FreeParametersIndices : unsigned int {
eFreeQOverP = 7u,
// Last uninitialized value contains the total number of components
eFreeParametersSize,
- // For backward compatibility
- FreeParsDim = eFreeParametersSize,
};
/// Underlying fundamental scalar type for free track parameters.
@@ -120,8 +117,6 @@ enum SpacePointIndices : unsigned int {
eSpaceMom1 = eSpacePos1,
eSpaceMom2 = eSpacePos2,
eSpaceEnergy = eSpaceTime,
- // for backward compatibility
- SpacePointDim = eSpacePointSize,
};
/// Underlying fundamental scalar type for space points.
--
GitLab