From cf630c2572c9c0f58c02f1921079e5e397927ff4 Mon Sep 17 00:00:00 2001
From: Andreas Salzburger <salzburg@cern.ch>
Date: Fri, 5 Sep 2014 14:56:24 +0200
Subject: [PATCH] Tagging as TrkExSolenoidalIntersector-00-01-05
(TrkExSolenoidalIntersector-00-01-05)
2014-09-05 Andreas Salzburger < Andreas.Salzburger -at- cern.ch >
* update to IIntersector interface
* tag as TrkExSolenoidalIntersector-00-01-05
2014-02-14 Niels van Eldik
---
.../SolenoidalIntersector.h | 52 +++++++++----------
.../src/SolenoidalIntersector.cxx | 12 ++---
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/TrkExSolenoidalIntersector/SolenoidalIntersector.h b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/TrkExSolenoidalIntersector/SolenoidalIntersector.h
index 3af54b96b50..daa8770385a 100755
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/TrkExSolenoidalIntersector/SolenoidalIntersector.h
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/TrkExSolenoidalIntersector/SolenoidalIntersector.h
@@ -41,33 +41,33 @@ public:
void handle(const Incident& inc) ;
/**IIntersector interface method for general Surface type */
- const Intersection* intersectSurface(const Surface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* intersectSurface(const Surface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method for specific Surface type : PerigeeSurface */
- const Intersection* approachPerigeeSurface(const PerigeeSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* approachPerigeeSurface(const PerigeeSurface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method for specific Surface type : StraightLineSurface */
- const Intersection* approachStraightLineSurface(const StraightLineSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* approachStraightLineSurface(const StraightLineSurface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method for specific Surface type : CylinderSurface */
- const Intersection* intersectCylinderSurface (const CylinderSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* intersectCylinderSurface (const CylinderSurface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method for specific Surface type : DiscSurface */
- const Intersection* intersectDiscSurface (const DiscSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* intersectDiscSurface (const DiscSurface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method for specific Surface type : PlaneSurface */
- const Intersection* intersectPlaneSurface(const PlaneSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* intersectPlaneSurface(const PlaneSurface& surface,
+ const TrackSurfaceIntersection* trackTrackSurfaceIntersection,
const double qOverP);
/**IIntersector interface method to check validity of parametrization within extrapolation range */
@@ -84,7 +84,7 @@ private:
bool extrapolateToR(double endRadius);
bool extrapolateToZ(double endZ);
const TrackSurfaceIntersection* intersection(const Surface& surface);
- void setParameters(const Intersection* intersection,
+ void setParameters(const TrackSurfaceIntersection* intersection,
double qOverP);
// services and tools:
@@ -220,10 +220,10 @@ SolenoidalIntersector::linearArcLength(double endRadius)
inline const TrackSurfaceIntersection*
SolenoidalIntersector::intersection(const Surface& surface)
{
- SurfaceIntersection SLIntersect = surface.straightLineIntersection(m_position, m_direction, false, false);
+ Intersection SLIntersect = surface.straightLineIntersection(m_position, m_direction, false, false);
if (! SLIntersect.valid) return 0;
- const Intersection* intersection = new Intersection(SLIntersect.intersection,
+ const TrackSurfaceIntersection* intersection = new TrackSurfaceIntersection(SLIntersect.position,
m_direction,
m_pathLength);
// // validate
@@ -251,24 +251,24 @@ SolenoidalIntersector::intersection(const Surface& surface)
}
inline void
-SolenoidalIntersector::setParameters(const Intersection* trackIntersection, double qOverP)
+SolenoidalIntersector::setParameters(const TrackSurfaceIntersection* trackTrackSurfaceIntersection, double qOverP)
{
- if (trackIntersection->serialNumber() != m_intersectionNumber || qOverP != m_qOverP)
+ if (trackTrackSurfaceIntersection->serialNumber() != m_intersectionNumber || qOverP != m_qOverP)
{
- // ATH_MSG_INFO(" initialize parameters. Diff: " << trackIntersection->serialNumber()-m_intersectionNumber
- // << " at R,Z: " << trackIntersection->position().perp() << ", " << trackIntersection->position().z());
+ // ATH_MSG_INFO(" initialize parameters. Diff: " << trackTrackSurfaceIntersection->serialNumber()-m_intersectionNumber
+ // << " at R,Z: " << trackTrackSurfaceIntersection->position().perp() << ", " << trackTrackSurfaceIntersection->position().z());
++m_countExtrapolations;
- m_position.x() = trackIntersection->position().x();
- m_position.y() = trackIntersection->position().y();
- m_position.z() = trackIntersection->position().z();
+ m_position.x() = trackTrackSurfaceIntersection->position().x();
+ m_position.y() = trackTrackSurfaceIntersection->position().y();
+ m_position.z() = trackTrackSurfaceIntersection->position().z();
m_radius = m_position.perp();
- m_direction.x() = trackIntersection->direction().x();
- m_direction.y() = trackIntersection->direction().y();
- m_direction.z() = trackIntersection->direction().z();
+ m_direction.x() = trackTrackSurfaceIntersection->direction().x();
+ m_direction.y() = trackTrackSurfaceIntersection->direction().y();
+ m_direction.z() = trackTrackSurfaceIntersection->direction().z();
m_sinTheta = m_direction.perp();
m_oneOverSinTheta = 1./m_sinTheta;
m_cotTheta = m_direction.z() * m_oneOverSinTheta;
- m_pathLength = trackIntersection->pathlength();
+ m_pathLength = trackTrackSurfaceIntersection->pathlength();
m_qOverP = qOverP;
m_qOverPt = qOverP * m_oneOverSinTheta;
m_solenoidParametrization->setParameters(m_radius,m_position.z(),m_cotTheta);
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
index c4322033ec6..a39a899db30 100755
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/src/SolenoidalIntersector.cxx
@@ -151,7 +151,7 @@ SolenoidalIntersector::handle(const Incident& inc)
/**IIntersector interface method for general Surface type */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::intersectSurface(const Surface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{
const PlaneSurface* plane = dynamic_cast<const PlaneSurface*>(&surface);
@@ -178,21 +178,21 @@ SolenoidalIntersector::intersectSurface(const Surface& surface,
/**IIntersector interface method for specific Surface type : PerigeeSurface */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::approachPerigeeSurface(const PerigeeSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{ return m_rungeKuttaIntersector->approachPerigeeSurface(surface, trackIntersection, qOverP); }
/**IIntersector interface method for specific Surface type : StraightLineSurface */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::approachStraightLineSurface(const StraightLineSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{ return m_rungeKuttaIntersector->approachStraightLineSurface(surface, trackIntersection, qOverP); }
/**IIntersector interface method for specific Surface type : CylinderSurface */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::intersectCylinderSurface(const CylinderSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{
double endRadius = surface.globalReferencePoint().perp();
@@ -210,7 +210,7 @@ SolenoidalIntersector::intersectCylinderSurface(const CylinderSurface& surface,
/**IIntersector interface method for specific Surface type : DiscSurface */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::intersectDiscSurface (const DiscSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{
double endZ = surface.center().z();
@@ -231,7 +231,7 @@ SolenoidalIntersector::intersectDiscSurface (const DiscSurface& surface,
/**IIntersector interface method for specific Surface type : PlaneSurface */
const Trk::TrackSurfaceIntersection*
SolenoidalIntersector::intersectPlaneSurface(const PlaneSurface& surface,
- const Intersection* trackIntersection,
+ const TrackSurfaceIntersection* trackIntersection,
const double qOverP)
{
if (std::abs(surface.center().z()) > m_validZ
--
GitLab