From aa860d75e8f2f4ee60051f3ad29fff0153701a04 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Thu, 27 Jul 2023 17:47:34 +0200 Subject: [PATCH] refactor!: Rename `Single*TrackParameters` to `Generic*TrackParameters` (#2269) I am unhappy with the name `Single*TrackParameters` as it could refer to singly charged or single track. The track actually supports different kinds of charge hypothesis so I thought `Generic*TrackParameter` might fit better. I also merged `NeutralTrackParameters` into `TrackParameters` and removed the external template instantiation as it could be a performance hit because it disables inlining. Pulled these changes out of https://github.com/acts-project/acts/pull/2181 --- ...rs.hpp => GenericBoundTrackParameters.hpp} | 49 ++++++++++--------- ... => GenericCurvilinearTrackParameters.hpp} | 34 ++++++------- ...ers.hpp => GenericFreeTrackParameters.hpp} | 36 +++++++------- .../MultiComponentBoundTrackParameters.hpp | 8 +-- .../Acts/EventData/NeutralTrackParameters.hpp | 27 ---------- .../Acts/EventData/TrackParameters.hpp | 21 ++++---- Core/include/Acts/Propagator/AtlasStepper.hpp | 2 +- Core/include/Acts/Propagator/EigenStepper.hpp | 4 +- Core/include/Acts/Propagator/EigenStepper.ipp | 2 +- .../Acts/Propagator/MultiEigenStepperLoop.hpp | 2 +- .../Acts/Propagator/StraightLineStepper.hpp | 6 +-- Core/src/EventData/CMakeLists.txt | 1 - Core/src/EventData/NeutralTrackParameters.cpp | 27 ---------- Core/src/EventData/TrackParameters.cpp | 12 +++-- Core/src/Material/SurfaceMaterialMapper.cpp | 1 - Core/src/Material/VolumeMaterialMapper.cpp | 1 - .../Propagator/detail/CovarianceEngine.cpp | 4 +- .../Printers/TrackParametersPrinter.cpp | 2 +- .../Propagation/PropagationAlgorithm.hpp | 1 - .../Propagation/src/PropagationAlgorithm.cpp | 3 +- .../TrackFitting/src/RefittingAlgorithm.cpp | 2 +- .../src/TrackFittingAlgorithm.cpp | 2 +- .../Utilities/src/TracksToTrajectories.cpp | 2 +- .../IterativeVertexFinderAlgorithm.hpp | 2 +- .../AdaptiveMultiVertexFinderAlgorithm.cpp | 2 +- .../Io/Csv/src/CsvTrackParameterWriter.cpp | 2 +- Examples/Io/EDM4hep/src/EDM4hepUtil.cpp | 2 +- .../Performance/VertexPerformanceWriter.cpp | 2 +- .../Io/Root/src/RootAthenaNTupleReader.cpp | 2 +- .../Root/src/RootTrajectorySummaryWriter.cpp | 2 +- .../include/ActsFatras/Kernel/Simulation.hpp | 4 +- .../Acts/Plugins/EDM4hep/EDM4hepUtil.hpp | 10 ++-- Plugins/EDM4hep/src/EDM4hepUtil.cpp | 4 +- .../Fatras/FatrasSimulationTests.cpp | 1 - Tests/IntegrationTests/PropagationTests.hpp | 31 ++++++------ .../EventData/BoundTrackParametersTests.cpp | 7 ++- .../CurvilinearTrackParametersTests.cpp | 7 ++- .../EventData/FreeTrackParametersTests.cpp | 7 ++- ...ultiComponentBoundTrackParametersTests.cpp | 4 +- .../Material/VolumeMaterialMapperTests.cpp | 1 - .../Core/Propagator/AtlasStepperTests.cpp | 4 +- .../Core/Propagator/EigenStepperTests.cpp | 5 +- .../Core/Propagator/ExtrapolatorTests.cpp | 2 +- .../Core/Propagator/JacobianTests.cpp | 2 +- .../Propagator/KalmanExtrapolatorTests.cpp | 2 +- .../Core/Propagator/LoopProtectionTests.cpp | 2 +- .../Propagator/MaterialCollectionTests.cpp | 2 +- .../Core/Propagator/MultiStepperTests.cpp | 6 +-- .../Core/Propagator/NavigatorTests.cpp | 2 +- .../Core/Propagator/PropagatorTests.cpp | 4 +- .../Propagator/StraightLineStepperTests.cpp | 5 +- .../EstimateTrackParamsFromSeedTest.cpp | 2 +- .../SpacePointBuilderTests.cpp | 2 +- .../CombinatorialKalmanFilterTests.cpp | 4 +- .../UnitTests/Core/TrackFitting/GsfTests.cpp | 10 ++-- .../Core/TrackFitting/KalmanFitterTests.cpp | 2 +- .../AdaptiveGridTrackDensityTests.cpp | 2 +- .../AdaptiveMultiVertexFinderTests.cpp | 2 +- .../AdaptiveMultiVertexFitterTests.cpp | 2 +- .../FullBilloirVertexFitterTests.cpp | 2 +- .../GaussianGridTrackDensityTests.cpp | 2 +- .../GridDensityVertexFinderTests.cpp | 2 +- .../Vertexing/ImpactPointEstimatorTests.cpp | 2 +- .../Vertexing/IterativeVertexFinderTests.cpp | 2 +- .../KalmanVertexTrackUpdaterTests.cpp | 2 +- .../Vertexing/KalmanVertexUpdaterTests.cpp | 2 +- .../TrackDensityVertexFinderTests.cpp | 2 +- .../EDM4hep/ConvertTrackEDM4hepTest.cpp | 22 ++++----- docs/core/eventdata.md | 8 +-- 69 files changed, 192 insertions(+), 255 deletions(-) rename Core/include/Acts/EventData/{SingleBoundTrackParameters.hpp => GenericBoundTrackParameters.hpp} (86%) rename Core/include/Acts/EventData/{SingleCurvilinearTrackParameters.hpp => GenericCurvilinearTrackParameters.hpp} (84%) rename Core/include/Acts/EventData/{SingleFreeTrackParameters.hpp => GenericFreeTrackParameters.hpp} (85%) delete mode 100644 Core/include/Acts/EventData/NeutralTrackParameters.hpp delete mode 100644 Core/src/EventData/NeutralTrackParameters.cpp diff --git a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp b/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp similarity index 86% rename from Core/include/Acts/EventData/SingleBoundTrackParameters.hpp rename to Core/include/Acts/EventData/GenericBoundTrackParameters.hpp index da9586579ea..3776d305add 100644 --- a/Core/include/Acts/EventData/SingleBoundTrackParameters.hpp +++ b/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp @@ -33,7 +33,7 @@ namespace Acts { /// /// @note This class holds shared ownership on its reference surface. template -class SingleBoundTrackParameters { +class GenericBoundTrackParameters { public: using Scalar = ActsScalar; using ParametersVector = BoundVector; @@ -51,9 +51,9 @@ class SingleBoundTrackParameters { /// an input here to be consistent with the other constructors below that /// that also take the charge as an input. The charge sign is only used in /// debug builds to check for consistency with the q/p parameter. - SingleBoundTrackParameters(std::shared_ptr surface, - const ParametersVector& params, Scalar q, - std::optional cov = std::nullopt) + GenericBoundTrackParameters( + std::shared_ptr surface, const ParametersVector& params, + Scalar q, std::optional cov = std::nullopt) : m_params(params), m_cov(std::move(cov)), m_surface(std::move(surface)), @@ -74,9 +74,9 @@ class SingleBoundTrackParameters { /// ambiguities, i.e. the charge type is default-constructible. template , int> = 0> - SingleBoundTrackParameters(std::shared_ptr surface, - const ParametersVector& params, - std::optional cov = std::nullopt) + GenericBoundTrackParameters( + std::shared_ptr surface, const ParametersVector& params, + std::optional cov = std::nullopt) : m_params(params), m_cov(std::move(cov)), m_surface(std::move(surface)) { assert(m_surface); normalizePhiTheta(); @@ -95,7 +95,7 @@ class SingleBoundTrackParameters { /// /// @note The returned result indicates whether the free parameters could /// successfully be converted to on-surface parameters. - static Result> create( + static Result> create( std::shared_ptr surface, const GeometryContext& geoCtx, const Vector4& pos4, const Vector3& dir, Scalar p, Scalar q, std::optional cov = std::nullopt) { @@ -107,8 +107,8 @@ class SingleBoundTrackParameters { return bound.error(); } - return SingleBoundTrackParameters{std::move(surface), *bound, q, - std::move(cov)}; + return GenericBoundTrackParameters{std::move(surface), *bound, q, + std::move(cov)}; } /// Factory to construct from four-position, direction, and @@ -128,7 +128,7 @@ class SingleBoundTrackParameters { /// successfully be converted to on-surface parameters. template , int> = 0> - static Result> create( + static Result> create( std::shared_ptr surface, const GeometryContext& geoCtx, const Vector4& pos4, const Vector3& dir, Scalar qOverP, std::optional cov = std::nullopt) { @@ -138,18 +138,19 @@ class SingleBoundTrackParameters { return bound.error(); } - return SingleBoundTrackParameters{std::move(surface), *bound, - std::move(cov)}; + return GenericBoundTrackParameters{std::move(surface), *bound, + std::move(cov)}; } /// Parameters are not default constructible due to the charge type. - SingleBoundTrackParameters() = delete; - SingleBoundTrackParameters(const SingleBoundTrackParameters&) = default; - SingleBoundTrackParameters(SingleBoundTrackParameters&&) = default; - ~SingleBoundTrackParameters() = default; - SingleBoundTrackParameters& operator=(const SingleBoundTrackParameters&) = + GenericBoundTrackParameters() = delete; + GenericBoundTrackParameters(const GenericBoundTrackParameters&) = default; + GenericBoundTrackParameters(GenericBoundTrackParameters&&) = default; + ~GenericBoundTrackParameters() = default; + GenericBoundTrackParameters& operator=(const GenericBoundTrackParameters&) = + default; + GenericBoundTrackParameters& operator=(GenericBoundTrackParameters&&) = default; - SingleBoundTrackParameters& operator=(SingleBoundTrackParameters&&) = default; /// Parameters vector. ParametersVector& parameters() { return m_params; } @@ -263,20 +264,20 @@ class SingleBoundTrackParameters { /// of equality in different contexts. None of that can be handled by /// this operator. Users should think really hard if this is what they /// want and we might decided that we will remove this in the future. - friend bool operator==(const SingleBoundTrackParameters& lhs, - const SingleBoundTrackParameters& rhs) { + friend bool operator==(const GenericBoundTrackParameters& lhs, + const GenericBoundTrackParameters& rhs) { return (lhs.m_params == rhs.m_params) and (lhs.m_cov == rhs.m_cov) and (lhs.m_surface == rhs.m_surface) and (lhs.m_chargeInterpreter == rhs.m_chargeInterpreter); } /// Compare two bound track parameters for bitwise in-equality. - friend bool operator!=(const SingleBoundTrackParameters& lhs, - const SingleBoundTrackParameters& rhs) { + friend bool operator!=(const GenericBoundTrackParameters& lhs, + const GenericBoundTrackParameters& rhs) { return not(lhs == rhs); } /// Print information to the output stream. friend std::ostream& operator<<(std::ostream& os, - const SingleBoundTrackParameters& tp) { + const GenericBoundTrackParameters& tp) { detail::printBoundParameters( os, tp.referenceSurface(), tp.parameters(), tp.covariance().has_value() ? &tp.covariance().value() : nullptr); diff --git a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp similarity index 84% rename from Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp rename to Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp index 1ca67bab05c..8d36eaafe78 100644 --- a/Core/include/Acts/EventData/SingleCurvilinearTrackParameters.hpp +++ b/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp @@ -8,7 +8,7 @@ #pragma once -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/Surfaces/PlaneSurface.hpp" namespace Acts { @@ -22,11 +22,11 @@ namespace Acts { /// parameters and their corresponding covariance matrix are stored in /// curvilinear parametrization. /// -/// @see SingleBoundTrackParameters +/// @see GenericBoundTrackParameters template -class SingleCurvilinearTrackParameters - : public SingleBoundTrackParameters { - using Base = SingleBoundTrackParameters; +class GenericCurvilinearTrackParameters + : public GenericBoundTrackParameters { + using Base = GenericBoundTrackParameters; public: using Scalar = ActsScalar; @@ -40,7 +40,7 @@ class SingleCurvilinearTrackParameters /// @param p Absolute momentum /// @param q Particle charge /// @param cov Curvilinear bound parameters covariance matrix - SingleCurvilinearTrackParameters( + GenericCurvilinearTrackParameters( const Vector4& pos4, const Vector3& dir, Scalar p, Scalar q, std::optional cov = std::nullopt) : Base(Surface::makeShared(pos4.segment<3>(ePos0), dir), @@ -61,7 +61,7 @@ class SingleCurvilinearTrackParameters /// ambiguities, i.e. the charge interpretation type is default-constructible. template , int> = 0> - SingleCurvilinearTrackParameters( + GenericCurvilinearTrackParameters( const Vector4& pos4, const Vector3& dir, Scalar qOverP, std::optional cov = std::nullopt) : Base(Surface::makeShared(pos4.segment<3>(ePos0), dir), @@ -77,7 +77,7 @@ class SingleCurvilinearTrackParameters /// @param p Absolute momentum /// @param q Particle charge /// @param cov Curvilinear bound parameters covariance matrix - SingleCurvilinearTrackParameters( + GenericCurvilinearTrackParameters( const Vector4& pos4, Scalar phi, Scalar theta, Scalar p, Scalar q, std::optional cov = std::nullopt) : Base(Surface::makeShared( @@ -101,7 +101,7 @@ class SingleCurvilinearTrackParameters /// ambiguities, i.e. the charge interpretation type is default-constructible. template , int> = 0> - SingleCurvilinearTrackParameters( + GenericCurvilinearTrackParameters( const Vector4& pos4, Scalar phi, Scalar theta, Scalar qOverP, std::optional cov = std::nullopt) : Base(Surface::makeShared( @@ -112,16 +112,16 @@ class SingleCurvilinearTrackParameters std::move(cov)) {} /// Parameters are not default constructible due to the charge type. - SingleCurvilinearTrackParameters() = delete; - SingleCurvilinearTrackParameters(const SingleCurvilinearTrackParameters&) = + GenericCurvilinearTrackParameters() = delete; + GenericCurvilinearTrackParameters(const GenericCurvilinearTrackParameters&) = default; - SingleCurvilinearTrackParameters(SingleCurvilinearTrackParameters&&) = + GenericCurvilinearTrackParameters(GenericCurvilinearTrackParameters&&) = default; - ~SingleCurvilinearTrackParameters() = default; - SingleCurvilinearTrackParameters& operator=( - const SingleCurvilinearTrackParameters&) = default; - SingleCurvilinearTrackParameters& operator=( - SingleCurvilinearTrackParameters&&) = default; + ~GenericCurvilinearTrackParameters() = default; + GenericCurvilinearTrackParameters& operator=( + const GenericCurvilinearTrackParameters&) = default; + GenericCurvilinearTrackParameters& operator=( + GenericCurvilinearTrackParameters&&) = default; }; } // namespace Acts diff --git a/Core/include/Acts/EventData/SingleFreeTrackParameters.hpp b/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp similarity index 85% rename from Core/include/Acts/EventData/SingleFreeTrackParameters.hpp rename to Core/include/Acts/EventData/GenericFreeTrackParameters.hpp index b0e8501d6f7..84ad5b8abd4 100644 --- a/Core/include/Acts/EventData/SingleFreeTrackParameters.hpp +++ b/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp @@ -28,7 +28,7 @@ namespace Acts { /// Parameters and covariance matrix are stored using the free parametrization /// defined in `enum FreeIndices`. template -class SingleFreeTrackParameters { +class GenericFreeTrackParameters { public: using Scalar = ActsScalar; using ParametersVector = FreeVector; @@ -45,8 +45,8 @@ class SingleFreeTrackParameters { /// an input here to be consistent with the other constructors below that /// that also take the charge as an input. The charge sign is only used in /// debug builds to check for consistency with the q/p parameter. - SingleFreeTrackParameters(const ParametersVector& params, Scalar q, - std::optional cov = std::nullopt) + GenericFreeTrackParameters(const ParametersVector& params, Scalar q, + std::optional cov = std::nullopt) : m_params(params), m_cov(std::move(cov)), m_chargeInterpreter(std::abs(q)) { @@ -63,8 +63,8 @@ class SingleFreeTrackParameters { /// ambiguities, i.e. the charge interpretation type is default-constructible. template , int> = 0> - SingleFreeTrackParameters(const ParametersVector& params, - std::optional cov = std::nullopt) + GenericFreeTrackParameters(const ParametersVector& params, + std::optional cov = std::nullopt) : m_params(params), m_cov(std::move(cov)) {} /// Construct from four-position, angles, absolute momentum, and charge. @@ -75,9 +75,9 @@ class SingleFreeTrackParameters { /// @param p Absolute momentum /// @param q Particle charge /// @param cov Free parameters covariance matrix - SingleFreeTrackParameters(const Vector4& pos4, Scalar phi, Scalar theta, - Scalar p, Scalar q, - std::optional cov = std::nullopt) + GenericFreeTrackParameters(const Vector4& pos4, Scalar phi, Scalar theta, + Scalar p, Scalar q, + std::optional cov = std::nullopt) : m_params(FreeVector::Zero()), m_cov(std::move(cov)), m_chargeInterpreter(std::abs(q)) { @@ -106,9 +106,9 @@ class SingleFreeTrackParameters { /// ambiguities, i.e. the charge interpretation type is default-constructible. template , int> = 0> - SingleFreeTrackParameters(const Vector4& pos4, Scalar phi, Scalar theta, - Scalar qOverP, - std::optional cov = std::nullopt) + GenericFreeTrackParameters(const Vector4& pos4, Scalar phi, Scalar theta, + Scalar qOverP, + std::optional cov = std::nullopt) : m_params(FreeVector::Zero()), m_cov(std::move(cov)) { auto dir = makeDirectionUnitFromPhiTheta(phi, theta); m_params[eFreePos0] = pos4[ePos0]; @@ -122,13 +122,13 @@ class SingleFreeTrackParameters { } /// Parameters are not default constructible due to the charge type. - SingleFreeTrackParameters() = delete; - SingleFreeTrackParameters(const SingleFreeTrackParameters&) = default; - SingleFreeTrackParameters(SingleFreeTrackParameters&&) = default; - ~SingleFreeTrackParameters() = default; - SingleFreeTrackParameters& operator=(const SingleFreeTrackParameters&) = + GenericFreeTrackParameters() = delete; + GenericFreeTrackParameters(const GenericFreeTrackParameters&) = default; + GenericFreeTrackParameters(GenericFreeTrackParameters&&) = default; + ~GenericFreeTrackParameters() = default; + GenericFreeTrackParameters& operator=(const GenericFreeTrackParameters&) = default; - SingleFreeTrackParameters& operator=(SingleFreeTrackParameters&&) = default; + GenericFreeTrackParameters& operator=(GenericFreeTrackParameters&&) = default; /// Parameters vector. const ParametersVector& parameters() const { return m_params; } @@ -194,7 +194,7 @@ class SingleFreeTrackParameters { /// Print information to the output stream. friend std::ostream& operator<<(std::ostream& os, - const SingleFreeTrackParameters& tp) { + const GenericFreeTrackParameters& tp) { detail::printFreeParameters( os, tp.parameters(), tp.covariance().has_value() ? &tp.covariance().value() : nullptr); diff --git a/Core/include/Acts/EventData/MultiComponentBoundTrackParameters.hpp b/Core/include/Acts/EventData/MultiComponentBoundTrackParameters.hpp index f1b292911c2..9659bea77a6 100644 --- a/Core/include/Acts/EventData/MultiComponentBoundTrackParameters.hpp +++ b/Core/include/Acts/EventData/MultiComponentBoundTrackParameters.hpp @@ -8,7 +8,7 @@ #pragma once -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/Surfaces/Surface.hpp" #include @@ -21,7 +21,7 @@ namespace Acts { /// This class is only a light wrapper around a surface and a vector of /// parameters. Its main purpose is to provide many constructors for the /// underlying vector. Most accessors are generated from the -/// SingleBoundTrackParameters equivalent and thus may be expensive +/// GenericBoundTrackParameters equivalent and thus may be expensive /// @tparam charge_t Helper type to interpret the particle charge/momentum /// @note This class holds shared ownership on its reference surface. /// @note The accessors for parameters, covariance, position, etc. @@ -31,7 +31,7 @@ namespace Acts { /// TODO Add constructor from range and projector maybe? template class MultiComponentBoundTrackParameters { - using SingleParameters = SingleBoundTrackParameters; + using SingleParameters = GenericBoundTrackParameters; std::vector>> m_components; @@ -157,7 +157,7 @@ class MultiComponentBoundTrackParameters { /// Reference surface onto which the parameters are bound. const Surface& referenceSurface() const { return *m_surface; } - /// Get the weight and a SingleBoundTrackParameters object for one component + /// Get the weight and a GenericBoundTrackParameters object for one component std::pair operator[](std::size_t i) const { return std::make_pair( std::get(m_components[i]), diff --git a/Core/include/Acts/EventData/NeutralTrackParameters.hpp b/Core/include/Acts/EventData/NeutralTrackParameters.hpp deleted file mode 100644 index 06f8cbc19ea..00000000000 --- a/Core/include/Acts/EventData/NeutralTrackParameters.hpp +++ /dev/null @@ -1,27 +0,0 @@ -// This file is part of the Acts project. -// -// Copyright (C) 2016-2020 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 http://mozilla.org/MPL/2.0/. - -#pragma once - -#include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" -#include "Acts/EventData/SingleFreeTrackParameters.hpp" - -namespace Acts { - -extern template class SingleBoundTrackParameters; -extern template class SingleCurvilinearTrackParameters; -extern template class SingleFreeTrackParameters; - -using NeutralBoundTrackParameters = SingleBoundTrackParameters; -using NeutralCurvilinearTrackParameters = - SingleCurvilinearTrackParameters; -using NeutralFreeTrackParameters = SingleFreeTrackParameters; - -} // namespace Acts diff --git a/Core/include/Acts/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp index ad9e0924281..ad8f1b90ee1 100644 --- a/Core/include/Acts/EventData/TrackParameters.hpp +++ b/Core/include/Acts/EventData/TrackParameters.hpp @@ -9,19 +9,20 @@ #pragma once #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" -#include "Acts/EventData/SingleFreeTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericFreeTrackParameters.hpp" namespace Acts { -extern template class SingleBoundTrackParameters; -extern template class SingleCurvilinearTrackParameters; -extern template class SingleFreeTrackParameters; - -using BoundTrackParameters = SingleBoundTrackParameters; +using BoundTrackParameters = GenericBoundTrackParameters; using CurvilinearTrackParameters = - SingleCurvilinearTrackParameters; -using FreeTrackParameters = SingleFreeTrackParameters; + GenericCurvilinearTrackParameters; +using FreeTrackParameters = GenericFreeTrackParameters; + +using NeutralBoundTrackParameters = GenericBoundTrackParameters; +using NeutralCurvilinearTrackParameters = + GenericCurvilinearTrackParameters; +using NeutralFreeTrackParameters = GenericFreeTrackParameters; } // namespace Acts diff --git a/Core/include/Acts/Propagator/AtlasStepper.hpp b/Core/include/Acts/Propagator/AtlasStepper.hpp index b74535b56d5..7574fd1ec93 100644 --- a/Core/include/Acts/Propagator/AtlasStepper.hpp +++ b/Core/include/Acts/Propagator/AtlasStepper.hpp @@ -297,7 +297,7 @@ class AtlasStepper { template State makeState(std::reference_wrapper gctx, std::reference_wrapper mctx, - const SingleBoundTrackParameters& par, + const GenericBoundTrackParameters& par, Direction navDir = Direction::Forward, double ssize = std::numeric_limits::max(), double stolerance = s_onSurfaceTolerance) const { diff --git a/Core/include/Acts/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp index c7eae5c5342..7ca2e54c60c 100644 --- a/Core/include/Acts/Propagator/EigenStepper.hpp +++ b/Core/include/Acts/Propagator/EigenStepper.hpp @@ -76,7 +76,7 @@ class EigenStepper { template explicit State(const GeometryContext& gctx, MagneticFieldProvider::Cache fieldCacheIn, - const SingleBoundTrackParameters& par, + const GenericBoundTrackParameters& par, Direction ndir = Direction::Forward, double ssize = std::numeric_limits::max()) : absCharge(std::abs(par.charge())), @@ -167,7 +167,7 @@ class EigenStepper { template State makeState(std::reference_wrapper gctx, std::reference_wrapper mctx, - const SingleBoundTrackParameters& par, + const GenericBoundTrackParameters& par, Direction navDir = Direction::Forward, double ssize = std::numeric_limits::max()) const; diff --git a/Core/include/Acts/Propagator/EigenStepper.ipp b/Core/include/Acts/Propagator/EigenStepper.ipp index 53a8338a0f9..b5a60342d59 100644 --- a/Core/include/Acts/Propagator/EigenStepper.ipp +++ b/Core/include/Acts/Propagator/EigenStepper.ipp @@ -19,7 +19,7 @@ template auto Acts::EigenStepper::makeState( std::reference_wrapper gctx, std::reference_wrapper mctx, - const SingleBoundTrackParameters& par, Direction navDir, + const GenericBoundTrackParameters& par, Direction navDir, double ssize) const -> State { return State{gctx, m_bField->makeCache(mctx), par, navDir, ssize}; } diff --git a/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp b/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp index 55131f4d93f..41dea12c979 100644 --- a/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp +++ b/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp @@ -612,7 +612,7 @@ class MultiEigenStepperLoop /// the component number is again modified template Result addComponent( - State& state, const SingleBoundTrackParameters& pars, + State& state, const GenericBoundTrackParameters& pars, double weight) const { state.components.push_back( {SingleState(state.geoContext, diff --git a/Core/include/Acts/Propagator/StraightLineStepper.hpp b/Core/include/Acts/Propagator/StraightLineStepper.hpp index e779dc41b1c..ad475d40c5b 100644 --- a/Core/include/Acts/Propagator/StraightLineStepper.hpp +++ b/Core/include/Acts/Propagator/StraightLineStepper.hpp @@ -37,7 +37,7 @@ namespace Acts { template -class SingleBoundTrackParameters; +class GenericBoundTrackParameters; /// @brief straight line stepper based on Surface intersection /// @@ -73,7 +73,7 @@ class StraightLineStepper { template explicit State(const GeometryContext& gctx, const MagneticFieldContext& mctx, - const SingleBoundTrackParameters& par, + const GenericBoundTrackParameters& par, Direction ndir = Direction::Forward, double ssize = std::numeric_limits::max(), double stolerance = s_onSurfaceTolerance) @@ -147,7 +147,7 @@ class StraightLineStepper { template State makeState(std::reference_wrapper gctx, std::reference_wrapper mctx, - const SingleBoundTrackParameters& par, + const GenericBoundTrackParameters& par, Direction navDir = Direction::Forward, double ssize = std::numeric_limits::max(), double stolerance = s_onSurfaceTolerance) const { diff --git a/Core/src/EventData/CMakeLists.txt b/Core/src/EventData/CMakeLists.txt index ad67f3b4936..8064f509ab3 100644 --- a/Core/src/EventData/CMakeLists.txt +++ b/Core/src/EventData/CMakeLists.txt @@ -1,7 +1,6 @@ target_sources( ActsCore PRIVATE - NeutralTrackParameters.cpp PrintParameters.cpp TrackParameters.cpp TransformationBoundToFree.cpp diff --git a/Core/src/EventData/NeutralTrackParameters.cpp b/Core/src/EventData/NeutralTrackParameters.cpp deleted file mode 100644 index 908895ece27..00000000000 --- a/Core/src/EventData/NeutralTrackParameters.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// This file is part of the Acts project. -// -// Copyright (C) 2016-2020 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 http://mozilla.org/MPL/2.0/. - -#include "Acts/EventData/NeutralTrackParameters.hpp" - -#include "Acts/EventData/TrackParametersConcept.hpp" - -namespace Acts { - -// explicitly instantiate templates -template class SingleBoundTrackParameters; -template class SingleCurvilinearTrackParameters; -template class SingleFreeTrackParameters; - -// ensure concrete classes satisfy the concepts -static_assert( - Concepts::BoundTrackParametersConcept); -static_assert( - Concepts::BoundTrackParametersConcept); -static_assert(Concepts::FreeTrackParametersConcept); - -} // namespace Acts diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp index 05ef2fafed0..b8e47ba57dc 100644 --- a/Core/src/EventData/TrackParameters.cpp +++ b/Core/src/EventData/TrackParameters.cpp @@ -12,15 +12,17 @@ namespace Acts { -// explicitly instantiate templates -template class SingleBoundTrackParameters; -template class SingleCurvilinearTrackParameters; -template class SingleFreeTrackParameters; - // ensure concrete classes satisfy the concepts + static_assert(Concepts::BoundTrackParametersConcept); static_assert( Concepts::BoundTrackParametersConcept); static_assert(Concepts::FreeTrackParametersConcept); +static_assert( + Concepts::BoundTrackParametersConcept); +static_assert( + Concepts::BoundTrackParametersConcept); +static_assert(Concepts::FreeTrackParametersConcept); + } // namespace Acts diff --git a/Core/src/Material/SurfaceMaterialMapper.cpp b/Core/src/Material/SurfaceMaterialMapper.cpp index 50350f8d81e..8dbf0544b8a 100644 --- a/Core/src/Material/SurfaceMaterialMapper.cpp +++ b/Core/src/Material/SurfaceMaterialMapper.cpp @@ -11,7 +11,6 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/Tolerance.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/ApproachDescriptor.hpp" #include "Acts/Geometry/BoundarySurfaceT.hpp" diff --git a/Core/src/Material/VolumeMaterialMapper.cpp b/Core/src/Material/VolumeMaterialMapper.cpp index 586ea430e6e..9ddee6bc274 100644 --- a/Core/src/Material/VolumeMaterialMapper.cpp +++ b/Core/src/Material/VolumeMaterialMapper.cpp @@ -10,7 +10,6 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/Tolerance.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/ApproachDescriptor.hpp" #include "Acts/Geometry/BoundarySurfaceT.hpp" diff --git a/Core/src/Propagator/detail/CovarianceEngine.cpp b/Core/src/Propagator/detail/CovarianceEngine.cpp index 13e926e1457..e04f8ee1194 100644 --- a/Core/src/Propagator/detail/CovarianceEngine.cpp +++ b/Core/src/Propagator/detail/CovarianceEngine.cpp @@ -10,8 +10,8 @@ #include "Acts/Definitions/Common.hpp" #include "Acts/Definitions/Tolerance.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp" #include "Acts/EventData/detail/TransformationBoundToFree.hpp" #include "Acts/EventData/detail/TransformationFreeToBound.hpp" diff --git a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp index f537ec4c540..1b90ad08ce0 100644 --- a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp +++ b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp @@ -8,7 +8,7 @@ #include "TrackParametersPrinter.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/Utilities/Logger.hpp" #include "ActsExamples/EventData/Track.hpp" #include "ActsExamples/Framework/AlgorithmContext.hpp" diff --git a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp index afb3e678065..acc4874c2b3 100644 --- a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp +++ b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp @@ -11,7 +11,6 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Material/MaterialInteraction.hpp" #include "Acts/Propagator/AbortList.hpp" diff --git a/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp b/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp index 80705834c6a..95981ccacd1 100644 --- a/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp +++ b/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp @@ -8,8 +8,7 @@ #include "ActsExamples/Propagation/PropagationAlgorithm.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Surfaces/PerigeeSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp b/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp index a290e5dacbf..abd75d54608 100644 --- a/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp +++ b/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp @@ -9,8 +9,8 @@ #include "ActsExamples/TrackFitting/RefittingAlgorithm.hpp" #include "Acts/Definitions/Algebra.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/SourceLink.hpp" #include "Acts/EventData/TrackContainer.hpp" #include "Acts/EventData/TrackParameters.hpp" diff --git a/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp b/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp index a0d116c0459..63935488395 100644 --- a/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp +++ b/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp @@ -9,7 +9,7 @@ #include "ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp" #include "Acts/Definitions/Algebra.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/SourceLink.hpp" #include "Acts/EventData/TrackProxy.hpp" #include "Acts/EventData/VectorMultiTrajectory.hpp" diff --git a/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp b/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp index 2737b8ff7ef..a490c378968 100644 --- a/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp +++ b/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp @@ -8,8 +8,8 @@ #include "ActsExamples/Utilities/TracksToTrajectories.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/TrackContainer.hpp" #include "Acts/EventData/TrackProxy.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp index c5474627646..e9def2e01d4 100644 --- a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp +++ b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp @@ -11,7 +11,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/Direction.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" #include "Acts/MagneticField/MagneticFieldProvider.hpp" diff --git a/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp b/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp index df8bbd1c691..5003b26b08d 100644 --- a/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp +++ b/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp @@ -10,7 +10,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/Propagator/EigenStepper.hpp" #include "Acts/Utilities/AnnealingUtility.hpp" #include "Acts/Utilities/Logger.hpp" diff --git a/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp b/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp index aec1f34cf57..a42988dacb3 100644 --- a/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp +++ b/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp @@ -9,7 +9,7 @@ #include "ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp" #include "Acts/Definitions/TrackParametrization.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "ActsExamples/EventData/Trajectories.hpp" #include "ActsExamples/Framework/AlgorithmContext.hpp" #include "ActsExamples/Utilities/Paths.hpp" diff --git a/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp b/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp index d84760989f2..79508c45ce4 100644 --- a/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp +++ b/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp @@ -278,7 +278,7 @@ void EDM4hepUtil::writeTrajectory( edm4hep::TrackState trackState; // This makes the hard assumption that |q| = 1 - Acts::SingleBoundTrackParameters parObj{ + Acts::GenericBoundTrackParameters parObj{ state.referenceSurface().getSharedPtr(), state.parameters(), state.covariance()}; diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp b/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp index e12092b78f1..1786cf7b7b9 100644 --- a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp +++ b/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp @@ -10,9 +10,9 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" #include "Acts/EventData/MultiTrajectoryHelpers.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Utilities/Logger.hpp" #include "Acts/Utilities/MultiIndex.hpp" diff --git a/Examples/Io/Root/src/RootAthenaNTupleReader.cpp b/Examples/Io/Root/src/RootAthenaNTupleReader.cpp index 4e62f80e28a..fe07f1e9794 100644 --- a/Examples/Io/Root/src/RootAthenaNTupleReader.cpp +++ b/Examples/Io/Root/src/RootAthenaNTupleReader.cpp @@ -9,7 +9,7 @@ #include "ActsExamples/Io/Root/RootAthenaNTupleReader.hpp" #include "Acts/Definitions/TrackParametrization.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Surfaces/PerigeeSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Examples/Io/Root/src/RootTrajectorySummaryWriter.cpp b/Examples/Io/Root/src/RootTrajectorySummaryWriter.cpp index 823cc4d0184..cfe33e56d05 100644 --- a/Examples/Io/Root/src/RootTrajectorySummaryWriter.cpp +++ b/Examples/Io/Root/src/RootTrajectorySummaryWriter.cpp @@ -9,8 +9,8 @@ #include "ActsExamples/Io/Root/RootTrajectorySummaryWriter.hpp" #include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectoryHelpers.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/VectorMultiTrajectory.hpp" #include "Acts/Surfaces/Surface.hpp" #include "Acts/Utilities/Intersection.hpp" diff --git a/Fatras/include/ActsFatras/Kernel/Simulation.hpp b/Fatras/include/ActsFatras/Kernel/Simulation.hpp index 9c02eb0236c..a59ebe6cdad 100644 --- a/Fatras/include/ActsFatras/Kernel/Simulation.hpp +++ b/Fatras/include/ActsFatras/Kernel/Simulation.hpp @@ -9,7 +9,7 @@ #pragma once #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/MagneticFieldContext.hpp" #include "Acts/Propagator/AbortList.hpp" @@ -92,7 +92,7 @@ struct SingleParticleSimulation { actor.selectHitSurface = selectHitSurface; actor.initialParticle = particle; // use AnyCharge to be able to handle neutral and charged parameters - Acts::SingleCurvilinearTrackParameters start( + Acts::GenericCurvilinearTrackParameters start( particle.fourPosition(), particle.direction(), particle.absoluteMomentum(), particle.charge()); auto result = propagator.propagate(start, options); diff --git a/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp b/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp index 0c375134d59..5c5192c6083 100644 --- a/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp +++ b/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp @@ -10,8 +10,8 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/Charge.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/TrackContainer.hpp" #include "Acts/EventData/TrackStatePropMask.hpp" #include "Acts/EventData/detail/TransformationBoundToFree.hpp" @@ -53,9 +53,9 @@ void packCovariance(const ActsSymMatrix<6>& from, float* to); Parameters convertTrackParametersToEdm4hep( const Acts::GeometryContext& gctx, double Bz, - const SingleBoundTrackParameters& params); + const GenericBoundTrackParameters& params); -SingleBoundTrackParameters convertTrackParametersFromEdm4hep( +GenericBoundTrackParameters convertTrackParametersFromEdm4hep( double Bz, const Parameters& params); } // namespace detail @@ -102,7 +102,7 @@ void writeTrack( trackState.location = edm4hep::TrackState::AtOther; // This makes the hard assumption that |q| = 1 - SingleBoundTrackParameters params{ + GenericBoundTrackParameters params{ state.referenceSurface().getSharedPtr(), state.parameters(), state.covariance()}; @@ -133,7 +133,7 @@ void writeTrack( auto& ipState = outTrackStates.emplace_back(); // Convert the track parameters at the IP - SingleBoundTrackParameters trackParams{ + GenericBoundTrackParameters trackParams{ track.referenceSurface().getSharedPtr(), track.parameters(), track.covariance()}; diff --git a/Plugins/EDM4hep/src/EDM4hepUtil.cpp b/Plugins/EDM4hep/src/EDM4hepUtil.cpp index 211297f439d..5e023c8131f 100644 --- a/Plugins/EDM4hep/src/EDM4hepUtil.cpp +++ b/Plugins/EDM4hep/src/EDM4hepUtil.cpp @@ -109,7 +109,7 @@ void unpackCovariance(const float* from, ActsSymMatrix<6>& to) { Parameters convertTrackParametersToEdm4hep( const Acts::GeometryContext& gctx, double Bz, - const SingleBoundTrackParameters& params) { + const GenericBoundTrackParameters& params) { Acts::Vector3 global = params.referenceSurface().localToGlobal( gctx, params.parameters().template head<2>(), params.momentum()); @@ -175,7 +175,7 @@ Parameters convertTrackParametersToEdm4hep( return result; } -SingleBoundTrackParameters convertTrackParametersFromEdm4hep( +GenericBoundTrackParameters convertTrackParametersFromEdm4hep( double Bz, const Parameters& params) { BoundVector targetPars; diff --git a/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp b/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp index 2d92b594b88..89c25807762 100644 --- a/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp +++ b/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp @@ -10,7 +10,6 @@ #include #include "Acts/Definitions/ParticleData.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/MagneticField/ConstantBField.hpp" #include "Acts/Propagator/EigenStepper.hpp" diff --git a/Tests/IntegrationTests/PropagationTests.hpp b/Tests/IntegrationTests/PropagationTests.hpp index 3d0ab9a9092..786b1769076 100644 --- a/Tests/IntegrationTests/PropagationTests.hpp +++ b/Tests/IntegrationTests/PropagationTests.hpp @@ -10,7 +10,6 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/MagneticFieldContext.hpp" @@ -99,8 +98,8 @@ inline Acts::NeutralCurvilinearTrackParameters makeParametersCurvilinearNeutral( /// \warning Does not check that they are defined on the same surface. template inline void checkParametersConsistency( - const Acts::SingleBoundTrackParameters& cmp, - const Acts::SingleBoundTrackParameters& ref, + const Acts::GenericBoundTrackParameters& cmp, + const Acts::GenericBoundTrackParameters& ref, const Acts::GeometryContext& geoCtx, double epsPos, double epsDir, double epsMom) { using namespace Acts; @@ -134,8 +133,8 @@ inline void checkParametersConsistency( /// \warning Does not check that the parameters value itself are consistent. template inline void checkCovarianceConsistency( - const Acts::SingleBoundTrackParameters& cmp, - const Acts::SingleBoundTrackParameters& ref, + const Acts::GenericBoundTrackParameters& cmp, + const Acts::GenericBoundTrackParameters& ref, double relativeTolerance) { // either both or none have covariance set if (cmp.covariance().has_value()) { @@ -157,7 +156,7 @@ inline void checkCovarianceConsistency( /// Construct the transformation from the curvilinear to the global coordinates. template inline Acts::Transform3 makeCurvilinearTransform( - const Acts::SingleBoundTrackParameters& params, + const Acts::GenericBoundTrackParameters& params, const Acts::GeometryContext& geoCtx) { Acts::Vector3 unitW = params.unitDirection(); auto [unitU, unitV] = Acts::makeCurvilinearUnitVectors(unitW); @@ -176,7 +175,7 @@ inline Acts::Transform3 makeCurvilinearTransform( struct ZCylinderSurfaceBuilder { template std::shared_ptr operator()( - const Acts::SingleBoundTrackParameters& params, + const Acts::GenericBoundTrackParameters& params, const Acts::GeometryContext& geoCtx) { auto radius = params.position(geoCtx).template head<2>().norm(); auto halfz = std::numeric_limits::max(); @@ -189,7 +188,7 @@ struct ZCylinderSurfaceBuilder { struct DiscSurfaceBuilder { template std::shared_ptr operator()( - const Acts::SingleBoundTrackParameters& params, + const Acts::GenericBoundTrackParameters& params, const Acts::GeometryContext& geoCtx) { using namespace Acts; using namespace Acts::UnitLiterals; @@ -213,7 +212,7 @@ struct DiscSurfaceBuilder { struct PlaneSurfaceBuilder { template std::shared_ptr operator()( - const Acts::SingleBoundTrackParameters& params, + const Acts::GenericBoundTrackParameters& params, const Acts::GeometryContext& geoCtx) { return Acts::Surface::makeShared( makeCurvilinearTransform(params, geoCtx)); @@ -224,7 +223,7 @@ struct PlaneSurfaceBuilder { struct ZStrawSurfaceBuilder { template std::shared_ptr operator()( - const Acts::SingleBoundTrackParameters& params, + const Acts::GenericBoundTrackParameters& params, const Acts::GeometryContext& geoCtx) { return Acts::Surface::makeShared( Acts::Transform3(Acts::Translation3(params.position(geoCtx)))); @@ -242,7 +241,7 @@ template transportFreely( const propagator_t& propagator, const Acts::GeometryContext& geoCtx, const Acts::MagneticFieldContext& magCtx, - const Acts::SingleCurvilinearTrackParameters& initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, double pathLength) { using namespace Acts::UnitLiterals; @@ -270,7 +269,7 @@ template transportToSurface( const propagator_t& propagator, const Acts::GeometryContext& geoCtx, const Acts::MagneticFieldContext& magCtx, - const Acts::SingleCurvilinearTrackParameters& initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, const Acts::Surface& targetSurface, double pathLimit) { using namespace Acts::UnitLiterals; @@ -302,7 +301,7 @@ template & initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, double pathLength, double epsPos, double epsDir, double epsMom) { // propagate parameters Acts::Direction::Forward auto [fwdParams, fwdPathLength] = @@ -329,7 +328,7 @@ template & initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, double pathLength, surface_builder_t&& buildTargetSurface, double epsPos, double epsDir, double epsMom) { // free propagation for the given path length @@ -371,7 +370,7 @@ inline void runForwardComparisonTest( const cmp_propagator_t& cmpPropagator, const ref_propagator_t& refPropagator, const Acts::GeometryContext& geoCtx, const Acts::MagneticFieldContext& magCtx, - const Acts::SingleCurvilinearTrackParameters& initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, double pathLength, double epsPos, double epsDir, double epsMom, double tolCov) { // propagate twice using the two different propagators @@ -402,7 +401,7 @@ inline void runToSurfaceComparisonTest( const cmp_propagator_t& cmpPropagator, const ref_propagator_t& refPropagator, const Acts::GeometryContext& geoCtx, const Acts::MagneticFieldContext& magCtx, - const Acts::SingleCurvilinearTrackParameters& initialParams, + const Acts::GenericCurvilinearTrackParameters& initialParams, double pathLength, surface_builder_t&& buildTargetSurface, double epsPos, double epsDir, double epsMom, double tolCov) { // free propagation with the reference propagator for the given path length diff --git a/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp index c51d6864604..2f0abcb294a 100644 --- a/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp +++ b/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp @@ -14,8 +14,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Surfaces/ConeSurface.hpp" @@ -45,14 +44,14 @@ namespace { namespace bdata = boost::unit_test::data; using namespace Acts; using namespace Acts::UnitLiterals; -using AnyBoundTrackParameters = SingleBoundTrackParameters; +using AnyBoundTrackParameters = GenericBoundTrackParameters; constexpr auto eps = 8 * std::numeric_limits::epsilon(); const GeometryContext geoCtx; const BoundSymMatrix cov = BoundSymMatrix::Identity(); template -void checkParameters(const SingleBoundTrackParameters& params, +void checkParameters(const GenericBoundTrackParameters& params, double l0, double l1, double time, double phi, double theta, double p, double q, const Vector3& pos, const Vector3& unitDir) { diff --git a/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp index 2c26cb5445b..ffc4ebc8345 100644 --- a/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp +++ b/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp @@ -13,8 +13,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp" @@ -34,14 +33,14 @@ namespace { using namespace Acts; using namespace Acts::UnitLiterals; using AnyCurvilinearTrackParameters = - SingleCurvilinearTrackParameters; + GenericCurvilinearTrackParameters; constexpr auto eps = 8 * std::numeric_limits::epsilon(); const GeometryContext geoCtx; const BoundSymMatrix cov = BoundSymMatrix::Identity(); template -void checkParameters(const SingleCurvilinearTrackParameters& params, +void checkParameters(const GenericCurvilinearTrackParameters& params, double phi, double theta, double p, double q, const Vector4& pos4, const Vector3& unitDir) { const auto qOverP = (q != 0) ? (q / p) : (1 / p); diff --git a/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp index 843a6d35043..5fdf2087db8 100644 --- a/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp +++ b/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp @@ -14,8 +14,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleFreeTrackParameters.hpp" +#include "Acts/EventData/GenericFreeTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp" @@ -32,14 +31,14 @@ namespace { using namespace Acts; using namespace Acts::UnitLiterals; -using AnyFreeTrackParameters = SingleFreeTrackParameters; +using AnyFreeTrackParameters = GenericFreeTrackParameters; constexpr auto eps = 8 * std::numeric_limits::epsilon(); const GeometryContext geoCtx; const FreeSymMatrix cov = FreeSymMatrix::Identity(); template -void checkParameters(const SingleFreeTrackParameters& params, +void checkParameters(const GenericFreeTrackParameters& params, const Vector4& pos4, const Vector3& unitDir, double p, double q) { const auto qOverP = (q != 0) ? (q / p) : (1 / p); diff --git a/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp index 3c6ffdfba8c..45a1f8b08d8 100644 --- a/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp +++ b/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp @@ -11,7 +11,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Surfaces/Surface.hpp" #include @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(test_accessors) { auto surface = Acts::Surface::makeShared( Vector3::Ones(), Vector3::Ones().normalized()); - const SingleBoundTrackParameters single_pars( + const GenericBoundTrackParameters single_pars( surface, BoundVector::Ones(), cov); const auto multi_pars = [&]() { diff --git a/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp b/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp index bc46cfd39ad..963b574379e 100644 --- a/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp +++ b/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp @@ -11,7 +11,6 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/CuboidVolumeBuilder.hpp" #include "Acts/Geometry/GeometryContext.hpp" diff --git a/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp b/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp index 58b995ab371..4df6a9e09aa 100644 --- a/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp +++ b/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp @@ -15,8 +15,8 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/detail/TransformationBoundToFree.hpp" #include "Acts/Geometry/GeometryContext.hpp" diff --git a/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp b/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp index e753b82e215..cf3ce2c6fc7 100644 --- a/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp +++ b/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp @@ -13,9 +13,8 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/detail/TransformationBoundToFree.hpp" #include "Acts/Geometry/BoundarySurfaceT.hpp" diff --git a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp index 0372ba35dd0..6ae63dccf95 100644 --- a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp +++ b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/ConstantBField.hpp" diff --git a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp index c43a8f433f4..d21ce86f724 100644 --- a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp +++ b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp @@ -13,7 +13,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/ConstantBField.hpp" diff --git a/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp index 9d1667bf2b6..aff85613a2f 100644 --- a/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp +++ b/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp @@ -12,7 +12,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/ConstantBField.hpp" diff --git a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp index 981755e8a73..978d55d17dc 100644 --- a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp +++ b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp @@ -13,7 +13,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/ConstantBField.hpp" diff --git a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp index 69b2f72bb17..723a6cbadf5 100644 --- a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp +++ b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp b/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp index 49aff99e094..12865ee271c 100644 --- a/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp +++ b/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp @@ -12,8 +12,8 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/Charge.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiComponentBoundTrackParameters.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp" #include "Acts/Geometry/GeometryContext.hpp" @@ -227,7 +227,7 @@ void test_multi_stepper_vs_eigen_stepper() { Vector3::Zero(), Vector3::Ones().normalized()); MultiComponentBoundTrackParameters multi_pars(surface, cmps); - SingleBoundTrackParameters single_pars(surface, pars, cov); + GenericBoundTrackParameters single_pars(surface, pars, cov); MultiState multi_state(geoCtx, magCtx, defaultBField, multi_pars, defaultNDir, defaultStepSize); @@ -603,7 +603,7 @@ void test_combined_curvilinear_state_function() { std::vector>> cmps(4, {0.25, pars, cov}); - SingleBoundTrackParameters check_pars(surface, pars, cov); + GenericBoundTrackParameters check_pars(surface, pars, cov); MultiComponentBoundTrackParameters multi_pars(surface, cmps); MultiState multi_state(geoCtx, magCtx, defaultBField, multi_pars, defaultNDir, diff --git a/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp index 6e386cc58f6..896bf8c5f2b 100644 --- a/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp +++ b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp @@ -16,7 +16,7 @@ #include "Acts/Definitions/Tolerance.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/TrackingGeometry.hpp" diff --git a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp index 59b3538b449..51c1af0abda 100644 --- a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp +++ b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp @@ -14,8 +14,8 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp b/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp index ce44cab69e3..820a19a550a 100644 --- a/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp +++ b/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp @@ -12,9 +12,8 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/NeutralTrackParameters.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp" #include "Acts/EventData/detail/TransformationBoundToFree.hpp" diff --git a/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp b/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp index 740ad594d19..e440dbe7ea7 100644 --- a/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp +++ b/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp @@ -12,7 +12,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp b/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp index 6eb3625a646..ecd2be80d67 100644 --- a/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp +++ b/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp @@ -13,8 +13,8 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/Measurement.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" #include "Acts/EventData/SourceLink.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" diff --git a/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp b/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp index a20e898c7c5..22b1eb31e27 100644 --- a/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp +++ b/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp @@ -12,9 +12,9 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" #include "Acts/EventData/SourceLink.hpp" #include "Acts/EventData/TrackContainer.hpp" #include "Acts/EventData/TrackParameters.hpp" diff --git a/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp b/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp index c8079926147..fb45398381b 100644 --- a/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp +++ b/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp @@ -14,10 +14,10 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/MultiComponentBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackContainer.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/TrackProxy.hpp" @@ -98,14 +98,14 @@ auto makeDefaultGsfOptions() { } // A Helper type to allow us to put the MultiComponentBoundTrackParameters into -// the function so that it can also be used as SingleBoundTrackParameters for +// the function so that it can also be used as GenericBoundTrackParameters for // the MeasurementsCreator template -struct MultiCmpsParsInterface : public SingleBoundTrackParameters { +struct MultiCmpsParsInterface : public GenericBoundTrackParameters { MultiComponentBoundTrackParameters multi_pars; MultiCmpsParsInterface(const MultiComponentBoundTrackParameters &p) - : SingleBoundTrackParameters( + : GenericBoundTrackParameters( p.referenceSurface().getSharedPtr(), p.parameters(), p.covariance()), multi_pars(p) {} diff --git a/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp b/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp index 78f9cfe49c8..ec5f4794562 100644 --- a/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp +++ b/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp @@ -12,8 +12,8 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" +#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleCurvilinearTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/EventData/TrackStatePropMask.hpp" #include "Acts/EventData/VectorMultiTrajectory.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp index 60cc230cb13..71e95d23896 100644 --- a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp @@ -13,7 +13,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Surfaces/PerigeeSurface.hpp" #include "Acts/Surfaces/Surface.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp index 3fd95204bc8..b4314bba723 100644 --- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp index 33a23d893af..fcb7562fdff 100644 --- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp @@ -15,7 +15,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp index 6ee8b7517e7..e78479f8186 100644 --- a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp index 496d8a5999a..49da24c0f61 100644 --- a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp @@ -13,7 +13,7 @@ #include "Acts/Definitions/Algebra.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Surfaces/PerigeeSurface.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp index b2fd6c71733..d39dba276c4 100644 --- a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp @@ -15,7 +15,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/MagneticFieldContext.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp b/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp index 24242b0fd8c..c5b32efd8ab 100644 --- a/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp @@ -15,7 +15,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp index 187de631f1e..bf124b99bb8 100644 --- a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp @@ -16,7 +16,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/KalmanVertexTrackUpdaterTests.cpp b/Tests/UnitTests/Core/Vertexing/KalmanVertexTrackUpdaterTests.cpp index f26fdd9535e..ad896275b0c 100644 --- a/Tests/UnitTests/Core/Vertexing/KalmanVertexTrackUpdaterTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/KalmanVertexTrackUpdaterTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp index 295a9d968c0..0e3f2ea123d 100644 --- a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp @@ -14,7 +14,7 @@ #include "Acts/Definitions/Direction.hpp" #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/Geometry/GeometryIdentifier.hpp" diff --git a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp index a44f4e3a814..02981b115ab 100644 --- a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp +++ b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp @@ -15,7 +15,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/Definitions/Units.hpp" #include "Acts/EventData/Charge.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/TrackParameters.hpp" #include "Acts/Geometry/GeometryContext.hpp" #include "Acts/MagneticField/MagneticFieldContext.hpp" diff --git a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp index 7f26b2d4234..dac0dc3e41a 100644 --- a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp +++ b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp @@ -13,8 +13,8 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/Charge.hpp" +#include "Acts/EventData/GenericBoundTrackParameters.hpp" #include "Acts/EventData/MultiTrajectory.hpp" -#include "Acts/EventData/SingleBoundTrackParameters.hpp" #include "Acts/EventData/TrackHelpers.hpp" #include "Acts/EventData/TrackStatePropMask.hpp" #include "Acts/EventData/VectorMultiTrajectory.hpp" @@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigee) { cov.setIdentity(); cov(5, 5) = 25_ns; - SingleBoundTrackParameters boundPar{refSurface, par, cov}; + GenericBoundTrackParameters boundPar{refSurface, par, cov}; double Bz = 2_T; @@ -71,7 +71,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigee) { // convert back for roundtrip test - SingleBoundTrackParameters roundtripPar = + GenericBoundTrackParameters roundtripPar = EDM4hepUtil::detail::convertTrackParametersFromEdm4hep(Bz, converted); BOOST_CHECK(roundtripPar.parameters().isApprox(boundPar.parameters())); @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigee) { cov.setIdentity(); cov(5, 5) = 25_ns; - SingleBoundTrackParameters boundPar{refSurface, par, cov}; + GenericBoundTrackParameters boundPar{refSurface, par, cov}; double Bz = 2_T; @@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigee) { BOOST_CHECK_EQUAL(converted.covariance.value()(5, 5), 25_ns); // convert back for roundtrip test - SingleBoundTrackParameters roundtripPar = + GenericBoundTrackParameters roundtripPar = EDM4hepUtil::detail::convertTrackParametersFromEdm4hep(Bz, converted); BOOST_CHECK_EQUAL(roundtripPar.parameters().template head<2>(), @@ -129,8 +129,8 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigeeNoCov) { par << 1_mm, 5_mm, 0, M_PI_2, -1 / 1_GeV, 5_ns; // -> perpendicular to perigee and pointing right, should be PCA - SingleBoundTrackParameters boundPar{refSurface, par, - std::nullopt}; + GenericBoundTrackParameters boundPar{refSurface, par, + std::nullopt}; double Bz = 2_T; @@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigeeNoCov) { // convert back for roundtrip test - SingleBoundTrackParameters roundtripPar = + GenericBoundTrackParameters roundtripPar = EDM4hepUtil::detail::convertTrackParametersFromEdm4hep(Bz, converted); BOOST_CHECK(roundtripPar.parameters().isApprox(boundPar.parameters())); @@ -162,8 +162,8 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigeeNoCov) { BoundVector par; par << 1_mm, 5_mm, M_PI / 4., M_PI_2, -1 / 1_GeV, 5_ns; - SingleBoundTrackParameters boundPar{refSurface, par, - std::nullopt}; + GenericBoundTrackParameters boundPar{refSurface, par, + std::nullopt}; double Bz = 2_T; @@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigeeNoCov) { CHECK_CLOSE_ABS(converted.values[2], par[2], 1e-6); // convert back for roundtrip test - SingleBoundTrackParameters roundtripPar = + GenericBoundTrackParameters roundtripPar = EDM4hepUtil::detail::convertTrackParametersFromEdm4hep(Bz, converted); BOOST_CHECK_EQUAL(roundtripPar.parameters().template head<2>(), diff --git a/docs/core/eventdata.md b/docs/core/eventdata.md index ba786e22199..c3fcfdfa531 100644 --- a/docs/core/eventdata.md +++ b/docs/core/eventdata.md @@ -87,8 +87,8 @@ which either is a `ChargedPolicy` class for charged track parameter representati ```cpp namespace Acts { typedef SingleTrackParameters TrackParameters; - typedef SingleCurvilinearTrackParameters CurvilinearTrackParameters; - typedef SingleBoundTrackParameters BoundTrackParameters; + typedef GenericCurvilinearTrackParameters CurvilinearTrackParameters; + typedef GenericBoundTrackParameters BoundTrackParameters; } // end of namespace Acts ``` @@ -97,9 +97,9 @@ Or, respectively, a `NeutralPolicy` object ```cpp namespace Acts { typedef SingleTrackParameters NeutralParameters; - typedef SingleCurvilinearTrackParameters + typedef GenericCurvilinearTrackParameters NeutralCurvilinearTrackParameters; - typedef SingleBoundTrackParameters NeutralBoundTrackParameters; + typedef GenericBoundTrackParameters NeutralBoundTrackParameters; } // end of namespace Acts ```