From 0b89e7300b2eea739e640336b72f07cd0501087d Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Sat, 24 Mar 2018 15:07:46 +0100 Subject: [PATCH] egammaValidation: Fix deprecation warning. IAsgElectronLikelihoodTool.h moved from ElectronPhotonSelectorTools to EgammaAnalysisInterfaces. Former-commit-id: 27199d98c487b6545f3f43b1c87e22155a3d2ee4 --- Reconstruction/egamma/egammaValidation/CMakeLists.txt | 7 +++---- .../egammaValidation/egammaValidation/EgammaMonitoring.h | 2 +- .../egamma/egammaValidation/src/EgammaMonitoring.cxx | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Reconstruction/egamma/egammaValidation/CMakeLists.txt b/Reconstruction/egamma/egammaValidation/CMakeLists.txt index 2fc3a576b1c..24ca334877f 100644 --- a/Reconstruction/egamma/egammaValidation/CMakeLists.txt +++ b/Reconstruction/egamma/egammaValidation/CMakeLists.txt @@ -13,8 +13,7 @@ atlas_depends_on_subdirs( PUBLIC Event/xAOD/xAODEgamma Event/xAOD/xAODEventInfo Event/xAOD/xAODTracking - PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools - PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools + PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces PRIVATE Control/AthenaBaseComps TestPolicy @@ -26,7 +25,7 @@ atlas_add_library (egammaValidationLib PUBLIC_HEADERS egammaValidation INCLUDE_DIRS PRIVATE_INCLUDE_DIRS - LINK_LIBRARIES GaudiKernel AsgTools xAODEventInfo xAODEgamma xAODTracking ElectronPhotonSelectorToolsLib ElectronPhotonSelectorToolsLib AsgAnalysisInterfaces + LINK_LIBRARIES GaudiKernel AsgTools xAODEventInfo xAODEgamma xAODTracking EgammaAnalysisInterfacesLib AsgAnalysisInterfaces PRIVATE_LINK_LIBRARIES AthenaBaseComps TrkValHistUtils) # add the Module/component library : @@ -34,7 +33,7 @@ atlas_add_component (egammmaValidation src/*.cxx src/components/*.cxx INCLUDE_DIRS LINK_LIBRARIES egammaValidationLib GaudiKernel AthenaBaseComps AsgTools xAODEventInfo - xAODEgamma xAODTracking ElectronPhotonSelectorToolsLib TrkValHistUtils ElectronPhotonSelectorToolsLib AsgAnalysisInterfaces) + xAODEgamma xAODTracking TrkValHistUtils AsgAnalysisInterfaces) # Install JO/python files from the package: atlas_install_python_modules( python/*.py ) diff --git a/Reconstruction/egamma/egammaValidation/egammaValidation/EgammaMonitoring.h b/Reconstruction/egamma/egammaValidation/egammaValidation/EgammaMonitoring.h index 0e34b3a386c..11c10ab17b2 100644 --- a/Reconstruction/egamma/egammaValidation/egammaValidation/EgammaMonitoring.h +++ b/Reconstruction/egamma/egammaValidation/egammaValidation/EgammaMonitoring.h @@ -12,7 +12,7 @@ #include "GaudiKernel/ITHistSvc.h" #include "AthenaBaseComps/AthAlgorithm.h" #include <AsgTools/AnaToolHandle.h> -#include "ElectronPhotonSelectorTools/IAsgElectronLikelihoodTool.h" +#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h" #include "TFile.h" #include "TH1.h" diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx index 4385d9e4f33..5761c91aeb7 100644 --- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx +++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.cxx @@ -19,7 +19,7 @@ #include "xAODEgamma/Electron.h" #include "xAODEgamma/EgammaxAODHelpers.h" #include <AsgTools/AnaToolHandle.h> -#include "ElectronPhotonSelectorTools/IAsgElectronLikelihoodTool.h" +#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h" #include <vector> #include <cmath> -- GitLab