From d3035610fb61b75514a8e4a4779411ed6adb531d Mon Sep 17 00:00:00 2001 From: Frank Winklmeier <fwinkl@cern> Date: Mon, 26 Oct 2020 16:30:38 +0100 Subject: [PATCH] TrigInDetConf: enable flake8 and fix code --- Trigger/TrigTools/TrigInDetConf/CMakeLists.txt | 2 +- .../TrigTools/TrigInDetConf/python/TrigInDetPostTools.py | 8 ++++---- .../TrigInDetConf/python/TrigInDetRecCommonTools.py | 3 +-- .../TrigTools/TrigInDetConf/python/TrigInDetSequence.py | 4 +++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt b/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt index 3ccccafb59f..c1fdc09d1b6 100644 --- a/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt +++ b/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt @@ -6,5 +6,5 @@ atlas_subdir( TrigInDetConf ) # 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/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py index b120cfe3565..d832c9e4ca7 100644 --- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py +++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetPostTools.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from __future__ import print_function @@ -15,7 +15,7 @@ from AthenaCommon.AppMgr import ToolSvc from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags -from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryHelperTool +# from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummaryHelperTool # from TrkTrackSummaryTool.TrkTrackSummaryToolConf import Trk__TrackSummaryTool # InDetTrigFastTrackSummaryTool = Trk__TrackSummaryTool(name = "InDetTrigFastTrackSummaryTool", @@ -42,8 +42,8 @@ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTrackSummar from InDetTrigRecExample.InDetTrigConfigRecLoadTools import \ - InDetTrigTrackSummaryHelperTool, InDetTrigTrackSummaryTool, InDetTrigTrackSummaryToolSharedHits, \ - InDetTrigHoleSearchTool,InDetTrigExtrapolator + InDetTrigTrackSummaryToolSharedHits, \ + InDetTrigExtrapolator from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool, InDetTrigTrackSummaryToolSharedHitsWithTRTPid diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py index 54a32710597..1b3e936943f 100644 --- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py +++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecCommonTools.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from __future__ import print_function @@ -32,7 +32,6 @@ if (InDetTrigFlags.doPrintConfigurables()): print ( InDetTrigFastTrackSummaryTool) -from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigHoleSearchTool InDetTrigTrackSummaryToolWithHoleSearch = Trk__TrackSummaryTool(name = "InDetTrigTrackSummaryToolWithHoleSearch", InDetSummaryHelperTool = InDetTrigTrackSummaryHelperTool, doSharedHits = False, diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py index 81fb172b1ac..3cc82e6db4d 100644 --- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py +++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetSequence.py @@ -1,7 +1,9 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration from __future__ import print_function +# flake8: noqa (trigger legacy code) + # # provisionally a copy of InDetRecExample # -- GitLab