From e0e49bdeabaffd9ed9dbb9ad1dda70f59ee0974a Mon Sep 17 00:00:00 2001
From: Walter Lampl <Walter.Lampl@cern.ch>
Date: Thu, 16 Apr 2020 14:00:29 +0200
Subject: [PATCH] fix (or ignore) flake8 warnings
---
.../python/BadLBFilterToolConfig.py | 2 --
.../Jet/JetRecConfig/python/JetGrooming.py | 4 ++--
.../Jet/JetRecConfig/python/JetRecConfig.py | 3 ++-
.../python/MuonCombinedRecToolsConfig.py | 14 ++++++++++----
.../python/TrigOutputHandlingConfig.py | 1 -
.../python/EgammaCalibrationConfig.py | 3 +++
6 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py b/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
index 40cc526db22..40d6a40ef60 100644
--- a/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
+++ b/Control/AthenaMonitoring/python/BadLBFilterToolConfig.py
@@ -12,8 +12,6 @@ def BadLBFilterAlgCfg(inputFlags,name, defects, writekey, ignoreRecoverable=Fals
log = logging.getLogger('BadLBFilterAlgCfg')
result=ComponentAccumulator()
- DQBadLBFilterAlg=CompFactory.DQBadLBFilterAlg
-
from DQDefects import DefectsDB
ddb = DefectsDB('COOLOFL_GLOBAL/' + inputFlags.IOVDb.DatabaseInstance,
tag=origDbTag or inputFlags.IOVDb.GlobalTag)
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
index 10ee0958c7e..6dd9cc826d0 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetGrooming.py
@@ -42,7 +42,7 @@ class GroomingDefinition(object):
return self.__hash__() == rhs.__hash__()
def __ne__(self,rhs):
- return (not __eq__(self,rhs))
+ return (not self.__eq__(rhs))
# Define core attributes as properties, with
# custom setter/getter such that if changed, these
@@ -63,7 +63,7 @@ class GroomingDefinition(object):
jetlog.error("Unsupported grooming algorithm specification \"{}\"! Allowable options:")
for groomalg in supportedGrooming:
jetlog.error(groomalg)
- raise KeyError("Invalid grooming algorithm choice: {0}".format(groomtype))
+ raise KeyError("Invalid grooming algorithm choice: {0}".format(groomalg))
@property
def groomspec(self):
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
index 1bf8eafba59..ef2e9f16a4c 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
@@ -21,7 +21,8 @@ def propertiesOf(comp):
try:
propNames = comp._descriptors
return propNames
- except: pass
+ except Exception:
+ pass
return comp.properties()
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index 5a2716eeafe..d5bc4674316 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -393,13 +393,19 @@ def MuidCaloTrackStateOnSurfaceCfg(flags, name='MuidCaloTrackStateOnSurface', **
result.setPrivateTools(tool)
return result
+
def MuidCaloTrackStateOnSurfaceParamCfg(flags, name='MuidCaloTrackStateOnSurfaceParam', **kwargs ):
- result = MuidCaloEnergyToolParamCfg(flags)
- kwargs.setdefault("CaloEnergyDeposit" , tmpAcc.popPrivateTools())
- tmpAcc = MuidCaloTrackStateOnSurfaceCfg(flags, name, **kwargs)
- result.merge(tmpAcc)
+ result=ComponentAccumulator()
+ kwargs.setdefault("Propagator", CompFactory.Trk.RungeKuttaPropagator(name = 'AtlasRungeKuttaPropagator'))# FIXME - there should be a CA for this!
+ kwargs.setdefault("MinRemainingEnergy" , 0.2*GeV )
+ kwargs.setdefault("ParamPtCut" , 3.0*GeV )
+ kwargs.setdefault("CaloEnergyDeposit" , MuidCaloEnergyParam(flags) )
+ kwargs.setdefault("CaloEnergyParam" , MuidCaloEnergyParam(flags) )
+ tool = CompFactory.Rec.MuidCaloTrackStateOnSurface(name,**kwargs)
+ result.setPrivateTools(tool)
return result
+
def MuidMaterialEffectsOnTrackProviderCfg(flags, name='MuidMaterialEffectsOnTrackProvider', **kwargs ):
result = MuidCaloTrackStateOnSurfaceCfg(flags)
kwargs.setdefault("TSOSTool", result.popPrivateTools() )
diff --git a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
index c70a87631de..1fbe67d0c0a 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
+++ b/Trigger/TrigSteer/TrigOutputHandling/python/TrigOutputHandlingConfig.py
@@ -144,7 +144,6 @@ def StreamTagMakerToolCfg(name="StreamTagMakerTool"):
def TriggerBitsMakerToolCfg(name="TriggerBitsMakerTool"):
- from TriggerJobOpts.TriggerFlags import TriggerFlags
bitsmaker = CompFactory.TriggerBitsMakerTool(name)
# Extra configuration may come here
diff --git a/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py b/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
index ce285ce687b..c94ee3bd353 100644
--- a/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
+++ b/Trigger/TrigTools/TrigT2CaloCalibration/python/EgammaCalibrationConfig.py
@@ -1,5 +1,8 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# flake8: noqa
+# ... because this file is hopeless ...
+
#############################
# EgammaLWCalibration
#############################
--
GitLab