Merge branch 'flake_attr' into 'main'

Fix flake8-bugbear warnings

See merge request atlas/athena!71170

Calorimeter/CaloClusterCorrection/python/common.py

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 #
 # File: CaloClusterCorrection/python/common.py
@@ -879,9 +879,9 @@ def _config_from_jo (corr, jo, key, sampling, valid_keys, order):
         parms = parms[sampling]
 
     if order != 0 and hasattr (corr, 'order'):
-        setattr (corr, 'order', order)
+        corr.order = order
     if hasattr (corr, 'isDummy'):
-        setattr (corr, 'isDummy', 0)
+        corr.isDummy = 0
 
     log = logging.getLogger ('CaloClusterCorrection')
 

Calorimeter/CaloCondPhysAlgs/python/CaloBlobWriter.py

 #!/bin/env python
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
-from __future__ import print_function
 import ROOT
 from PyCool import cool
 import os
-#from CaloCondBlobAlgs import CaloCondTools, CaloCondLogger
+
 
 def CaloCondBlobWriter(spec,valuePairs,defaultValue):
 
@@ -31,8 +30,7 @@ def CaloCondBlobWriter(spec,valuePairs,defaultValue):
    print ("Build CaloCondBlob object")
    data = cool.Record( spec )
    blob = data['CaloCondBlob16M']
-   #flt = g.CaloCondBlobFlt.getInstance(blob)
-   fltClass=getattr(ROOT,'CaloCondBlobFlt')
+   fltClass=ROOT.CaloCondBlobFlt
    flt=fltClass.getInstance(blob)
    flt.init(defVec,nChannels,1)
    

DetectorDescription/RegionSelector/python/RegSelToolConfig.py

@@ -260,8 +260,7 @@ def regSelToolsCfg(flags, detNames):
         elif det == 'STGC':
             flagName = 'sTGC'
         detFlag = f'Enable{flagName}'
-        detFlagCont = getattr(flags, 'Detector')
-        detEnabled = getattr(detFlagCont, detFlag)
+        detEnabled = getattr(flags.Detector, detFlag)
         if not detEnabled:
             _log.debug('regSelToolsCfg: skip adding detector "%s" because the flag Detector.%s is False', det, detFlag)
             continue

ForwardDetectors/AFP/AFP_Reconstruction/AFP_GlobReco/python/AFP_GlobReco.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 #==============================================================
 # Job options file for the AFP_GlobReco package
@@ -18,12 +18,7 @@ def AFP_GlobReco_Cfg(flags, kwargs={}):
 	# collect all output names and make a list with unique names for write handle keys; if this goes wrong AFP_GlobRecoTool::initialize() will complain
 	outputProtonList=[]
 	for protonTool in protonsToolsList:
-		try:
-			# in case the "protonsContainerName" is set
-			contName=getattr(protonTool, "protonsContainerName")
-		except AttributeError:
-			# in case the "protonsContainerName" is not set
-			contName=protonTool.getDefaultProperty("protonsContainerName")
+		contName=getattr(protonTool, "protonsContainerName", protonTool.getDefaultProperty("protonsContainerName"))
 		if contName not in outputProtonList:
 			outputProtonList.append(contName)
 

ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py

@@ -41,7 +41,7 @@ def AFP_LocReco_SiD_Cfg(flags, kwargs={}):
         for kalmanTool in kalmanToolsList:
                 try:
                         # in case the "tracksContainerName" is set
-                        contName=getattr(kalmanTool, "tracksContainerName")
+                        contName=kalmanTool.tracksContainerName
                 except AttributeError:
                         # in case the "tracksContainerName" is not set
                         contName=kalmanTool.getDefaultProperty("tracksContainerName")
@@ -86,12 +86,7 @@ def AFP_LocReco_TD_Cfg(flags, kwargs={}):
         # collect all output names and make a list with unique names for write handle keys; if this goes wrong AFP_TDLocRecoTool::initialize() will complain
         outputBasicList=[]
         for basicTool in basicToolsList:
-                try:
-                        # in case the "tracksContainerName" is set
-                        contName=getattr(basicTool, "tracksContainerName")
-                except AttributeError:
-                        # in case the "tracksContainerName" is not set
-                        contName=basicTool.getDefaultProperty("tracksContainerName")
+                contName=getattr(basicTool, "tracksContainerName", basicTool.getDefaultProperty("tracksContainerName"))
                 if contName not in outputBasicList:
                         outputBasicList.append(contName)
 

ForwardDetectors/AFP/AFP_Reconstruction/AFP_VertexReco/python/AFP_VertexReco.py

-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 #==============================================================
 # Job options file for the AFP_VertexReco package
@@ -28,12 +28,7 @@ def AFP_VertexReco_Cfg(flags, kwargs={}):
 	# collect all output names and make a list with unique names for write handle keys; if this goes wrong AFP_VertexRecoTool::initialize() will complain
 	outputVertexList=[]
 	for vertexTool in verticesToolsList:
-		try:
-			# in case the "verticesContainerName" is set
-			contName=getattr(vertexTool, "verticesContainerName")
-		except AttributeError:
-			# in case the "verticesContainerName" is not set
-			contName=vertexTool.getDefaultProperty("verticesContainerName")
+		contName=getattr(vertexTool, "verticesContainerName", vertexTool.getDefaultProperty("verticesContainerName"))
 		if contName not in outputVertexList:
 			outputVertexList.append(contName)
 

