From 1af6a459ca989aac10c95029c5f5ef702ab97da9 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 9 Dec 2018 01:33:32 +0100
Subject: [PATCH] ZDC_SimEvent: CLIDSvc -> AthenaKernel
Adjust for header moved from CLIDSvc to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt | 7 +++----
.../ZDC_SimEvent/ZDC_SimPixelHit_Collection.h | 8 ++------
.../ZDC_SimEvent/ZDC_SimStripHit_Collection.h | 8 ++------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt b/ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt
index e8df045aaf2..22ca9cf131d 100644
--- a/ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt
+++ b/ForwardDetectors/ZDC/ZDC_SimEvent/CMakeLists.txt
@@ -7,8 +7,7 @@ atlas_subdir( ZDC_SimEvent )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/SGTools
+ Control/AthenaKernel
Simulation/HitManagement )
# External dependencies:
@@ -19,12 +18,12 @@ atlas_add_library( ZDC_SimEvent
src/*.cxx
PUBLIC_HEADERS ZDC_SimEvent
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTools HitManagement
+ LINK_LIBRARIES AthenaKernel HitManagement
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( ZDC_SimEventDict
ZDC_SimEvent/ZDC_SimEventDict.h
ZDC_SimEvent/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools HitManagement ZDC_SimEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel HitManagement ZDC_SimEvent )
diff --git a/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimPixelHit_Collection.h b/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimPixelHit_Collection.h
index b38d663fa52..188e65189f6 100644
--- a/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimPixelHit_Collection.h
+++ b/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimPixelHit_Collection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDC_SIMPIXELHIT_COLLECTION
@@ -7,11 +7,7 @@
#include "ZDC_SimPixelHit.h"
#include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
- #include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
#include <string>
typedef AtlasHitsVector<ZDC_SimPixelHit> ZDC_SimPixelHit_Collection1;
diff --git a/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimStripHit_Collection.h b/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimStripHit_Collection.h
index 59eb1cd50c5..01f3a1c6326 100644
--- a/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimStripHit_Collection.h
+++ b/ForwardDetectors/ZDC/ZDC_SimEvent/ZDC_SimEvent/ZDC_SimStripHit_Collection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDC_SIMSTRIPHIT_COLLECTION
@@ -7,11 +7,7 @@
#include "ZDC_SimStripHit.h"
#include "HitManagement/AtlasHitsVector.h"
-
-#ifndef __CINT__
- #include "CLIDSvc/CLASS_DEF.h"
-#endif
-
+#include "AthenaKernel/CLASS_DEF.h"
#include <string>
typedef AtlasHitsVector<ZDC_SimStripHit> ZDC_SimStripHit_Collection1;
--
GitLab