From d7ab08190a3c85a2cb5877a7ca4fb271ce17d65e Mon Sep 17 00:00:00 2001 From: scott snyder <scott.snyder@cern.ch> Date: Sat, 22 Apr 2017 15:56:36 +0200 Subject: [PATCH] MuonD3PDMaker: DataModel -> AthContainers. --- PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt | 4 ++-- PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/cmt/requirements | 2 +- .../D3PDMaker/MuonD3PDMaker/src/TruthMuonsToSG.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt index 4b149e79786e..14f094f0a7f4 100644 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt +++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/CMakeLists.txt @@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PRIVATE Control/AthenaBaseComps Control/AthenaKernel Control/CxxUtils - Control/DataModel + Control/AthContainers Control/SGTools Control/StoreGate DetectorDescription/AtlasDetDescr @@ -59,7 +59,7 @@ atlas_add_component( MuonD3PDMaker src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils DataModel SGTools StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent ) + LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils AthContainers SGTools StoreGateLib SGtests AtlasDetDescr EventInfo EventKernel FourMomUtils xAODMuon xAODTracking xAODTruth GaudiKernel MuonCalibITools MuonIdHelpersLib MuonPattern MuonPrepRawData MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces MuonSimEvent AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib MCTruthClassifierLib McParticleEvent muonEvent TrkGeometry TrkEventPrimitives TrkPrepRawData TrkSegment TrkTrackSummary TrkTruthData TrkExInterfaces TrkToolInterfaces TrigObjectMatchingLib TrigInDetEvent TrigMuonEvent ) # Install files from the package: atlas_install_python_modules( python/*.py ) diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/cmt/requirements b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/cmt/requirements index ac0476603205..fd32d10888b9 100644 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/cmt/requirements +++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/cmt/requirements @@ -11,7 +11,7 @@ use AtlasBoost AtlasBoost-* External use CxxUtils CxxUtils-* Control use AthenaKernel AthenaKernel-* Control use SGTools SGTools-* Control -use DataModel DataModel-* Control +use AthContainers AthContainers-* Control use AthenaBaseComps AthenaBaseComps-* Control use StoreGate StoreGate-* Control use EventKernel EventKernel-* Event diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TruthMuonsToSG.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TruthMuonsToSG.cxx index 0e7ecc39b32d..fbecb5f347f5 100644 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TruthMuonsToSG.cxx +++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/TruthMuonsToSG.cxx @@ -14,7 +14,7 @@ #include "xAODTruth/TruthParticleContainer.h" #include "EventKernel/PdtPdg.h" -#include "DataModel/ConstDataVector.h" +#include "AthContainers/ConstDataVector.h" #include "AthenaKernel/errorcheck.h" -- GitLab