From d36e816ecdc7a7dd4396dce097ea5cc254c8b91c Mon Sep 17 00:00:00 2001
From: John Baines <john.baines@stfc.ac.uk>
Date: Wed, 2 Nov 2016 15:23:36 +0100
Subject: [PATCH] put back TrkTrack in requirements and CMakeLists
(FTK_RecToolInterfaces-00-00-06)
* cmt/requirements: put back use TrkTrack
* tag FTK_RecToolInterfaces-00-00-06
2016-09-01 Jahred Adelman <jahreda@gmail.com>
* IFTK_VertexFinderTool.h: add missing include
2016-08-29 Jahred Adelman <jahreda@gmail.com>
* IFTK_VertexFinderTool.h: update for multiple types of tracks
---
Trigger/TrigFTK/FTK_RecToolInterfaces/CMakeLists.txt | 1 +
.../FTK_RecToolInterfaces/IFTK_VertexFinderTool.h | 5 ++++-
Trigger/TrigFTK/FTK_RecToolInterfaces/cmt/requirements | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Trigger/TrigFTK/FTK_RecToolInterfaces/CMakeLists.txt b/Trigger/TrigFTK/FTK_RecToolInterfaces/CMakeLists.txt
index b4101ac2abd..45d9089aea7 100644
--- a/Trigger/TrigFTK/FTK_RecToolInterfaces/CMakeLists.txt
+++ b/Trigger/TrigFTK/FTK_RecToolInterfaces/CMakeLists.txt
@@ -5,6 +5,7 @@
# Declare the package name:
atlas_subdir( FTK_RecToolInterfaces )
+
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
GaudiKernel
diff --git a/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_VertexFinderTool.h b/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_VertexFinderTool.h
index e59c100adea..f61d72aac55 100644
--- a/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_VertexFinderTool.h
+++ b/Trigger/TrigFTK/FTK_RecToolInterfaces/FTK_RecToolInterfaces/IFTK_VertexFinderTool.h
@@ -15,6 +15,8 @@ class VxContainer;
#include "xAODTracking/VertexFwd.h"
//#include "xAODTracking/TrackParticleFwd.h"
#include "xAODTracking/VertexContainerFwd.h"
+#include "xAODTracking/VertexAuxContainer.h"
+#include "TrkTrack/TrackCollection.h"
//#include "xAODTracking/TrackParticleContainerFwd.h"
//namespace Trk {
//// class Track;
@@ -29,7 +31,8 @@ class IFTK_VertexFinderTool : virtual public IAlgTool {
{ return IID_IFTK_VertexFinderTool; }
// virtual VxContainer* findVertex(const FTK_RawTrackContainer* trks) = 0;
- virtual xAOD::VertexContainer* findVertex(const FTK_RawTrackContainer* trks) = 0;
+ virtual std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> findVertex(const FTK_RawTrackContainer* trks) = 0;
+ virtual std::pair<xAOD::VertexContainer*, xAOD::VertexAuxContainer*> findVertex(const TrackCollection* trks) = 0;
private:
};
diff --git a/Trigger/TrigFTK/FTK_RecToolInterfaces/cmt/requirements b/Trigger/TrigFTK/FTK_RecToolInterfaces/cmt/requirements
index ce1b9447eb2..234dc574708 100644
--- a/Trigger/TrigFTK/FTK_RecToolInterfaces/cmt/requirements
+++ b/Trigger/TrigFTK/FTK_RecToolInterfaces/cmt/requirements
@@ -13,5 +13,5 @@ use AtlasReconstructionRunTime AtlasReconstructionRunTime-*
use AtlasPolicy AtlasPolicy-*
use GaudiInterface GaudiInterface-* External
use TrigFTK_RawData TrigFTK_RawData-* Trigger/TrigFTK
-#use TrkTrack TrkTrack-* Tracking/TrkEvent
+use TrkTrack TrkTrack-* Tracking/TrkEvent
use xAODTracking xAODTracking-* Event/xAOD
--
GitLab