From 6a7eefd3849b50c9f5947c1f3440d7cceb8c8afb Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Tue, 1 May 2018 04:39:52 +0200
Subject: [PATCH] ReweightTools: DataModel -> AthContainers.
Remove references to obsolete package DataModel.
Also clean up references to files in CLIDSvc and SGTools that were
moved to other packages.
Former-commit-id: c1338c4cab903a259f7683d37ea1e8c4d09b6fcd
---
Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt | 6 +++---
.../GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt b/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
index 67ee7be5057..d6194240a3c 100644
--- a/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
+++ b/Generators/GenAnalysisTools/ReweightTools/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
Generators/GenInterfaces
PRIVATE
- Control/DataModel
+ Control/AthContainers
Control/StoreGate
Generators/GeneratorObjects )
@@ -25,12 +25,12 @@ atlas_add_library( ReweightToolsLib
PUBLIC_HEADERS ReweightTools
INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES DataModel GeneratorObjects )
+ PRIVATE_LINK_LIBRARIES AthContainers GeneratorObjects )
atlas_add_component( ReweightTools
src/components/*.cxx
INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
- LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel DataModel StoreGateLib SGtests GeneratorObjects ReweightToolsLib )
+ LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel AthContainers StoreGateLib SGtests GeneratorObjects ReweightToolsLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
index 95ec36d68ee..5e44e3253ef 100644
--- a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
+++ b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
@@ -18,7 +18,7 @@
#include "GaudiKernel/MsgStream.h"
#include "StoreGate/StoreGateSvc.h"
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
#include "GeneratorObjects/McEventCollection.h"
#include "HepMC/GenEvent.h"
--
GitLab