From c7ef9ff2f8fbac0031babc7236043917bd773679 Mon Sep 17 00:00:00 2001
From: Stephen Nicholas Swatman <stephen.nicholas.swatman@cern.ch>
Date: Tue, 10 Nov 2020 17:31:29 +0100
Subject: [PATCH] Return AMG vectors by value in graphics
This commit resolves some potential future problems with AMG vectors
being passed by reference in the graphics realm, and the code is adapted
to work seamlessly with a pass-by-value approach.
---
.../VP1TrackSystems/TrackHandleBase.h | 4 ++--
.../VP1TrackSystems/src/TrackHandleBase.cxx | 16 ++++++++--------
.../VP1TrackSystems/src/VP1TrackSystem.cxx | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/VP1TrackSystems/TrackHandleBase.h b/graphics/VP1/VP1Systems/VP1TrackSystems/VP1TrackSystems/TrackHandleBase.h
index 7136304bfb7c..b7ccd109b44f 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/VP1TrackSystems/TrackHandleBase.h
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/VP1TrackSystems/TrackHandleBase.h
@@ -74,8 +74,8 @@ public:
virtual QStringList clicked() const = 0;
virtual Amg::Vector3D momentum() const { return Amg::Vector3D(0,0,0); }
- virtual const Amg::Vector3D * startPoint() const;//!< returns 0 if can't find start point.
- virtual const Amg::Vector3D * endPoint() const;//!< returns 0 if can't find start point.
+ virtual std::optional<Amg::Vector3D> startPoint() const;//!< returns 0 if can't find start point.
+ virtual std::optional<Amg::Vector3D> endPoint() const;//!< returns 0 if can't find start point.
virtual int pdgCode() const { return 0; }//!< 0 means unknown
//Default implementation of the following two methods will based on
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx
index 267dae53a3ee..a26129388892 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/TrackHandleBase.cxx
@@ -1556,7 +1556,7 @@ QStringList TrackHandleBase::baseInfo() const
}
//____________________________________________________________________
-const Amg::Vector3D * TrackHandleBase::startPoint() const
+std::optional<Amg::Vector3D> TrackHandleBase::startPoint() const
{
m_d->ensureLoadPathInfo();
if (m_d->pathInfo_TrkTrack) {
@@ -1566,13 +1566,13 @@ const Amg::Vector3D * TrackHandleBase::startPoint() const
if (common()->trackSanityHelper()->isSafe(*tsos_iter)) {
const Trk::TrackParameters* trackParam = (*tsos_iter)->trackParameters();
if (common()->trackSanityHelper()->isSafe(trackParam))
- return &(trackParam->position());
+ return trackParam->position();
}
}
} else if (m_d->pathInfo_Points&&!m_d->pathInfo_Points->empty()) {
- return &(m_d->pathInfo_Points->at(0));
+ return m_d->pathInfo_Points->at(0);
}
- return 0;
+ return {};
}
//____________________________________________________________________
@@ -1586,18 +1586,18 @@ const Amg::Vector3D * TrackHandleBase::endPoint() const
if (common()->trackSanityHelper()->isSafe(*tsos_iter)) {
const Trk::TrackParameters* trackParam = (*tsos_iter)->trackParameters();
if (common()->trackSanityHelper()->isSafe(trackParam))
- return &(trackParam->position());
+ return trackParam->position();
}
}
} else if (m_d->pathInfo_Points&&!m_d->pathInfo_Points->empty()) {
- return &(m_d->pathInfo_Points->back());
+ return m_d->pathInfo_Points->back();
}
- return 0;
+ return {};
}
bool TrackHandleBase::isIDTrack() const
{
- const Amg::Vector3D * start = startPoint();
+ std::optional<Amg::Vector3D> start = startPoint();
if (!start) return false;
return start->perp()<1100 &&fabs( start->z())>3500;
}
diff --git a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
index e4ed3633e903..91eb346e5955 100644
--- a/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1TrackSystems/src/VP1TrackSystem.cxx
@@ -672,7 +672,7 @@ unsigned VP1TrackSystem::Imp::calcTotalMomentumOfSelectedHandles(Amg::Vector3D&
if (mom.mag2()==0.0)
continue;
//Fixme: Get actual position of perigee!!
- const Amg::Vector3D * pos = handle->startPoint();
+ std::optional<Amg::Vector3D> pos = handle->startPoint();
if (!pos)
continue;
++nused;
--
GitLab