From 424b83e2c61a192ee5cb23ca5b5dad634ad41c1b Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 8 Jul 2018 16:35:44 +0200
Subject: [PATCH] TBDetDescr: DataModel -> AthContainers.
Remove references to obsolete package DataModel.
Also remove references to CLIDSvc and SGTools.
Former-commit-id: df6e02e06d5357e99b5ad5b1956259392692f931
---
TestBeam/TBDetDescr/CMakeLists.txt | 9 ++++-----
TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h | 2 +-
TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/TestBeam/TBDetDescr/CMakeLists.txt b/TestBeam/TBDetDescr/CMakeLists.txt
index 4c0e60e44a9..54cdcb7961a 100644
--- a/TestBeam/TBDetDescr/CMakeLists.txt
+++ b/TestBeam/TBDetDescr/CMakeLists.txt
@@ -7,9 +7,8 @@ atlas_subdir( TBDetDescr )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
- Control/DataModel
- Control/SGTools
+ Control/AthenaKernel
+ Control/AthContainers
DetectorDescription/GeoPrimitives
PRIVATE
GaudiKernel )
@@ -24,12 +23,12 @@ atlas_add_library( TBDetDescr
PUBLIC_HEADERS TBDetDescr
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} DataModel SGTools GeoPrimitives
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthContainers GeoPrimitives
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
atlas_add_dictionary( TBDetDescrDict
TBDetDescr/TBDetDescrDict.h
TBDetDescr/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} DataModel SGTools GeoPrimitives GaudiKernel TBDetDescr )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthContainers GeoPrimitives GaudiKernel TBDetDescr )
diff --git a/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h b/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
index 16bb98f4cba..22b3a1b6319 100755
--- a/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
+++ b/TestBeam/TBDetDescr/TBDetDescr/TBDetDescrManager.h
@@ -9,7 +9,7 @@
#ifndef TBDetDescrManager_H
#define TBDetDescrManager_H
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBDetDescr/TBElement.h"
class TBElementContainer;
diff --git a/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h b/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
index 2411ca8888f..848dc3bcaeb 100755
--- a/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
+++ b/TestBeam/TBDetDescr/TBDetDescr/TBElementContainer.h
@@ -9,8 +9,8 @@
#ifndef TBElementContainer_H
#define TBElementContainer_H
-#include "DataModel/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthContainers/DataVector.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "TBDetDescr/TBElement.h"
--
GitLab