Merge branch 'datamodel.MuonEventTPCnv-20170424' into 'master'

MuonEventTPCnv: DataModel -> AthLinks, AthAllocators

See merge request !1115
Former-commit-id: dcf28e50

MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt

@@ -9,7 +9,8 @@ atlas_subdir( MuonEventTPCnv )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs(
    PUBLIC
-   Control/DataModel
+   Control/AthAllocators
+   Control/AthLinks
    Control/DataModelAthenaPool
    Database/AthenaPOOL/AthenaPoolCnvSvc
    Database/AthenaPOOL/AthenaPoolUtilities
@@ -63,7 +64,7 @@ atlas_add_tpcnv_library( MuonEventTPCnv
    MuonEventTPCnv/MuonChamberT0s/*.h src/MuonChamberT0s/*.cxx
    MuonEventTPCnv/MuonDigitContainer/*.h src/MuonDigitContainer/*.cxx
    PUBLIC_HEADERS MuonEventTPCnv
-   LINK_LIBRARIES DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib
+   LINK_LIBRARIES AthAllocators AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib
    AthenaPoolUtilities Identifier GaudiKernel GeneratorObjectsTPCnv
    MuonDigitContainer MuonChamberT0s MuonCompetingRIOsOnTrack MuonPrepRawData
    MuonRIO_OnTrack MuonSegment MuonTrigCoinData MuonSimData TrkSurfaces

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/CscClusterOnTrackCnv_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 "MuonPrepRawData/CscPrepData.h"
 
 class MsgStream;

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/CscClusterOnTrackCnv_p2.h

@@ -17,7 +17,7 @@
 
 #include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/CscPrepData.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/MM_ClusterOnTrackCnv_p1.h

@@ -16,7 +16,7 @@
 #include "MuonEventTPCnv/MuonRIO_OnTrack/MuonClusterOnTrackCnv_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/MMPrepData.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/MdtDriftCircleOnTrackCnv_p1.h

@@ -17,7 +17,7 @@
 #include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
 #include "TrkEventTPCnv/TrkSurfaces/BoundSurfaceCnv_p1.h"                 
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/MdtPrepDataContainer.h"
 
 class MsgStream;

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/MdtDriftCircleOnTrackCnv_p2.h

@@ -14,7 +14,7 @@
 #include "MuonRIO_OnTrack/MdtDriftCircleOnTrack.h"
 #include "MuonEventTPCnv/MuonRIO_OnTrack/MdtDriftCircleOnTrack_p2.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/MdtPrepDataContainer.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/RpcClusterOnTrackCnv_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 "MuonPrepRawData/RpcPrepData.h"
 
 class MsgStream;

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/RpcClusterOnTrackCnv_p2.h

@@ -17,7 +17,7 @@
 
 #include "TrkEventTPCnv/TrkRIO_OnTrack/RIO_OnTrackCnv_p1.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/RpcPrepData.h"
 
 class MsgStream;

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/RpcClusterOnTrackCnv_p3.h

@@ -16,7 +16,7 @@
 #include "MuonEventTPCnv/MuonRIO_OnTrack/MuonClusterOnTrackCnv_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/RpcPrepData.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/STGC_ClusterOnTrackCnv_p1.h

@@ -15,7 +15,7 @@
 #include "MuonEventTPCnv/MuonRIO_OnTrack/STGC_ClusterOnTrack_p1.h"
 
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/sTgcPrepData.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/TgcClusterOnTrackCnv_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 "MuonPrepRawData/TgcPrepData.h"
 
 class MsgStream;

MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/MuonRIO_OnTrack/TgcClusterOnTrackCnv_p2.h

@@ -14,7 +14,7 @@
 #include "MuonRIO_OnTrack/TgcClusterOnTrack.h"
 #include "MuonEventTPCnv/MuonRIO_OnTrack/TgcClusterOnTrack_p2.h"
 #include "DataModelAthenaPool/ElementLinkCnv_p3.h"
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
 #include "MuonPrepRawData/TgcPrepData.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "TrkEventCnvTools/IEventCnvSuperTool.h"

MuonSpectrometer/MuonCnv/MuonEventTPCnv/cmt/requirements

@@ -6,7 +6,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  GeneratorObjectsTPCnv      GeneratorObjectsTPCnv-*         Generators

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p1.cxx

@@ -22,7 +22,6 @@
 #include "StoreGate/StoreGateSvc.h"
 #include <limits>       // std::numeric_limits
 
-//#include "DataModel/DataPool.h"
 
 StatusCode Muon::MM_DigitContainerCnv_p1::initialize(MsgStream &log) {
    // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/MM_DigitContainerCnv_p2.cxx

@@ -22,7 +22,6 @@
 #include "StoreGate/StoreGateSvc.h"
 #include <limits>       // std::numeric_limits
 
-//#include "DataModel/DataPool.h"
 
 StatusCode Muon::MM_DigitContainerCnv_p2::initialize(MsgStream &log) {
    // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonDigitContainer/STGC_DigitContainerCnv_p1.cxx

@@ -21,7 +21,6 @@
 // Athena
 #include "StoreGate/StoreGateSvc.h"
 
-//#include "DataModel/DataPool.h"
 /*******************************************************************************/
 StatusCode Muon::STGC_DigitContainerCnv_p1::initialize(MsgStream &log) {
   // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p1.cxx

@@ -26,7 +26,7 @@
 
 
 
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 StatusCode Muon::CscPrepDataContainerCnv_p1::initialize(MsgStream &log) {
    // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscPrepDataContainerCnv_p2.cxx

@@ -22,7 +22,6 @@
 // Athena
 #include "StoreGate/StoreGateSvc.h"
 
-//#include "DataModel/DataPool.h"
 
 StatusCode Muon::CscPrepDataContainerCnv_p2::initialize(MsgStream &log) {
    // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/CscStripPrepDataContainerCnv_p1.cxx

@@ -26,7 +26,7 @@
 
 
 
-#include "DataModel/DataPool.h"
+#include "AthAllocators/DataPool.h"
 
 StatusCode Muon::CscStripPrepDataContainerCnv_p1::initialize(MsgStream &log) {
    // Do not initialize again:

MuonSpectrometer/MuonCnv/MuonEventTPCnv/src/MuonPrepRawData/MMPrepDataContainerCnv_p1.cxx

@@ -22,7 +22,6 @@
 // Athena
 #include "StoreGate/StoreGateSvc.h"
 
-//#include "DataModel/DataPool.h"
 
 StatusCode Muon::MMPrepDataContainerCnv_p1::initialize(MsgStream &log) {
    // Do not initialize again: