From d97443fba68b98f335e61c93f6e2cc5c2611edfe Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 1 Dec 2017 22:19:12 +0100
Subject: [PATCH] TBRec: CLASS_DEF.h moved from CLIDSvc to AthenaKernel.
CLASS_DEF.h moved from CLIDSvc to AthenaKernel.
Former-commit-id: 8a5ddc559a2fb3a4c68275fa8912d4ec314eec17
---
TestBeam/TBRec/CMakeLists.txt | 6 ++----
TestBeam/TBRec/TBRec/ImpactInCaloCollection.h | 2 +-
TestBeam/TBRec/TBRec/TB_tree.h | 2 +-
TestBeam/TBRec/TBRec/TileRec_h1000.h | 2 +-
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/TestBeam/TBRec/CMakeLists.txt b/TestBeam/TBRec/CMakeLists.txt
index a434362173a..2f68f38a814 100644
--- a/TestBeam/TBRec/CMakeLists.txt
+++ b/TestBeam/TBRec/CMakeLists.txt
@@ -15,9 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloUtils
Control/AthenaBaseComps
Control/AthenaKernel
- Control/CLIDSvc
Control/AthContainers
- Control/SGTools
Control/StoreGate
DetectorDescription/GeoPrimitives
DetectorDescription/Identifier
@@ -69,13 +67,13 @@ atlas_add_library( TBRecLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel AthContainers SGTools GeoPrimitives Identifier EventInfo xAODTracking GaudiKernel LArIdentifier LArRawEvent TBEvent TrkDetDescrUtils TrkParameters TrkTrack CaloRecLib CaloUtilsLib StoreGateLib SGtests LArRawUtilsLib LArCablingLib CaloDetDescrLib TBCaloGeometryLib TBCondRunParLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel AthContainers GeoPrimitives Identifier EventInfo xAODTracking GaudiKernel LArIdentifier LArRawEvent TBEvent TrkDetDescrUtils TrkParameters TrkTrack CaloRecLib CaloUtilsLib StoreGateLib SGtests LArRawUtilsLib LArCablingLib CaloDetDescrLib TBCaloGeometryLib TBCondRunParLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CaloDmDetDescr CaloSimEvent CondDBObjects xAODCaloEvent LArG4TBSimEvent Particle PathResolver TrkSurfaces TrkEventPrimitives TrkExInterfaces )
atlas_add_component( TBRec
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers CaloIdentifier CaloRecLib CaloUtilsLib AthenaBaseComps AthenaKernel AthContainers SGTools StoreGateLib SGtests GeoPrimitives Identifier EventInfo xAODTracking GaudiKernel LArIdentifier LArRawEvent LArRawUtilsLib LArCablingLib TBEvent TrkDetDescrUtils TrkParameters TrkTrack CaloDetDescrLib CaloDmDetDescr CaloSimEvent CondDBObjects xAODCaloEvent LArG4TBSimEvent Particle TBCaloGeometryLib TBCondRunParLib PathResolver TrkSurfaces TrkEventPrimitives TrkExInterfaces TBRecLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers CaloIdentifier CaloRecLib CaloUtilsLib AthenaBaseComps AthenaKernel AthContainers StoreGateLib SGtests GeoPrimitives Identifier EventInfo xAODTracking GaudiKernel LArIdentifier LArRawEvent LArRawUtilsLib LArCablingLib TBEvent TrkDetDescrUtils TrkParameters TrkTrack CaloDetDescrLib CaloDmDetDescr CaloSimEvent CondDBObjects xAODCaloEvent LArG4TBSimEvent Particle TBCaloGeometryLib TBCondRunParLib PathResolver TrkSurfaces TrkEventPrimitives TrkExInterfaces TBRecLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h b/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h
index 72348721648..db872843c3c 100755
--- a/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h
+++ b/TestBeam/TBRec/TBRec/ImpactInCaloCollection.h
@@ -6,7 +6,7 @@
#define IMPACTINCALOCOLLECTION_H
#include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBRec/ImpactInCalo.h"
//class ImpactInCalo;
diff --git a/TestBeam/TBRec/TBRec/TB_tree.h b/TestBeam/TBRec/TBRec/TB_tree.h
index a6b45514f98..67b1390cac6 100644
--- a/TestBeam/TBRec/TBRec/TB_tree.h
+++ b/TestBeam/TBRec/TBRec/TB_tree.h
@@ -12,7 +12,7 @@
#ifndef TB_tree_h
#define TB_tree_h
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TROOT.h"
#include "TChain.h"
diff --git a/TestBeam/TBRec/TBRec/TileRec_h1000.h b/TestBeam/TBRec/TBRec/TileRec_h1000.h
index 48ee6ac5322..3ab6f91eeb0 100644
--- a/TestBeam/TBRec/TBRec/TileRec_h1000.h
+++ b/TestBeam/TBRec/TBRec/TileRec_h1000.h
@@ -12,7 +12,7 @@
#ifndef TileRec_h1000_h
#define TileRec_h1000_h
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TROOT.h"
#include "TChain.h"
--
GitLab