Merge branch 'ATLASRECTS-5629_private_handle_inDetFinderTools' into 'master'

ATLASRECTS-5629 : Conversion Finder: New Gaudi style private handle for InDetFinderTools

See merge request atlas/athena!35939

InnerDetector/InDetRecAlgs/InDetConversionFinder/InDetConversionFinder/ConversionFinder.h

@@ -17,13 +17,12 @@
 #include "GaudiKernel/ToolHandle.h"
 #include "xAODTracking/VertexContainer.h"
 #include "xAODTracking/TrackParticleContainer.h"
-
+#include "InDetRecToolInterfaces/IVertexFinder.h"
 class IEMExtrapolationTools;
 
 
 namespace InDet{
 
-  class IVertexFinder;
   class ConversionFinder : public AthAlgorithm {
 
   public:
@@ -40,8 +39,13 @@ namespace InDet{
     SG::ReadHandleKey<xAOD::TrackParticleContainer> m_tracksName;                //!< Name of track container in StoreGate
     SG::WriteHandleKey<xAOD::VertexContainer>       m_InDetConversionOutputName; //!< Name of output container to store results
 
-    ToolHandle< IVertexFinder > m_VertexFinderTool;  //<! Vertex finder tool
-    ToolHandle< IEMExtrapolationTools >  m_EMExtrapolationTool;
+    ToolHandle<IVertexFinder> m_VertexFinderTool{
+      this,
+      "VertexFinderTool",
+      "InDet::InDetConversionFinderTools",
+      "vertex finder tool"
+    };
+    ToolHandle<IEMExtrapolationTools> m_EMExtrapolationTool;
 
     bool m_doExtrapolation;
 

InnerDetector/InDetRecAlgs/InDetConversionFinder/src/ConversionFinder.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -13,7 +13,6 @@
 #include "InDetConversionFinder/ConversionFinder.h"
 
 #include "TrkTrack/TrackCollection.h"
-#include "InDetRecToolInterfaces/IVertexFinder.h"
 #include "TrkTrackSummary/TrackSummary.h"
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/EventContext.h"
@@ -31,14 +30,12 @@ namespace InDet
   : AthAlgorithm(name, pSvcLocator),
   m_tracksName("InDetTrackParticles"),
   m_InDetConversionOutputName("InDetConversion"),
-  m_VertexFinderTool("InDet::InDetConversionFinderTools"),
   m_EMExtrapolationTool("EMExtrapolationTools"),
   m_doExtrapolation(false)
   {
     /* Retrieve StoreGate container and tool names from job options */
     declareProperty("TracksName",m_tracksName);
     declareProperty("InDetConversionOutputName", m_InDetConversionOutputName);
-    declareProperty("VertexFinderTool",m_VertexFinderTool);
     declareProperty("ExtrapolationTool", m_EMExtrapolationTool, "Handle of the extrapolation tool");
     declareProperty("doExtrapolation", m_doExtrapolation );
 	}