Generators/Herwig7_i/python/Herwig7Control.py

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 ## \file Herwig7Control.py
 ## \brief Main python interface for %Herwig7 for preparing the event generation
 ## \author Daniel Rauch (daniel.rauch@desy.de)
@@ -111,7 +111,7 @@ def matchbox_run_gridpack(gen_config, integration_jobs, gridpack_name, cleanup_h
   else:
 
     ## unpack the gridpack
-    DSIS_dir = getattr(gen_config.runArgs, 'jobConfig')[0]+"/"
+    DSIS_dir = gen_config.runArgs.jobConfig[0]+"/"
     do_uncompress_gridpack(DSIS_dir+gridpack_name)
     athMsgLog.info("Finished unpacking the gridpack")
 

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCalo/python/DerivationFrameworkCaloConfig.py

@@ -112,10 +112,10 @@ def getGainLayerNames(tool):
     """getGainLayerNames( tool ) -> return a list of names of the decorations added to the
     egamma tool, given the GainDecorator tool"""
     return [
-        getattr(tool, "decoration_pattern").format(info=info, layer=layer, gain=gain)
+        tool.decoration_pattern.format(info=info, layer=layer, gain=gain)
         for info in ["E", "nCells"]
-        for layer in getattr(tool, "layers")
-        for gain in getattr(tool, "gain_names").values()
+        for layer in tool.layers
+        for gain in tool.gain_names.values()
     ]
 
 
@@ -168,13 +168,13 @@ def getClusterEnergyPerLayerDecorations(acc, kernel):
     for tool in ClusterEnergyPerLayerDecorators:
         collections = filter(bool, (getattr(tool, x) for x in properties))
         for part in collections:
-            for layer in getattr(tool, "layers"):
+            for layer in tool.layers:
                 decorations.extend(
                     [
                         "{part}.E{neta}x{nphi}_Lr{layer}".format(
                             part=part,
-                            neta=getattr(tool, "neta"),
-                            nphi=getattr(tool, "nphi"),
+                            neta=tool.neta,
+                            nphi=tool.nphi,
                             layer=layer,
                         )
                     ]

Simulation/RunDependentSim/RunDependentSimComps/python/PileUpUtils.py

-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from copy import deepcopy
 from math import ceil
@@ -120,8 +120,7 @@ def loadPileUpProfile(flags, fragment_string):
 
     from importlib import import_module
     loaded_module = import_module(fragment_string)
-    function_def = getattr(loaded_module, 'setupProfile')
-    return function_def(flags)
+    return loaded_module.setupProfile(flags)
 
 
 def generatePileUpProfile(flags,
@@ -357,8 +356,7 @@ def setupPileUpProfile(flags):
 
     from importlib import import_module
     loaded_module = import_module(bunchStructure)
-    function_def = getattr(loaded_module, 'setupBunchStructure')
-    function_def(flags)
+    loaded_module.setupBunchStructure(flags)
 
     # Setup pile-up profile
     flags.Digitization.PU.NumberOfCollisions = flags.Digitization.PU.NumberOfLowPtMinBias + flags.Digitization.PU.NumberOfHighPtMinBias

Tools/PyJobTransformsCore/python/TransformConfig.py

-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 __author__ = "clat@hep.ph.bham.ac.uk"
 
@@ -287,7 +287,6 @@ class AllowedExpression:
 
 class JobConfigMetaClass(type):
     def __init__( self, name, bases, dict ):
-##        print "JobConfigMetaClass( self=%r, name=%r, bases=%r, dict=%r )" % (self,name,bases,dict)
         if '__slots__' not in dict:
             raise TransformConfigError('Class %s does not have member __slots__. Please add __slots__ = ()'
                                        ' to the class definition' % (name,) )
@@ -296,24 +295,19 @@ class JobConfigMetaClass(type):
         #
         # first add it to __slots__
         slots = self.__slots__
-##        print "%s.__slots__ before: = %r" % (self.__name__,slots)
         descrName = '__properties'
         if descrName not in slots:
             # add variable
             slots += ( descrName, )
             # synchronise dict
             dict['__slots__'] = slots
-##            print "%s.__slots__ after: = %r" % (self.__name__,slots)
         # then add the list itself
         setattr(self,descrName,[])
         descrList = getattr(self,descrName)
         # set names of properties and add them to the list of properties
         for n,attrib in dict.items():
-#            attrib = getattr(self,n)
             if isinstance(attrib,Descriptor):
-##                print "Setting name of %s.%s" % (self.__name__,n)
-                setattr(attrib,'_Descriptor__name',n)
-##                print "Adding %s.%s to %s.%s" % (self.__name__,n,self.__name__,descrName)
+                setattr(attrib,'_Descriptor__name',n)  # noqa: B010 (private property)
                 descrList.append(attrib)
 
         type.__init__(self,name,bases,dict)
@@ -365,7 +359,7 @@ class JobConfig(with_metaclass(JobConfigMetaClass,object)):
 ##        print "%s.properties()" % self.__name__
         descr = []
         for cl in self.__class__.__bases__ + (self.__class__,):
-            descr += getattr(cl,'__properties')
+            descr += getattr(cl,'__properties')  # noqa: B009 (private property)
         return descr