Merge branch 'depr.egammaValidation-20180326' into 'master'

egammaValidation: Fix deprecation warning.

See merge request atlas/athena!9996

Former-commit-id: 01aff859

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 )

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"

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>