Skip to content
Snippets Groups Projects
Commit a9578e0b authored by Christos Anastopoulos's avatar Christos Anastopoulos
Browse files

Make the Extrapolator implementation aware of EventContext

parent 836569f0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1426 additions and 852 deletions
Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IExtrapolator.h
+ 8
− 8
View file @ a9578e0b
......@@ -102,7 +102,7 @@ namespace Trk {
const BoundaryCheck& bcheck = true,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise,
Trk::ExtrapolationCache* cache = 0) const = 0;
Trk::ExtrapolationCache* cache = nullptr) const = 0;
/** 2) <b>Configured AlgTool extrapolation method</b>):
- returns a vector of TrackParameters representing the tracking detector elements
......@@ -125,7 +125,7 @@ namespace Trk {
const BoundaryCheck& bcheck = true,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise,
Trk::ExtrapolationCache* cache = 0) const = 0;
Trk::ExtrapolationCache* cache = nullptr) const = 0;
/** 4) <b>Configured AlgTool extrapolation method</b>):
- direct extrapolation to the destination surface, no material effects
......@@ -156,7 +156,7 @@ namespace Trk {
PropDirection dir = anyDirection,
const BoundaryCheck& bcheck = true,
ParticleHypothesis particle = pion,
const Volume* boundaryVol = 0) const = 0;
const Volume* boundaryVol = nullptr) const = 0;
/** 6) <b>Configured AlgTool extrapolation method</b>):
*- extrapolation to the next active layer, based on the extrapolation to the next layer
......@@ -194,7 +194,7 @@ namespace Trk {
PropDirection dir,
const BoundaryCheck& bcheck,
ParticleHypothesis particle = pion,
Trk::ExtrapolationCache* cache = 0) const = 0;
Trk::ExtrapolationCache* cache = nullptr) const = 0;
/** 10) <b>Configured AlgTool extrapolation method</b>:
- Extrapolate to a destination surface, while collecting all the material layers and transport jacobians in
......@@ -207,7 +207,7 @@ namespace Trk {
std::vector<MaterialEffectsOnTrack>& material,
std::vector<Trk::TransportJacobian*>& jacs,
ParticleHypothesis particle = pion,
Trk::ExtrapolationCache* cache = 0) const = 0;
Trk::ExtrapolationCache* cache = nullptr) const = 0;
virtual const Trk::TrackParameters* extrapolateWithPathLimit(
const Trk::TrackParameters& parm,
......@@ -216,7 +216,7 @@ namespace Trk {
Trk::ParticleHypothesis particle,
std::vector<const Trk::TrackParameters*>*& parmOnSf,
std::vector<const Trk::TrackStateOnSurface*>*& material,
const Trk::TrackingVolume* boundaryVol = 0,
const Trk::TrackingVolume* boundaryVol = nullptr,
MaterialUpdateMode matupmod = Trk::addNoise) const = 0;
/** extrapolation method collecting intersections with subdetector boundaries and active volumes/layers.
......@@ -254,7 +254,7 @@ namespace Trk {
MaterialUpdateMode /*matupmod*/) const
{
std::cout << "CONFIGURATION ERROR: dummy version of extrapolation-with-path-limit method called " << std::endl;
return 0;
return nullptr;
}
inline const std::vector<std::pair<const Trk::TrackParameters*, int>>*
......@@ -265,7 +265,7 @@ namespace Trk {
int /*destination*/) const
{
std::cout << "CONFIGURATION ERROR: dummy version of extrapolation through active regions called " << std::endl;
return 0;
return nullptr;
}
......
Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IPropagator.h
+ 6
− 6
View file @ a9578e0b
......@@ -202,7 +202,7 @@ namespace Trk {
double& pathLength,
ParticleHypothesis particle = pion,
bool returnCurv = false,
const TrackingVolume* tVol = 0) const = 0;
const TrackingVolume* tVol = nullptr) const = 0;
/** Propagation interface without Covariance matrix propagation
......@@ -217,7 +217,7 @@ namespace Trk {
const MagneticFieldProperties& mprop,
ParticleHypothesis particle=pion,
bool returnCurv = false,
const TrackingVolume* tVol=0) const = 0;
const TrackingVolume* tVol=nullptr) const = 0;
virtual TrackParameters* propagateParameters( const EventContext& ctx,
const TrackParameters& parm,
......@@ -228,7 +228,7 @@ namespace Trk {
TransportJacobian*& jacob,
ParticleHypothesis particle=pion,
bool returnCurv = false,
const TrackingVolume* tVol=0) const = 0;
const TrackingVolume* tVol=nullptr) const = 0;
/** Intersection interface:
......@@ -241,7 +241,7 @@ namespace Trk {
const Surface& sf,
const MagneticFieldProperties& mprop,
ParticleHypothesis particle=pion,
const TrackingVolume* tVol=0) const = 0;
const TrackingVolume* tVol=nullptr) const = 0;
/** Intersection and Intersector interface:
*/
......@@ -269,7 +269,7 @@ namespace Trk {
const CylinderBounds& cylbo,
double stepSize,
ParticleHypothesis particle=pion,
const TrackingVolume* tVol=0) const = 0;
const TrackingVolume* tVol=nullptr) const = 0;
/** a very simple propagation along a given path length */
virtual void propagateStep(const EventContext& ctx,
......@@ -300,7 +300,7 @@ namespace Trk {
const MagneticFieldProperties& mprop,
ParticleHypothesis particle = pion,
bool returnCurv = false,
const TrackingVolume* tVol = 0) const;
const TrackingVolume* tVol = nullptr) const;
/** Propagation interface:
......
Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/ITimedExtrapolator.h
+ 2
− 2
View file @ a9578e0b
......@@ -55,7 +55,7 @@ namespace Trk {
Trk::ParticleHypothesis particle,
std::vector<HitInfo>*& hitVector,
Trk::GeometrySignature& nextGeoId,
const Trk::TrackingVolume* boundaryVol=0) const = 0;
const Trk::TrackingVolume* boundaryVol=nullptr) const = 0;
/** Transport method for neutral and/or unstable particles. Search of intersections with active surfaces/layers on demand.
The extrapolation is interrupted at subdetector boundary for surviving/stable particles.
......@@ -67,7 +67,7 @@ namespace Trk {
Trk::ParticleHypothesis particle,
std::vector<HitInfo>*& hitVector,
Trk::GeometrySignature& nextGeoId,
const Trk::TrackingVolume* boundaryVol=0) const = 0;
const Trk::TrackingVolume* boundaryVol=nullptr) const = 0;
/** Return the TrackingGeometry used by the Extrapolator (forwards information from Navigator) */
......
Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
+ 1216
− 684
View file @ a9578e0b
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment