From 6af07afff7809332a078bef32d80ee16facd785a Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 9 Nov 2020 14:43:07 +0100
Subject: [PATCH] IsolationAlgs: cmake cleanup, enable flake8
---
.../RecoAlgs/IsolationAlgs/CMakeLists.txt | 25 +++----------------
.../IsolationAlgs/python/IsoGetter.py | 7 +++---
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt b/Reconstruction/RecoAlgs/IsolationAlgs/CMakeLists.txt
index 6369845e1e7..b4f4d639bbd 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 b6b2fbfe158..c5d636540c5 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
)
--
GitLab