Merge branch 'declareInterfaceMigration_Pt2_ATLASSIM-3439_21.3' into '21.3'

Simulation declareInterface migration Part2 ATLASSIM-3439

See merge request !4816


Former-commit-id: 5c565bdecb29a6dd1e22627557dfe2a6d19c2ef4

Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/ISF_FatrasRecoTools/PlanarClusterOnTrackTool.h

@@ -31,7 +31,7 @@ class IPixelOfflineCalibSvc;
 
 namespace iFatras {
 
-  class PlanarClusterOnTrackTool: public AthAlgTool, virtual public Trk::IRIO_OnTrackCreator,  virtual public IIncidentListener
+  class PlanarClusterOnTrackTool: public extends<AthAlgTool, Trk::IRIO_OnTrackCreator, IIncidentListener>
   {
     
   public:

Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/PlanarClusterOnTrackTool.cxx

@@ -22,10 +22,9 @@
 namespace iFatras {
   PlanarClusterOnTrackTool::PlanarClusterOnTrackTool
   (const std::string& t,const std::string& n,const IInterface* p) :
-    ::AthAlgTool(t,n,p),
+    base_class(t,n,p),
     m_useDefinedParameters(false)
   {
-    declareInterface<IRIO_OnTrackCreator>(this);
     declareProperty("UseDefinedParameters",     m_useDefinedParameters);
   }
   

Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/ICompetingRIOsOnTrackTool.h

@@ -50,8 +50,6 @@ public:
     static const InterfaceID& interfaceID() {
         return IID_ICompetingRIOsOnTrackTool;
     }    //!< The AlgTool InterfaceID
-    virtual StatusCode initialize()=0;     //!< standard AlgTool method
-    virtual StatusCode finalize()=0;       //!< standard AlgTool method
 
     /** @brief abstract base method for making a Trk::CompetingRIOsOnTrack object.
 

Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IRIO_OnTrackCreator.h

@@ -40,8 +40,6 @@ namespace Trk {
     virtual ~IRIO_OnTrackCreator() {}
     static const InterfaceID& interfaceID()
     { return IID_IRIO_OnTrackCreator; }    //!< The AlgTool InterfaceID
-    virtual StatusCode initialize()=0;     //!< standard AlgTool method
-    virtual StatusCode finalize()=0;       //!< standard AlgTool method
 
     /** abstract base method for the creation of RIO_OnTrack
         it takes a RIO (PrepRawData) and the given Track Parameter

Tracking/TrkTools/TrkToolInterfaces/TrkToolInterfaces/IRIO_OnTrackErrorScalingTool.h

@@ -40,8 +40,6 @@ namespace Trk {
     virtual ~IRIO_OnTrackErrorScalingTool() {}
     static const InterfaceID& interfaceID() //!< AlgTool standard interface
     { return IID_IRIO_OnTrackErrorScalingTool; }
-    virtual StatusCode initialize()=0; //!< AlgTool standard initialisation
-    virtual StatusCode finalize()=0;
     /* The AtlasDetectorID helper does not have an is_endcap method.
        therefore follow a different approach than this one:
       virtual const void