Merge branch 'datamodel.InDetEventTPCnv-20170423' into 'master'

InDetEventTPCnv: DataModel -> AthLinks, AthContainers

See merge request !1111

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

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"

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"

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"
 
 

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"

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"
 
 

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"

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

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) 
 {

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"

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) 
 {

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) 
 {

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"

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"

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"

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"

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"