From c0ed1619b69ded2fff540805af651fec435b2db0 Mon Sep 17 00:00:00 2001
From: Zach Marshall <ZLMarshall@lbl.gov>
Date: Sun, 3 Sep 2017 00:46:18 +0200
Subject: [PATCH] Removing TruthUtils dependence
Former-commit-id: 50801a898bca73514b7b58c18aefde5c00cfbe7a
---
.../CommonTools/ExpressionEvaluation/CMakeLists.txt | 7 +++----
.../ExpressionEvaluation/src/SGxAODProxyLoader.cxx | 3 ---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
index 19deef5c994..212e83ee62c 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
@@ -26,8 +26,7 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODParticleEvent
Event/xAOD/xAODTau
Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- Generators/TruthUtils )
+ Event/xAOD/xAODTruth )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
@@ -41,10 +40,10 @@ atlas_add_library( ExpressionEvaluationLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools GaudiKernel StoreGateLib SGtests TrigDecisionToolLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth TruthUtils )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth )
atlas_add_component( ExpressionEvaluation
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthContainers SGTools StoreGateLib SGtests GaudiKernel TrigDecisionToolLib xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth TruthUtils ExpressionEvaluationLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthContainers SGTools StoreGateLib SGtests GaudiKernel TrigDecisionToolLib xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth ExpressionEvaluationLib )
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
index a819dcc58b1..0a02b26a266 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/SGxAODProxyLoader.cxx
@@ -64,9 +64,6 @@
#include "xAODParticleEvent/CompositeParticleContainer.h"
#include "xAODTracking/TrackMeasurementValidationContainer.h"
-// For the MC PDG ID helpers
-#include "TruthUtils/PIDHelpers.h"
-
#include <algorithm>
#include <boost/algorithm/string.hpp>
--
GitLab