diff --git a/HLT/HLTUtils/CMakeLists.txt b/HLT/HLTUtils/CMakeLists.txt
index d7b42c17f6793b4e3498798b5f2799d04121a617..2b27c5f76d964fcf6a0931859941512ea311c01d 100644
--- a/HLT/HLTUtils/CMakeLists.txt
+++ b/HLT/HLTUtils/CMakeLists.txt
@@ -6,7 +6,7 @@
atlas_subdir( HLTUtils )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts(
share/make_hlt_rep.py
share/make_coralServer_rep.py
diff --git a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
index 52b83e0ba48c70ecf96d4143aa32ada18335ec6d..7c0b89bec727bfbb8add8a60597b899a66780b5e 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
@@ -20,6 +20,6 @@ atlas_add_library( TrigPSC
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${Python_LIBRARIES} TrigKernel PathResolver TrigConfBase )
# 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/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
index be2d2c51e6859be7f68a6ee9ea9e4c49e5429ef1..5cb0f8c8234e50fd1fb13b55867e546fea34d102 100644
--- a/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
+++ b/HLT/Trigger/TrigMonitoring/TrigOnlineMonitor/CMakeLists.txt
@@ -20,6 +20,6 @@ atlas_add_component( TrigOnlineMonitor
# Install files from the package:
atlas_install_headers( TrigOnlineMonitor )
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_scripts( share/plotL1TopoROBMonHist.py )
diff --git a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
index d7b7fa10044d639d9e12f6055dc0bad32e58591b..004854e2519c5d10f75d3fdbe7281234aa9e984b 100644
--- a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
+++ b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/CMakeLists.txt
@@ -23,4 +23,4 @@ atlas_add_component( TrigInDetAccelerationService
src/components/*.cxx
LINK_LIBRARIES TrigInDetAccelerationServiceLib AthenaKernel GaudiKernel AthenaBaseComps StoreGateLib TrigAccelEvent ${TBB_LIBRARIES} rt dl)
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigAlgorithms/TrigmuRoI/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigmuRoI/CMakeLists.txt
index a7786893966fd8c01b684308da2192b8fb4384b2..27b763c5cfa899ba097f22ef3dce572008f1997a 100644
--- a/Trigger/TrigAlgorithms/TrigmuRoI/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigmuRoI/CMakeLists.txt
@@ -10,4 +10,4 @@ atlas_add_component( TrigmuRoI
LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib CxxUtils GaudiKernel TrigInterfacesLib TrigMuonToolInterfaces TrigNavigationLib TrigSteeringEvent TrigT1Interfaces TrigT1Result )
# 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/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIConfig.py b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIConfig.py
index 674fd6c07e5ca4e81fbfd3a1de7b4d53024c2fe3..f257845b7922736a1399aeb0a2229fadb414e1a2 100755
--- a/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIConfig.py
+++ b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIConfig.py
@@ -1,7 +1,7 @@
-# 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 TrigmuRoI.TrigmuRoIConf import *
-from TrigmuRoI.TrigmuRoIMonitoring import *
+from TrigmuRoI.TrigmuRoIConf import TrigmuRoI, TrigmuRoIMT
+from TrigmuRoI.TrigmuRoIMonitoring import TrigmuRoIValidationMonitoring, TrigmuRoIOnlineMonitoring, TrigmuRoICosmicMonitoring, TrigmuRoIMTMonitoring
from TrigTimeMonitor.TrigTimeHistToolConfig import TrigTimeHistToolConfig
class TrigmuRoIConfig (TrigmuRoI):
@@ -18,8 +18,7 @@ class TrigmuRoIConfig (TrigmuRoI):
time = TrigTimeHistToolConfig("Time")
time.TimerHistLimits = [0, 5]
- #time.NumberOfHistBins = 50
-
+
self.AthenaMonTools = [ validation, online, cosmic, time ]
class TrigmuRoIMTConfig (TrigmuRoIMT):
@@ -28,7 +27,7 @@ class TrigmuRoIMTConfig (TrigmuRoIMT):
def __init__( self, name="TrigmuRoIMT" ):
super( TrigmuRoIMTConfig, self ).__init__( name )
-
+
self.MonTool = TrigmuRoIMTMonitoring()
from TrigMuonRoITools.TrigMuonRoIToolsConfig import TrigMuonRoIToolCfg
diff --git a/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py
index 2f0c15d0c47a67a2d2c268bca2dba5337513ddea..4222b55b0c66e35d07c10ac31e5eaf1a1231734e 100755
--- a/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.py
+++ b/Trigger/TrigAlgorithms/TrigmuRoI/python/TrigmuRoIMonitoring.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 TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -16,7 +16,7 @@ class TrigmuRoIValidationMonitoring(TrigGenericMonitoringToolConfig):
xbins=108, xmin=-2.7, xmax=2.7, ybins=96, ymin=-3.1416, ymax=3.1416 ) ]
-
+
class TrigmuRoIOnlineMonitoring(TrigGenericMonitoringToolConfig):
def __init__ (self, name="TrigmuRoIOnlineMonitoring"):
super(TrigmuRoIOnlineMonitoring, self).__init__(name)
diff --git a/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt b/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
index 271c4c63208e2f13b3b2142df4410b87091b545c..1237c10164d4040e4534dad5c0b880ef2801be35 100644
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/CMakeLists.txt
@@ -21,5 +21,5 @@ atlas_add_executable( TrigAnalysisExApp
GaudiKernel TrigDecisionToolLib )
# 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/Trigger/TrigAnalysis/TrigAnalysisExamples/python/TDTExample.py b/Trigger/TrigAnalysis/TrigAnalysisExamples/python/TDTExample.py
index 93085c603339173e6ff663a716123bfe39d63097..d437ce0dc5034cb2a86ea702c888ed348ca61925 100755
--- a/Trigger/TrigAnalysis/TrigAnalysisExamples/python/TDTExample.py
+++ b/Trigger/TrigAnalysis/TrigAnalysisExamples/python/TDTExample.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from types import (IntType,LongType,FloatType,BooleanType)
from array import array
@@ -6,8 +6,8 @@ from math import (pi,hypot)
from AthenaPython.PyAthena import StatusCode
import AthenaPython.PyAthena as PyAthena
from ROOT import (TTree,)
-from AthenaCommon.SystemOfUnits import (GeV,cm)
-from operator import (attrgetter,itemgetter,setitem,getitem)
+from AthenaCommon.SystemOfUnits import GeV
+from operator import itemgetter
class TriggerTree(PyAthena.Alg):
def __init__(self, name="JetTurnOnTree", **kw):
@@ -21,17 +21,14 @@ class TriggerTree(PyAthena.Alg):
return
def treewrap(self,variable=None,value=None):
- if not self.DATA.has_key(variable):
+ if variable not in self.DATA:
if type(value) in [IntType,LongType]:
- CHANGE=True
self.DATA[variable]=array('i',[0])
self.BRANCHES[variable]=self.tree.Branch(variable,self.DATA[variable],"%s/I" % variable)
elif type(value) in [FloatType]:
- CHANGE=True
self.DATA[variable]=array('d',[0.0])
self.BRANCHES[variable]=self.tree.Branch(variable,self.DATA[variable],"%s/D" % variable)
elif type(value) in [BooleanType]:
- CHANGE=True
self.DATA[variable]=array('i',[0])
self.BRANCHES[variable]=self.tree.Branch(variable,self.DATA[variable],"%s/I" % variable)
self.DATA[variable][0]=value
diff --git a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/CMakeLists.txt b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/CMakeLists.txt
index 31778656a7627a26d9070d7d53fc342277cc1afd..5434c110d3d56ce22ec3485d3123db63de6c952f 100644
--- a/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigTauAnalysis/TrigTauEmulation/CMakeLists.txt
@@ -25,4 +25,4 @@ atlas_add_dictionary( TrigTauEmulationDict
LINK_LIBRARIES TrigTauEmulationLib )
# 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/TrigEvent/TrigNavTools/CMakeLists.txt b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
index b5caeda5c6571d0f64c1d1c9a330358209462111..d9c1693d63f7ee3853e9b0a91a12f9164c594a04 100644
--- a/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
@@ -15,6 +15,6 @@ atlas_add_component( TrigNavTools
LINK_LIBRARIES TrigNavToolsLib )
# Install files from the package:
-atlas_install_python_modules( python/__init__.py python/TrigNavToolsConfig.py )
+atlas_install_python_modules( python/__init__.py python/TrigNavToolsConfig.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
index f5a1e179ffdbde7eb0f33817fd6cf96a6801aa4b..9bf76102d7cd6141f8915371001b42d91b73dcdf 100644
--- a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
@@ -45,6 +45,6 @@ foreach( name TriggerElement_test Holder_test Registration_test Ownership_test H
endforeach()
# 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/test.txt share/navigation2dot.py )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
index 699da01d175f6f518780a366b8eda7b34ea82dd2..8c3a4ca1fd746545d8396706c0d88e92d8b24369 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/CMakeLists.txt
@@ -18,5 +18,5 @@ atlas_add_test( TrigMuonHypoConfig
POST_EXEC_SCRIPT nopost.sh )
# 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/TrigHypothesis/TrigMuonHypo/python/TrigEFMuonOverlapRemoverConfig.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigEFMuonOverlapRemoverConfig.py
index 12baccdf7aca9f1a619de679d57dd1f1b947a9f0..f2c93cbbadbc094e4e9e7f02d18ee6dbd2aefc94 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigEFMuonOverlapRemoverConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigEFMuonOverlapRemoverConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from TrigMuonHypo.TrigMuonHypoConf import *
from TrigMuonHypo.TrigEFMuonOverlapRemoverMonitoring import *
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigL2MuonOverlapRemoverConfig.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigL2MuonOverlapRemoverConfig.py
index 582f759e341e4b992b4a7733f0b5f32f671e82ca..c94324c5f7e406a822dc3a9ca1baed56e83fcd64 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigL2MuonOverlapRemoverConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigL2MuonOverlapRemoverConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from TrigMuonHypo.TrigMuonHypoConf import *
from TrigMuonHypo.TrigL2MuonOverlapRemoverMonitoring import *
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfig.py b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfig.py
index 138aae44e609642b2ddcd0ab58b8d5f2a59af695..b1d569121d8a0dc761ff98f48d397034882c377d 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/python/TrigMuonHypoConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from __future__ import print_function
diff --git a/Trigger/TrigMonitoring/TrigMonitorBase/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMonitorBase/CMakeLists.txt
index 32c406f024a66715aa8cce9f1ef6e892c9b88f85..a057c743324bf118d62219f27d3632ac7e9f52d0 100644
--- a/Trigger/TrigMonitoring/TrigMonitorBase/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/CMakeLists.txt
@@ -23,4 +23,4 @@ atlas_add_test( LBNHist_test
LINK_LIBRARIES TrigMonitorBaseLib )
# 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/TrigMonitoring/TrigMonitorBase/python/TrigGenericMonitoringToolConfig.py b/Trigger/TrigMonitoring/TrigMonitorBase/python/TrigGenericMonitoringToolConfig.py
index 81bd3d0fabf77a6a75c90c31303ff6fffdb30942..93d135223e4aaee464b52e7aabc07688719a8939 100755
--- a/Trigger/TrigMonitoring/TrigMonitorBase/python/TrigGenericMonitoringToolConfig.py
+++ b/Trigger/TrigMonitoring/TrigMonitorBase/python/TrigGenericMonitoringToolConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from AthenaCommon.Logging import logging
log = logging.getLogger('TrigGenericMonitoringToolConfig.py')
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigMuonMonitoring/CMakeLists.txt
index 6572b35a0ecdad9ed4490610ab4c98ab1d6edbdd..068c5f97c5c07bf4a7480a153583928d7d7486ff 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/CMakeLists.txt
@@ -15,5 +15,5 @@ atlas_add_component( TrigMuonMonitoring
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AnalysisTriggerEvent AthenaMonitoringLib EventInfo GaudiKernel StoreGateLib TrigAnalysisInterfaces TrigConfHLTData TrigDecisionToolLib TrigHLTMonitoringLib TrigMuonEvent TrigObjectMatchingLib TrigSteeringEvent VxVertex muonEvent xAODMuon xAODPrimitives xAODTracking xAODTrigMuon xAODTrigger xAODTruth )
# 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/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
index 14fd384f1e0a51485a0a1bf71b2fa23f620a3317..7f2fdc0197ffe51f1fe5e830807dc3db38895077 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
@@ -1,99 +1,93 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import TrigMuonMonitoring.TrigMuonMonitCategory as muon
def TrigMuonMonitoringTool():
- from TrigMuonMonitoring.MuZTPChains import GetMuZTPChains
- from TrigMuonMonitoring.TrigMuonMonitoringConf import HLTMuonMonTool
- from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
- HLTMuonMon = HLTMuonMonTool(name = 'HLTMuonMon',
- histoPathBase = "/Trigger/HLT",
- TriggerStreamOfFile = getTriggerStreamOfFile(),
- ZTPPtCone30RelCut = 0.5)
- HLTMuonMon.monitoring_muonNonIso = hltmonList.monitoring_muonNonIso
- HLTMuonMon.monitoring_muonIso = hltmonList.monitoring_muonIso
- HLTMuonMon.monitoring_MSonly = hltmonList.monitoring_MSonly
- HLTMuonMon.monitoring_muonEFFS = hltmonList.monitoring_muonEFFS
- HLTMuonMon.monitoring_muonLowpt = hltmonList.monitoring_muonLowpt
- HLTMuonMon.monitoring_muon_Support = hltmonList.monitoring_muon_Support
- setL2HypoTENames( HLTMuonMon, hltmonList)
- from RecExConfig.RecFlags import rec
- from AthenaCommon.BeamFlags import jobproperties
- if rec.doHeavyIon == True or rec.doHIP == True:
- HLTMuonMon.HI_pp_mode = False
- else:
- HLTMuonMon.HI_pp_mode = True
- from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
- HLTMuonMon.BCTool = BunchCrossingTool()
- from AthenaCommon.AppMgr import ToolSvc
- #ToolSvc += HLTMuonMon;
- from AthenaCommon.GlobalFlags import globalflags
- inputDataType = str(globalflags.DataSource.StoredValue)
- if inputDataType == 'data':
- HLTMuonMon.truthmon_isData = 1
- else:
- HLTMuonMon.truthmon_isData = 0
- list = [ HLTMuonMon ];
- return list
+ from TrigMuonMonitoring.TrigMuonMonitoringConf import HLTMuonMonTool
+ from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # access to central tool
+ HLTMuonMon = HLTMuonMonTool(name = 'HLTMuonMon',
+ histoPathBase = "/Trigger/HLT",
+ TriggerStreamOfFile = getTriggerStreamOfFile(),
+ ZTPPtCone30RelCut = 0.5)
+ HLTMuonMon.monitoring_muonNonIso = hltmonList.monitoring_muonNonIso
+ HLTMuonMon.monitoring_muonIso = hltmonList.monitoring_muonIso
+ HLTMuonMon.monitoring_MSonly = hltmonList.monitoring_MSonly
+ HLTMuonMon.monitoring_muonEFFS = hltmonList.monitoring_muonEFFS
+ HLTMuonMon.monitoring_muonLowpt = hltmonList.monitoring_muonLowpt
+ HLTMuonMon.monitoring_muon_Support = hltmonList.monitoring_muon_Support
+ setL2HypoTENames( HLTMuonMon, hltmonList)
+ from RecExConfig.RecFlags import rec
+ if rec.doHeavyIon is True or rec.doHIP is True:
+ HLTMuonMon.HI_pp_mode = False
+ else:
+ HLTMuonMon.HI_pp_mode = True
+ from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
+ HLTMuonMon.BCTool = BunchCrossingTool()
+ from AthenaCommon.GlobalFlags import globalflags
+ inputDataType = str(globalflags.DataSource.StoredValue)
+ if inputDataType == 'data':
+ HLTMuonMon.truthmon_isData = 1
+ else:
+ HLTMuonMon.truthmon_isData = 0
+ list = [ HLTMuonMon ]
+ return list
def getTriggerStreamOfFile():
- from RecExConfig.RecFlags import rec
- return rec.triggerStream()
+ from RecExConfig.RecFlags import rec
+ return rec.triggerStream()
def setL2HypoTENames( HLTMuonMon, hltmonList):
#default
- HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_L2SAHypo
- HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_L2SAHypo
- HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_L2SAHypo
- HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_L2SAHypo
- HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_L2SAHypo
- HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_L2SAHypo
+ HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_L2SAHypo
+ HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_L2SAHypo
+ HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_L2SAHypo
+ HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_L2SAHypo
+ HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_L2SAHypo
+ HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_L2SAHypo
- HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_L2CBHypo
- HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_L2CBHypo
- HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_L2CBHypo
- HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_L2CBHypo
- HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_L2CBHypo
- HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_L2CBHypo
+ HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_L2CBHypo
+ HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_L2CBHypo
+ HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_L2CBHypo
+ HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_L2CBHypo
+ HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_L2CBHypo
+ HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_L2CBHypo
- if hltmonList._get_monitoring_mode_success == False:
- # what should be done in this case?
- #print "HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used."
- pass
-
-
- elif hltmonList.pp_mode == True:
- HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_pp_L2SAHypo
- HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_pp_L2SAHypo
- HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_pp_L2SAHypo
- HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_pp_L2SAHypo
- HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_pp_L2SAHypo
- HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_pp_L2SAHypo
+ if hltmonList._get_monitoring_mode_success is False:
+ # what should be done in this case?
+ #print "HLTMonTriggerList: Error getting monitoring mode, default monitoring lists will be used."
+ pass
- HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_pp_L2CBHypo
- HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_pp_L2CBHypo
- HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_pp_L2CBHypo
- HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_pp_L2CBHypo
- HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_pp_L2CBHypo
- HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_pp_L2CBHypo
-
- elif hltmonList.HI_mode == True:
- HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_HI_L2SAHypo
- HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_HI_L2SAHypo
- HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_HI_L2SAHypo
- HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_HI_L2SAHypo
- HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_HI_L2SAHypo
- HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_HI_L2SAHypo
+ elif hltmonList.pp_mode is True:
+ HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_pp_L2SAHypo
+ HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_pp_L2SAHypo
+ HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_pp_L2SAHypo
+ HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_pp_L2SAHypo
+ HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_pp_L2SAHypo
+ HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_pp_L2SAHypo
- HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_HI_L2CBHypo
- HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_HI_L2CBHypo
- HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_HI_L2CBHypo
- HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_HI_L2CBHypo
- HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_HI_L2CBHypo
- HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_HI_L2CBHypo
+ HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_pp_L2CBHypo
+ HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_pp_L2CBHypo
+ HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_pp_L2CBHypo
+ HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_pp_L2CBHypo
+ HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_pp_L2CBHypo
+ HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_pp_L2CBHypo
+ elif hltmonList.HI_mode is True:
+ HLTMuonMon.monitoring_muonNonIso_L2SAHypo = muon.monitoring_muonNonIso_HI_L2SAHypo
+ HLTMuonMon.monitoring_muonIso_L2SAHypo = muon.monitoring_muonIso_HI_L2SAHypo
+ HLTMuonMon.monitoring_MSonly_L2SAHypo = muon.monitoring_MSonly_HI_L2SAHypo
+ HLTMuonMon.monitoring_muonEFFS_L2SAHypo = muon.monitoring_muonEFFS_HI_L2SAHypo
+ HLTMuonMon.monitoring_muonLowpt_L2SAHypo = muon.monitoring_muonLowpt_HI_L2SAHypo
+ HLTMuonMon.monitoring_muon_Support_L2SAHypo = muon.monitoring_muon_Support_HI_L2SAHypo
+
+ HLTMuonMon.monitoring_muonNonIso_L2CBHypo = muon.monitoring_muonNonIso_HI_L2CBHypo
+ HLTMuonMon.monitoring_muonIso_L2CBHypo = muon.monitoring_muonIso_HI_L2CBHypo
+ HLTMuonMon.monitoring_MSonly_L2CBHypo = muon.monitoring_MSonly_HI_L2CBHypo
+ HLTMuonMon.monitoring_muonEFFS_L2CBHypo = muon.monitoring_muonEFFS_HI_L2CBHypo
+ HLTMuonMon.monitoring_muonLowpt_L2CBHypo = muon.monitoring_muonLowpt_HI_L2CBHypo
+ HLTMuonMon.monitoring_muon_Support_L2CBHypo = muon.monitoring_muon_Support_HI_L2CBHypo
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/CMakeLists.txt b/Trigger/TrigMonitoring/TrigSteerMonitor/CMakeLists.txt
index 034f4b7ee3e539c381a76ff365eea7da984eeb33..dc98e33c196b34793c89ea5e23f8bb0d0667846f 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/CMakeLists.txt
@@ -21,4 +21,4 @@ atlas_add_component( TrigSteerMonitor
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} TrigSteerMonitorLib AthenaBaseComps AthenaInterprocess AthenaKernel AthenaMonitoringKernelLib AthenaMonitoringLib EventInfo GaudiKernel StoreGateLib TrigCompositeUtilsLib TrigConfData TrigConfHLTData TrigConfInterfaces TrigConfL1Data TrigDataAccessMonitoringLib TrigInterfacesLib TrigMonitorBaseLib TrigNavigationLib TrigSteeringEvent TrigSteeringLib TrigT1Interfaces TrigT1Result xAODEventInfo xAODTrigger )
# 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/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorLegacyConfig.py b/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorLegacyConfig.py
index 98720c1c1ff4892cf1c83d71efa979313a8c5ec9..a7a8591f5fae9c7df94afcde3e541dbca92afed8 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorLegacyConfig.py
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/python/TrigSteerMonitorLegacyConfig.py
@@ -1,9 +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 TrigSteerMonitor.TrigSteerMonitorConf import *
+import TrigSteerMonitor.TrigSteerMonitorConf as Conf
-class TrigErrorMonConfigValidation(TrigErrorMon):
+class TrigErrorMonConfigValidation(Conf.TrigErrorMon):
""" HLT Error Code monitoring """
__slots__ = [ ]
def __init__(self,name="TrigErrorMonValidation"):
@@ -13,7 +13,7 @@ class TrigErrorMonConfigValidation(TrigErrorMon):
def target(self):
return [ "Validation" ]
-class TrigRoIMoniConfigValidation(TrigRoIMoni):
+class TrigRoIMoniConfigValidation(Conf.TrigRoIMoni):
""" RoI monitoring """
__slots__ = [ ]
def __init__(self,name="TrigRoIMoniValidation"):
@@ -24,7 +24,7 @@ class TrigRoIMoniConfigValidation(TrigRoIMoni):
def target(self):
return [ "Validation" ]
-class TrigSignatureMoniConfigValidation(TrigSignatureMoni):
+class TrigSignatureMoniConfigValidation(Conf.TrigSignatureMoni):
""" Signature monitoring """
__slots__ = [ ]
def __init__(self,name="TrigSignatureMoniValidation"):
@@ -34,7 +34,7 @@ class TrigSignatureMoniConfigValidation(TrigSignatureMoni):
def target(self):
return [ "Validation" ]
-class TrigTEMoniConfig(TrigTEMoni):
+class TrigTEMoniConfig(Conf.TrigTEMoni):
""" TriggerElement monitoring """
__slots__ = [ ]
def __init__(self,name="TrigTEMoni"):
@@ -45,7 +45,7 @@ class TrigTEMoniConfig(TrigTEMoni):
return [ "Validation" ]
-class TrigChainMoniConfig(TrigChainMoni):
+class TrigChainMoniConfig(Conf.TrigChainMoni):
""" Chains monitoring """
__slots__ = [ ]
def __init__(self,name="TrigChainMoni"):
@@ -55,7 +55,7 @@ class TrigChainMoniConfig(TrigChainMoni):
def target(self):
return [ "Online", "Validation" ]
-class TrigErrorMonitor(TrigErrorMon):
+class TrigErrorMonitor(Conf.TrigErrorMon):
""" HLT Error Code monitoring """
__slots__ = [ ]
def __init__(self,name="TrigErrorMonitor"):
@@ -66,7 +66,7 @@ class TrigErrorMonitor(TrigErrorMon):
def target(self):
return [ "Online", "Validation" ]
-class TrigErrorExpertMonitor(TrigErrorMon):
+class TrigErrorExpertMonitor(Conf.TrigErrorMon):
""" HLT Error Code monitoring for experts (all errorcodes) """
__slots__ = [ ]
def __init__(self,name="TrigErrorExpertMonitor"):
@@ -77,7 +77,7 @@ class TrigErrorExpertMonitor(TrigErrorMon):
def target(self):
return [ "Online", "Validation" ]
-class TrigRoIMoniConfigOnline(TrigRoIMoni):
+class TrigRoIMoniConfigOnline(Conf.TrigRoIMoni):
""" RoI monitoring """
__slots__ = [ ]
def __init__(self,name="TrigRoIMoniOnline"):
@@ -88,7 +88,7 @@ class TrigRoIMoniConfigOnline(TrigRoIMoni):
def target(self):
return [ "Online" ]
-class TrigSignatureMoniConfigOnline(TrigSignatureMoni):
+class TrigSignatureMoniConfigOnline(Conf.TrigSignatureMoni):
""" Signature monitoring """
__slots__ = [ ]
def __init__(self,name="TrigSignatureMoniOnline"):
@@ -98,7 +98,7 @@ class TrigSignatureMoniConfigOnline(TrigSignatureMoni):
def target(self):
return [ "Online" ]
-class TrigRateMoniConfig20s(TrigRateMoni):
+class TrigRateMoniConfig20s(Conf.TrigRateMoni):
""" Rates monitor for online use only """
def __init__(self,name="TrigRate20s"):
super(TrigRateMoniConfig20s, self).__init__(name)
@@ -109,13 +109,12 @@ class TrigRateMoniConfig20s(TrigRateMoni):
self.StreamSets = [
'recording_physics_prompt:Main',
'recording_physics_delayed:BphysDelayed,ExoDelayed',
- 'recording_physics_other:'
- ]
+ 'recording_physics_other:']
def target(self):
return [ "Online" ]
-class TrigMemMonitor(TrigMemMoni):
+class TrigMemMonitor(Conf.TrigMemMoni):
""" Memory monitor """
def __init__(self,name="TrigMemMonitor"):
super(TrigMemMonitor, self).__init__(name)
@@ -129,7 +128,7 @@ class TrigMemMonitor(TrigMemMoni):
def target(self):
return [ "Online" ]
-class TrigROBMoniConfig(TrigROBMoni):
+class TrigROBMoniConfig(Conf.TrigROBMoni):
""" ROB request monitor for online use """
def __init__(self,name="TrigROBMoni"):
super(TrigROBMoniConfig, self).__init__(name)
@@ -137,7 +136,7 @@ class TrigROBMoniConfig(TrigROBMoni):
def target(self):
return [ "OnlineDetail" ]
-class TrigCorMonitor(TrigCorMoni):
+class TrigCorMonitor(Conf.TrigCorMoni):
""" Trigger L1 and HLT correlation monitor """
def __init__(self,name="TrigCorMonitor"):
super(TrigCorMonitor, self).__init__(name)
diff --git a/Trigger/TrigMonitoring/TrigTimeMonitor/CMakeLists.txt b/Trigger/TrigMonitoring/TrigTimeMonitor/CMakeLists.txt
index 304f7677c568865d914e3a9287593e6f7260f12e..04f81a565c88bbb44f5774f5b2769250bcc6b9fb 100644
--- a/Trigger/TrigMonitoring/TrigTimeMonitor/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigTimeMonitor/CMakeLists.txt
@@ -15,4 +15,4 @@ atlas_add_component( TrigTimeMonitor
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaMonitoringLib GaudiKernel TrigMonitorBaseLib TrigTimeAlgsLib )
# 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/TrigSteer/TrigSteering/CMakeLists.txt b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
index 73a50b5d879ca2b9403a8f924d95ef825cdd420d..6c562a18d10548c50b62b0f3a519057a3d3db728 100644
--- a/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
@@ -41,7 +41,7 @@ atlas_add_test( SteeringChain_test
POST_EXEC_SCRIPT nopost.sh )
# 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 share/Lvl1Results.txt )
atlas_install_xmls( share/*.dtd )
diff --git a/Trigger/TrigSteer/TrigSteering/python/TestingTrigSteeringConfig.py b/Trigger/TrigSteer/TrigSteering/python/TestingTrigSteeringConfig.py
index 5a22642523e92ad1b99c640c72c53426a2fe5f73..bd6f5447503e60eae5d867616c2ed2565806aac0 100755
--- a/Trigger/TrigSteer/TrigSteering/python/TestingTrigSteeringConfig.py
+++ b/Trigger/TrigSteer/TrigSteering/python/TestingTrigSteeringConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from TrigSteering.TrigSteeringConf import *
from TrigSteering.TrigSteeringConfig import TrigSteer_baseClass
diff --git a/Trigger/TrigSteer/TrigSteering/python/TrigSteeringConfig.py b/Trigger/TrigSteer/TrigSteering/python/TrigSteeringConfig.py
index b7afd00911820fdd18b80070cf6e549d6e806fa1..778400aeafdf2b04a698775456798a358764131e 100755
--- a/Trigger/TrigSteer/TrigSteering/python/TrigSteeringConfig.py
+++ b/Trigger/TrigSteer/TrigSteering/python/TrigSteeringConfig.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# flake8: noqa (trigger legacy code)
from TrigSteering.TrigSteeringConf import *
from TrigNavigation.TrigNavigationConfig import *
diff --git a/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt b/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
index 7a86a987b03b367b6e1efe75e04e0aff4e00e452..e2d9417156b95fa6971469284087e2112cf9b336 100644
--- a/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigSteeringTest/CMakeLists.txt
@@ -10,5 +10,5 @@ atlas_add_component( TrigSteeringTest
LINK_LIBRARIES GaudiKernel TrigSteeringEvent TrigInterfacesLib AthenaKernel AthContainers xAODTrigger TrigNavigationLib TrigT1Interfaces TrigTimeAlgsLib )
# 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/TrigT1/TrigT1CTMonitoring/CMakeLists.txt b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
index 96e3d3713e3b2978af8c0855468c2df2446ef135..3c1c89b35df9d095cf049c0556ead00a154e4bcb 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_add_component( TrigT1CTMonitoring
LINK_LIBRARIES ${Boost_LIBRARIES} ${COOL_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib AthenaPoolUtilities CoraCool EventInfo GaudiKernel LWHists MuonDigitContainer MuonRDO MuonTrigCoinData TrigConfInterfaces TrigConfL1Data TrigConfStorage TrigT1CaloEventLib TrigT1Interfaces TrigT1Result )
# 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 )
atlas_install_xmls( data/*.xml )
atlas_install_scripts( scripts/*.py )
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py b/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
index 74e6486a037cf2d37a514c0e372fae63aea7f0d8..3c22b021ad0534e4a1a333deb37df29e6e9e1825 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/python/TrigT1CTMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
## get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
@@ -10,8 +10,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
#---------------------------------------------------------------
# CTP / MuCTPI bytestream conversion
#---------------------------------------------------------------
-from TrigT1ResultByteStream.TrigT1ResultByteStreamConf import MuCTPIByteStreamTool,RecMuCTPIByteStreamTool
-from TrigT1ResultByteStream.TrigT1ResultByteStreamConf import CTPByteStreamTool,RecCTPByteStreamTool
if not hasattr( svcMgr, "THistSvc" ):
from GaudiSvc.GaudiSvcConf import THistSvc
diff --git a/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt b/Trigger/TrigTools/TrigInDetConf/CMakeLists.txt
index 3ccccafb59fd5f1b75102a8c3cc5d9527470b910..c1fdc09d1b60da365a761b02f341c14e36f6b2ca 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 b120cfe3565f96d9e371256af283fde787b2f3d4..d832c9e4ca71b9d5575405aaf7cf4547ed3dcc5e 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 54a32710597789e16b8146a0113cb816475bbd0b..1b3e936943fde41169e5d1e3181760aed19a55ce 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 81fb172b1acdacad24a6a17a37cb53cc499c2aff..3cc82e6db4d61e51d2fab557377533054a3deb39 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
#