From bf8656473f92ec636647d5c7df9a31649725fdaa Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 23 Aug 2022 13:28:44 +0000 Subject: [PATCH 1/2] fix: make work with edm4hep::Vector and eicd::Vector --- JugTrack/src/components/ParticlesFromTrackFit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/JugTrack/src/components/ParticlesFromTrackFit.cpp b/JugTrack/src/components/ParticlesFromTrackFit.cpp index 9a6418b1..daa30eea 100644 --- a/JugTrack/src/components/ParticlesFromTrackFit.cpp +++ b/JugTrack/src/components/ParticlesFromTrackFit.cpp @@ -117,8 +117,8 @@ namespace Jug::Reco { } const decltype(eicd::TrackParametersData::loc) loc { - parameter[Acts::eBoundLoc0], - parameter[Acts::eBoundLoc1] + static_cast(parameter[Acts::eBoundLoc0]), + static_cast(parameter[Acts::eBoundLoc1]) }; const decltype(eicd::TrackParametersData::momentumError) momentumError { static_cast(covariance(Acts::eBoundTheta, Acts::eBoundTheta)), -- GitLab From 151397e372dbb6ab7b67770ccf9b3041d4b71fcd Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 23 Aug 2022 13:30:32 +0000 Subject: [PATCH 2/2] explicit static_cast to float on output types --- JugTrack/src/components/TrackProjector.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/JugTrack/src/components/TrackProjector.cpp b/JugTrack/src/components/TrackProjector.cpp index 9e84d855..3722b16c 100644 --- a/JugTrack/src/components/TrackProjector.cpp +++ b/JugTrack/src/components/TrackProjector.cpp @@ -138,15 +138,15 @@ namespace Jug::Reco { ); // global position const decltype(eicd::TrackPoint::position) position { - global.x(), - global.y(), - global.z() + static_cast(global.x()), + static_cast(global.y()), + static_cast(global.z()) }; // local position const decltype(eicd::TrackParametersData::loc) loc { - parameter[Acts::eBoundLoc0], - parameter[Acts::eBoundLoc1] + static_cast(parameter[Acts::eBoundLoc0]), + static_cast(parameter[Acts::eBoundLoc1]) }; const decltype(eicd::TrackParametersData::locError) locError { static_cast(covariance(Acts::eBoundLoc0, Acts::eBoundLoc0)), @@ -155,9 +155,9 @@ namespace Jug::Reco { }; const decltype(eicd::TrackPoint::positionError) positionError{0, 0, 0}; const decltype(eicd::TrackPoint::momentum) momentum = eicd::sphericalToVector( - 1.0 / std::abs(parameter[Acts::eBoundQOverP]), - parameter[Acts::eBoundTheta], - parameter[Acts::eBoundPhi] + static_cast(1.0 / std::abs(parameter[Acts::eBoundQOverP])), + static_cast(parameter[Acts::eBoundTheta]), + static_cast(parameter[Acts::eBoundPhi]) ); const decltype(eicd::TrackPoint::momentumError) momentumError { static_cast(covariance(Acts::eBoundTheta, Acts::eBoundTheta)), -- GitLab