From 623d70ac5409cb60e50fdf03663c40ca57b5d2e5 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Wed, 3 Oct 2018 14:38:11 +0200
Subject: [PATCH] ALFA_SimEv: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
Former-commit-id: f5074449ef24497b98fb57df121a0c33facc275e
---
.../ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h | 5 +----
.../ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h | 5 +----
ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt | 7 +++----
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
index 97885a00bd8..65e6c072fad 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_HitCollection.h
@@ -8,10 +8,7 @@
#include "ALFA_SimEv/ALFA_Hit.h"
#include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
typedef AtlasHitsVector<ALFA_Hit> ALFA_HitCollection;
typedef AtlasHitsVector<ALFA_Hit>::iterator ALFA_HitIter;
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
index 5293ef12d44..cc85110b237 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/ALFA_SimEv/ALFA_ODHitCollection.h
@@ -8,10 +8,7 @@
#include "ALFA_SimEv/ALFA_ODHit.h"
#include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
-#include "CLIDSvc/CLASS_DEF.h"
-#endif
+#include "AthenaKernel/CLASS_DEF.h"
typedef AtlasHitsVector<ALFA_ODHit> ALFA_ODHitCollection;
typedef AtlasHitsVector<ALFA_ODHit>::iterator ALFA_ODHitIter;
diff --git a/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
index c1df210c659..27a77bc306a 100644
--- a/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_SimEv/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( ALFA_SimEv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
Simulation/HitManagement
PRIVATE
GaudiKernel )
@@ -21,12 +20,12 @@ atlas_add_library( ALFA_SimEv
src/*.cxx
PUBLIC_HEADERS ALFA_SimEv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTools HitManagement
+ LINK_LIBRARIES AthenaKernel HitManagement
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
atlas_add_dictionary( ALFA_SimEvDict
ALFA_SimEv/ALFA_SimEvDict.h
ALFA_SimEv/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement GaudiKernel ALFA_SimEv )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} HitManagement GaudiKernel ALFA_SimEv )
--
GitLab