Merge branch 'TAT' into 'master'

TauAnalysisTools: do not compile TauOverlappingElectronLLHDecorator in AnalysisBase

See merge request atlas/athena!34384

PhysicsAnalysis/DerivationFramework/DerivationFrameworkTau/CMakeLists.txt

@@ -5,23 +5,12 @@
 # Declare the package name:
 atlas_subdir( DerivationFrameworkTau )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Event/xAOD/xAODTracking
-                          GaudiKernel
-                          PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
-                          PRIVATE
-                          Event/xAOD/xAODTau
-                          PhysicsAnalysis/JpsiUpsilonTools
-                          PhysicsAnalysis/TauID/TauAnalysisTools )
-
 # Component(s) in the package:
 atlas_add_library( DerivationFrameworkTauLib
                    src/*.cxx
                    PUBLIC_HEADERS DerivationFrameworkTau
-                   LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel JpsiUpsilonToolsLib
-                   PRIVATE_LINK_LIBRARIES xAODTau )
+                   LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel JpsiUpsilonToolsLib TauAnalysisToolsLib DerivationFrameworkInterfaces
+                   PRIVATE_LINK_LIBRARIES xAODTau)
 
 atlas_add_component( DerivationFrameworkTau
                      src/components/*.cxx

PhysicsAnalysis/TauID/TauAnalysisTools/CMakeLists.txt

@@ -6,55 +6,29 @@
 # Declare the package name:
 atlas_subdir( TauAnalysisTools )
 
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
-   set( extra_deps Control/xAODRootAccess )
-else()
-   set( extra_deps GaudiKernel
-      PhysicsAnalysis/POOLRootAccess
-      Control/AthenaBaseComps
-      Control/AthAnalysisBaseComps )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODEgamma
-   Event/xAOD/xAODMuon
-   Event/xAOD/xAODJet
-   Event/xAOD/xAODTau
-   Event/xAOD/xAODTracking
-   Event/xAOD/xAODTruth
-   Generators/TruthUtils
-   PhysicsAnalysis/AnalysisCommon/PATCore
-   PhysicsAnalysis/AnalysisCommon/PATInterfaces
-   PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-   PhysicsAnalysis/MCTruthClassifier
-   Reconstruction/tauRecTools
-   PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
-   PRIVATE
-   Control/AthLinks
-   Event/xAOD/xAODCore
-   Event/xAOD/xAODEventInfo
-   Event/xAOD/xAODMetaData
-   Tools/PathResolver
-   PhysicsAnalysis/AnalysisCommon/PileupReweighting
-   ${extra_deps} )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
 
 # Libraries in the package:
-atlas_add_library( TauAnalysisToolsLib
-   TauAnalysisTools/*.h Root/*.cxx
-	PUBLIC_HEADERS TauAnalysisTools
-   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
-   xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
-   ElectronPhotonSelectorToolsLib tauRecToolsLib MCTruthClassifierLib
-   PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+if( XAOD_STANDALONE )
+   atlas_add_library( TauAnalysisToolsLib
+      TauAnalysisTools/*.h Root/*.cxx
+	  PUBLIC_HEADERS TauAnalysisTools
+      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
+      xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
+      tauRecToolsLib MCTruthClassifierLib
+      PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+else()
+   atlas_add_library( TauAnalysisToolsLib
+      TauAnalysisTools/*.h Root/*.cxx
+	  PUBLIC_HEADERS TauAnalysisTools
+      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEgamma xAODMuon xAODJet
+      xAODTau xAODTracking xAODTruth TruthUtils PATCoreLib PATInterfaces
+      ElectronPhotonSelectorToolsLib tauRecToolsLib MCTruthClassifierLib
+      PRIVATE_LINK_LIBRARIES AthLinks xAODEventInfo xAODMetaData PathResolver )
+endif()
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( TauAnalysisTools

PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauOverlappingElectronLLHDecorator.cxx

+#ifndef XAOD_STANDALONE
+
 /*
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
@@ -211,3 +213,5 @@ StatusCode TauOverlappingElectronLLHDecorator::beginEvent()
 }
 
 //______________________________________________________________________________
+
+#endif

PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauOverlappingElectronLLHDecorator.h

+#ifndef XAOD_STANDALONE
+
 // Dear emacs, this is -*- c++ -*-
 
 /*
@@ -87,3 +89,5 @@ private:
 } // namespace TauAnalysisTools
 
 #endif // TAUANALYSISTOOLS_TAUOVERLAPPINGELECTRONLLHDECORATOR_H
+
+#endif

PhysicsAnalysis/TauID/TauAnalysisTools/util/TauAnalysisToolsExample.cxx

@@ -227,10 +227,11 @@ int main( int argc, char* argv[] )
   // ===========================================================================
   // TauOverlappingElectronLLHDecorator
   // ===========================================================================
+#ifndef XAOD_STANDALONE
   TauAnalysisTools::TauOverlappingElectronLLHDecorator TOELLHDecorator( "TauOverlappingElectronLLHDecorator");
   TOELLHDecorator.msg().setLevel( MSG::INFO );
   CHECK(TOELLHDecorator.initialize());
-
+#endif
   // Loop over the events:
   for( Long64_t iEntry = 0; iEntry < iEntries; ++iEntry )
   {

Projects/AnalysisBase/package_filters.txt

@@ -94,7 +94,7 @@
 + PhysicsAnalysis/MuonID/MuonIDAnalysis/.*
 + PhysicsAnalysis/MuonID/MuonSelectorTools
 + PhysicsAnalysis/TauID/DiTauMassTools
-#+ PhysicsAnalysis/TauID/TauAnalysisTools
++ PhysicsAnalysis/TauID/TauAnalysisTools
 + PhysicsAnalysis/TrackingID/.*
 + Reconstruction/EventShapes/EventShapeInterface
 #+ Reconstruction/Jet/BoostedJetTaggers