From 087c7ed271e4b2ab0175c049e675bf758012b1f6 Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Tue, 14 May 2019 18:21:44 +0000
Subject: [PATCH] Use DeclareInterfaceID and extends for
(I)SiCombinatorialTrackFinder(_xk)
---
.../ISiCombinatorialTrackFinder.h | 29 ++++++-------------
.../SiCombinatorialTrackFinder_xk.h | 2 +-
.../src/SiCombinatorialTrackFinder_xk.cxx | 3 +-
3 files changed, 11 insertions(+), 23 deletions(-)
mode change 100755 => 100644 InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
old mode 100755
new mode 100644
index 39f37ba7f0e..b71106326d9
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -15,14 +15,16 @@
#ifndef ISiCombinatorialTrackFinder_H
#define ISiCombinatorialTrackFinder_H
-#include <list>
-#include <map>
-#include "GaudiKernel/AlgTool.h"
+#include "GeoPrimitives/GeoPrimitives.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkSpacePoint/SpacePoint.h"
-#include "GeoPrimitives/GeoPrimitives.h"
#include "TrkTrack/Track.h"
+#include "GaudiKernel/AlgTool.h"
+
+#include <list>
+#include <map>
+
class MsgStream;
namespace InDetDD {
@@ -33,9 +35,6 @@ namespace InDet {
class TrackQualityCuts;
- static const InterfaceID IID_ISiCombinatorialTrackFinder
- ("InDet::ISiCombinatorialTrackFinder",1,0);
-
class ISiCombinatorialTrackFinder : virtual public IAlgTool
{
///////////////////////////////////////////////////////////////////
@@ -44,13 +43,8 @@ namespace InDet {
public:
- ///////////////////////////////////////////////////////////////////
- // Standard tool methods
- ///////////////////////////////////////////////////////////////////
-
- static const InterfaceID& interfaceID();
- virtual StatusCode initialize ()=0;
- virtual StatusCode finalize ()=0;
+ // InterfaceID
+ DeclareInterfaceID(ISiCombinatorialTrackFinder, 1, 0);
///////////////////////////////////////////////////////////////////
// Main methods for track-finding
@@ -104,11 +98,6 @@ namespace InDet {
// Inline methods
///////////////////////////////////////////////////////////////////
- inline const InterfaceID& ISiCombinatorialTrackFinder::interfaceID()
- {
- return IID_ISiCombinatorialTrackFinder;
- }
-
///////////////////////////////////////////////////////////////////
// Overload of << operator MsgStream
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
index ac463a94b85..ebb9250da0d 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
@@ -53,7 +53,7 @@ namespace InDet {
class SiCombinatorialTrackFinder_xk :
- virtual public ISiCombinatorialTrackFinder, public AthAlgTool
+ public extends<AthAlgTool, ISiCombinatorialTrackFinder>
{
friend class SiTrajectory_xk;
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
index d7091b37aea..d74dfe49e6c 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
@@ -36,9 +36,8 @@
InDet::SiCombinatorialTrackFinder_xk::SiCombinatorialTrackFinder_xk
(const std::string& t, const std::string& n, const IInterface* p)
- : AthAlgTool(t, n, p)
+ : base_class(t, n, p)
{
- declareInterface<ISiCombinatorialTrackFinder>(this);
}
///////////////////////////////////////////////////////////////////
--
GitLab