diff --git a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/CMakeLists.txt b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/CMakeLists.txt
index 46ecfa3a662b8daccb9ef2d6eb70d21eee456541..f93ca0059f5730b9d0a93dd9c9d6a4d2b94aede2 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/CMakeLists.txt
+++ b/Reconstruction/Jet/JetAnalysisTools/JetAnalysisEDM/CMakeLists.txt
@@ -1,18 +1,15 @@
-################################################################################
-# Package: JetAnalysisEDM
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetAnalysisEDM )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Reconstruction/Jet/JetEvent )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-# Install files from the package:
-atlas_install_headers( JetAnalysisEDM )
-
+# Component(s) in the package:
+atlas_add_library( JetAnalysisEDMLib
+ JetAnalysisEDM/*.h
+ INTERFACE
+ PUBLIC_HEADERS JetAnalysisEDM
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent JetEvent )
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
index dbed1b3346251cb755313f743b9e4cc42f841c10..8c5c5c65844642fc9e272abfaf4dfc8e48292692 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
+++ b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
@@ -1,32 +1,8 @@
-# $Id: CMakeLists.txt 782136 2016-11-03 14:26:48Z krasznaa $
-################################################################################
-# Package: JetTileCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetTileCorrection )
-# Extra dependencies, based on the environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
- set( extra_deps Control/xAODRootAccess )
-else()
- set( extra_deps Control/AthAnalysisBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Reconstruction/Jet/JetCPInterfaces
- Event/xAOD/xAODJet
- PRIVATE
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- Tools/PathResolver
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODCore
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Hist RIO )
find_package( Boost )
diff --git a/Reconstruction/Jet/JetCPInterfaces/CMakeLists.txt b/Reconstruction/Jet/JetCPInterfaces/CMakeLists.txt
index a6a443194f7cf8b396759851f3f7d7a8fd37779e..7c9b814a8ad61fdf973c146bc278e0cf73ec41a9 100644
--- a/Reconstruction/Jet/JetCPInterfaces/CMakeLists.txt
+++ b/Reconstruction/Jet/JetCPInterfaces/CMakeLists.txt
@@ -1,18 +1,8 @@
-# $Id: CMakeLists.txt 779385 2016-10-20 11:16:26Z krasznaa $
-################################################################################
-# Package: JetCPInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetCPInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- Reconstruction/Jet/JetInterface
- Event/xAOD/xAODJet )
-
# Declare an interface library for the package's header(s):
atlas_add_library( JetCPInterfaces
JetCPInterfaces/*.h
diff --git a/Reconstruction/Jet/JetCalibTools/CMakeLists.txt b/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
index d0ed595eed7dbab36490b4b6f43119da50173320..71de38863d9f839ebf2fdc99a37d25fa17cc59f4 100644
--- a/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
@@ -1,35 +1,8 @@
-################################################################################
-# Package: JetCalibTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetCalibTools )
-# Extra dependencies, based on the environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
- set( extra_deps Control/xAODRootAccess )
-else()
- set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODEventShape
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- Reconstruction/Jet/JetInterface
- PRIVATE
- Event/xAOD/xAODMuon
- Tools/PathResolver
- PhysicsAnalysis/POOLRootAccess
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO Graf Gpad )
diff --git a/Reconstruction/Jet/JetEDM/CMakeLists.txt b/Reconstruction/Jet/JetEDM/CMakeLists.txt
index d1741397d97e2bcdbc460d5438ac4a55a042d0be..31d08d59be729de56b9f3172650ea46a1a9dbe46 100644
--- a/Reconstruction/Jet/JetEDM/CMakeLists.txt
+++ b/Reconstruction/Jet/JetEDM/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: JetEDM
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetEDM )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODBase
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- PRIVATE
- Event/xAOD/xAODMuon )
-
# External dependencies:
find_package( FastJet )
@@ -22,6 +11,5 @@ atlas_add_library( JetEDM
Root/*.cxx
PUBLIC_HEADERS JetEDM
INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS}
- LINK_LIBRARIES AsgTools xAODBase xAODJet xAODTracking
- PRIVATE_LINK_LIBRARIES ${FASTJET_LIBRARIES} xAODMuon )
-
+ LINK_LIBRARIES ${FASTJET_LIBRARIES} AsgTools xAODBase xAODJet xAODTracking
+ PRIVATE_LINK_LIBRARIES xAODMuon )
diff --git a/Reconstruction/Jet/JetEvent/CMakeLists.txt b/Reconstruction/Jet/JetEvent/CMakeLists.txt
index 8337a21664e5ec370917b309b522b526c1ee301e..3dd61b857eca8446dd0673ef654717ef07f63634 100644
--- a/Reconstruction/Jet/JetEvent/CMakeLists.txt
+++ b/Reconstruction/Jet/JetEvent/CMakeLists.txt
@@ -1,42 +1,21 @@
-################################################################################
-# Package: JetEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Control/AthLinks
- Control/Navigation
- Control/StoreGate
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEvent )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( JetEvent
src/*.cxx
PUBLIC_HEADERS JetEvent
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks Navigation AthenaKernel EventKernel FourMom NavFourMom GaudiKernel ParticleEvent StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks Navigation AthenaKernel EventKernel FourMom NavFourMom GaudiKernel ParticleEvent StoreGateLib )
atlas_add_dictionary( JetEventDict
JetEvent/JetEventDict.h
JetEvent/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks Navigation AthenaKernel StoreGateLib SGtests EventKernel FourMom NavFourMom GaudiKernel ParticleEvent JetEvent
- NAVIGABLES JetCollection )
-
+ LINK_LIBRARIES AthContainers JetEvent )
diff --git a/Reconstruction/Jet/JetEventTPCnv/CMakeLists.txt b/Reconstruction/Jet/JetEventTPCnv/CMakeLists.txt
index 880be48137a28fd19a8222a43484e007c95243e3..8e25a9cfaea130512f7a2870ba8241fa792488b6 100644
--- a/Reconstruction/Jet/JetEventTPCnv/CMakeLists.txt
+++ b/Reconstruction/Jet/JetEventTPCnv/CMakeLists.txt
@@ -1,46 +1,25 @@
-################################################################################
-# Package: JetEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/EventCommonTPCnv
- PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv
- Reconstruction/Jet/JetEvent
- PRIVATE
- Control/AthenaKernel
- Control/AthAllocators
- PhysicsAnalysis/MuonID/MuonIDEvent
- Reconstruction/egamma/egammaEvent
- Tracking/TrkEvent/VxVertex )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( JetEventTPCnv
src/*.cxx
PUBLIC_HEADERS JetEventTPCnv
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv ParticleEventTPCnv JetEvent AthenaKernel AthAllocators MuonIDEvent egammaEvent VxVertex )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities DataModelAthenaPoolLib EventCommonTPCnv JetEvent ParticleEventTPCnv
+ PRIVATE_LINK_LIBRARIES AthAllocators AthenaKernel MuonIDEvent VxVertex egammaEvent )
atlas_add_dictionary( JetEventTPCnvDict
JetEventTPCnv/JetEventTPCnvDict.h
JetEventTPCnv/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv ParticleEventTPCnv JetEvent AthenaKernel AthAllocators MuonIDEvent egammaEvent VxVertex JetEventTPCnv )
+ LINK_LIBRARIES JetEventTPCnv )
atlas_add_dictionary( OLD_JetEventTPCnvDict
JetEventTPCnv/JetEventTPCnvDict.h
JetEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv ParticleEventTPCnv JetEvent AthenaKernel AthAllocators MuonIDEvent egammaEvent VxVertex JetEventTPCnv )
-
+ LINK_LIBRARIES JetEventTPCnv )
diff --git a/Reconstruction/Jet/JetInterface/CMakeLists.txt b/Reconstruction/Jet/JetInterface/CMakeLists.txt
index 75b10d8229ab1b3d7a3460153424e617c85ccc20..17bba7e1544f8c942a5e4c6ca987c9edfc97ca5e 100644
--- a/Reconstruction/Jet/JetInterface/CMakeLists.txt
+++ b/Reconstruction/Jet/JetInterface/CMakeLists.txt
@@ -1,27 +1,17 @@
-# $Id: CMakeLists.txt 778355 2016-10-13 19:11:02Z krasznaa $
-################################################################################
-# Package: JetInterface
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetInterface )
-find_package( ROOT )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- Event/xAOD/xAODBase )
+# External dependencies:
+find_package( FastJet )
# Component(s) in the package:
atlas_add_library( JetInterface
JetInterface/*.h Root/*.cxx
PUBLIC_HEADERS JetInterface
- LINK_LIBRARIES AsgTools AsgDataHandlesLib xAODEventInfo xAODJet xAODTracking xAODBase )
+ INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS}
+ LINK_LIBRARIES ${FASTJET_LIBRARIES} AsgTools AsgDataHandlesLib xAODEventInfo xAODJet xAODTracking xAODBase )
atlas_add_dictionary( JetInterfaceDict
JetInterface/JetInterfaceDict.h
diff --git a/Reconstruction/Jet/JetJvtEfficiency/CMakeLists.txt b/Reconstruction/Jet/JetJvtEfficiency/CMakeLists.txt
index 5b72604ac5630fd8aabfd91a3165b031f27d4d79..007eb09a55358bb4dfebb6dfaebee8d5acc349cd 100644
--- a/Reconstruction/Jet/JetJvtEfficiency/CMakeLists.txt
+++ b/Reconstruction/Jet/JetJvtEfficiency/CMakeLists.txt
@@ -1,24 +1,8 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# The name of the package:
atlas_subdir( JetJvtEfficiency )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PRIVATE
- Tools/PathResolver
- ${extra_deps} )
-
# External(s):
find_package( ROOT COMPONENTS Core Hist RIO )
diff --git a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
index 2df1c1928b64d03d57ae78566c84368d2144cc39..3380b03d56bbe875b6b5c67ece4ba8a3b4f41d62 100644
--- a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
@@ -1,104 +1,37 @@
-# $Id: CMakeLists.txt 784099 2016-11-14 17:18:18Z khoo $
-################################################################################
-# Package: JetMomentTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetMomentTools )
-# Declare the package's dependencies:
-if( XAOD_STANDALONE OR XAOD_ANALYSIS )
- set( extra_deps )
- if( NOT XAOD_STANDALONE )
- set( extra_deps GaudiKernel )
- endif()
- atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- InnerDetector/InDetRecTools/TrackVertexAssociationTool
- Reconstruction/Jet/JetEDM
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetRec
- Reconstruction/Jet/JetUtils
- Reconstruction/Jet/JetCalibTools
- Reconstruction/PFlow/PFlowUtils
- PRIVATE
- Calorimeter/CaloGeoHelpers
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODPFlow
- Tools/PathResolver
- Event/xAOD/xAODMetaData
- ${extra_deps} )
-else()
- atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- InnerDetector/InDetRecTools/TrackVertexAssociationTool
- Reconstruction/Jet/JetEDM
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetRec
- Reconstruction/Jet/JetCalibTools
- Reconstruction/Jet/JetRecCalo
- Reconstruction/Jet/JetUtils
- PRIVATE
- Reconstruction/PFlow/PFlowUtils
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Control/AthenaKernel
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODPFlow
- Tools/PathResolver
- Event/xAOD/xAODMetaData
- GaudiKernel )
-endif()
-
# External dependencies:
find_package( Boost )
+find_package( FastJet )
find_package( ROOT COMPONENTS Core Hist RIO TMVA)
# Component(s) in the package:
atlas_add_library( JetMomentToolsLib
JetMomentTools/*.h Root/*.cxx
PUBLIC_HEADERS JetMomentTools
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES}
- AsgTools xAODCaloEvent xAODJet xAODMissingET xAODTracking xAODTruth JetEDM JetInterface TrackVertexAssociationToolLib
- JetRecLib JetUtils PFlowUtilsLib JetCalibToolsLib
- xAODMetaData InDetTrackSelectionToolLib AsgDataHandlesLib
- PRIVATE_LINK_LIBRARIES CaloGeoHelpers xAODEventInfo xAODPFlow PathResolver )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} AsgDataHandlesLib AsgTools InDetTrackSelectionToolLib JetEDM JetInterface JetRecLib JetUtils PFlowUtilsLib TrackVertexAssociationToolLib xAODCaloEvent xAODEventInfo xAODJet xAODMissingET xAODTracking xAODTruth
+ PRIVATE_LINK_LIBRARIES CaloGeoHelpers xAODMetaData xAODPFlow PathResolver )
if( NOT XAOD_STANDALONE )
set( extra_libs )
if( NOT XAOD_ANALYSIS )
- set( extra_libs JetRecCaloLib CaloDetDescrLib CaloEvent AthenaKernel )
+ set( extra_libs JetRecCaloLib CaloDetDescrLib CaloEvent AthenaKernel StoreGateLib )
endif()
atlas_add_component( JetMomentTools
src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier xAODCaloEvent xAODJet xAODMetaData
- GaudiKernel JetRecLib JetUtils PathResolver JetMomentToolsLib JetCalibToolsLib
- ${extra_libs} )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${FASTJET_LIBRARIES} ${ROOT_LIBRARIES} AsgTools CaloIdentifier xAODCaloEvent xAODJet GaudiKernel JetEDM JetInterface JetRecLib JetUtils PFlowUtilsLib PathResolver JetMomentToolsLib ${extra_libs} )
endif()
#if( XAOD_STANDALONE )
atlas_add_dictionary( JetMomentToolsDict
Root/JetMomentToolsDict.h
Root/selection.xml
- LINK_LIBRARIES JetMomentToolsLib )
+ LINK_LIBRARIES JetMomentToolsLib PFlowUtilsLib )
#endif()
# Install files from the package:
diff --git a/Reconstruction/Jet/JetMonitoring/CMakeLists.txt b/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
index e577342bc483726b36b1d1e17a41533fb9b93da8..3e46feac7fe3a035bf8353f8e5fc4f55debe8397 100644
--- a/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
+++ b/Reconstruction/Jet/JetMonitoring/CMakeLists.txt
@@ -1,35 +1,17 @@
-################################################################################
-# Package: JetMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODHIEvent
- Event/xAOD/xAODJet
- GaudiKernel
- Reconstruction/Jet/JetInterface
- Trigger/TrigEvent/TrigDecisionInterface
- Control/AthenaMonitoring
- PRIVATE
- Control/AthContainers
- Trigger/TrigAnalysis/TrigDecisionTool
- Reconstruction/Jet/JetUtils
- Event/FourMomUtils
- )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_library( JetMonitoringLib
- JetMonitoring/*.h
- INTERFACE
- PUBLIC_HEADERS JetMonitoring
- LINK_LIBRARIES xAODJet GaudiKernel AthenaMonitoringLib )
-
+ JetMonitoring/*.h
+ INTERFACE
+ PUBLIC_HEADERS JetMonitoring
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthenaBaseComps AthenaMonitoringKernelLib AthenaMonitoringLib GaudiKernel JetInterface StoreGateLib xAODEventInfo xAODHIEvent xAODJet )
# Component(s) in the package:
atlas_add_component( JetMonitoring
@@ -37,10 +19,9 @@ atlas_add_component( JetMonitoring
Root/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODHIEvent xAODJet GaudiKernel JetInterface AthContainers AthenaMonitoringLib JetUtils FourMomUtils)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthContainers AthenaBaseComps AthenaMonitoringKernelLib AthenaMonitoringLib FourMomUtils GaudiKernel JetInterface JetMonitoringLib JetUtils StoreGateLib TrigDecisionInterface xAODEventInfo xAODHIEvent xAODJet )
# Install files from the package:
-atlas_install_headers( JetMonitoring )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/Jet/JetRec/CMakeLists.txt b/Reconstruction/Jet/JetRec/CMakeLists.txt
index 66d1012f8071ac945cc0ac90665b2e544ecff106..f67252d4a75554d2d39649967657a4f4e4cff236 100644
--- a/Reconstruction/Jet/JetRec/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRec/CMakeLists.txt
@@ -1,48 +1,20 @@
-# $Id: CMakeLists.txt 778359 2016-10-13 19:24:10Z krasznaa $
-################################################################################
-# Package: JetRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetRec )
# Extra dependencies, based on the environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-set( mon_deps )
-set( mon_lib )
-if( NOT GENERATIONBASE AND NOT XAOD_STANDALONE )
- set( mon_deps Control/AthenaMonitoringKernel )
- set( mon_lib AthenaMonitoringKernelLib )
+set( extra_libs )
+if( NOT GENERATIONBASE )
+ list( APPEND extra_libs xAODPFlow )
+ if( NOT XAOD_STANDALONE )
+ list( APPEND extra_libs AthenaMonitoringKernelLib )
+ endif()
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthLinks
- Control/AthContainers
- ${mon_deps}
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Reconstruction/EventShapes/EventShapeInterface
- Reconstruction/Jet/JetEDM
- Reconstruction/Jet/JetInterface
- PRIVATE
- Control/CxxUtils
- Event/xAOD/xAODBase
- Event/xAOD/xAODCore
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTracking
- ${extra_deps} )
-
# External dependencies:
-find_package( FastJet COMPONENTS fastjetplugins fastjettools siscone
- siscone_spherical )
+find_package( Boost )
+find_package( FastJet COMPONENTS fastjetplugins fastjettools siscone siscone_spherical )
find_package( FastJetContrib COMPONENTS VariableR RecursiveTools )
find_package( ROOT COMPONENTS Core )
find_package( GTest )
@@ -51,23 +23,20 @@ find_package( GTest )
atlas_add_library( JetRecLib
JetRec/*.h Root/*.h Root/*.cxx
PUBLIC_HEADERS JetRec
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} ${FASTJET_LIBRARIES} AthLinks AthContainers AsgTools
- xAODCaloEvent xAODJet xAODMuon EventShapeInterface JetEDM
- JetInterface ${mon_lib} AsgDataHandlesLib
- PRIVATE_LINK_LIBRARIES CxxUtils xAODBase xAODCore
- xAODEventInfo xAODTracking )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${FASTJET_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} ${ROOT_LIBRARIES} AsgDataHandlesLib AsgTools AthLinks EventShapeInterface JetEDM JetInterface xAODBase xAODCaloEvent xAODCore xAODEventInfo xAODJet xAODMuon ${extra_libs}
+ PRIVATE_LINK_LIBRARIES CxxUtils xAODTracking )
if( NOT XAOD_STANDALONE )
atlas_add_component( JetRec
src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES GaudiKernel AthenaBaseComps JetInterface JetRecLib ${mon_lib} )
+ LINK_LIBRARIES ${FASTJET_LIBRARIES} AthContainers AthenaBaseComps GaudiKernel JetEDM JetInterface JetRecLib StoreGateLib xAODJet xAODMuon )
endif()
atlas_add_dictionary( JetRecDict
JetRec/JetRecDict.h
JetRec/selection.xml
- LINK_LIBRARIES JetRecLib ${mon_lib} )
+ LINK_LIBRARIES JetRecLib )
# Test(s) in the package:
atlas_add_test( TestTests
diff --git a/Reconstruction/Jet/JetRecCalo/CMakeLists.txt b/Reconstruction/Jet/JetRecCalo/CMakeLists.txt
index dfd9ec1ce6fea3887cfa4945c87378469de370cc..82b20ab5c0d49387e6d835c7cdba049edc29da39 100644
--- a/Reconstruction/Jet/JetRecCalo/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRecCalo/CMakeLists.txt
@@ -1,36 +1,16 @@
-# $Id: CMakeLists.txt 757523 2016-06-24 15:20:43Z krasznaa $
-################################################################################
-# Package: JetRecCalo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetRecCalo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthToolSupport/AsgTools
- Control/CxxUtils
- GaudiKernel
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetUtils
- TileCalorimeter/TileConditions
- LArCalorimeter/LArRecConditions
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/AthenaKernel )
-
# Component(s) in the package:
atlas_add_library( JetRecCaloLib
JetRecCalo/*.h
INTERFACE
PUBLIC_HEADERS JetRecCalo
- LINK_LIBRARIES GaudiKernel CaloIdentifier TileConditionsLib CxxUtils JetUtils
- AsgTools JetInterface )
+ LINK_LIBRARIES GaudiKernel CaloIdentifier LArRecConditions TileConditionsLib JetUtils
+ StoreGateLib AsgTools JetInterface )
atlas_add_component( JetRecCalo
src/*.cxx src/components/*.cxx
- LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloEvent AthenaKernel
- LArRecConditions JetRecCaloLib )
+ LINK_LIBRARIES AsgTools AthenaKernel CaloDetDescrLib CaloEvent CaloIdentifier GaudiKernel JetInterface JetRecCaloLib JetUtils LArRecConditions StoreGateLib TileConditionsLib )
diff --git a/Reconstruction/Jet/JetRecConfig/CMakeLists.txt b/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
index c24fb465bb5942152980475fe9ce173d08e5fc3d..5d29ebbb481e3703fb7c4d75f68f031e582d6827 100644
--- a/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
@@ -1,7 +1,4 @@
-# $Id: CMakeLists.txt 801725 2017-03-28 19:23:28Z khoo $
-################################################################################
-# Package: JetRecConfig
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetRecConfig )
diff --git a/Reconstruction/Jet/JetRecTools/CMakeLists.txt b/Reconstruction/Jet/JetRecTools/CMakeLists.txt
index b9796f9ea39307b5db1df7f526c7fbc6609e3c69..3e6c0310cb0b8f285007c6af9eac6ef8fea32009 100644
--- a/Reconstruction/Jet/JetRecTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRecTools/CMakeLists.txt
@@ -6,30 +6,25 @@ atlas_subdir( JetRecTools )
# External dependencies.
find_package( FastJet )
find_package( FastJetContrib COMPONENTS SoftKiller ConstituentSubtractor )
-
-set( mon_lib )
-if( NOT GENERATIONBASE )
- set( mon_deps Control/AthenaMonitoringKernel )
- set( mon_lib AthenaMonitoringKernelLib )
-endif()
+find_package( ROOT COMPONENTS Core Math )
# Component(s) in the package.
atlas_add_library( JetRecToolsLib
JetRecTools/*.h Root/*.cxx
PUBLIC_HEADERS JetRecTools
INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${FASTJETCONTRIB_INCLUDE_DIRS}
- LINK_LIBRARIES ${FASTJET_LIBRARIES} AthContainers AsgTools xAODPFlow
+ PRIVATE_INCLUDE_DIRS ${FASTJETCONTRIB_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${FASTJET_LIBRARIES} AsgMessagingLib AthContainers AsgTools xAODPFlow
xAODTracking xAODCore xAODBase xAODCaloEvent xAODEgamma xAODJet
TrackVertexAssociationToolLib JetEDM JetInterface JetRecLib
InDetTrackSelectionToolLib PFlowUtilsLib AthenaMonitoringKernelLib
- PRIVATE_LINK_LIBRARIES ${FASTJETCONTRIB_LIBRARIES} xAODTruth )
+ PRIVATE_LINK_LIBRARIES ${FASTJETCONTRIB_LIBRARIES} ${ROOT_LIBRARIES} xAODTruth )
if( NOT XAOD_STANDALONE )
atlas_add_component( JetRecTools
src/components/*.cxx
- LINK_LIBRARIES JetRecToolsLib AthenaMonitoringKernelLib)
+ LINK_LIBRARIES JetRecToolsLib )
endif()
# Install files from the package.
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py b/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
index e47472cefaa2a7831dad69e3296857ab6508622b..ff29746d5e0f4953da71e4bbeff2c80624e07ba6 100644
--- a/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
+++ b/Reconstruction/Jet/JetRecTools/python/ConstitToolManager.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-import os
from AthenaCommon import Logging, CfgMgr
@@ -33,7 +32,7 @@ class ConstituentToolManager(object):
import cppyy
try:
cppyy.load_library('libxAODBaseObjectTypeDict')
- except:
+ except Exception:
pass
from ROOT import xAODType
xAODType.ObjectType
@@ -55,8 +54,6 @@ class ConstituentToolManager(object):
self.log.warning("Tool named "+alias+" already registered. Not adding a new one under this alias. Was "+name)
return self.modifiersMap[alias]
- from AthenaCommon.AppMgr import ToolSvc
-
self.modifiersMap[name] = tool
if alias: self.modifiersMap[alias] = tool
return tool
diff --git a/Reconstruction/Jet/JetRecTools/python/OnlineMon.py b/Reconstruction/Jet/JetRecTools/python/OnlineMon.py
index 2a4ee3d95e16903e7a330d4edb958ed6bf274371..7b862decdb37ff0c12bebf194a69982d30814c54 100644
--- a/Reconstruction/Jet/JetRecTools/python/OnlineMon.py
+++ b/Reconstruction/Jet/JetRecTools/python/OnlineMon.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
def getMonTool_Algorithm(path):
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
diff --git a/Reconstruction/Jet/JetReclustering/CMakeLists.txt b/Reconstruction/Jet/JetReclustering/CMakeLists.txt
index e4f9d7bdbad4a2a58b7fbcf7bae2328936d6c3bd..2290702cc364831799bd6265306777f7e12b19e5 100644
--- a/Reconstruction/Jet/JetReclustering/CMakeLists.txt
+++ b/Reconstruction/Jet/JetReclustering/CMakeLists.txt
@@ -1,28 +1,8 @@
-# $Id: CMakeLists.txt 779569 2016-10-21 11:02:57Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# The name of the package:
atlas_subdir( JetReclustering )
-# Dependency helper variable:
-set( extra_deps )
-if( XAOD_STANDALONE )
- set( extra_deps Control/xAODRootAccess
- PhysicsAnalysis/D3PDTools/EventLoop PRIVATE Event/xAOD/xAODEventInfo
- Reconstruction/Jet/JetSubStructureMomentTools )
-else()
- set( extra_deps PRIVATE Control/xAODRootAccess Control/AthenaBaseComps
- PhysicsAnalysis/POOLRootAccess GaudiKernel )
-endif()
-
-# The dependencies of the package:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetRec
- ${extra_deps}
- Event/xAODJet )
-
# Libraries in the package:
if( XAOD_STANDALONE )
atlas_add_root_dictionary( JetReclusteringLib JetReclusteringCintDict
@@ -58,7 +38,7 @@ if( NOT XAOD_STANDALONE )
atlas_add_test( ut_JetReclusteringTool_test
SOURCES test/ut_JetReclusteringTool_test.cxx
LINK_LIBRARIES xAODRootAccess AsgTools JetInterface xAODJet
- POOLRootAccess )
+ POOLRootAccessLib )
endif()
# Install files from the package:
diff --git a/Reconstruction/Jet/JetReclustering/test/ut_JetReclusteringTool_test.cxx b/Reconstruction/Jet/JetReclustering/test/ut_JetReclusteringTool_test.cxx
index 81a3a99639c3c95f56275301138ad4e46c744193..09ec18cac6acb55b9024653b62a749ded1ee4b0b 100644
--- a/Reconstruction/Jet/JetReclustering/test/ut_JetReclusteringTool_test.cxx
+++ b/Reconstruction/Jet/JetReclustering/test/ut_JetReclusteringTool_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include <xAODRootAccess/Init.h>
@@ -26,7 +26,7 @@ int main() {
//start just by loading the first event of the test MC file
POOL::TEvent evt(POOL::TEvent::kAthenaAccess);
- evt.readFrom("$ASG_TEST_FILE_MC");
+ ANA_CHECK(evt.readFrom("$ASG_TEST_FILE_MC"));
evt.getEntry(0);
//example of configuring the tool
diff --git a/Reconstruction/Jet/JetSimTools/CMakeLists.txt b/Reconstruction/Jet/JetSimTools/CMakeLists.txt
index f8e4b37a5e99b26330ea50d74ea50aed5fb05525..293ad7b2d40953ccc778da36fe86cca67fcc6454 100644
--- a/Reconstruction/Jet/JetSimTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSimTools/CMakeLists.txt
@@ -1,27 +1,15 @@
-################################################################################
-# Package: JetSimTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetSimTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODTruth
- GaudiKernel
- Reconstruction/Jet/JetRec
- PRIVATE
- Reconstruction/Jet/JetUtils )
-
# Component(s) in the package:
atlas_add_component( JetSimTools
Root/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AsgTools xAODTruth GaudiKernel JetRecLib JetUtils )
+ LINK_LIBRARIES AsgTools xAODTruth JetUtils )
# Install files from the package:
-atlas_install_headers( JetSimTools )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
index e7d097fec6e7105aaae659ec3bb1836a05db1e66..d51d10d54139f2a810780c3297b9912f5fb6a53e 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
@@ -1,33 +1,11 @@
-################################################################################
-# Package: JetSubStructureMomentTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetSubStructureMomentTools )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Reconstruction/Jet/JetInterface
- Reconstruction/Jet/JetRec
- PRIVATE
- Control/CxxUtils
- Event/xAOD/xAODMuon
- Reconstruction/Jet/JetEDM
- Reconstruction/Jet/JetSubStructureUtils
- ${extra_deps} )
-
# External dependencies:
find_package( FastJet )
+find_package( FastJetContrib COMPONENTS Nsubjettiness EnergyCorrelator )
find_package( ROOT COMPONENTS Core Hist )
# Component(s) in the package:
@@ -42,9 +20,9 @@ endif()
atlas_add_library( JetSubStructureMomentToolsLib
JetSubStructureMomentTools/*.h Root/*.cxx ${extra_srcs}
PUBLIC_HEADERS JetSubStructureMomentTools
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS}
LINK_LIBRARIES AsgTools xAODCaloEvent xAODJet JetInterface JetRecLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} xAODMuon CxxUtils
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES} ${FASTJET_LIBRARIES} xAODMuon CxxUtils
JetEDM JetSubStructureUtils ${extra_libs} )
if( NOT XAOD_STANDALONE )
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx b/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
index 3999d0d7909192a2497bcbff51755a7ecf32c304..c69f7d9305cf62009de02325c950795e97469864 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/Root/NSubjettinessTool.cxx
@@ -6,7 +6,10 @@
#include "JetSubStructureUtils/Nsubjettiness.h"
#include "CxxUtils/ubsan_suppress.h"
-NSubjettinessTool::NSubjettinessTool(std::string name) :
+#include "fastjet/contrib/Nsubjettiness.hh"
+#include "fastjet/contrib/AxesDefinition.hh"
+
+NSubjettinessTool::NSubjettinessTool(std::string name) :
JetSubStructureMomentToolsBase(name)
{
declareProperty("Alpha", m_Alpha = 1.0);
diff --git a/Reconstruction/Jet/JetSubStructureUtils/CMakeLists.txt b/Reconstruction/Jet/JetSubStructureUtils/CMakeLists.txt
index eb9e8272a0c8871c764a4671512be44bda99d98d..420a1da5a99cd2f67b7574672e9a232c99ae2b00 100644
--- a/Reconstruction/Jet/JetSubStructureUtils/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSubStructureUtils/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: JetSubStructureUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetSubStructureUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- PhysicsAnalysis/MuonID/MuonSelectorTools
- Reconstruction/Jet/JetEDM
- PRIVATE
- Tools/PathResolver )
-
# External dependencies:
find_package( FastJet )
find_package( FastJetContrib COMPONENTS Nsubjettiness EnergyCorrelator )
@@ -27,8 +15,7 @@ atlas_add_library( JetSubStructureUtils
INCLUDE_DIRS ${FASTJET_INCLUDE_DIRS} ${FASTJETCONTRIB_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${FASTJET_LIBRARIES} ${FASTJETCONTRIB_LIBRARIES}
- xAODJet xAODMuon JetEDM
- MuonSelectorToolsLib
+ xAODJet xAODMuon MuonSelectorToolsLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} PathResolver )
# Install files from the package:
diff --git a/Reconstruction/Jet/JetUncertainties/CMakeLists.txt b/Reconstruction/Jet/JetUncertainties/CMakeLists.txt
index 45768f21603d4a7a27428cc148e4b41542a439cb..28381461acc05d036887b757015aed4046c7621b 100644
--- a/Reconstruction/Jet/JetUncertainties/CMakeLists.txt
+++ b/Reconstruction/Jet/JetUncertainties/CMakeLists.txt
@@ -1,33 +1,8 @@
-# $Id: CMakeLists.txt 786868 2016-11-28 12:40:09Z krasznaa $
-################################################################################
-# Package: JetUncertainties
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetUncertainties )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
- set( extra_deps Control/xAODRootAccess )
-else()
- set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- Reconstruction/Jet/JetCPInterfaces
- PRIVATE
- Event/xAOD/xAODCore
- Event/xAOD/xAODTracking
- Tools/PathResolver
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO Graf Gpad )
@@ -36,7 +11,7 @@ atlas_add_library( JetUncertaintiesLib
JetUncertainties/*.h Root/*.cxx
PUBLIC_HEADERS JetUncertainties
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo xAODJet PATInterfaces
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgMessagingLib AsgTools xAODEventInfo xAODJet PATInterfaces
JetCPInterfaces
PRIVATE_LINK_LIBRARIES xAODCore xAODTracking PathResolver )
diff --git a/Reconstruction/Jet/JetUtils/CMakeLists.txt b/Reconstruction/Jet/JetUtils/CMakeLists.txt
index c70c5c7da19cba9e954055d8f23f679d7bde3013..12ca8d0e05f5aadde1cf023ea79ddbead1d242e0 100644
--- a/Reconstruction/Jet/JetUtils/CMakeLists.txt
+++ b/Reconstruction/Jet/JetUtils/CMakeLists.txt
@@ -1,41 +1,8 @@
-# $Id: CMakeLists.txt 801794 2017-03-29 15:34:20Z elmsheus $
-################################################################################
-# Package: JetUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetUtils )
-# Declare the package's dependencies:
-if( XAOD_STANDALONE OR XAOD_ANALYSIS )
- atlas_depends_on_subdirs(
- PUBLIC
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- PRIVATE
- Calorimeter/CaloGeoHelpers
- Event/xAOD/xAODPFlow
- Control/AthLinks )
-else()
- atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloEvent
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- PRIVATE
- Calorimeter/CaloGeoHelpers
- Control/AthLinks
- Control/SGTools
- Control/AthenaKernel
- Event/xAOD/xAODPFlow
- TileCalorimeter/TileEvent )
-endif()
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree RIO )
-
# Component(s) in the package:
if( XAOD_STANDALONE OR XAOD_ANALYSIS )
atlas_add_library( JetUtils
@@ -55,14 +22,12 @@ endif()
if( NOT XAOD_STANDALONE )
atlas_add_test( JetUtils_CaloQual_test
SOURCES test/JetUtils_CaloQual_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODCaloEvent JetUtils AthLinks SGTools AthenaKernel
+ LINK_LIBRARIES xAODCaloEvent JetUtils SGTools AthenaKernel
LOG_IGNORE_PATTERN "no dictionary for class" )
elseif( XAOD_STANDALONE OR XAOD_ANALYSIS )
atlas_add_test( JetUtils_CaloQual_test
SOURCES test/JetUtils_CaloQual_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODCaloEvent JetUtils AthLinks
+ LINK_LIBRARIES xAODRootAccess xAODCaloEvent JetUtils
LOG_IGNORE_PATTERN "no dictionary for class|xAOD::Init" )
endif()
diff --git a/Reconstruction/Jet/KtJet/CMakeLists.txt b/Reconstruction/Jet/KtJet/CMakeLists.txt
index e9643ccb0f469effe9e0c8915c904470678f68fc..76e2391b64dcc8d39f0efab17eded42f16a10a82 100644
--- a/Reconstruction/Jet/KtJet/CMakeLists.txt
+++ b/Reconstruction/Jet/KtJet/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: KtJet
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( KtJet )
diff --git a/Reconstruction/Jet/OjfJet/CMakeLists.txt b/Reconstruction/Jet/OjfJet/CMakeLists.txt
index a731a5d10f19dea1d1d93019b83635b83a132385..86cfa1f5a423046d145d5f694913eff733a1ea41 100644
--- a/Reconstruction/Jet/OjfJet/CMakeLists.txt
+++ b/Reconstruction/Jet/OjfJet/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: OjfJet
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( OjfJet )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel )
-
# External dependencies:
find_package( CLHEP )
diff --git a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/CMakeLists.txt b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/CMakeLists.txt
index be36c748000ed677d21dae39d189975a962bf372..8f2de5e5a4a4eedd452f0c9d8682447cb4dda892 100644
--- a/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/CMakeLists.txt
+++ b/Reconstruction/TrackCaloClusterRec/TrackCaloClusterRecValidation/CMakeLists.txt
@@ -1,50 +1,18 @@
-################################################################################
-# Package: TrackCaloClusterRecValidation
-################################################################################
-
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrackCaloClusterRecValidation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Event/xAOD/xAODCore
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODPFlow
- GaudiKernel
- InnerDetector/InDetValidation/InDetPhysValMonitoring
- Tracking/TrkValidation/TrkValHistUtils
- PRIVATE
- Control/AthToolSupport/AsgTools
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- Event/xAOD/xAODBase
- Event/xAOD/xAODParticleEvent
- Reconstruction/Jet/JetCalibTools
- Tools/PathResolver
- )
-
-
# External dependencies:
-find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread EG )
-find_package( XercesC )
-find_package( Boost )
# Component(s) in the package:
atlas_add_component( TrackCaloClusterRecValidation
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES}
- AthenaBaseComps AthenaMonitoringLib xAODCore xAODTracking xAODTruth xAODPFlow GaudiKernel TrkValHistUtils InDetPhysValMonitoringLib
- AsgTools AthenaKernel GeoPrimitives EventPrimitives xAODBase xAODParticleEvent xAODEventInfo xAODJet PathResolver)
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaMonitoringLib GaudiKernel InDetPhysValMonitoringLib JetCalibToolsLib StoreGateLib TrkValHistUtils xAODBase xAODCaloEvent xAODCore xAODEventInfo xAODJet xAODPFlow xAODParticleEvent xAODTracking xAODTruth )
+
# Install files from the package:
atlas_install_runtime( share/*.xml)