From c9fbee273d65b0ad2c6d55d1e616bfc82fc06d33 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Sat, 22 Apr 2017 15:57:05 +0200
Subject: [PATCH] InDetEventTPCnv: DataModel -> AthLinks, AthContainers
---
InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt | 5 +++--
.../InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h | 2 +-
.../InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h | 2 +-
.../InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h | 2 +-
.../InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h | 2 +-
.../InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h | 2 +-
.../InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h | 2 +-
InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements | 3 ++-
.../src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx | 2 +-
.../InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx | 2 +-
.../src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx | 2 +-
.../src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx | 2 +-
.../InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx | 2 +-
.../InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx | 2 +-
.../InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx | 2 +-
.../InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx | 2 +-
.../InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx | 2 +-
17 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
index 622e47bcccb..f9ce27dee28 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/CMakeLists.txt
@@ -9,7 +9,8 @@ atlas_subdir( InDetEventTPCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
- Control/DataModel
+ Control/AthAllocators
+ Control/AthLinks
Control/DataModelAthenaPool
Control/StoreGate
Database/AthenaPOOL/AthenaPoolCnvSvc
@@ -46,7 +47,7 @@ atlas_add_tpcnv_library( InDetEventTPCnv
src/InDetCompetingRIOsOnTrack/*.cxx
InDetEventTPCnv/InDetLowBetaInfo/*.h src/InDetLowBetaInfo/*.cxx
PUBLIC_HEADERS InDetEventTPCnv
- LINK_LIBRARIES DataModel DataModelAthenaPoolLib StoreGateLib
+ LINK_LIBRARIES AthAllocators AthLinks DataModelAthenaPoolLib StoreGateLib
AthenaPoolCnvSvcLib AthenaPoolUtilities Identifier GaudiKernel
InDetIdentifier InDetCompetingRIOsOnTrack InDetLowBetaInfo
InDetPrepRawData InDetRIO_OnTrack TrkEventTPCnv
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
index 932da8ec058..26443a5fe35 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
#include "InDetEventTPCnv/InDetRIO_OnTrack/SiClusterOnTrackCnv_p1.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
index 6fd6b93432a..04426bfe2c8 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrackCnv_p2.h
@@ -10,7 +10,7 @@
#include "InDetEventTPCnv/InDetRIO_OnTrack/PixelClusterOnTrack_p2.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
index f6bd8c2966b..643b44be84b 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
#include "InDetEventTPCnv/InDetRIO_OnTrack/SiClusterOnTrackCnv_p1.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/SCT_ClusterContainer.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
index cd369b0bad8..526b584e741 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrackCnv_p2.h
@@ -9,7 +9,7 @@
#include "InDetEventTPCnv/InDetRIO_OnTrack/SCT_ClusterOnTrack_p2.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/SCT_ClusterContainer.h"
#include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
index 3718ed577b9..34ae5b1401e 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p1.h
@@ -17,7 +17,7 @@
#include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
index 49a205d0321..d19671f4339 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrackCnv_p2.h
@@ -9,7 +9,7 @@
#include "InDetEventTPCnv/InDetRIO_OnTrack/TRT_DriftCircleOnTrack_p2.h"
#include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "InDetPrepRawData/TRT_DriftCircleContainer.h"
#include "TrkEventTPCnv/TrkEventPrimitives/ErrorMatrixCnv_p1.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements b/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
index 51f4005764b..d1155c81a36 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/cmt/requirements
@@ -7,7 +7,8 @@ public
use AtlasPolicy AtlasPolicy-*
use AthenaPoolCnvSvc AthenaPoolCnvSvc-* Database/AthenaPOOL
use AthenaPoolUtilities AthenaPoolUtilities-* Database/AthenaPOOL
-use DataModel DataModel-* Control
+use AthAllocators AthAllocators-* Control
+use AthLinks AthLinks-* Control
use DataModelAthenaPool DataModelAthenaPool-* Control
use GaudiInterface GaudiInterface-* External
use Identifier Identifier-* DetectorDescription
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
index 68c8540c05e..bcc3e5ea0f1 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelClusterContainerCnv_p1.cxx
@@ -27,7 +27,7 @@
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
void InDet::PixelClusterContainerCnv_p1::transToPers(const InDet::PixelClusterContainer* transCont, InDet::InDetPRD_Container_p1* persCont, MsgStream &log)
{
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
index 693d3e02373..aa5c495a779 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
@@ -7,7 +7,7 @@
#include "InDetPrepRawData/PixelClusterContainer.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguities_p1.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.h"
-#include "DataModel/tools/IdentContIndex.h"
+#include "AthLinks/tools/IdentContIndex.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
index 7097de0b6f3..2906d5e93ab 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/SCT_ClusterContainerCnv_p1.cxx
@@ -25,7 +25,7 @@
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
void InDet::SCT_ClusterContainerCnv_p1::transToPers(const InDet::SCT_ClusterContainer* transCont, InDet::InDetPRD_Container_p1* persCont, MsgStream &log)
{
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
index d90fe78db0b..ee46ba310ab 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/TRT_DriftCircleContainerCnv_p1.cxx
@@ -26,7 +26,7 @@
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
void InDet::TRT_DriftCircleContainerCnv_p1::transToPers(const InDet::TRT_DriftCircleContainer* transCont, InDet::InDetPRD_Container_p1* persCont, MsgStream &log)
{
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
index 245dd323ec8..e32a38bdf4c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p2.h"
#include "InDetEventTPCnv/PixelClusterContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
index a6981289e27..92decc31bfd 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/PixelClusterContainerCnv_p3.cxx
@@ -13,7 +13,7 @@
#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "InDetEventTPCnv/InDetPrepRawData/PixelClusterCnv_p3.h"
#include "InDetEventTPCnv/PixelClusterContainerCnv_p3.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
index 517d78113bd..c80ef83f6d5 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
#include "InDetReadoutGeometry/SCT_DetectorManager.h"
#include "InDetEventTPCnv/InDetPrepRawData/SCT_ClusterCnv_p2.h"
#include "InDetEventTPCnv/SCT_ClusterContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
index a04293303e3..f27bc74b1e0 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/SCT_ClusterContainerCnv_p3.cxx
@@ -13,7 +13,7 @@
#include "InDetReadoutGeometry/SCT_DetectorManager.h"
#include "InDetEventTPCnv/InDetPrepRawData/SCT_ClusterCnv_p3.h"
#include "InDetEventTPCnv/SCT_ClusterContainerCnv_p3.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
diff --git a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
index 6c9503b04b8..108c2f3e11e 100644
--- a/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
+++ b/InnerDetector/InDetEventCnv/InDetEventTPCnv/src/TRT_DriftCircleContainerCnv_p2.cxx
@@ -13,7 +13,7 @@
#include "InDetReadoutGeometry/TRT_DetectorManager.h"
#include "InDetEventTPCnv/InDetPrepRawData/TRT_DriftCircleCnv_p2.h"
#include "InDetEventTPCnv/TRT_DriftCircleContainerCnv_p2.h"
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
// Gaudi
#include "GaudiKernel/ISvcLocator.h"
--
GitLab