diff --git a/Reconstruction/MVAUtils/CMakeLists.txt b/Reconstruction/MVAUtils/CMakeLists.txt
index d35c0cf8d37bf2dc57c171a15ad4ba472fde5de2..c93e0b83e7eec52708703bb1107c508cd612a5ca 100644
--- a/Reconstruction/MVAUtils/CMakeLists.txt
+++ b/Reconstruction/MVAUtils/CMakeLists.txt
@@ -1,16 +1,10 @@
-################################################################################
-# Package: MVAUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MVAUtils )
# External dependencies:
-find_package( ROOT COMPONENTS Tree TMVA XMLIO Core MathCore RIO)
-atlas_depends_on_subdirs(
- PRIVATE
- Control/CxxUtils
-)
+find_package( ROOT COMPONENTS Tree TMVA XMLIO Core MathCore RIO)
# Component(s) in the package:
atlas_add_library( MVAUtils
@@ -27,13 +21,13 @@ atlas_add_dictionary( MVAUtilsDict
atlas_install_python_modules( util/*.py )
atlas_add_executable( convertXmlToRootTree util/convertXmlToRootTree.cxx
- INCLUDE_DIRS MVAUtils
- LINK_LIBRARIES MVAUtils CxxUtils)
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} MVAUtils
+ LINK_LIBRARIES ${ROOT_LIBRARIES} MVAUtils CxxUtils)
atlas_add_executable( check_timing_mvautils
util/check_timing_mvautils.cxx
- INCLUDE_DIRS MVAUtils
- LINK_LIBRARIES MVAUtils )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} MVAUtils
+ LINK_LIBRARIES ${ROOT_LIBRARIES} MVAUtils )
atlas_install_scripts( util/convertLGBMToRootTree.py
util/convertXGBoostToRootTree.py )
diff --git a/Reconstruction/RecAlgs/CMakeLists.txt b/Reconstruction/RecAlgs/CMakeLists.txt
index 5c4c7fa5995a9c2751ff640327e0e5e2fbe01222..1158aeb6f72e0862476e6067088083031c8feb74 100644
--- a/Reconstruction/RecAlgs/CMakeLists.txt
+++ b/Reconstruction/RecAlgs/CMakeLists.txt
@@ -1,25 +1,14 @@
-################################################################################
-# Package: RecAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- GaudiKernel
- Reconstruction/RecEvent )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_component( RecAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps StoreGateLib SGtests xAODEventInfo GaudiKernel RecEvent )
-
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODEventInfo GaudiKernel RecEvent )
diff --git a/Reconstruction/RecBackground/RecBackgroundAlgs/CMakeLists.txt b/Reconstruction/RecBackground/RecBackgroundAlgs/CMakeLists.txt
index 2cb147df3a49d9c459237f57a650edaf90f61310..72cfa9623f5accac41a339492821ceec861e03b5 100644
--- a/Reconstruction/RecBackground/RecBackgroundAlgs/CMakeLists.txt
+++ b/Reconstruction/RecBackground/RecBackgroundAlgs/CMakeLists.txt
@@ -1,47 +1,13 @@
-################################################################################
-# Package: RecBackgroundAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecBackgroundAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Control/AthenaBaseComps
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODJet
- GaudiKernel
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
- MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools
- Reconstruction/RecBackground/RecBackgroundEvent
- Tracking/TrkEvent/TrkSegment
- PRIVATE
- Calorimeter/CaloGeoHelpers
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/GeoPrimitives
- ForwardDetectors/LUCID/LUCID_RawEvent
- InnerDetector/InDetRecEvent/BCM_CollisionTime
- LArCalorimeter/LArRecEvent
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- PhysicsAnalysis/EventTag/TagEvent
- TileCalorimeter/TileEvent )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_component( RecBackgroundAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthLinks AthenaBaseComps xAODCaloEvent xAODEventInfo xAODJet GaudiKernel MuonIdHelpersLib MuonSegment MuonRecHelperToolsLib RecBackgroundEvent TrkSegment CaloGeoHelpers AthenaKernel StoreGateLib SGtests GeoPrimitives LUCID_RawEvent LArRecEvent MuonPrepRawData TagEvent TileEvent BCM_CollisionTimeLib )
+ LINK_LIBRARIES AthLinks AthenaBaseComps xAODCaloEvent xAODEventInfo xAODJet GaudiKernel MuonIdHelpersLib MuonSegment MuonRecHelperToolsLib RecBackgroundEvent TrkSegment CaloGeoHelpers AthenaKernel GeoPrimitives LUCID_RawEvent LArRecEvent MuonPrepRawData TagEvent TileEvent BCM_CollisionTimeLib )
# Install files from the package:
-atlas_install_headers( RecBackgroundAlgs )
atlas_install_joboptions( share/*.py )
-
diff --git a/Reconstruction/RecBackground/RecBackgroundEvent/CMakeLists.txt b/Reconstruction/RecBackground/RecBackgroundEvent/CMakeLists.txt
index 9fbd98de8a2ab0bf7ffcaefb2f3e125813874f1b..edb7e0b2c3754b2b0866872edcbd13c280ce91fb 100644
--- a/Reconstruction/RecBackground/RecBackgroundEvent/CMakeLists.txt
+++ b/Reconstruction/RecBackground/RecBackgroundEvent/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: RecBackgroundEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecBackgroundEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthLinks
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Tracking/TrkEvent/TrkSegment )
-
# Component(s) in the package:
atlas_add_library( RecBackgroundEvent
src/*.cxx
diff --git a/Reconstruction/RecEvent/CMakeLists.txt b/Reconstruction/RecEvent/CMakeLists.txt
index 1b469bd87f529b49e76bf2e1b8ac7c92cb4fbf7c..dfdb88732be9488df2ed0daafd78c3ed69d23c5b 100644
--- a/Reconstruction/RecEvent/CMakeLists.txt
+++ b/Reconstruction/RecEvent/CMakeLists.txt
@@ -1,29 +1,15 @@
-################################################################################
-# Package: RecEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/SGTools )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( RecEvent
src/*.cxx
PUBLIC_HEADERS RecEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES SGTools AthenaKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES SGTools AthenaKernel )
atlas_add_dictionary( RecEventDict
RecEvent/RecEventDict.h
RecEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} SGTools RecEvent )
-
+ LINK_LIBRARIES RecEvent )
diff --git a/Reconstruction/RecEventAthenaPool/CMakeLists.txt b/Reconstruction/RecEventAthenaPool/CMakeLists.txt
index 7bf27ff44682f51998b1d398d6c8c250b1d117ae..ac21958e0e7bab120a61c7c981e981c1d8806fda 100644
--- a/Reconstruction/RecEventAthenaPool/CMakeLists.txt
+++ b/Reconstruction/RecEventAthenaPool/CMakeLists.txt
@@ -1,20 +1,8 @@
-################################################################################
-# Package: RecEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/AtlasSealCLHEP
- PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- Reconstruction/RecEvent
- Reconstruction/RecEventTPCnv )
-
# Component(s) in the package:
atlas_add_poolcnv_library( RecEventAthenaPoolPoolCnv
src/*.cxx
diff --git a/Reconstruction/RecEventTPCnv/CMakeLists.txt b/Reconstruction/RecEventTPCnv/CMakeLists.txt
index 3209af5df198f030c9906526a7db51feb8ec7f8e..96e717fe7c332c38827e92bf7053be132396a732 100644
--- a/Reconstruction/RecEventTPCnv/CMakeLists.txt
+++ b/Reconstruction/RecEventTPCnv/CMakeLists.txt
@@ -1,30 +1,15 @@
-################################################################################
-# Package: RecEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Reconstruction/RecEvent
- PRIVATE
- Control/AthenaKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( RecEventTPCnv
src/*.cxx
PUBLIC_HEADERS RecEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib RecEvent AthenaKernel )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib RecEvent AthenaKernel )
atlas_add_dictionary( RecEventTPCnvDict
RecEventTPCnv/RecEventTPCnvDict.h
RecEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib RecEvent AthenaKernel RecEventTPCnv )
-
+ LINK_LIBRARIES RecEvent RecEventTPCnv )
diff --git a/Reconstruction/RecJiveXML/CMakeLists.txt b/Reconstruction/RecJiveXML/CMakeLists.txt
index e8bf93c59fb9cfc330db550925149dd5de375513..867af5e2690a0370cda248bb097b2d04ca825fd2 100644
--- a/Reconstruction/RecJiveXML/CMakeLists.txt
+++ b/Reconstruction/RecJiveXML/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: RecJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Tracking/TrkEvent/TrkParameters
- graphics/JiveXML
- PRIVATE
- Calorimeter/CaloEvent
- Control/Navigation
- GaudiKernel
- PhysicsAnalysis/JetTagging/JetTagEvent
- Reconstruction/Jet/JetEvent
- Reconstruction/MissingETEvent
- Tracking/TrkEvent/TrkTrack )
-
# External dependencies:
find_package( CLHEP )
@@ -27,9 +11,7 @@ atlas_add_component( RecJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkParameters JiveXMLLib CaloEvent Navigation GaudiKernel JetTagEvent JetEvent MissingETEvent TrkTrack )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkParameters JiveXMLLib CaloEvent Navigation JetTagEvent JetEvent MissingETEvent TrkTrack )
# Install files from the package:
-atlas_install_headers( RecJiveXML )
atlas_install_joboptions( share/*.py )
-
diff --git a/Reconstruction/RecJobTransforms/CMakeLists.txt b/Reconstruction/RecJobTransforms/CMakeLists.txt
index d5819bc9aad7f0f97cda906b245dc3532e7831d7..85424aa442489cd450c201684af59938a13c0f1a 100644
--- a/Reconstruction/RecJobTransforms/CMakeLists.txt
+++ b/Reconstruction/RecJobTransforms/CMakeLists.txt
@@ -1,15 +1,8 @@
-################################################################################
-# Package: RecJobTransforms
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecJobTransforms )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Tools/PyJobTransforms
- Tools/PyJobTransformsCore )
-
# Install python modules
atlas_install_python_modules( python/*.py )
# Install RDOtoRDOtrigger job opts with flake8 check
diff --git a/Reconstruction/RecTPCnv/CMakeLists.txt b/Reconstruction/RecTPCnv/CMakeLists.txt
index 981e6944481552bf8776d9ac233f8ad3b93c4e40..a61c1ef153555d8fc7232ffc2520b598e1d51c56 100644
--- a/Reconstruction/RecTPCnv/CMakeLists.txt
+++ b/Reconstruction/RecTPCnv/CMakeLists.txt
@@ -1,28 +1,8 @@
-################################################################################
-# Package: RecTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( RecTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/EventCommonTPCnv
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEventTPCnv
- Reconstruction/MissingETEvent
- Reconstruction/MuonIdentification/muonEvent
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEventCnv/TrkEventTPCnv
- PRIVATE
- AtlasTest/TestTools
- Control/AthAllocators
- Control/AthenaKernel
- Database/AthenaPOOL/RootConversions )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -30,21 +10,20 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_tpcnv_library( RecTPCnv
src/*.cxx
PUBLIC_HEADERS RecTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel ParticleEventTPCnv MissingETEvent muonEvent TrkMaterialOnTrack TrkEventTPCnv TestTools AthAllocators AthenaKernel RootConversions )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib CxxUtils DataModelAthenaPoolLib EventCommonTPCnv GaudiKernel MissingETEvent ParticleEventTPCnv StoreGateLib TrkEventTPCnv TrkMaterialOnTrack muonEvent
+ PRIVATE_LINK_LIBRARIES AthenaKernel RootConversions )
atlas_add_dictionary( RecTPCnvDict
RecTPCnv/RecTPCnvDict.h
RecTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel ParticleEventTPCnv MissingETEvent muonEvent TrkMaterialOnTrack TrkEventTPCnv TestTools AthAllocators AthenaKernel RootConversions RecTPCnv )
+ LINK_LIBRARIES RecTPCnv )
atlas_add_dictionary( OLD_RecTPCnvDict
RecTPCnv/RecTPCnvDict.h
RecTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel ParticleEventTPCnv MissingETEvent muonEvent TrkMaterialOnTrack TrkEventTPCnv TestTools AthAllocators AthenaKernel RootConversions RecTPCnv )
+ LINK_LIBRARIES RecTPCnv )
+# Tests in the package:
atlas_add_test( CaloEnergyCnv_p1_test
SOURCES
test/CaloEnergyCnv_p1_test.cxx
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt b/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt
index 6369845e1e719df755ba70474739be615c3535ff..b4f4d639bbdb8f26c93e02453be7d3f166788905 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt
@@ -1,34 +1,15 @@
-################################################################################
-# Package: IsolationAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( IsolationAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Calorimeter/CaloEvent
- Control/AthContainers
- Control/AthenaBaseComps
- Event/xAOD/xAODPrimitives
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODBase
- Reconstruction/RecoTools/RecoToolInterfaces
- PhysicsAnalysis/ElectronPhotonID/IsolationCorrections )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-
# Component(s) in the package:
atlas_add_component( IsolationAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} GaudiKernel CaloEvent AthContainers AthenaBaseComps xAODBase xAODPrimitives xAODEgamma RecoToolInterfaces IsolationCorrectionsLib)
+ LINK_LIBRARIES GaudiKernel CaloEvent AthContainers AthenaBaseComps StoreGateLib xAODBase xAODPrimitives xAODEgamma RecoToolInterfaces IsolationCorrectionsLib)
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoGetter.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoGetter.py
index b6b2fbfe15883de1de313143857db550bf409898..c5d636540c581c0e8dc9fb4b19c92e17b1f34da8 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoGetter.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoGetter.py
@@ -3,7 +3,6 @@
from __future__ import print_function
from AthenaCommon.Constants import INFO
-from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon.Logging import logging
from RecExConfig.RecFlags import rec
@@ -281,13 +280,13 @@ isoBuilder = AlgFactory(IsolationBuilder,
FeIsoTypes = [] if not rec.doEgamma() else IsoTypesFe,
FeCorTypes = IsoCorFe,
FeCorTypesExtra = IsoCorFeExtra,
- ElIsoTypes = [] if not rec.doEgamma() else IsoTypes,
+ ElIsoTypes = [] if not rec.doEgamma() else IsoTypes,
ElCorTypes = IsoCorEg,
ElCorTypesExtra = IsoCorEgExtra,
- PhIsoTypes = [] if not rec.doEgamma() else IsoTypes,
+ PhIsoTypes = [] if not rec.doEgamma() else IsoTypes,
PhCorTypes = IsoCorEg,
PhCorTypesExtra = IsoCorEgExtra,
- MuIsoTypes = IsoTypes if rec.doMuon() and muonRecFlags.doMuonIso() else [],
+ MuIsoTypes = IsoTypes if rec.doMuon() and muonRecFlags.doMuonIso() else [],
MuCorTypes = IsoCorMu,
MuCorTypesExtra = IsoCorMuExtra
)
diff --git a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/CMakeLists.txt b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/CMakeLists.txt
index 919b823866d0dd37638f91875cbf9c90586e31a8..9819ccd5322061d5b784598e001deb9c8ef42979 100644
--- a/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/CMakeLists.txt
+++ b/Reconstruction/RecoAlgs/TrackParticleAssociationAlgs/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: TrackParticleAssociationAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrackParticleAssociationAlgs )
@@ -9,6 +7,4 @@ atlas_subdir( TrackParticleAssociationAlgs )
atlas_add_component( TrackParticleAssociationAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES CaloUtilsLib AthenaBaseComps xAODAssociations xAODCaloEvent xAODTracking FourMomUtils GaudiKernel RecoToolInterfaces TrackToCaloLib TrkToolInterfaces )
-
+ LINK_LIBRARIES AthContainers AthenaBaseComps CaloUtilsLib FourMomUtils GaudiKernel RecoToolInterfaces StoreGateLib TrackToCaloLib TrackVertexAssociationToolLib TrkCaloExtension xAODAssociations xAODCaloEvent xAODTracking )
diff --git a/Reconstruction/RecoEvent/ParticleCaloExtension/CMakeLists.txt b/Reconstruction/RecoEvent/ParticleCaloExtension/CMakeLists.txt
index 0d4b58d6208e2f7121716d2474f23f1e212dfc7d..22a9af308c84c6d9030f7f1b8a0871c8378334bc 100644
--- a/Reconstruction/RecoEvent/ParticleCaloExtension/CMakeLists.txt
+++ b/Reconstruction/RecoEvent/ParticleCaloExtension/CMakeLists.txt
@@ -1,21 +1,10 @@
-################################################################################
-# Package: ParticleCaloExtension
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ParticleCaloExtension )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/AthContainers
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
- Tracking/TrkEvent/TrkCaloExtension)
-
# Component(s) in the package:
atlas_add_library( ParticleCaloExtension
src/*.cxx
PUBLIC_HEADERS ParticleCaloExtension
- LINK_LIBRARIES CaloEvent AthContainers xAODCaloEvent xAODCore TrkCaloExtension )
-
+ LINK_LIBRARIES CaloEvent AthContainers xAODCaloEvent xAODCore TrkCaloExtension )
diff --git a/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt b/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
index 893fcf0eedc02a7dfbe8c77971d6ad28be6b848e..017d06e259b651d258ada0d774b0c1dba0d6a395 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
+++ b/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
@@ -1,28 +1,8 @@
-################################################################################
-# Package: CaloRingerTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloRingerTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Event/xAOD/xAODBase
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCaloRings
- GaudiKernel
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloUtils
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/CxxUtils
- Event/xAOD/xAODEgamma
- PhysicsAnalysis/AnalysisCommon/PATCore
- PhysicsAnalysis/RingerSelectorTools )
-
atlas_add_library( CaloRingerToolsLib
CaloRingerTools/*.h
INTERFACE
@@ -33,8 +13,7 @@ atlas_add_library( CaloRingerToolsLib
atlas_add_component( CaloRingerTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloRingerToolsLib xAODCaloRings CaloEvent CaloGeoHelpers CaloUtilsLib AthenaBaseComps AthenaKernel CxxUtils xAODEgamma PATCoreLib RingerSelectorToolsLib )
+ LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel CaloEvent CaloGeoHelpers CaloRingerToolsLib CaloUtilsLib GaudiKernel PATCoreAcceptLib RingerSelectorToolsEnumsLib StoreGateLib xAODBase xAODCaloEvent xAODCaloRings xAODEgamma )
# 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/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
index 43e60ccda6ff6194c6f51f101a8b145b38f7e2f2..7b263c07e928cbc47861c2465386761ac13154e1 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerBuilderFactories.py
@@ -74,7 +74,7 @@ class AsymRings( object ):
self.doPhiAxesDivision = doPhiAxesDivision
def resizeNRingsAsymRings(self, obj):
- if ((obj.doEtaAxesDivision == True) and (obj.doPhiAxesDivision == True)):
+ if ((obj.doEtaAxesDivision is True) and (obj.doPhiAxesDivision is True)):
obj.NRings = [(rings-1)*4+1 for rings in obj.NRings]
else:
obj.NRings = [(rings-1)*2+1 for rings in obj.NRings]
diff --git a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerInputReaderFactories.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerInputReaderFactories.py
index fc8322a0d39785a3c9e6f1415444f57b43a61124..0da538d5b23dc56dd6b1c2f560b94c91d9d4761f 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerInputReaderFactories.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerInputReaderFactories.py
@@ -60,7 +60,6 @@ CaloRingerElectronsReaderTool = PublicToolFactory(CaloRingerToolsConf.Ringer__Ca
)
from CaloRingerAlgs.CaloRingerAlgorithmBuilder import checkBuildPhotonCaloRings
-from CaloRingerAlgs.CaloRingerAlgorithmBuilder import checkDoPhotonIdentification
CaloRingerPhotonsReaderTool = PublicToolFactory(CaloRingerToolsConf.Ringer__CaloRingerPhotonsReader,
name = "CaloRingerPhotonsReaderTool",
inputKey = CaloRingerKeys.inputPhotonKey(),
diff --git a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
index 686e6fc7fcd8203a31ab64fc0c9597b025261aff..d0a9b71e471181ec5ca204fb2ca34e0bbe15b756 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
+++ b/Reconstruction/RecoTools/CaloRingerTools/python/CaloRingerSelectorsBuilders.py
@@ -70,7 +70,7 @@ class CaloRingerElectronSelectorsBuilder ( Configured ):
if not isinstance(customElectronSelectors,(list)):
customElectronSelectors = list(customElectronSelectors)
for selector in customElectronSelectors:
- if not selector.getType() is "Ringer::AsgElectronRingerSelector":
+ if selector.getType() != "Ringer::AsgElectronRingerSelector":
raise ValueError(("Selector must be of type Ringer::AsgElectronRingerSelector"
"and is of type %s"),selector.getType())
self._customSelectors.extend( customElectronSelectors )