From 6d2a6473ee81f6e54714787207f408a58a1611ff Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 15 Dec 2016 18:31:19 +0100
Subject: [PATCH] DataModel -> AthLinks, AthContainers. (NavFourMom-00-04-20)
* Tagging NavFourMom-00-04-20.
* DataModel -> AthLinks, AthContainers.
Former-commit-id: 5dcf766dbadf8f9c0edeec180c81ec5fd5b61ed8
---
Event/NavFourMom/CMakeLists.txt | 7 ++++---
Event/NavFourMom/NavFourMom/I4MomentumContainer.h | 4 +---
Event/NavFourMom/NavFourMom/INav4MomAssocs.h | 5 ++---
Event/NavFourMom/NavFourMom/INav4MomLink.h | 3 +--
Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h | 3 +--
.../NavFourMom/NavFourMom/INavigable4MomentumCollection.h | 2 +-
Event/NavFourMom/NavFourMom/IParticleContainer.h | 2 +-
Event/NavFourMom/NavFourMom/IParticleLink.h | 3 +--
Event/NavFourMom/NavFourMom/IParticleLinkContainer.h | 3 +--
Event/NavFourMom/cmt/requirements | 3 ++-
Event/NavFourMom/src/INav4MomAssocs.cxx | 2 +-
11 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/Event/NavFourMom/CMakeLists.txt b/Event/NavFourMom/CMakeLists.txt
index 44fc45cbb9b..ce444189e1b 100644
--- a/Event/NavFourMom/CMakeLists.txt
+++ b/Event/NavFourMom/CMakeLists.txt
@@ -8,7 +8,8 @@ atlas_subdir( NavFourMom )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CLIDSvc
- Control/DataModel
+ Control/AthLinks
+ Control/AthContainers
Control/Navigation
Control/SGTools
Event/EventKernel
@@ -26,14 +27,14 @@ atlas_add_library( NavFourMom
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} DataModel Navigation SGTools EventKernel
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation SGTools EventKernel
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} FourMom )
atlas_add_dictionary( NavFourMomDict
NavFourMom/NavFourMomDict.h
NavFourMom/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} DataModel Navigation SGTools EventKernel FourMom NavFourMom
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation SGTools EventKernel FourMom NavFourMom
NAVIGABLES DataVector<INavigable4Momentum> DataVector<IParticle>
DATA_LINKS INav4MomAssocs
ELEMENT_LINKS DataVector<I4Momentum> )
diff --git a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
index 42f06a79ec8..736bdc2cf71 100644
--- a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
+++ b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
@@ -17,9 +17,7 @@
// Framework includes
#include "CLIDSvc/CLASS_DEF.h"
-
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
// EventKernel includes
#include "EventKernel/I4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INav4MomAssocs.h b/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
index 1de71e6a1b2..79b6a639d38 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomAssocs.h
@@ -13,9 +13,8 @@
// STL includes
-// DataModel includes
-#include "DataModel/AssociationMap.h"
-#include "DataModel/DataLink.h"
+#include "AthLinks/AssociationMap.h"
+#include "AthLinks/DataLink.h"
// EventKernel includes
#include "EventKernel/INavigable4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INav4MomLink.h b/Event/NavFourMom/NavFourMom/INav4MomLink.h
index 4c8e0de4020..31447ea07af 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomLink.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomLink.h
@@ -10,8 +10,7 @@
#ifndef NAVFOURMOM_INAV4MOMLINK_H
#define NAVFOURMOM_INAV4MOMLINK_H 1
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
index 974c89b78d7..ad920bce8a3 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
@@ -16,8 +16,7 @@
// STL includes
#include <vector>
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "CLIDSvc/CLASS_DEF.h"
#include "NavFourMom/INav4MomLink.h"
#include "EventKernel/INavigable4Momentum.h"
diff --git a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
index f68edcefa6f..0f99c65756b 100644
--- a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
+++ b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
@@ -12,7 +12,7 @@
#include "CLIDSvc/CLASS_DEF.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "EventKernel/INavigable4Momentum.h"
//#include "NavFourMom/I4MomentumContainer.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleContainer.h b/Event/NavFourMom/NavFourMom/IParticleContainer.h
index f32552573cb..03c2aa6e715 100644
--- a/Event/NavFourMom/NavFourMom/IParticleContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleContainer.h
@@ -19,7 +19,7 @@ PURPOSE: This is a data object, containing a collection of IParticle Objects.
// INCLUDE HEADER FILES:
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "CLIDSvc/CLASS_DEF.h"
#include "EventKernel/IParticle.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleLink.h b/Event/NavFourMom/NavFourMom/IParticleLink.h
index f809b678640..a904f21e358 100644
--- a/Event/NavFourMom/NavFourMom/IParticleLink.h
+++ b/Event/NavFourMom/NavFourMom/IParticleLink.h
@@ -10,8 +10,7 @@
#ifndef NAVFOURMOM_IPARTICLELINK_H
#define NAVFOURMOM_IPARTICLELINK_H 1
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "NavFourMom/IParticleContainer.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
index 28a902efd56..88962af8745 100644
--- a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
@@ -16,8 +16,7 @@
// STL includes
#include <vector>
-// DataModel includes
-#include "DataModel/ElementLink.h"
+#include "AthLinks/ElementLink.h"
#include "CLIDSvc/CLASS_DEF.h"
#include "EventKernel/IParticle.h"
#include "NavFourMom/IParticleLink.h"
diff --git a/Event/NavFourMom/cmt/requirements b/Event/NavFourMom/cmt/requirements
index 0ea96df26fb..830351f5c74 100644
--- a/Event/NavFourMom/cmt/requirements
+++ b/Event/NavFourMom/cmt/requirements
@@ -7,7 +7,8 @@ use AtlasPolicy AtlasPolicy-*
use AtlasCLHEP AtlasCLHEP-* External
use CLIDSvc CLIDSvc-* Control
-use DataModel DataModel-* Control
+use AthLinks AthLinks-* Control
+use AthContainers AthContainers-* Control
use EventKernel EventKernel-* Event
use Navigation Navigation-* Control
diff --git a/Event/NavFourMom/src/INav4MomAssocs.cxx b/Event/NavFourMom/src/INav4MomAssocs.cxx
index 680043fa059..86ec2bb3182 100644
--- a/Event/NavFourMom/src/INav4MomAssocs.cxx
+++ b/Event/NavFourMom/src/INav4MomAssocs.cxx
@@ -15,7 +15,7 @@
// NavFourMom includes
#include "NavFourMom/INav4MomAssocs.h"
#include "EventKernel/IParticle.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
///////////////////////////////////////////////////////////////////
// Public methods:
--
GitLab