From f5ce786fe58c8168585e2e7b29ad1d6f1a62977c Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Sun, 30 Sep 2018 17:11:40 +0200
Subject: [PATCH] NavFourMomByteStreamCnvSvcBase: CLIDSvc -> AthenaKernel
Remove references to obsolete package CLIDSvc; header moved to AthenaKernel.
Also remove unneeded dependency on SGTools.
---
Event/NavFourMom/CMakeLists.txt | 7 +++----
Event/NavFourMom/NavFourMom/I4MomentumContainer.h | 2 +-
Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h | 2 +-
.../NavFourMom/NavFourMom/INavigable4MomentumCollection.h | 2 +-
Event/NavFourMom/NavFourMom/IParticleContainer.h | 2 +-
Event/NavFourMom/NavFourMom/IParticleLinkContainer.h | 2 +-
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Event/NavFourMom/CMakeLists.txt b/Event/NavFourMom/CMakeLists.txt
index ce444189e1b..d4bd6eb616f 100644
--- a/Event/NavFourMom/CMakeLists.txt
+++ b/Event/NavFourMom/CMakeLists.txt
@@ -7,11 +7,10 @@ atlas_subdir( NavFourMom )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/CLIDSvc
+ Control/AthenaKernel
Control/AthLinks
Control/AthContainers
Control/Navigation
- Control/SGTools
Event/EventKernel
PRIVATE
Event/FourMom )
@@ -27,14 +26,14 @@ atlas_add_library( NavFourMom
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation SGTools EventKernel
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation 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} AthLinks AthContainers Navigation SGTools EventKernel FourMom NavFourMom
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation 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 736bdc2cf71..0277588caff 100644
--- a/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
+++ b/Event/NavFourMom/NavFourMom/I4MomentumContainer.h
@@ -16,7 +16,7 @@
// HepMC / CLHEP includes
// Framework includes
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "AthContainers/DataVector.h"
// EventKernel includes
diff --git a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
index ad920bce8a3..690061f8c3e 100644
--- a/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/INav4MomLinkContainer.h
@@ -17,7 +17,7 @@
#include <vector>
#include "AthLinks/ElementLink.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "NavFourMom/INav4MomLink.h"
#include "EventKernel/INavigable4Momentum.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
index 0f99c65756b..8139e4710aa 100644
--- a/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
+++ b/Event/NavFourMom/NavFourMom/INavigable4MomentumCollection.h
@@ -10,7 +10,7 @@
// //
///////////////////////////////////////////////////////////////////////////////
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "AthContainers/DataVector.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleContainer.h b/Event/NavFourMom/NavFourMom/IParticleContainer.h
index 03c2aa6e715..bab97ea7904 100644
--- a/Event/NavFourMom/NavFourMom/IParticleContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleContainer.h
@@ -20,7 +20,7 @@ PURPOSE: This is a data object, containing a collection of IParticle Objects.
// INCLUDE HEADER FILES:
#include "AthContainers/DataVector.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "EventKernel/IParticle.h"
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
index 88962af8745..f58f5ef844a 100644
--- a/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
+++ b/Event/NavFourMom/NavFourMom/IParticleLinkContainer.h
@@ -17,7 +17,7 @@
#include <vector>
#include "AthLinks/ElementLink.h"
-#include "CLIDSvc/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "EventKernel/IParticle.h"
#include "NavFourMom/IParticleLink.h"
#include "NavFourMom/IParticleContainer.h"
--
GitLab