Tagging as TrkExStraightLineIntersector-01-00-01 (TrkExStraightLineIntersector-01-00-01)

        * update to IIntersection
        * tag as TrkExStraightLineIntersector-01-00-01

Tracking/TrkExtrapolation/TrkExStraightLineIntersector/TrkExStraightLineIntersector/StraightLineIntersector.h

@@ -12,9 +12,8 @@
 #define TRKEXSTRAIGHTLINEINTERSECTOR_STRAIGHTLINEINTERSECTOR_H
 
 #include "AthenaBaseComps/AthAlgTool.h"
-//#include "TrkEventPrimitives/GlobalDirection.h"
-//#include "TrkEventPrimitives/GlobalPosition.h"
 #include "TrkExInterfaces/IIntersector.h"
+#include "TrkExUtils/TrackSurfaceIntersection.h"
 
 namespace Trk
 {
@@ -33,33 +32,33 @@ public:
     StatusCode			finalize();
 
     /**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 for validity check over a particular extrapolation range */

Tracking/TrkExtrapolation/TrkExStraightLineIntersector/cmt/requirements

@@ -5,7 +5,6 @@ author			Alan Poppleton <Alan.Poppleton@cern.ch>
 private
 use AtlasCLHEP			AtlasCLHEP-*			External
 use GaudiInterface		GaudiInterface-*		External
-use TrkExUtils			TrkExUtils-*			Tracking/TrkExtrapolation
 use TrkParameters		TrkParameters-*			Tracking/TrkEvent
 use TrkSurfaces			TrkSurfaces-*			Tracking/TrkDetDescr
 
@@ -13,6 +12,7 @@ public
 use AtlasPolicy			AtlasPolicy-*
 use AthenaBaseComps		AthenaBaseComps-*		Control
 use TrkExInterfaces		TrkExInterfaces-*		Tracking/TrkExtrapolation
+use TrkExUtils			TrkExUtils-*			Tracking/TrkExtrapolation
 
 library TrkExStraightLineIntersector    StraightLineIntersector.cxx \
 					components/*.cxx

Tracking/TrkExtrapolation/TrkExStraightLineIntersector/src/StraightLineIntersector.cxx

@@ -61,7 +61,7 @@ StraightLineIntersector::finalize()
 /**IIntersector interface method for general Surface type */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::intersectSurface(const Surface&	surface,
-					  const Intersection*	trackIntersection,
+					  const TrackSurfaceIntersection*	trackIntersection,
 					  const double      	qOverP)
 {
     const PlaneSurface* plane			= dynamic_cast<const PlaneSurface*>(&surface);
@@ -86,7 +86,7 @@ StraightLineIntersector::intersectSurface(const Surface&	surface,
 /**IIntersector interface method for specific Surface type : PerigeeSurface */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::approachPerigeeSurface(const PerigeeSurface&	surface,
-						const Intersection*	trackIntersection,
+						const TrackSurfaceIntersection*	trackIntersection,
 						const double      	/*qOverP*/)
 {
     // set member data
@@ -103,7 +103,7 @@ StraightLineIntersector::approachPerigeeSurface(const PerigeeSurface&	surface,
     distanceToLine (surface.center(),lineDirection);
     step();
     
-    const Intersection* intersection	= new TrackSurfaceIntersection(m_position,
+    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
 								       m_direction,
 								       m_transverseLength);
     m_intersectionNumber		= intersection->serialNumber();
@@ -113,7 +113,7 @@ StraightLineIntersector::approachPerigeeSurface(const PerigeeSurface&	surface,
 /**IIntersector interface method for specific Surface type : StraightLineSurface */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::approachStraightLineSurface(const StraightLineSurface& surface,
-						     const Intersection*	trackIntersection,
+						     const TrackSurfaceIntersection*	trackIntersection,
 						     const double      		/*qOverP*/)
 {
     // set member data
@@ -130,7 +130,7 @@ StraightLineIntersector::approachStraightLineSurface(const StraightLineSurface&
     distanceToLine (surface.center(),lineDirection);
     step();
 
-    const Intersection* intersection	= new TrackSurfaceIntersection(m_position,
+    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
 								       m_direction,
 								       m_transverseLength);
     m_intersectionNumber		= intersection->serialNumber();
@@ -140,7 +140,7 @@ StraightLineIntersector::approachStraightLineSurface(const StraightLineSurface&
 /**IIntersector interface method for specific Surface type : CylinderSurface */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::intersectCylinderSurface (const CylinderSurface&	surface,
-						   const Intersection*		trackIntersection,
+						   const TrackSurfaceIntersection*		trackIntersection,
 						   const double      		/*qOverP*/)
 {
     // set member data
@@ -157,7 +157,7 @@ StraightLineIntersector::intersectCylinderSurface (const CylinderSurface&	surfac
     distanceToCylinder(cylinderRadius);
     step();
 
-    const Intersection* intersection	= new TrackSurfaceIntersection(m_position,
+    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
 								       m_direction,
 								       m_transverseLength);
     m_intersectionNumber		= intersection->serialNumber();
@@ -167,7 +167,7 @@ StraightLineIntersector::intersectCylinderSurface (const CylinderSurface&	surfac
 /**IIntersector interface method for specific Surface type : DiscSurface */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::intersectDiscSurface (const DiscSurface&	surface,
-					       const Intersection*	trackIntersection,
+					       const TrackSurfaceIntersection*	trackIntersection,
 					       const double      	/*qOverP*/)
 {
     if (trackIntersection->serialNumber() != m_intersectionNumber)
@@ -182,7 +182,7 @@ StraightLineIntersector::intersectDiscSurface (const DiscSurface&	surface,
     distanceToDisc(surface.center().z());
     step();
   
-    const Intersection* intersection	= new TrackSurfaceIntersection(m_position,
+    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
 								       m_direction,
 								       m_transverseLength);
     m_intersectionNumber		= intersection->serialNumber();
@@ -192,7 +192,7 @@ StraightLineIntersector::intersectDiscSurface (const DiscSurface&	surface,
 /**IIntersector interface method for specific Surface type : PlaneSurface */
 const Trk::TrackSurfaceIntersection*
 StraightLineIntersector::intersectPlaneSurface(const PlaneSurface&	surface,
-					       const Intersection*	trackIntersection,
+					       const TrackSurfaceIntersection*	trackIntersection,
 					       const double      	/*qOverP*/)
 {
     // set member data
@@ -209,7 +209,7 @@ StraightLineIntersector::intersectPlaneSurface(const PlaneSurface&	surface,
     step();
     distanceToPlane(surface.center(),surface.normal());
 
-    const Intersection* intersection	= new TrackSurfaceIntersection(m_position,
+    const Trk::TrackSurfaceIntersection* intersection	= new TrackSurfaceIntersection(m_position,
 								       m_direction,
 								       m_transverseLength);
     m_intersectionNumber		= intersection->serialNumber();