Merge branch 'ExternalsUpdate-master-20201201' into 'master'

Externals Update and CMake Fixes, master branch (2020.12.01.)

See merge request atlas/athena!38749

Control/RootUtils/CMakeLists.txt

@@ -10,6 +10,7 @@ find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore ROOTTPython
    cppyy${Python_VERSION_MAJOR}_${Python_VERSION_MINOR} )
 
 set( ROOT_LIBRARIES_PYROOT ${ROOT_LIBRARIES} )
+unset( ROOT_FOUND )
 find_package( ROOT COMPONENTS RIO Hist Tree Core MathCore )
 
 # Component(s) in the package:

PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt

@@ -17,7 +17,7 @@ if( XAOD_STANDALONE )
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
       LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
       xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
-      tauRecToolsLib MCTruthClassifierLib
+      tauRecToolsLib MCTruthClassifierLib AsgAnalysisInterfaces
       PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
 else()
    atlas_add_library( TauAnalysisToolsLib
@@ -27,12 +27,13 @@ else()
       LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
       xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
       ElectronPhotonSelectorToolsLib tauRecToolsLib MCTruthClassifierLib
+      AsgAnalysisInterfaces
       PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
 endif()
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( TauAnalysisTools
-      src/*.cxx src/components/*.cxx		     
+      src/*.cxx src/components/*.cxx
       LINK_LIBRARIES AthenaBaseComps AsgTools xAODTau GaudiKernel
       TauAnalysisToolsLib )
 endif()

PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyCorrectionsTool.h

 // Dear emacs, this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TAUANALYSISTOOLS_TAUEFFICIENCYTOOL_H
@@ -29,11 +29,9 @@
 #include "TauAnalysisTools/TauEfficiencyEleIDTool.h"
 #include "TauAnalysisTools/TauEfficiencyTriggerTool.h"
 
-#if __has_include("PileupReweighting/IPileupReweightingTool.h")
 // Tool include(s)
 #include "AsgAnalysisInterfaces/IPileupReweightingTool.h"
 #define TAUANALYSISTOOLS_PRWTOOL_AVAILABLE
-#endif
 
 namespace TauAnalysisTools
 {

Projects/AnalysisBase/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.89
+AnalysisBaseExternalsVersion = 2.0.91

Projects/AthDataQuality/externals.txt

@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 2.0.89
+AtlasExternalsVersion = 2.0.91

Projects/AthGeneration/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthGenerationExternalsVersion = 2.0.89
+AthGenerationExternalsVersion = 2.0.91

Projects/AthSimulation/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.89
+AthSimulationExternalsVersion = 2.0.91

Projects/Athena/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.89
+AthenaExternalsVersion = 2.0.91

Projects/VP1Light/externals.txt

@@ -6,4 +6,4 @@
 # forbidden.
 
 # The version of atlas/atlasexternals to use:
-VP1LightExternalsVersion = 2.0.89
+VP1LightExternalsVersion = 2.0.91