From d1bf0268db5421614b413811db6beb4649abd372 Mon Sep 17 00:00:00 2001
From: Christos Anastopoulos <christos.anastopoulos@cern.ch>
Date: Thu, 19 Nov 2020 09:35:56 +0000
Subject: [PATCH] IPropagator/IExtrapolator remove virtual from methods that do
not need to be virtual
---
.../TrkExInterfaces/IExtrapolator.h | 157 +++++++++---------
.../TrkExInterfaces/IExtrapolator.icc | 20 +--
.../TrkExInterfaces/INavigator.h | 34 ++--
.../TrkExInterfaces/IPropagator.h | 156 +++++++++--------
.../TrkExInterfaces/IPropagator.icc | 11 +-
5 files changed, 188 insertions(+), 190 deletions(-)
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.h b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.h
index 99f6d3c1170..f25ad41e799 100755
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.h
@@ -264,35 +264,37 @@ namespace Trk {
virtual const IPropagator* subPropagator(const TrackingVolume& tvol) const = 0;
- /** [TrackParameters] old interfaces WITHOUT EventContext ------------------------------------------ */
-
-
- /** xAOD 0) xAOD track particle */
- virtual const TrackParameters* extrapolate(const xAOD::TrackParticle& particleBase,
- const Surface& sf,
- PropDirection dir=anyDirection,
- const BoundaryCheck& bcheck = true,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const;
-
+ /** [TrackParameters] old interfaces WITHOUT EventContext
+ * Implemented here in terms of the new ones
+ * so need to be re-implemented
+ **/
+
+ /** xAOD 0) xAOD track particle */
+ const TrackParameters* extrapolate(
+ const xAOD::TrackParticle& particleBase,
+ const Surface& sf,
+ PropDirection dir = anyDirection,
+ const BoundaryCheck& bcheck = true,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
-
/** 1) <b>Configured AlgTool extrapolation method</b>):
- returns the TrackParameters at the Destination Surface (if extrapolation succeeds),
nullptr if extrapolation to destination surface does not succeed */
- virtual const TrackParameters* extrapolate(const TrackParameters& parm,
- const Surface& sf,
- PropDirection dir = anyDirection,
- const BoundaryCheck& bcheck = true,
- ParticleHypothesis particle = pion,
- MaterialUpdateMode matupmode = addNoise,
- Trk::ExtrapolationCache* cache = nullptr) const;
+ const TrackParameters* extrapolate(
+ const TrackParameters& parm,
+ const Surface& sf,
+ PropDirection dir = anyDirection,
+ const BoundaryCheck& bcheck = true,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise,
+ Trk::ExtrapolationCache* cache = nullptr) const;
/** 2) <b>Configured AlgTool extrapolation method</b>):
- returns a vector of TrackParameters representing the tracking detector elements
hit in between and the TrackParameters at the destination Surface (if final extrapolation suceeds),
empty if the extrapolation to the destination surface does not suceed*/
- virtual std::vector<std::unique_ptr<const TrackParameters>> extrapolateStepwise(
+ std::vector<std::unique_ptr<const TrackParameters>> extrapolateStepwise(
const TrackParameters& parm,
const Surface& sf,
PropDirection dir = anyDirection,
@@ -303,39 +305,42 @@ namespace Trk {
- searches the closest TrackParameters of the Track to the destination Surface
- returns the TrackParameters at the Destination Surface (if extrapolation succeeds),
0 if extrapolation to destination surface does not suceed */
- virtual const TrackParameters* extrapolate(const Track& trk,
- const Surface& sf,
- PropDirection dir = anyDirection,
- const BoundaryCheck& bcheck = true,
- ParticleHypothesis particle = pion,
- MaterialUpdateMode matupmode = addNoise,
- Trk::ExtrapolationCache* cache = nullptr) const;
+ const TrackParameters* extrapolate(
+ const Track& trk,
+ const Surface& sf,
+ PropDirection dir = anyDirection,
+ const BoundaryCheck& bcheck = true,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise,
+ Trk::ExtrapolationCache* cache = nullptr) const;
/** 4) <b>Configured AlgTool extrapolation method</b>):
- direct extrapolation to the destination surface, no material effects
or intermediate steps are taken into account
*/
- virtual TrackParameters* extrapolateDirectly(const TrackParameters& parm,
- const Surface& sf,
- PropDirection dir = anyDirection,
- const BoundaryCheck& bcheck = true,
- ParticleHypothesis particle = pion) const;
+ TrackParameters* extrapolateDirectly(
+ const TrackParameters& parm,
+ const Surface& sf,
+ PropDirection dir = anyDirection,
+ const BoundaryCheck& bcheck = true,
+ ParticleHypothesis particle = pion) const;
/** 4.1) <b>Configured AlgTool extrapolation method</b>):
Same as 4 but with propagator arguement (needed by a single client TRT_TrackExtensionToolCosmics
*/
- virtual TrackParameters* extrapolateDirectly(const IPropagator& prop,
- const TrackParameters& parm,
- const Surface& sf,
- PropDirection dir = anyDirection,
- const BoundaryCheck& bcheck = true,
- ParticleHypothesis particle = pion) const;
+ TrackParameters* extrapolateDirectly(
+ const IPropagator& prop,
+ const TrackParameters& parm,
+ const Surface& sf,
+ PropDirection dir = anyDirection,
+ const BoundaryCheck& bcheck = true,
+ ParticleHypothesis particle = pion) const;
/** 5) <b>Configured AlgTool extrapolation method</b>):
- blind inside the given tracking Volume (boundaryVol),
if none is given the reference surface for destination is used
*/
- virtual std::vector<std::unique_ptr<const TrackParameters>> extrapolateBlindly(
+ std::vector<std::unique_ptr<const TrackParameters>> extrapolateBlindly(
const TrackParameters& parm,
PropDirection dir = anyDirection,
const BoundaryCheck& bcheck = true,
@@ -345,7 +350,8 @@ namespace Trk {
/** 6) <b>Configured AlgTool extrapolation method</b>):
*- extrapolation to the next active layer, based on the extrapolation to the next layer
and layer identification*/
- virtual std::pair<const TrackParameters*, const Trk::Layer*> extrapolateToNextActiveLayer(
+ std::pair<const TrackParameters*, const Trk::Layer*>
+ extrapolateToNextActiveLayer(
const TrackParameters& parm,
PropDirection dir = anyDirection,
const BoundaryCheck& bcheck = true,
@@ -353,7 +359,8 @@ namespace Trk {
MaterialUpdateMode matupmode = addNoise) const;
/** 7) <b>Configured AlgTool extrapolation method</b>):*/
- virtual std::pair<const TrackParameters*, const Trk::Layer*> extrapolateToNextActiveLayerM(
+ std::pair<const TrackParameters*, const Trk::Layer*>
+ extrapolateToNextActiveLayerM(
const TrackParameters& parm,
PropDirection dir,
const BoundaryCheck& bcheck,
@@ -361,39 +368,42 @@ namespace Trk {
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const;
- /** 8) <b>Configured AlgTool extrapolation method</b> ):
- - extrapolation to the next active layer, based on the extrapolation to the next layer
- and layer identification
- * */
- virtual const TrackParameters* extrapolateToVolume(const TrackParameters& parm,
- const Trk::TrackingVolume& vol,
- PropDirection dir = anyDirection,
- ParticleHypothesis particle = pion) const;
+ /** 8) <b>Configured AlgTool extrapolation method</b> ):
+ - extrapolation to the next active layer, based on the extrapolation to
+ the next layer and layer identification
+ * */
+ const TrackParameters* extrapolateToVolume(
+ const TrackParameters& parm,
+ const Trk::TrackingVolume& vol,
+ PropDirection dir = anyDirection,
+ ParticleHypothesis particle = pion) const;
/** 9) <b>Configured AlgTool extrapolation method</b>:
- Extrapolate to a destination surface, while collecting all the material layers in between.
*/
- virtual std::vector<const TrackStateOnSurface*>* extrapolateM(const TrackParameters& parameters,
- const Surface& sf,
- PropDirection dir,
- const BoundaryCheck& bcheck,
- ParticleHypothesis particle = pion,
- Trk::ExtrapolationCache* cache = nullptr) const;
+ std::vector<const TrackStateOnSurface*>* extrapolateM(
+ const TrackParameters& parameters,
+ const Surface& sf,
+ PropDirection dir,
+ const BoundaryCheck& bcheck,
+ ParticleHypothesis particle = pion,
+ Trk::ExtrapolationCache* cache = nullptr) const;
/** 10) <b>Configured AlgTool extrapolation method</b>:
- Extrapolate to a destination surface, while collecting all the material layers and transport jacobians in
between.
*/
- virtual std::vector<const TrackParameters*>* extrapolateM(const TrackParameters& parameters,
- const Surface& sf,
- PropDirection dir,
- const BoundaryCheck& bcheck,
- std::vector<MaterialEffectsOnTrack>& material,
- std::vector<Trk::TransportJacobian*>& jacs,
- ParticleHypothesis particle = pion,
- Trk::ExtrapolationCache* cache = nullptr) const;
+ std::vector<const TrackParameters*>* extrapolateM(
+ const TrackParameters& parameters,
+ const Surface& sf,
+ PropDirection dir,
+ const BoundaryCheck& bcheck,
+ std::vector<MaterialEffectsOnTrack>& material,
+ std::vector<Trk::TransportJacobian*>& jacs,
+ ParticleHypothesis particle = pion,
+ Trk::ExtrapolationCache* cache = nullptr) const;
- virtual const Trk::TrackParameters* extrapolateWithPathLimit(
+ const Trk::TrackParameters* extrapolateWithPathLimit(
const Trk::TrackParameters& parm,
double& pathLim,
Trk::PropDirection dir,
@@ -407,22 +417,15 @@ namespace Trk {
A primitive identification is provided - to be replaced with appropriate identifier, and possibly merged
with TrackParameters. Material collection in option. Destination (subdetector boundary) : geoID (exit)
*/
- virtual const std::vector<std::pair<const Trk::TrackParameters*, int>>* extrapolate(
- const Trk::TrackParameters& parm,
- Trk::PropDirection dir,
- Trk::ParticleHypothesis particle,
- std::vector<const Trk::TrackStateOnSurface*>*& material,
- int destination = 3) const;
-
-
+ const std::vector<std::pair<const Trk::TrackParameters*, int>>*
+ extrapolate(const Trk::TrackParameters& parm,
+ Trk::PropDirection dir,
+ Trk::ParticleHypothesis particle,
+ std::vector<const Trk::TrackStateOnSurface*>*& material,
+ int destination = 3) const;
};
-
-
} // end of namespace
-
#include "TrkExInterfaces/IExtrapolator.icc"
-
-
#endif // TRKEXINTERFACES_ITRKEXTRAPOLATOR_H
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.icc b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.icc
index 131c1957700..476231316df 100644
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.icc
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.icc
@@ -6,9 +6,9 @@
// IExtrapolator.icc, (c) ATLAS Detector software
///////////////////////////////////////////////////////////////////
-/** [TrackParameters] old interfaces WITHOUT EventContext ------------------------------------------ */
+/** Implement old interfaces WITHOUT EventContext ------------------------------------------ */
+
-
/** xAOD 0) xAOD track particle */
inline const Trk::TrackParameters*
Trk::IExtrapolator::extrapolate(const xAOD::TrackParticle& particleBase,
@@ -16,7 +16,7 @@ Trk::IExtrapolator::extrapolate(const xAOD::TrackParticle& particleBase,
Trk::PropDirection dir,
const BoundaryCheck& bcheck,
Trk::ParticleHypothesis particle,
- Trk::MaterialUpdateMode matupmode) const
+ Trk::MaterialUpdateMode matupmode) const
{
return extrapolate( Gaudi::Hive::currentContext(),
particleBase,
@@ -29,7 +29,7 @@ Trk::IExtrapolator::extrapolate(const xAOD::TrackParticle& particleBase,
-
+
/** 1) <b>Configured AlgTool extrapolation method</b>):
- returns the TrackParameters at the Destination Surface (if extrapolation succeeds),
nullptr if extrapolation to destination surface does not succeed */
@@ -40,7 +40,7 @@ Trk::IExtrapolator::extrapolate(const TrackParameters& parm,
const BoundaryCheck& bcheck,
Trk::ParticleHypothesis particle,
Trk::MaterialUpdateMode matupmode,
- Trk::ExtrapolationCache* cache) const
+ Trk::ExtrapolationCache* cache) const
{
return extrapolate( Gaudi::Hive::currentContext(),
parm,
@@ -74,7 +74,7 @@ inline std::vector<std::unique_ptr<const Trk::TrackParameters>> Trk::IExtrapolat
/** 3) <b>Configured AlgTool extrapolation method</b>):
- searches the closest TrackParameters of the Track to the destination Surface
- - returns the TrackParameters at the Destination Surface (if extrapolation succeeds),
+ - returns the TrackParameters at the Destination Surface (if extrapolation succeeds),
0 if extrapolation to destination surface does not suceed */
inline const Trk::TrackParameters* Trk::IExtrapolator::extrapolate(const Track& trk,
const Trk::Surface& sf,
@@ -95,7 +95,7 @@ inline const Trk::TrackParameters* Trk::IExtrapolator::extrapolate(const Track&
}
/** 4) <b>Configured AlgTool extrapolation method</b>):
- - direct extrapolation to the destination surface, no material effects
+ - direct extrapolation to the destination surface, no material effects
or intermediate steps are taken into account
*/
inline Trk::TrackParameters* Trk::IExtrapolator::extrapolateDirectly(const TrackParameters& parm,
@@ -132,7 +132,7 @@ inline Trk::TrackParameters* Trk::IExtrapolator::extrapolateDirectly(const IProp
}
/** 5) <b>Configured AlgTool extrapolation method</b>):
- - blind inside the given tracking Volume (boundaryVol),
+ - blind inside the given tracking Volume (boundaryVol),
if none is given the reference surface for destination is used
*/
inline std::vector<std::unique_ptr<const Trk::TrackParameters>> Trk::IExtrapolator::extrapolateBlindly(
@@ -288,8 +288,8 @@ inline const std::vector<std::pair<const Trk::TrackParameters*, int>>* Trk::IExt
-
-
+
+
inline const Trk::TrackParameters*
Trk::IExtrapolator::extrapolateWithPathLimit(const EventContext& /*ctx*/,
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
index e9886fc2216..1356fb21124 100755
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
@@ -152,24 +152,24 @@ public:
/** INavigator interface method - returns the TrackingGeometry used for
* navigation */
- virtual const TrackingGeometry* trackingGeometry() const;
+ const TrackingGeometry* trackingGeometry() const;
/** INavigator interface method - global search for the Volume one is in */
- virtual const TrackingVolume* volume(const Amg::Vector3D& gp) const;
+ const TrackingVolume* volume(const Amg::Vector3D& gp) const;
/** INavigator interface method - forward hightes TrackingVolume */
- virtual const TrackingVolume* highestVolume() const;
+ const TrackingVolume* highestVolume() const;
/** INavigator interface method - getting the next BoundarySurface not knowing
* the Volume*/
- virtual const BoundarySurface<TrackingVolume>* nextBoundarySurface(
+ const BoundarySurface<TrackingVolume>* nextBoundarySurface(
const IPropagator& prop,
const TrackParameters& parms,
PropDirection dir) const;
/** INavigator interface method - getting the next BoundarySurface when
* knowing the Volume*/
- virtual const BoundarySurface<TrackingVolume>* nextBoundarySurface(
+ const BoundarySurface<TrackingVolume>* nextBoundarySurface(
const IPropagator& prop,
const TrackParameters& parms,
PropDirection dir,
@@ -177,24 +177,22 @@ public:
/** INavigator interface method - - getting the next Volume and the parameter
* for the next Navigation */
- virtual NavigationCell nextTrackingVolume(
- const IPropagator& prop,
- const TrackParameters& parms,
- PropDirection dir,
- const TrackingVolume& vol) const;
+ NavigationCell nextTrackingVolume(const IPropagator& prop,
+ const TrackParameters& parms,
+ PropDirection dir,
+ const TrackingVolume& vol) const;
/** INavigator interface method - getting the next Volume and the parameter
for the next Navigation
- contains full loop over volume boundaries
*/
- virtual NavigationCell nextDenseTrackingVolume(const IPropagator& prop,
- const TrackParameters& parms,
- const Surface* destination,
- PropDirection dir,
- ParticleHypothesis particle,
- const TrackingVolume& vol,
- double& path) const;
-
+ NavigationCell nextDenseTrackingVolume(const IPropagator& prop,
+ const TrackParameters& parms,
+ const Surface* destination,
+ PropDirection dir,
+ ParticleHypothesis particle,
+ const TrackingVolume& vol,
+ double& path) const;
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.h b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.h
index da03f25f143..3c7ffea8412 100755
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.h
@@ -297,57 +297,57 @@ public:
*/
virtual void validationAction() const {}
- /** [TrackParameters] old interfaces WITHOUT EventContext
- * ------------------------------------------ */
+ /**
+ * Old interfaces WITHOUT EventContext
+ * Implemented here in terms of the new one
+ * so no need to be re-implemented
+ **/
/** Propagation interface:
The propagation method called by the TrkExtrapolator. The extrapolator
is responsible for the underlying logic of which surface to go to.
*/
- virtual TrackParameters* propagate(
- const TrackParameters& parm,
- const Surface& sf,
- PropDirection dir,
- const BoundaryCheck& bcheck,
- const MagneticFieldProperties& mprop,
- ParticleHypothesis particle = pion,
- bool returnCurv = false,
- const TrackingVolume* tVol = nullptr) const;
+ TrackParameters* propagate(const TrackParameters& parm,
+ const Surface& sf,
+ PropDirection dir,
+ const BoundaryCheck& bcheck,
+ const MagneticFieldProperties& mprop,
+ ParticleHypothesis particle = pion,
+ bool returnCurv = false,
+ const TrackingVolume* tVol = nullptr) const;
/** Propagation interface:
The propagation method called by the TrkExtrapolator. The propagator
finds the closest surface.
*/
- virtual TrackParameters* propagate(
- const TrackParameters& parm,
- std::vector<DestSurf>& sfs,
- PropDirection dir,
- const MagneticFieldProperties& mprop,
- ParticleHypothesis particle,
- std::vector<unsigned int>& solutions,
- double& path,
- bool usePathLim = false,
- bool returnCurv = false,
- const TrackingVolume* tVol = nullptr) const;
+ TrackParameters* propagate(const TrackParameters& parm,
+ std::vector<DestSurf>& sfs,
+ PropDirection dir,
+ const MagneticFieldProperties& mprop,
+ ParticleHypothesis particle,
+ std::vector<unsigned int>& solutions,
+ double& path,
+ bool usePathLim = false,
+ bool returnCurv = false,
+ const TrackingVolume* tVol = nullptr) const;
/** Propagation interface:
The propagation method called by the TrkExtrapolator. The propagator
finds the closest surface. Timing included.
*/
- virtual TrackParameters* propagateT(
- const TrackParameters& parm,
- std::vector<DestSurf>& sfs,
- PropDirection dir,
- const MagneticFieldProperties& mprop,
- ParticleHypothesis particle,
- std::vector<unsigned int>& solutions,
- PathLimit& pathLim,
- TimeLimit& timeLim,
- bool returnCurv,
- const TrackingVolume* tVol,
- std::vector<Trk::HitInfo>*& hitVector) const;
+ TrackParameters* propagateT(const TrackParameters& parm,
+ std::vector<DestSurf>& sfs,
+ PropDirection dir,
+ const MagneticFieldProperties& mprop,
+ ParticleHypothesis particle,
+ std::vector<unsigned int>& solutions,
+ PathLimit& pathLim,
+ TimeLimit& timeLim,
+ bool returnCurv,
+ const TrackingVolume* tVol,
+ std::vector<Trk::HitInfo>*& hitVector) const;
/** Propagation interface:
@@ -355,32 +355,30 @@ public:
finds the closest surface. Timing included.
*/
- virtual TrackParameters* propagateT(
- const TrackParameters& parm,
- TargetSurfaces& sfs,
- PropDirection dir,
- const MagneticFieldProperties& mprop,
- ParticleHypothesis particle,
- TargetSurfaceVector& solutions,
- PathLimit& pathLim,
- TimeLimit& timeLim,
- bool returnCurv,
- std::vector<Trk::HitInfo>*& hitVector) const;
+ TrackParameters* propagateT(const TrackParameters& parm,
+ TargetSurfaces& sfs,
+ PropDirection dir,
+ const MagneticFieldProperties& mprop,
+ ParticleHypothesis particle,
+ TargetSurfaceVector& solutions,
+ PathLimit& pathLim,
+ TimeLimit& timeLim,
+ bool returnCurv,
+ std::vector<Trk::HitInfo>*& hitVector) const;
/** Propagation interface:
The propagation method called by the TrkExEngine. All options included.
*/
- virtual Trk::ExtrapolationCode propagate(
- Trk::ExCellCharged& eCell,
- Trk::TargetSurfaces& sfs,
- Trk::TargetSurfaceVector& solutions) const;
+ Trk::ExtrapolationCode propagate(Trk::ExCellCharged& eCell,
+ Trk::TargetSurfaces& sfs,
+ Trk::TargetSurfaceVector& solutions) const;
/** Propagation interface:
The propagation method with internal material collection. The propagator
finds the closest surface.
*/
- virtual TrackParameters* propagateM(
+ TrackParameters* propagateM(
const TrackParameters& parm,
std::vector<DestSurf>& sfs,
PropDirection dir,
@@ -400,23 +398,21 @@ public:
The propagation method including the return of the TransportJacobian matrix.
*/
- virtual TrackParameters* propagate(
- const TrackParameters& parm,
- const Surface& sf,
- PropDirection dir,
- const BoundaryCheck& bcheck,
- const MagneticFieldProperties& mprop,
- TransportJacobian*&,
- double& pathLength,
- ParticleHypothesis particle = pion,
- bool returnCurv = false,
- const TrackingVolume* tVol = nullptr) const;
+ TrackParameters* propagate(const TrackParameters& parm,
+ const Surface& sf,
+ PropDirection dir,
+ const BoundaryCheck& bcheck,
+ const MagneticFieldProperties& mprop,
+ TransportJacobian*&,
+ double& pathLength,
+ ParticleHypothesis particle = pion,
+ bool returnCurv = false,
+ const TrackingVolume* tVol = nullptr) const;
/** Propagation interface without Covariance matrix propagation
the pathlength has to be returned for eventual following propagateCovariance
*/
-
- virtual TrackParameters* propagateParameters(
+ TrackParameters* propagateParameters(
const TrackParameters& parm,
const Surface& sf,
PropDirection dir,
@@ -426,7 +422,7 @@ public:
bool returnCurv = false,
const TrackingVolume* tVol = nullptr) const;
- virtual TrackParameters* propagateParameters(
+ TrackParameters* propagateParameters(
const TrackParameters& parm,
const Surface& sf,
PropDirection dir,
@@ -442,7 +438,7 @@ public:
The intersection interface might be used by the material service as well to
estimate the surfaces (sensitive and nonesensitive) while propagation
*/
- virtual const IntersectionSolution* intersect(
+ const IntersectionSolution* intersect(
const TrackParameters& parm,
const Surface& sf,
const MagneticFieldProperties& mprop,
@@ -452,7 +448,7 @@ public:
/** Intersection and Intersector interface:
*/
- virtual const TrackSurfaceIntersection* intersectSurface(
+ const TrackSurfaceIntersection* intersectSurface(
const Surface& surface,
const TrackSurfaceIntersection* trackIntersection,
const double qOverP,
@@ -468,22 +464,22 @@ public:
list, the list of GlobalPositions is given by reference through the
signature and a void method has been chosen.
*/
- virtual void globalPositions(std::list<Amg::Vector3D>& positionslist,
- const TrackParameters& parm,
- const MagneticFieldProperties& mprop,
- const CylinderBounds& cylbo,
- double stepSize,
- ParticleHypothesis particle = pion,
- const TrackingVolume* tVol = nullptr) const;
+ void globalPositions(std::list<Amg::Vector3D>& positionslist,
+ const TrackParameters& parm,
+ const MagneticFieldProperties& mprop,
+ const CylinderBounds& cylbo,
+ double stepSize,
+ ParticleHypothesis particle = pion,
+ const TrackingVolume* tVol = nullptr) const;
/** a very simple propagation along a given path length */
- virtual void propagateStep(const Amg::Vector3D& inputPosition,
- const Amg::Vector3D& inputMomentum,
- double charge,
- double step,
- Amg::Vector3D& outputPosition,
- Amg::Vector3D& outputMomentum,
- const MagneticFieldProperties& mprop) const;
+ void propagateStep(const Amg::Vector3D& inputPosition,
+ const Amg::Vector3D& inputMomentum,
+ double charge,
+ double step,
+ Amg::Vector3D& outputPosition,
+ Amg::Vector3D& outputMomentum,
+ const MagneticFieldProperties& mprop) const;
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.icc b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.icc
index 0e995ee311d..4c205fd3d29 100644
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.icc
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.icc
@@ -3,12 +3,13 @@
*/
/*
- * default implementations
- * for some methods which need to be always
- * re-implemented.
+ * default implementations
+ * for some methods which do NOT need
+ * to be always re-implemented
+ * by derived classes ...
*
- * TODO: Check usage / design causing
- * this
+ * We need to check the design for
+ * these.
*/
inline Trk::TrackParameters*
Trk::IPropagator::propagate(const EventContext&,
--
GitLab