diff --git a/PhysicsAnalysis/PhysicsElementLinks/CMakeLists.txt b/PhysicsAnalysis/PhysicsElementLinks/CMakeLists.txt index 0fa3407896fec43d582feb07ca7618e6d49364db..8cd7505a7daf29e4df15e493e7c3ec077f999a5b 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/CMakeLists.txt +++ b/PhysicsAnalysis/PhysicsElementLinks/CMakeLists.txt @@ -7,7 +7,7 @@ atlas_subdir( PhysicsElementLinks ) # Declare the package's dependencies: atlas_depends_on_subdirs( PUBLIC - Control/SGTools + Control/AthenaKernel PhysicsAnalysis/AnalysisCommon/ParticleEvent PhysicsAnalysis/TruthParticleID/McParticleEvent Reconstruction/Jet/JetEvent @@ -25,12 +25,12 @@ atlas_add_library( PhysicsElementLinks src/*.cxx PUBLIC_HEADERS PhysicsElementLinks PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES SGTools ParticleEvent McParticleEvent JetEvent muonEvent Particle egammaEvent tauEvent + LINK_LIBRARIES AthenaKernel ParticleEvent McParticleEvent JetEvent muonEvent Particle egammaEvent tauEvent PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ) atlas_add_dictionary( PhysicsElementLinksDict PhysicsElementLinks/PhysicsElementLinksDict.h PhysicsElementLinks/selection.xml INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools ParticleEvent McParticleEvent JetEvent muonEvent Particle egammaEvent tauEvent PhysicsElementLinks ) + LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel ParticleEvent McParticleEvent JetEvent muonEvent Particle egammaEvent tauEvent PhysicsElementLinks ) diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/ElectronLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/ElectronLinks.h index e0836a03475e178d30272637b90d91add533708f..5e859d8e6f28c21231eae94a342cacf6e03c18bf 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/ElectronLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/ElectronLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -18,7 +18,7 @@ ElectronLinks.h is needed to be able to add ParticleLinks<ElectronContainer> #include "egammaEvent/ElectronContainer.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<ElectronContainer> ElectronLinks ; typedef ElementLink<ElectronContainer> ElectronLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/JetLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/JetLinks.h index 9ddf14d064ccbdebc14e65abf2b46aff2690ee35..b2227033a0a29abdcb3bbf07343e1fe7bbf56607 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/JetLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/JetLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -17,7 +17,7 @@ JetLinks.h is needed to be able to add ParticleLinks<JetContainer> #include "JetEvent/JetCollection.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<JetCollection> JetLinks ; typedef ElementLink<JetCollection> JetLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/MuonLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/MuonLinks.h index d52b0f68e4cc28e9b193e3fd944ae57491bfcf6e..ea8889a032fc0977e7d53f8981a9cbf9bf98f959 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/MuonLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/MuonLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -18,7 +18,7 @@ MuonLinks.h is needed to be able to add ParticleLinks<MuonContainer> #include "muonEvent/MuonContainer.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<Analysis::MuonContainer> MuonLinks ; typedef ElementLink<Analysis::MuonContainer> MuonLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/PhotonLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/PhotonLinks.h index c2dd4cc534c4c606b6aefe11ceb79897ba3c8d7b..54d9d00eaff5f8f9bec42deb92d389c218c428cc 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/PhotonLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/PhotonLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -18,7 +18,7 @@ PhotonLinks.h is needed to be able to add ParticleLinks<PhotonContainer> #include "egammaEvent/PhotonContainer.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<PhotonContainer> PhotonLinks ; typedef ElementLink<PhotonContainer> PhotonLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TauJetLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TauJetLinks.h index 95b4d232ceaaa59ecc60ee99b0e8ef66514eab1a..f0e0037cbebc4046cd83b6aff4386b90fb79ce57 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TauJetLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TauJetLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -17,7 +17,7 @@ TauJetLinks.h is needed to be able to add ParticleLinks<TauJetContainer> #include "tauEvent/TauJetContainer.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<Analysis::TauJetContainer> TauJetLinks ; typedef ElementLink<Analysis::TauJetContainer> TauJetLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TrackLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TrackLinks.h index 8cb42c68fe83ce4f9dc984b0927bff1f933fabe4..fa0814732c7a216b444098cdd51d3c805af7b838 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TrackLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TrackLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -16,7 +16,7 @@ TrackLinks.h is needed to be able to add ParticleLinks<TrackParticleContainer> #include "ParticleEvent/ParticleLinks.h" #include "Particle/TrackParticleContainer.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<Rec::TrackParticleContainer> TrackLinks ; typedef ElementLink<Rec::TrackParticleContainer> TrackLink ; diff --git a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TruthParticleLinks.h b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TruthParticleLinks.h index 41afcc0f65a234e5200026a2e854fb6b76af6c2b..45581cabc1d2be3ed799afcc33db8af0d5c8a70c 100644 --- a/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TruthParticleLinks.h +++ b/PhysicsAnalysis/PhysicsElementLinks/PhysicsElementLinks/TruthParticleLinks.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration */ /*************************************************************************************** @@ -18,7 +18,7 @@ TruthParticleLinks.h is needed to be able to add ParticleLinks<TruthParticleCont #include "McParticleEvent/TruthParticleContainer.h" #include "ParticleEvent/ParticleLinks.h" -#include "SGTools/CLASS_DEF.h" +#include "AthenaKernel/CLASS_DEF.h" typedef ParticleLinks<TruthParticleContainer> TruthParticleLinks ; typedef ElementLink<TruthParticleContainer> TruthParticleLink ;