diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
index 3d6d3226ba7eb59f1e3aae6a0bdd5bb4dd6b22ff..a0bcc2ad47607ed47dc789051d7689a37e94a5b0 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
@@ -13,14 +13,13 @@ atlas_add_library( TrigEgammaAnalysisToolsLib
PUBLIC_HEADERS TrigEgammaAnalysisTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools EgammaAnalysisInterfacesLib GaudiKernel LumiBlockCompsLib LumiBlockData PATCoreLib StoreGateLib TrigConfHLTData TrigDecisionToolLib TrigEgammaEmulationToolLib TrigEgammaMatchingToolLib TrigHLTMonitoringLib TrigNavigationLib xAODCaloEvent xAODCaloRings xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODTrigger xAODTruth
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools EgammaAnalysisInterfacesLib GaudiKernel LumiBlockCompsLib LumiBlockData PATCoreLib StoreGateLib TrigConfHLTData TrigDecisionToolLib TrigEgammaEmulationToolLib TrigEgammaMatchingToolLib TrigHLTMonitoringLib xAODCaloEvent xAODCaloRings xAODEgamma xAODEventInfo xAODJet xAODMissingET xAODTracking xAODTrigCalo xAODTrigEgamma xAODTrigRinger xAODTrigger xAODTruth
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} AthenaMonitoringLib TrigConfxAODLib TrigSteeringEvent )
atlas_add_component( TrigEgammaAnalysisTools
- src/*.h
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AthenaMonitoringLib TrigEgammaAnalysisToolsLib )
+ LINK_LIBRARIES AsgTools AthenaBaseComps AthenaMonitoringLib TrigEgammaAnalysisToolsLib xAODEgamma )
# Install files from the package:
atlas_install_python_modules( python/TrigEgamma*.py )
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt b/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
index ef0560b21342a56acf36a02dee923697b6dc825c..d7e1ebe89e8a55cfe98e2d8c48fd5004480becb8 100644
--- a/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
@@ -15,8 +15,6 @@ atlas_add_library( TrigSerializeResultLib
LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils DataModelRoot PathResolver )
-atlas_install_python_modules( python/*.py )
-
atlas_add_component( TrigSerializeResult
src/components/*.cxx
LINK_LIBRARIES TrigSerializeResultLib )
@@ -27,6 +25,7 @@ atlas_add_dictionary( TrigSerializeResultDict
LINK_LIBRARIES TrigSerializeResultLib )
# Install files from the package:
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_runtime( share/bs-streamerinfos*.root )
# Tests in the package:
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/python/StreamerInfoGenerator.py b/Trigger/TrigDataAccess/TrigSerializeResult/python/StreamerInfoGenerator.py
index 1b1ebd2ecc3b9278c828b7da61b7ca5c21cbf30b..9dd5a0a4f6c10c99c09bc98433a580bd13c995c5 100755
--- a/Trigger/TrigDataAccess/TrigSerializeResult/python/StreamerInfoGenerator.py
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/python/StreamerInfoGenerator.py
@@ -1,8 +1,7 @@
#!/usr/bin/env pyroot.py
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import cppyy
-import ROOT
class StreamerInfoGenerator:
def __init__(self):
@@ -42,7 +41,7 @@ class StreamerInfoGenerator:
return
if t.IsAbstract():
dontAdd = True
- except:
+ except Exception:
pass
try:
@@ -60,11 +59,11 @@ class StreamerInfoGenerator:
print("Making class {} -> {}".format(typename, bind_name))
print("cl = " + bind_name)
exec("cl = " + bind_name, globals())
- print(cl)
+ print(cl) # noqa: F821
if not dontAdd:
self.classlist.append(typename)
print("appended type to the classlist")
- except:
+ except Exception:
print('Cannot create class of ', typename)
t = self.type.ByName(typename)
@@ -89,7 +88,7 @@ class StreamerInfoGenerator:
print('std::business removed')
try:
self.classlist.remove(typename)
- except:
+ except Exception:
pass
for i in range(t.TemplateArgumentSize()):
tt = t.TemplateArgumentAt(i)
@@ -123,7 +122,7 @@ class StreamerInfoGenerator:
if __name__ == '__main__':
- from ROOT import TClass, TFile
+ from ROOT import TClass, TFile # noqa: F401
a = StreamerInfoGenerator()
a.inspect('TrigTauClusterContainer_tlp1')
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
index 3dc80172aed0bb53c1a3c2af086dee66ec0b72fb..ea506f543f83793859cf58d4fc139208c2a99558 100755
--- a/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/python/dictwrite.py
@@ -1,6 +1,6 @@
#!/usr/bin/env pyroot.py
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#----------------------------------------------
#
@@ -69,7 +69,7 @@ def update_streamerinfos(objects, updated_objects):
types_bad = 0
fulllist = list(set(fulllist))
for item in fulllist:
- if doxAODonly and not 'xAOD' in item: continue # current issues seen because of missing xAOD libs not being loaded
+ if doxAODonly and 'xAOD' not in item: continue # current issues seen because of missing xAOD libs not being loaded
print("Trying to fill item", item, "to root file")
c_clid = cgen.genClidFromName(item)
c_typeinfo = cgen.getTidFromClid(c_clid)
@@ -77,11 +77,11 @@ def update_streamerinfos(objects, updated_objects):
print("TypeInfo", c_typeinfo)
try:
cls = ROOT.gROOT.GetClass(item)
- except:
+ except Exception:
cls = ROOT.gROOT.GetClass(c_typeinfo)
print(cls)
- if cls!=None:
+ if cls is not None:
streamerinfo = cls.GetStreamerInfo()
if streamerinfo.GetCheckSum() == 0:
# try to patch missing checksum in DataVectors
diff --git a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
index 80bc59b6fef0e28732a66f65198c45f7fb59f9fa..0afca4f193c9344195a626696d1930bfaee20e19 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigInDetValidation/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: TrigInDetValidation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigInDetValidation )
@@ -9,10 +7,10 @@ atlas_subdir( TrigInDetValidation )
find_package( requests )
# 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_data( share/*.json )
-atlas_install_runtime( test/TrigInDetValidation_TestConfiguration.xml share/TrigInDetValidation_*.py TIDAbuild )
+atlas_install_runtime( share/TrigInDetValidation_*.py TIDAbuild )
atlas_install_scripts( scripts/TIDA*.py test/test*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=ATL902 )
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index 5abf3a639ff7dfe93e7b37a90fe4374e3d66251b..ac024978f5920afa136abeded50083e9e53ba1a9 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -218,7 +218,7 @@ class TrigInDetCompStep(RefComparisonStep):
self.args += self.input_file + ' '
- if (self.reference == None):
+ if (self.reference is None):
# if no reference found, use input file as reference - athout it doesn't matter - could use --noref
self.args += self.input_file + ' '
else:
@@ -252,7 +252,7 @@ class TrigInDetCpuCostStep(RefComparisonStep):
def configure(self, test):
#self.args += self.input_file+' '+self.ref_file+' '+' -o '+self.output_dir
- if (self.reference == None):
+ if (self.reference is None):
## if not reference found, run with "--noref" option
self.args += ' {} --noref -o {} -p TIME'.format(self.input_file,self.output_dir)
else: