Merge branch 'datamodel.TrackParticleTPCnv-20171214' into 'master'

TrackParticleTPCnv: DataModel -> AthLinks.

See merge request atlas/athena!7433

Former-commit-id: d87a2f22

Reconstruction/TrackParticleTPCnv/CMakeLists.txt

@@ -7,7 +7,7 @@ atlas_subdir( TrackParticleTPCnv )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/AthLinks
                           Control/DataModelAthenaPool
                           Database/AthenaPOOL/AthenaPoolCnvSvc
                           Database/AthenaPOOL/AthenaPoolUtilities
@@ -32,11 +32,11 @@ atlas_add_tpcnv_library( TrackParticleTPCnv
                          src/Particle/*.cxx
                          PUBLIC_HEADERS TrackParticleTPCnv
                          PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities Particle TrkParameters TrkParticleBase TrkTrack VxVertex TrkEventTPCnv AthenaKernel CxxUtils GeoPrimitives )
+                         LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities Particle TrkParameters TrkParticleBase TrkTrack VxVertex TrkEventTPCnv AthenaKernel CxxUtils GeoPrimitives )
 
 atlas_add_dictionary( TrackParticleTPCnvDict
                       TrackParticleTPCnv/TrackParticleTPCnvDict.h
                       TrackParticleTPCnv/selection.xml
                       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} DataModel DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities Particle TrkParameters TrkParticleBase TrkTrack VxVertex TrkEventTPCnv AthenaKernel CxxUtils GeoPrimitives TrackParticleTPCnv )
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities Particle TrkParameters TrkParticleBase TrkTrack VxVertex TrkEventTPCnv AthenaKernel CxxUtils GeoPrimitives TrackParticleTPCnv )
 

Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainerCnv_tlp1.h

@@ -88,7 +88,7 @@
 // Element Link for track collection
 //-----------------------------------------------------------------------------
 #include "DataModelAthenaPool/ElementLinkCnv_p1.h"
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "TrkTrack/TrackCollection.h"
 #include "VxVertex/VxContainer.h"
 

Reconstruction/TrackParticleTPCnv/TrackParticleTPCnv/TrackParticleContainerCnv_tlp2.h

@@ -78,7 +78,7 @@
 //-----------------------------------------------------------------------------
 // Element Link for track collection
 //-----------------------------------------------------------------------------
-#include "DataModel/ElementLink.h" 
+#include "AthLinks/ElementLink.h" 
 #include "TrkTrack/TrackCollection.h"
 #include "VxVertex/VxContainer.h"