From c08ee00a17c88b0743be10a6fdd4d8cf4e1f85e8 Mon Sep 17 00:00:00 2001
From: Carlo Varni <carlo.varni@cern.ch>
Date: Mon, 5 Dec 2022 20:37:30 +0100
Subject: [PATCH] Bump Acts Tag to v21.1.0
Bump Acts Tag to v21.1.0
---
.../xAODTracking/Root/TrackMeasurement_v1.cxx | 19 +---
.../versions/TrackMeasurement_v1.h | 30 ++++--
Projects/Athena/build_externals.sh | 2 +-
.../src/ActsGeantFollowerHelper.cxx | 20 ++--
.../src/ActsGeantFollowerHelper.h | 2 +-
.../ActsGeometry/ATLASSourceLink.h | 8 +-
.../ActsGeometry/ActsExtrapolationTool.h | 4 +-
.../src/ActsExtrapolationTool.cxx | 16 +--
.../IActsExtrapolationTool.h | 4 +-
.../ActsTrkSeeding/src/SeedingAlg.cxx | 2 +-
.../src/SeedingFromAthenaAlg.cxx | 2 +-
.../ActsTrkEvent/MultiTrajectory.h | 75 ++++++++------
.../test/CommonHelpers/MeasurementHelpers.hpp | 98 -------------------
.../test/MultiTrajectoryBasic_test.cxx | 13 ++-
.../src/ActsKalmanFitter.h | 21 ++--
.../ActsTrkSeedingTool/src/SeedingTool.cxx | 55 +++++------
.../ActsTrkSeedingTool/src/SeedingTool.h | 19 ++--
.../src/ExtrapolatorComparisonTest.cxx | 4 +-
18 files changed, 151 insertions(+), 243 deletions(-)
delete mode 100644 Tracking/Acts/ActsTrkEvent/test/CommonHelpers/MeasurementHelpers.hpp
diff --git a/Event/xAOD/xAODTracking/Root/TrackMeasurement_v1.cxx b/Event/xAOD/xAODTracking/Root/TrackMeasurement_v1.cxx
index dcc3e08ad177..efa8ef9c5b57 100644
--- a/Event/xAOD/xAODTracking/Root/TrackMeasurement_v1.cxx
+++ b/Event/xAOD/xAODTracking/Root/TrackMeasurement_v1.cxx
@@ -12,27 +12,10 @@ namespace xAOD {
meas,
setMeas)
- static const SG::AuxElement::Accessor<std::vector<double>> measAcc("meas");
- TrackMeasurement_v1::VectorMap TrackMeasurement_v1::measEigen() {
- return VectorMap{measAcc(*this).data()};
- }
-
- TrackMeasurement_v1::ConstVectorMap TrackMeasurement_v1::measEigen() const {
- return ConstVectorMap{measAcc(*this).data()};
- }
-
AUXSTORE_OBJECT_SETTER_AND_GETTER(TrackMeasurement_v1,
std::vector<double>,
covMatrix,
setCovMatrix)
- static const SG::AuxElement::Accessor<std::vector<double>> covMatrixAcc("covMatrix");
- TrackMeasurement_v1::MatrixMap TrackMeasurement_v1::covMatrixEigen() {
- return MatrixMap{covMatrixAcc(*this).data()};
- }
-
- TrackMeasurement_v1::ConstMatrixMap TrackMeasurement_v1::covMatrixEigen() const {
- return ConstMatrixMap{covMatrixAcc(*this).data()};
- }
AUXSTORE_OBJECT_SETTER_AND_GETTER(TrackMeasurement_v1,
ElementLink<xAOD::UncalibratedMeasurementContainer>,
@@ -58,4 +41,4 @@ namespace xAOD {
measAcc(*this).resize(sz);
covMatrixAcc(*this).resize(sz * sz);
}
-}
\ No newline at end of file
+}
diff --git a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackMeasurement_v1.h b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackMeasurement_v1.h
index 5d813dec45fc..cb5c70854093 100644
--- a/Event/xAOD/xAODTracking/xAODTracking/versions/TrackMeasurement_v1.h
+++ b/Event/xAOD/xAODTracking/xAODTracking/versions/TrackMeasurement_v1.h
@@ -11,6 +11,9 @@
#include "EventPrimitives/EventPrimitives.h"
+static const SG::AuxElement::Accessor<std::vector<double>> measAcc("meas");
+static const SG::AuxElement::Accessor<std::vector<double>> covMatrixAcc("covMatrix");
+
namespace xAOD {
/**
* @brief Track Measurements for Acts MultiTrajectory
@@ -18,20 +21,21 @@ namespace xAOD {
class TrackMeasurement_v1 : public SG::AuxElement {
public:
- using ConstVectorMap = Eigen::Map<const Eigen::Matrix<double, 6, 1>>;
- using VectorMap = Eigen::Map<Eigen::Matrix<double, 6, 1>>;
- using ConstMatrixMap = Eigen::Map<const Eigen::Matrix<double, 6, 6>>;
- using MatrixMap = Eigen::Map<Eigen::Matrix<double, 6, 6>>;
-
TrackMeasurement_v1() = default;
/**
* access track Measurements vector of const element
**/
- ConstVectorMap measEigen() const;
+ template<std::size_t measdim = 6>
+ Eigen::Map<const Eigen::Matrix<double, measdim, 1>> measEigen() const {
+ return Eigen::Map<const Eigen::Matrix<double, measdim, 1>>{measAcc(*this).data()};
+ }
/**
* access Measurements of non const element
**/
- VectorMap measEigen();
+ template<std::size_t measdim = 6>
+ Eigen::Map<Eigen::Matrix<double, measdim, 1>> measEigen() {
+ return Eigen::Map<Eigen::Matrix<double, measdim, 1>>{measAcc(*this).data()};
+ }
/**
* access track Measurements as plain vector
@@ -46,12 +50,18 @@ namespace xAOD {
/**
* access track covariance matrix (flattened, rows layout) of const element
**/
- ConstMatrixMap covMatrixEigen() const;
+ template<std::size_t measdim = 6>
+ Eigen::Map<const Eigen::Matrix<double, measdim, measdim>> covMatrixEigen() const {
+ return Eigen::Map<const Eigen::Matrix<double, measdim, measdim>>{covMatrixAcc(*this).data()};
+ }
/**
* access track covariance matrix (flattened, rows layout)
**/
- MatrixMap covMatrixEigen();
+ template<std::size_t measdim = 6>
+ Eigen::Map<Eigen::Matrix<double, measdim, measdim>> covMatrixEigen() {
+ return Eigen::Map<Eigen::Matrix<double, measdim, measdim>> {covMatrixAcc(*this).data()};
+ }
/**
* access track covariance as plain vector
@@ -92,4 +102,4 @@ namespace xAOD {
void resize(size_t sz = 6);
};
}
-#endif
\ No newline at end of file
+#endif
diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh
index c85100d5a218..faf1f78e4629 100755
--- a/Projects/Athena/build_externals.sh
+++ b/Projects/Athena/build_externals.sh
@@ -12,7 +12,7 @@ ATLAS_BUILDTYPE="RelWithDebInfo"
ATLAS_EXTRA_CMAKE_ARGS=(-DLCG_VERSION_NUMBER=102
-DLCG_VERSION_POSTFIX="b_ATLAS_6"
-DATLAS_GAUDI_SOURCE="URL;https://gitlab.cern.ch/atlas/Gaudi/-/archive/v36r6.003/Gaudi-v36r6.003.tar.gz;URL_MD5;e7b279804438a7c68b190084fe2592a7"
- -DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v20.3.0.tar.gz;URL_MD5;2f4d7c2b04495ec5f4ea2ed30c419770"
+ -DATLAS_ACTS_SOURCE="URL;https://github.com/acts-project/acts/archive/refs/tags/v21.1.0.tar.gz;URL_MD5;6c852dabc9c750326377761a1d298139"
-DATLAS_GEOMODEL_SOURCE="URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/4.4.3/GeoModel-4.4.3.tar.bz2;URL_MD5;593a9eda9974e73d30b60d4d670b6940")
ATLAS_EXTRA_MAKE_ARGS=()
diff --git a/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.cxx b/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.cxx
index 9fb6065f8a43..6bf202b2e2af 100755
--- a/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.cxx
+++ b/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.cxx
@@ -39,7 +39,7 @@ ActsGeantFollowerHelper::ActsGeantFollowerHelper(const std::string& t, const std
m_extrapolateDirectly(true),
m_extrapolateIncrementally(true),
m_parameterCache(nullptr),
- m_actsParameterCache(nullptr),
+ m_actsParameterCache(std::nullopt),
m_tX0Cache(0.),
m_tX0NonSensitiveCache(0.),
m_tNonSensitiveCache(0.),
@@ -209,7 +209,7 @@ void ActsGeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
Acts::Vector4 actsStart(pos.x(),pos.y(),pos.z(),0);
Acts::Vector3 dir = nmom.normalized();
- m_actsParameterCache = std::make_unique<const Acts::BoundTrackParameters>(Acts::BoundTrackParameters::create(surface, gctx.context(), actsStart, dir, mom.mag()/1000, charge).value());
+ m_actsParameterCache = std::make_optional<Acts::BoundTrackParameters>(Acts::BoundTrackParameters::create(surface, gctx.context(), actsStart, dir, mom.mag()/1000, charge).value());
}
// Store material in cache
@@ -256,12 +256,12 @@ void ActsGeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
// create a Acts::Surface that correspond to the Trk::Surface
auto destinationSurfaceActs = Acts::Surface::makeShared<Acts::PlaneSurface>(destinationSurface.center(), destinationSurface.normal());
- std::unique_ptr<const Acts::BoundTrackParameters> actsParameters = m_actsExtrapolator->propagate(ctx,
- *m_actsParameterCache,
- *destinationSurfaceActs,
- Acts::NavigationDirection::Forward,
- std::numeric_limits<double>::max(),
- particleHypo);
+ std::optional<Acts::BoundTrackParameters> actsParameters = m_actsExtrapolator->propagate(ctx,
+ *m_actsParameterCache,
+ *destinationSurfaceActs,
+ Acts::NavigationDirection::Forward,
+ std::numeric_limits<double>::max(),
+ particleHypo);
float X0Acts = m_actsExtrapolator->propagationSteps(ctx,
*m_actsParameterCache,
@@ -270,7 +270,7 @@ void ActsGeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
std::numeric_limits<double>::max(),
particleHypo).second.materialInX0;
- if(actsParameters == nullptr){
+ if(not actsParameters.has_value()){
ATH_MSG_ERROR("Error in the Acts extrapolation, skip the current step");
return;
}
@@ -357,7 +357,7 @@ void ActsGeantFollowerHelper::trackParticle(const G4ThreeVector& pos,
delete m_parameterCache;
m_actsParameterCache.reset();
m_parameterCache = trkParameters;
- m_actsParameterCache = std::move(actsParameters);
+ m_actsParameterCache = actsParameters;
}
// delete cache and increment
delete g4Parameters;
diff --git a/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.h b/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.h
index d628255403ee..e07c702ebe54 100755
--- a/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.h
+++ b/Tracking/Acts/ActsGeantFollowing/src/ActsGeantFollowerHelper.h
@@ -61,7 +61,7 @@ class ActsGeantFollowerHelper : public extends<AthAlgTool, IActsGeantFollowerHel
bool m_extrapolateIncrementally;
Trk::TrackParameters* m_parameterCache;
- std::unique_ptr<const Acts::BoundTrackParameters> m_actsParameterCache;
+ std::optional<Acts::BoundTrackParameters> m_actsParameterCache;
std::unique_ptr<std::vector<Acts::SurfaceHit>> m_actsSurfaceCache;
std::vector<Acts::SurfaceHit>::iterator m_actsSurfaceIterator;
// Hypothesis to pdg converter
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASSourceLink.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASSourceLink.h
index eea4cccecb50..f210865b264e 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASSourceLink.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASSourceLink.h
@@ -82,8 +82,8 @@ void ATLASSourceLinkCalibrator::calibrate(const Acts::GeometryContext& /*gctx*/,
throw std::runtime_error("Cannot create dim 0 measurement");
} else if (sourceLink.dim() == 1) {
// return Acts::makeMeasurement(sourceLink, sourceLink.values().head<1>(), sourceLink.cov().topLeftCorner<1, 1>(), Acts::eBoundLoc0);
- trackState.calibrated().template head<1>() = sourceLink.values().head<1>();
- trackState.calibratedCovariance().template topLeftCorner<1, 1>() = sourceLink.cov().topLeftCorner<1, 1>();
+ trackState.template calibrated<1>() = sourceLink.values().head<1>();
+ trackState.template calibratedCovariance<1>() = sourceLink.cov().topLeftCorner<1, 1>();
trackState.calibratedSize() = sourceLink.dim();
// Create a 1D projection matrix
Acts::ActsMatrix<Acts::MultiTrajectory<trajectory_t>::MeasurementSizeMax, 1> proj;
@@ -94,8 +94,8 @@ void ATLASSourceLinkCalibrator::calibrate(const Acts::GeometryContext& /*gctx*/,
else if (sourceLink.dim() == 2)
{
// return Acts::makeMeasurement(sourceLink, sourceLink.values().head<2>(), sourceLink.cov().topLeftCorner<2, 2>(), Acts::eBoundLoc0, Acts::eBoundLoc1);
- trackState.calibrated().template head<2>() = sourceLink.values().head<2>();
- trackState.calibratedCovariance().template topLeftCorner<2, 2>() = sourceLink.cov().topLeftCorner<2, 2>();
+ trackState.template calibrated<2>() = sourceLink.values().head<2>();
+ trackState.template calibratedCovariance<2>() = sourceLink.cov().topLeftCorner<2, 2>();
trackState.calibratedSize() = sourceLink.dim();
// Create a 2D projection matrix
Acts::ActsMatrix<Acts::MultiTrajectory<trajectory_t>::MeasurementSizeMax, 2> proj;
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index 84830551841f..607f5e9fc87d 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -77,7 +77,7 @@ public:
Trk::ParticleHypothesis particleHypo = Trk::pion) const override;
virtual
- std::unique_ptr<const Acts::CurvilinearTrackParameters>
+ std::optional<const Acts::CurvilinearTrackParameters>
propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::NavigationDirection::Forward,
@@ -94,7 +94,7 @@ public:
Trk::ParticleHypothesis particleHypo = Trk::pion) const override;
virtual
- std::unique_ptr<const Acts::BoundTrackParameters>
+ std::optional<const Acts::BoundTrackParameters>
propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
index 449261b71b9a..584a88478588 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
@@ -213,7 +213,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
-std::unique_ptr<const Acts::CurvilinearTrackParameters>
+std::optional<const Acts::CurvilinearTrackParameters>
ActsExtrapolationTool::propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir /*= Acts::NavigationDirection::Forward*/,
@@ -254,14 +254,14 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
mInteractor.energyLoss = m_interactionEloss;
mInteractor.recordInteractions = m_interactionRecord;
- auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::CurvilinearTrackParameters> {
+ auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::optional<const Acts::CurvilinearTrackParameters> {
auto result = propagator.propagate(startParameters, options);
if (!result.ok()) {
ATH_MSG_ERROR("Got error during propagation:" << result.error()
<< ". Returning empty parameters.");
- return nullptr;
+ return std::nullopt;
}
- return std::move(result.value().endParameters);
+ return result.value().endParameters;
}, *m_varProp);
return parameters;
@@ -338,7 +338,7 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
return output;
}
-std::unique_ptr<const Acts::BoundTrackParameters>
+std::optional<const Acts::BoundTrackParameters>
ActsExtrapolationTool::propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
@@ -380,14 +380,14 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
mInteractor.energyLoss = m_interactionEloss;
mInteractor.recordInteractions = m_interactionRecord;
- auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::unique_ptr<const Acts::BoundTrackParameters> {
+ auto parameters = boost::apply_visitor([&](const auto& propagator) -> std::optional<const Acts::BoundTrackParameters> {
auto result = propagator.propagate(startParameters, target, options);
if (!result.ok()) {
ATH_MSG_ERROR("Got error during propagation: " << result.error()
<< ". Returning empty parameters.");
- return nullptr;
+ return std::nullopt;
}
- return std::move(result.value().endParameters);
+ return result.value().endParameters;
}, *m_varProp);
return parameters;
diff --git a/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h b/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
index 75cc0928bcab..a4f7a0191c23 100644
--- a/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometryInterfaces/ActsGeometryInterfaces/IActsExtrapolationTool.h
@@ -42,7 +42,7 @@ class IActsExtrapolationTool : virtual public IAlgTool {
Trk::ParticleHypothesis particleHypo = Trk::pion) const = 0;
virtual
- std::unique_ptr<const Acts::CurvilinearTrackParameters>
+ std::optional<const Acts::CurvilinearTrackParameters>
propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
Acts::NavigationDirection navDir = Acts::NavigationDirection::Forward,
@@ -59,7 +59,7 @@ class IActsExtrapolationTool : virtual public IAlgTool {
Trk::ParticleHypothesis particleHypo = Trk::pion) const = 0;
virtual
- std::unique_ptr<const Acts::BoundTrackParameters>
+ std::optional<const Acts::BoundTrackParameters>
propagate(const EventContext& ctx,
const Acts::BoundTrackParameters& startParameters,
const Acts::Surface& target,
diff --git a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingAlg.cxx b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingAlg.cxx
index 135a4683c520..9b330f32a4e7 100644
--- a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingAlg.cxx
+++ b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingAlg.cxx
@@ -11,7 +11,7 @@
#include "Acts/Seeding/BinFinder.hpp"
#include "Acts/Seeding/BinnedSPGroup.hpp"
#include "Acts/Seeding/SeedFilter.hpp"
-#include "Acts/Seeding/Seedfinder.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
#include "TrkSpacePoint/SpacePointCollection.h"
#include "AthenaMonitoringKernel/Monitored.h"
diff --git a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingFromAthenaAlg.cxx b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingFromAthenaAlg.cxx
index 5d77602542ae..3f27dbbe98a4 100644
--- a/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingFromAthenaAlg.cxx
+++ b/Tracking/Acts/ActsTrkAlgs/ActsTrkSeeding/src/SeedingFromAthenaAlg.cxx
@@ -11,7 +11,7 @@
#include "Acts/Seeding/BinFinder.hpp"
#include "Acts/Seeding/BinnedSPGroup.hpp"
#include "Acts/Seeding/SeedFilter.hpp"
-#include "Acts/Seeding/Seedfinder.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "TrkSpacePoint/SpacePointCollection.h"
diff --git a/Tracking/Acts/ActsTrkEvent/ActsTrkEvent/MultiTrajectory.h b/Tracking/Acts/ActsTrkEvent/ActsTrkEvent/MultiTrajectory.h
index 73aa78c0ed2d..b28525e170c3 100644
--- a/Tracking/Acts/ActsTrkEvent/ActsTrkEvent/MultiTrajectory.h
+++ b/Tracking/Acts/ActsTrkEvent/ActsTrkEvent/MultiTrajectory.h
@@ -5,6 +5,7 @@
#define ActsTrkEvent_MultiTrajectory_h
#include <type_traits>
#include "CxxUtils/concepts.h"
+#include "Acts/EventData/VectorMultiTrajectory.hpp"
#include "Acts/EventData/MultiTrajectory.hpp"
#include "Acts/EventData/TrackStatePropMask.hpp"
#include "Acts/Utilities/HashedString.hpp"
@@ -18,13 +19,23 @@
#include "ActsTrkEvent/SourceLink.h"
namespace ActsTrk {
+ template<bool RWState>
+ class MultiTrajectory;
+
+ namespace detail { struct Decoration; }
+
+ constexpr static bool IsReadOnly = true;
+ constexpr static bool IsReadWrite = false;
+}
+
+namespace Acts {
+ template <>
+ struct isReadOnlyMultiTrajectory<ActsTrk::MultiTrajectory<ActsTrk::IsReadOnly>> : std::true_type {};
+ template <>
+ struct isReadOnlyMultiTrajectory<ActsTrk::MultiTrajectory<ActsTrk::IsReadWrite>> : std::false_type {};
+}
- namespace detail { struct Decoration; }
-
- constexpr static bool IsReadOnly = true;
- constexpr static bool IsReadWrite = false;
-
-
+namespace ActsTrk {
/**
* @brief Athena implementation of ACTS::MultiTrajectory
*
@@ -32,7 +43,7 @@ namespace ActsTrk {
*/
template<bool RWState>
class MultiTrajectory final
- : public Acts::MultiTrajectory<ActsTrk::MultiTrajectory<RWState>>{ // TODO select other variant of the interface for UNMODIFIABLE (needs next ACTS version)
+ : public Acts::MultiTrajectory<ActsTrk::MultiTrajectory<RWState>>{
public:
using TrackStateContainerBackendPtr = typename std::conditional<RWState, const xAOD::TrackStateContainer*, xAOD::TrackStateContainer*>::type;
@@ -107,7 +118,7 @@ namespace ActsTrk {
typename ConstTrackStateProxy::Parameters parameters_impl(IndexType index) const {
return trackParameters().at(index)-> paramsEigen();
- };
+ }
ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Parameters) parameters_impl(IndexType index){
return trackParameters().at(index)-> paramsEigen();
}
@@ -120,7 +131,7 @@ namespace ActsTrk {
*/
typename ConstTrackStateProxy::Covariance covariance_impl(IndexType index) const {
return trackParameters().at(index)-> covMatrixEigen();
- };
+ }
ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Covariance) covariance_impl(IndexType index) {
return trackParameters().at(index)-> covMatrixEigen();
}
@@ -133,7 +144,7 @@ namespace ActsTrk {
*/
typename ConstTrackStateProxy::Covariance trackMeasurementsCov(IndexType index) const {
return trackMeasurements().at(index)-> covMatrixEigen();
- };
+ }
ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Covariance) trackMeasurementsCov(IndexType index) {
return trackMeasurements().at(index)-> covMatrixEigen();
}
@@ -147,7 +158,7 @@ namespace ActsTrk {
inline typename ConstTrackStateProxy::Covariance jacobian_impl(IndexType index) const {
return trackJacobians().at(index)-> jacEigen();
- };
+ }
ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Covariance) jacobian_impl(IndexType index) {
return trackJacobians().at(index)-> jacEigen();
}
@@ -159,11 +170,14 @@ namespace ActsTrk {
* @return TrackStateProxy::Measurement
*/
- inline typename ConstTrackStateProxy::Measurement measurement_impl(IndexType index) const {
- return trackMeasurements().at(index)-> measEigen();
- };
- ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Measurement) measurement_impl(IndexType index) {
- return trackMeasurements().at(index)-> measEigen();
+ template<std::size_t measdim>
+ inline typename ConstTrackStateProxy::Measurement<measdim> measurement_impl(IndexType index) const {
+ return trackMeasurements().at(index)->template measEigen<measdim>();
+ }
+ template<std::size_t measdim, bool Enable = true>
+ std::enable_if_t<Enable && (RWState==IsReadWrite), typename TrackStateProxy::Measurement<measdim>>
+ measurement_impl(IndexType index) {
+ return trackMeasurements().at(index)->template measEigen<measdim>();
}
/**
* @brief obtain measurements covariance for a state at given index
@@ -172,11 +186,14 @@ namespace ActsTrk {
* @return TrackStateProxy::Covariance
*/
- inline typename ConstTrackStateProxy::Covariance measurementCovariance_impl(IndexType index) const {
- return trackMeasurements().at(index)-> covMatrixEigen();
- };
- ATH_MEMBER_REQUIRES(RWState==IsReadWrite, typename TrackStateProxy::Covariance) measurementCovariance_impl(IndexType index) {
- return trackMeasurements().at(index)-> covMatrixEigen();
+ template<std::size_t measdim>
+ inline typename ConstTrackStateProxy::MeasurementCovariance<measdim> measurementCovariance_impl(IndexType index) const {
+ return trackMeasurements().at(index)->template covMatrixEigen<measdim>();
+ }
+ template<std::size_t measdim, bool Enable = true>
+ std::enable_if_t<Enable && (RWState==IsReadWrite), typename TrackStateProxy::MeasurementCovariance<measdim>>
+ measurementCovariance_impl(IndexType index) {
+ return trackMeasurements().at(index)->template covMatrixEigen<measdim>();
}
/**
@@ -187,7 +204,7 @@ namespace ActsTrk {
inline size_t size_impl() const {
return m_trackStates->size();
- };
+ }
/**
* @brief clears backends
@@ -198,7 +215,7 @@ namespace ActsTrk {
m_trackParameters->clear();
m_trackJacobians->clear();
m_trackMeasurements->clear();
- };
+ }
/**
* @brief checks if the backends are connected (i.e. is safe to use, else any other call will cause segfaults)
@@ -252,16 +269,15 @@ namespace ActsTrk {
std::vector<SourceLinkType*> m_sourceLinks;
};
-
+
typedef ActsTrk::MultiTrajectory<ActsTrk::IsReadOnly> ConstMultiTrajectory;
typedef ActsTrk::MultiTrajectory<ActsTrk::IsReadWrite> MutableMultiTrajectory;
-
namespace detail {
struct Decoration {
- using SetterType = std::function<std::any(MultiTrajectory<true>::IndexType, const std::string&)>;
- using GetterType = std::function<const std::any(MultiTrajectory<true>::IndexType, const std::string&)>;
-
+ using SetterType = std::function<std::any(ActsTrk::MultiTrajectory<true>::IndexType, const std::string&)>;
+ using GetterType = std::function<const std::any(ActsTrk::MultiTrajectory<true>::IndexType, const std::string&)>;
+
Decoration(const std::string& n, SetterType s, GetterType g)
: name(n), hash(Acts::hashString(name)), setter(s), getter(g) {}
std::string name; // xAOD API needs this
@@ -271,10 +287,7 @@ namespace ActsTrk {
};
}
-
-
} // EOF namespace ActsTrk
-
#include "MultiTrajectory.icc"
diff --git a/Tracking/Acts/ActsTrkEvent/test/CommonHelpers/MeasurementHelpers.hpp b/Tracking/Acts/ActsTrkEvent/test/CommonHelpers/MeasurementHelpers.hpp
deleted file mode 100644
index 1712b3bf0fe4..000000000000
--- a/Tracking/Acts/ActsTrkEvent/test/CommonHelpers/MeasurementHelpers.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-*/
-
-// File based on Acts:
-// https://github.com/acts-project/acts/blob/v21.0.0/Tests/CommonHelpers/Acts/Tests/CommonHelpers/MeasurementHelpers.hpp
-// TODO: centralize the helper files
-
-
-
-#include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/Utilities/Helpers.hpp"
-
-#include <cstddef>
-
-namespace Acts {
-
-namespace detail {
-/// Helper functor for @c visit_measurement. This is the actual functor given
-/// to @c template_switch.
-/// @tparam I Compile time int value
-template <size_t I>
-struct visit_measurement_callable {
- /// The invoked function. It will perform the head/top-left corner
- /// extraction, and pass thee results to the given lambda.
- /// @tparam L The lambda type
- /// @tparam A The parameter vector type
- /// @tparam B The covariance matrix type
- /// @note No requirements on @c A and @c B are made, to enable a single
- /// overload for both const and non-const matrices/vectors.
- /// @param param The parameter vector
- /// @param cov The covariance matrix
- /// @param lambda The lambda to call with the statically sized subsets
- template <typename L, typename A, typename B>
- auto static constexpr invoke(A&& param, B&& cov, L&& lambda) {
- return lambda(param.template head<I>(), cov.template topLeftCorner<I, I>());
- }
-};
-} // namespace detail
-
-/// Dispatch a lambda call on an overallocated parameter vector and covariance
-/// matrix, based on a runtime dimension value. Inside the lambda call, the
-/// vector and matrix will have fixed dimensions, but will still point back to
-/// the originally given overallocated values.
-/// @tparam L The lambda type
-/// @tparam A The parameter vector type
-/// @tparam B The covariance matrix type
-/// @note No requirements on @c A and @c B are made, to enable a single
-/// overload for both const and non-const matrices/vectors.
-/// @param param The parameter vector
-/// @param cov The covariance matrix
-/// @param dim The actual dimension as a runtime value
-/// @param lambda The lambda to call with the statically sized subsets
-template <typename L, typename A, typename B>
-auto visit_measurement(A&& param, B&& cov, size_t dim, L&& lambda) {
- return template_switch<detail::visit_measurement_callable, 1, eBoundSize>(
- dim, param, cov, lambda);
-}
-
-//MWMW
-
-/// Alternative version of @c template_switch which accepts a generic
-/// lambda and communicates the dimension via an integral constant type
-/// @tparam N Value from which to start the dispatch chain, i.e. 0 in most cases
-/// @tparam NMAX Maximum value up to which to attempt a dispatch
-/// @param v The runtime value to dispatch on
-/// @param func The lambda to invoke
-/// @param args Additional arguments passed to @p func
-template <size_t N, size_t NMAX, typename Lambda, typename... Args>
-auto template_switch_lambda(size_t v, Lambda&& func, Args&&... args) {
- if (v == N) {
- return func(std::integral_constant<size_t, N>{},
- std::forward<Args>(args)...);
- }
- if constexpr (N < NMAX) {
- return template_switch_lambda<N + 1, NMAX>(v, func,
- std::forward<Args>(args)...);
- }
- std::cerr << "template_switch<Fn, " << N << ", " << NMAX << ">(v=" << v
- << ") is not valid (v > NMAX)" << std::endl;
- std::abort();
-}
-
-// MWMW end
-
-/// Dispatch a generic lambda on a measurement dimension. This overload doesn't
-/// assume anything about what is needed inside the lambda, it communicates the
-/// dimension via an integral constant type
-/// @tparam L The generic lambda type to call
-/// @param dim The runtime dimension of the measurement
-/// @param lambda The generic lambda instance to call
-/// @return Returns the lambda return value
-template <typename L>
-auto visit_measurement(size_t dim, L&& lambda) {
- return template_switch_lambda<1, eBoundSize>(dim, lambda);
-}
-
-} // namespace Acts
\ No newline at end of file
diff --git a/Tracking/Acts/ActsTrkEvent/test/MultiTrajectoryBasic_test.cxx b/Tracking/Acts/ActsTrkEvent/test/MultiTrajectoryBasic_test.cxx
index dd42aa6cc1e3..c4aff2a14cd5 100644
--- a/Tracking/Acts/ActsTrkEvent/test/MultiTrajectoryBasic_test.cxx
+++ b/Tracking/Acts/ActsTrkEvent/test/MultiTrajectoryBasic_test.cxx
@@ -8,6 +8,8 @@
#include "Acts/EventData/Measurement.hpp"
#include "Acts/EventData/MultiTrajectory.hpp"
#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/MeasurementHelpers.hpp"
+#include "Acts/Utilities/Helpers.hpp"
#include "ActsTrkEvent/MultiTrajectory.h"
#include "xAODTracking/TrackJacobianAuxContainer.h"
@@ -17,8 +19,7 @@
#include "CommonHelpers/GenerateParameters.hpp"
#include "CommonHelpers/TestSourceLink.hpp"
-#include "CommonHelpers/MeasurementHelpers.hpp"
-
+
namespace {
using namespace Acts;
@@ -541,8 +542,11 @@ BOOST_FIXTURE_TEST_CASE(TrackStateProxyCrossTalk, EmptyMTJ) {
//TODO
//allocateCalibrated(eBoundSize) is not implemented yet
// https://github.com/acts-project/acts/blob/980f9ef66ce2df426be87e611f9a8c813904ad7c/Tests/UnitTests/Core/EventData/MultiTrajectoryTests.cpp#L488
-
-
+
+ // TODO
+ // re-enable this test as soon as the allocateCalibrated(eBoundSize) is implemented in the ActsTrk::Multitrajectory
+ // as of now the calibratedSize is 0 and this makes the test fail
+ /*
{
// reset only the effective measurements
auto [measPar, measCov] = generateBoundParametersCovariance(rng);
@@ -559,6 +563,7 @@ BOOST_FIXTURE_TEST_CASE(TrackStateProxyCrossTalk, EmptyMTJ) {
BOOST_CHECK_EQUAL(tsb.effectiveCalibrated(), effPar);
BOOST_CHECK_EQUAL(tsb.effectiveCalibratedCovariance(), effCov);
}
+ */
{
Jacobian jac = Jacobian::Identity();
BOOST_CHECK_NE(tsa.jacobian(), jac);
diff --git a/Tracking/Acts/ActsTrkTools/ActsTrkFittingTools/src/ActsKalmanFitter.h b/Tracking/Acts/ActsTrkTools/ActsTrkFittingTools/src/ActsKalmanFitter.h
index b9b7ef499bd7..dc453dd327d2 100755
--- a/Tracking/Acts/ActsTrkTools/ActsTrkFittingTools/src/ActsKalmanFitter.h
+++ b/Tracking/Acts/ActsTrkTools/ActsTrkFittingTools/src/ActsKalmanFitter.h
@@ -118,19 +118,24 @@ public:
return false;
}
return Acts::visit_measurement(
- state.calibrated(), state.calibratedCovariance(),
state.calibratedSize(),
- [&](const auto calibrated, const auto calibratedCovariance) {
- // Determine the mesurement size
- constexpr size_t kMeasurementSize =
- decltype(calibrated)::RowsAtCompileTime;
- // Resize the projector with the measurement size
+ [&] (auto N) -> bool {
+ constexpr size_t kMeasurementSize = decltype(N)::value;
+
+ typename Acts::TrackStateTraits<kMeasurementSize, true>::Measurement calibrated{
+ state.template calibrated<Acts::MultiTrajectoryTraits::MeasurementSizeMax>().data()};
+
+ typename Acts::TrackStateTraits<kMeasurementSize, true>::MeasurementCovariance
+ calibratedCovariance{state.template calibratedCovariance<Acts::MultiTrajectoryTraits::MeasurementSizeMax>().data()};
+
+ // Take the projector (measurement mapping function)
const auto H =
state.projector()
.template topLeftCorner<kMeasurementSize, Acts::BoundIndices::eBoundSize>()
.eval();
- const auto residual = calibrated - H * state.predicted();
- double chi2 = (residual.transpose() * ((calibratedCovariance + H * state.predictedCovariance() * H.transpose())).inverse() * residual).value();
+
+ const auto residual = calibrated - H * state.predicted();
+ double chi2 = (residual.transpose() * ((calibratedCovariance + H * state.predictedCovariance() * H.transpose())).inverse() * residual).value();
return bool(chi2 > StateChiSquaredPerNumberDoFCut * kMeasurementSize);
});
}
diff --git a/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.cxx b/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.cxx
index c369d25696b3..abb0b8d19228 100644
--- a/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.cxx
+++ b/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.cxx
@@ -9,8 +9,10 @@
#include "Acts/Seeding/BinFinder.hpp"
#include "Acts/Seeding/BinnedSPGroup.hpp"
#include "Acts/Seeding/SeedFilter.hpp"
-#include "Acts/Seeding/Seedfinder.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
+#include "Acts/Seeding/SeedFinderConfig.hpp"
#include "Acts/Definitions/Units.hpp"
+#include "Acts/Seeding/SeedConfirmationRangeConfig.hpp"
namespace ActsTrk {
@@ -42,7 +44,7 @@ namespace ActsTrk {
ATH_MSG_DEBUG(" " << m_bFieldInZ);
ATH_MSG_DEBUG(" " << m_phiBinDeflectionCoverage);
- ATH_MSG_DEBUG(" * Used by SeedfinderConfig:");
+ ATH_MSG_DEBUG(" * Used by SeedFinderConfig:");
ATH_MSG_DEBUG(" " << m_minPt);
ATH_MSG_DEBUG(" " << m_cotThetaMax);
ATH_MSG_DEBUG(" " << m_impactMax);
@@ -121,9 +123,6 @@ namespace ActsTrk {
ATH_MSG_DEBUG(" " << m_seedWeightIncrement);
ATH_MSG_DEBUG(" " << m_numSeedIncrement);
ATH_MSG_DEBUG(" " << m_deltaInvHelixDiameter);
- ATH_MSG_DEBUG(" " << m_seedConfMinBottomRadius);
- ATH_MSG_DEBUG(" " << m_seedConfMaxZOrigin);
- ATH_MSG_DEBUG(" " << m_minImpactSeedConf);
if (m_zBinEdges.size() - 1 !=
m_zBinNeighborsTop.size() and
@@ -198,7 +197,7 @@ namespace ActsTrk {
return StatusCode::SUCCESS;
auto [gridCfg, finderCfg] = prepareConfiguration< external_spacepoint_t >(Acts::Vector2(beamSpotPos[Amg::x], beamSpotPos[Amg::y]),
- bField);
+ bField);
auto extractCovariance = [&beamSpotPos](const external_spacepoint_t& sp, float,
float, float) -> std::pair<Acts::Vector3, Acts::Vector2> {
@@ -208,6 +207,9 @@ namespace ActsTrk {
return std::make_pair(position, covariance);
};
+
+ Acts::Extent rRangeSPExtent;
+
std::shared_ptr< Acts::BinFinder< external_spacepoint_t > > bottomBinFinder =
std::make_shared< Acts::BinFinder< external_spacepoint_t > >(m_zBinNeighborsBottom, m_numPhiNeighbors);
std::shared_ptr< Acts::BinFinder< external_spacepoint_t > > topBinFinder =
@@ -215,28 +217,25 @@ namespace ActsTrk {
std::unique_ptr< Acts::SpacePointGrid< external_spacepoint_t > > grid =
Acts::SpacePointGridCreator::createGrid< external_spacepoint_t >(gridCfg);
- Acts::BinnedSPGroup< external_spacepoint_t > spacePointsGrouping(spBegin, spEnd, extractCovariance,
- bottomBinFinder, topBinFinder, std::move(grid), finderCfg);
-
- Acts::Seedfinder< external_spacepoint_t > finder(finderCfg);
-
- //TODO POSSIBLE OPTIMISATION come back here: see MR !52399 ( i.e. use static thread_local)
- typename decltype(finder)::State state;
+ Acts::BinnedSPGroup< external_spacepoint_t > spacePointsGrouping(spBegin, spEnd, extractCovariance,
+ bottomBinFinder, topBinFinder, std::move(grid), rRangeSPExtent, finderCfg);
- Acts::Extent rRangeSPExtent;
-
- for (auto it = spBegin; it != spEnd; ++it) {
- const auto& sp = *it;
- rRangeSPExtent.extend({sp->x(), sp->y(), sp->z()});
- }
+ Acts::SeedFinder< external_spacepoint_t > finder(finderCfg);
+ // variable middle SP radial region of interest
+ const Acts::Range1D<float> rMiddleSPRange(std::floor(rRangeSPExtent.min(Acts::binR) / 2) * 2 +
+ finderCfg.deltaRMiddleMinSPRange,
+ std::floor(rRangeSPExtent.max(Acts::binR) / 2) * 2 -
+ finderCfg.deltaRMiddleMaxSPRange);
+ //TODO POSSIBLE OPTIMISATION come back here: see MR !52399 ( i.e. use static thread_local)
+ typename decltype(finder)::SeedingState state;
auto group = spacePointsGrouping.begin();
auto groupEnd = spacePointsGrouping.end();
for (; group != groupEnd; ++group) {
finder.createSeedsForGroup(state, std::back_inserter(seeds), group.bottom(),
- group.middle(), group.top(), rRangeSPExtent);
+ group.middle(), group.top(), rMiddleSPRange);
}
return StatusCode::SUCCESS;
@@ -245,12 +244,12 @@ namespace ActsTrk {
template< typename external_spacepoint_t >
- const std::pair< Acts::SpacePointGridConfig, Acts::SeedfinderConfig< external_spacepoint_t > >
- SeedingTool::prepareConfiguration(const Acts::Vector2& beamPos,
- const Acts::Vector3& bField) const {
-
+ const std::pair< Acts::SpacePointGridConfig, Acts::SeedFinderConfig< external_spacepoint_t > >
+ SeedingTool::prepareConfiguration(const Acts::Vector2& beamPos,
+ const Acts::Vector3& bField) const {
+
//TODO POSSIBLE OPTIMISATION
- // do not create for each call SpacePointGridConfig, SeedfinderConfig and SeedFilterConfig.
+ // do not create for each call SpacePointGridConfig, SeedFinderConfig and SeedFilterConfig.
// They only two quantities that depend on the event context are
// finderCfg.bFieldInZ and finderCfg.beamPos.
// The rest of the configuration stays the same.
@@ -276,7 +275,7 @@ namespace ActsTrk {
// Configuration for Acts::SeedFinder
// These values will not be changed during execution
// B Field and Beam Spot position will be updated for each event (finderCfg.bFieldInZ and finderCfg.beamPos)
- Acts::SeedfinderConfig< external_spacepoint_t > finderCfg;
+ Acts::SeedFinderConfig< external_spacepoint_t > finderCfg;
finderCfg.bFieldInZ = bField[2];
finderCfg.beamPos = beamPos;
finderCfg.minPt = m_minPt;
@@ -372,10 +371,6 @@ namespace ActsTrk {
filterCfg.seedWeightIncrement = m_seedWeightIncrement;
filterCfg.numSeedIncrement = m_numSeedIncrement;
filterCfg.deltaInvHelixDiameter = m_deltaInvHelixDiameter;
- filterCfg.seedConfMinBottomRadius = m_seedConfMinBottomRadius;
- filterCfg.seedConfMaxZOrigin = m_seedConfMaxZOrigin;
- filterCfg.minImpactSeedConf = m_minImpactSeedConf;
-
finderCfg.seedFilter = std::make_unique<Acts::SeedFilter< external_spacepoint_t > >(filterCfg);
return std::make_pair(gridCfg, finderCfg);
diff --git a/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.h b/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.h
index 081855ad168f..0a43392577f3 100644
--- a/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.h
+++ b/Tracking/Acts/ActsTrkTools/ActsTrkSeedingTool/src/SeedingTool.h
@@ -16,10 +16,10 @@
#include "Acts/Seeding/SpacePointGrid.hpp"
#include "Acts/Seeding/BinFinder.hpp"
#include "Acts/Seeding/BinnedSPGroup.hpp"
-#include "Acts/Seeding/SeedfinderConfig.hpp"
+#include "Acts/Seeding/SeedFinderConfig.hpp"
#include "Acts/Seeding/SeedFilterConfig.hpp"
#include "Acts/Seeding/SeedFilter.hpp"
-#include "Acts/Seeding/Seedfinder.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
#include "Acts/Seeding/Seed.hpp"
#include <cmath> //for M_PI
@@ -42,7 +42,7 @@ namespace ActsTrk {
const std::vector<const ActsTrk::SpacePoint*>& spContainer,
const Acts::Vector3& beamSpotPos,
const Acts::Vector3& bField,
- ActsTrk::SeedContainer& seedContainer ) const override;
+ ActsTrk::SeedContainer& seedContainer) const override;
private:
// metafunction to obtain correct type in iterated container given the iterator type
@@ -66,13 +66,14 @@ namespace ActsTrk {
template< typename external_spacepoint_t >
const std::pair<
Acts::SpacePointGridConfig,
- Acts::SeedfinderConfig< external_spacepoint_t >
+ Acts::SeedFinderConfig< external_spacepoint_t >
>
- prepareConfiguration( const Acts::Vector2& beamPos,
- const Acts::Vector3& bField ) const;
+ prepareConfiguration(const Acts::Vector2& beamPos,
+ const Acts::Vector3& bField) const;
// *********************************************************************
// *********************************************************************
+
private:
// Properties to set SpacePointGridConfig
@@ -215,12 +216,6 @@ namespace ActsTrk {
"use deltaR (top radius - middle radius) instead of top radius"};
Gaudi::Property<float> m_deltaInvHelixDiameter {this, "deltaInvHelixDiameter", 0.00003 * 1. / Acts::UnitConstants::mm,
"the allowed delta between two inverted seed radii for them to be considered compatible"};
- Gaudi::Property<float> m_seedConfMinBottomRadius {this, "seedConfMinBottomRadius", 60. * Acts::UnitConstants::mm,
- "increment in seed weight if the number of compatible seeds is larger than numSeedIncrement, this is used in case of high occupancy scenarios if we want to increase the weight of the seed by seedWeightIncrement when the number of compatible seeds is higher than a certain value"};
- Gaudi::Property<float> m_seedConfMaxZOrigin {this, "seedConfMaxZOrigin", 150. * Acts::UnitConstants::mm,
- "maximum zOrigin in seed confirmation"};
- Gaudi::Property<float> m_minImpactSeedConf {this, "minImpactSeedConf", 1. * Acts::UnitConstants::mm,
- "minimum impact parameter for seed confirmation"};
// Properties to set other objects used in
// seeding algorithm
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
index 356a701d13f6..1629ac7e2a52 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/src/ExtrapolatorComparisonTest.cxx
@@ -336,8 +336,8 @@ StatusCode Trk::ExtrapolatorComparisonTest::execute(const EventContext& ctx) con
// Construct wrappers for Acts track parameters
const ActsTrackWrapper* startWrapper = new ActsTrackWrapper(startParameters, anygctx);
- const ActsTrackWrapper* destWrapper = new ActsTrackWrapper(destParameters.release(), anygctx);
- const ActsTrackWrapper* finalWrapper = new ActsTrackWrapper(finalperigee.release(), anygctx);
+ const ActsTrackWrapper* destWrapper = new ActsTrackWrapper(&destParameters.value(), anygctx);
+ const ActsTrackWrapper* finalWrapper = new ActsTrackWrapper(&finalperigee.value(), anygctx);
m_actsPropResultWriterSvc->write<ActsTrackWrapper>(startWrapper, destWrapper, ms_fwd, finalWrapper, ms_bkw);
--
GitLab