diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt index acf3960eabeadf43229226b03fc6060d213af8c7..a978e7f37e8faacdcff8acba8f007a375d2d799e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt +++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt @@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PRIVATE Trigger/TriggerCommon/TriggerJobOpts) atlas_add_test( flake8 - SCRIPT flake8 --select=F,E7,E9,W6 --enable-extension=ATL100 ${CMAKE_CURRENT_SOURCE_DIR}/python/HLTMenuConfig + SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/python/HLTMenuConfig POST_EXEC_SCRIPT nopost.sh ) #---------------------------------- @@ -115,12 +115,6 @@ atlas_install_scripts( scripts/test_HLTmenu.sh ) atlas_install_xmls( data/*.dtd data/*.xml ) -#atlas_add_test( generateMenuMT SCRIPT scripts/generateMenuMT.sh -# PROPERTIES TIMEOUT 500 -# POST_EXEC_SCRIPT "check_log.pl --config checklogTriggerTest.conf generateMenuMT.log" -# ) - - atlas_add_test( generateMenuMT_newJO SCRIPT python -m TriggerMenuMT.HLTMenuConfig.Menu.LS2_v1_newJO PROPERTIES TIMEOUT 500 ) @@ -129,18 +123,6 @@ atlas_add_test( generateMenuMT SCRIPT bash test_HLTmenu.sh PROPERTIES TIMEOUT 1000 ) - - -#file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenu ) -#atlas_add_test( generateMenu -# SCRIPT scripts/test_HLTmenu.sh -# EXTRA_PATTERNS "-s TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*" -# PROPERTIES TIMEOUT 500 -# PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenu -# ) - - - #---------------------------------- # List of menus to be created: atlas_build_lvl1_trigger_menu( LS2_v1 ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py index 7c4f874197f0781972038799b1e2194458b72391..f49223fa89583ce163c146d7c633b17ceccdb4a5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py @@ -6,7 +6,7 @@ from AthenaCommon.CFElements import seqAND from AthenaConfiguration.AllConfigFlags import ConfigFlags -class CaloMenuDefs(): +class CaloMenuDefs(object): """Static Class to collect all string manipulations in Calo sequences """ from TrigEDMConfig.TriggerEDMRun3 import recordable L2CaloClusters= recordable("HLT_L2CaloEMClusters") diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py index 875dcb2d6a849b956e3508eb16b2a7a2b1f6cf40..bb07ba2e4ec1b8860c60c4869fd29859043234db 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/InDetSetup.py @@ -4,7 +4,7 @@ # this is copy paste from Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py # once the cunction below is moved to the destination pkg, will eliminate this duplication -class InDetCacheNames: +class InDetCacheNames(object): Pixel_ClusterKey = "PixelTrigClustersCache" SCT_ClusterKey = "SCT_ClustersCache" SpacePointCachePix = "PixelSpacePointCache" @@ -41,8 +41,8 @@ def makeInDetAlgs( whichSignature='' ): ToolSvc += InDetPixelRawDataProviderTool if (InDetTrigFlags.doPrintConfigurables()): - print InDetPixelRawDataProviderTool - + print(InDetPixelRawDataProviderTool) # noqa: ATL901 + # load the PixelRawDataProvider from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProvider InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider"+ signature, @@ -56,8 +56,8 @@ def makeInDetAlgs( whichSignature='' ): if (InDetTrigFlags.doPrintConfigurables()): - print InDetPixelRawDataProvider - + print(InDetPixelRawDataProvider) # noqa: ATL901 + #SCT from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCT_RodDecoder @@ -69,7 +69,8 @@ def makeInDetAlgs( whichSignature='' ): Decoder = InDetSCTRodDecoder) ToolSvc += InDetSCTRawDataProviderTool if (InDetTrigFlags.doPrintConfigurables()): - print InDetSCTRawDataProviderTool + print(InDetSCTRawDataProviderTool) # noqa: ATL901 + # load the SCTRawDataProvider from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProvider @@ -177,7 +178,6 @@ def makeInDetAlgs( whichSignature='' ): condTools = [] for condToolHandle in InDetSCT_ConditionsSummaryTool.ConditionsTools: condTool = condToolHandle.typeAndName - print condTool if condTool not in condTools: if condTool != "SCT_FlaggedConditionTool/InDetSCT_FlaggedConditionTool": condTools.append(condTool) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py index 8bf1cb115b7a3adde60322b32d2a09e4f0cd7225..e20e1f2f327d58605a87c6a5fbacb1d4a5f76f4f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py @@ -6,7 +6,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, RecoFragments #---------------------------------------------------------------- # Base class to configure chain #---------------------------------------------------------------- -class ChainConfigurationBase: +class ChainConfigurationBase(object): def __init__(self, chainDict): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py index 5f01015f995e442a825fe84da4495027c0f1a203..69e3016a434e883a785f5250f3d27985e1d8c735 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py @@ -19,7 +19,7 @@ log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT' ) _func_to_modify_signatures = None -class GenerateMenuMT: +class GenerateMenuMT(object): def overwriteSignaturesWith(f): """ @@ -310,7 +310,7 @@ class GenerateMenuMT: log.debug(' L1Seed %s', cc.seed) log.debug(' ChainSteps %s', cc.steps) for step in cc.steps: - print step + log.info(step) makeHLTTree(finalListOfChainConfigs, self.triggerConfigHLT) # the return values used for debugging, might be removed later diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py index ec6802db5a831de808bc8606da8fa04f98952f0c..46421faa12ae20f8ec12c2e5beb36edc72769927 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py @@ -63,7 +63,6 @@ def createCFTree(CFseq): for menuseq in CFseq.step.sequences: ath_sequence = menuseq.sequence.Alg name = ath_sequence.name() - print('5555555 ATH SEQUENCE NAME ---- ', name) if name in already_connected: log.debug("AthSequencer %s already in the Tree, not added again",name) else: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py index cb5872881b860b2528c2531a080815ebfa966e13..b99f6c4c5a3de1f852c707d8ad12418767736f15 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py @@ -13,13 +13,13 @@ from AthenaCommon.Logging import logging log = logging.getLogger('HLTCFConfig_newJO') def printStepsMatrix(matrix): - print('----- Steps matrix ------') + print('----- Steps matrix ------') # noqa: ATL901 for nstep in matrix: - print('step {}:'.format(nstep)) + print('step {}:'.format(nstep)) # noqa: ATL901 for chainName in matrix[nstep]: namesInCell = map(lambda el: el.name, matrix[nstep][chainName]) - print('---- {}: {}'.format(chainName, namesInCell)) - print('-------------------------') + print('---- {}: {}'.format(chainName, namesInCell)) # noqa: ATL901 + print('-------------------------') # noqa: ATL901 def generateDecisionTree(chains): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py index 5768accf1bd251657db63a6b8a98c751cb69fde1..d87cbe1fcbc0306313a1ccbcb5e73e95e83575a6 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py @@ -88,8 +88,7 @@ def all_DataFlow_to_dot(name, step_list): # reset the last step last_step_hypoNodes =[] for cfseq in cfseq_list: -# print cfseq.name - file.write(" %s[fillcolor=%s style=filled]\n"%(cfseq.filter.Alg.name(),algColor(cfseq.filter.Alg))) + file.write(" %s[fillcolor=%s style=filled]\n"%(cfseq.filter.Alg.name(),algColor(cfseq.filter.Alg))) step_connections.append(cfseq.filter) file.write( '\n subgraph cluster_%s {\n'%(cfseq.step.name)\ +' node [color=white style=filled]\n'\ @@ -222,7 +221,7 @@ def findDHconnections(nodeA, nodeB): if len(dataIntersection) > 0: for line in dataIntersection: lineconnect+=addConnection(nodeA.Alg.name(),nodeB.Alg.name(), line) - print 'Data DH connections between %s and %s: %s'%(nodeA.Alg.name(), nodeB.Alg.name(), line) + #print 'Data DH connections between %s and %s: %s'%(nodeA.Alg.name(), nodeB.Alg.name(), line) return lineconnect diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py index 69a22cf9e93a6fb08663c55575d2b37a516c3f84..fcc13cbdc7a5a9416d88e19a52f633a5537f4aa3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py @@ -73,7 +73,7 @@ def setupMenu(): Prescales.HLTPrescales_cosmics = deepcopy(mydict) -class Prescales: +class Prescales(object): # Item name | Prescale #---------------------------------------------------------- L1Prescales = {} diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 082d7ad7dfb75e9bc24e4f1b61e56ef0bf3174d6..656f01a74602353268ce8223935a63311a2b25ca 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -85,7 +85,7 @@ def setupMenu(): Prescales.HLTPrescales_cosmics = deepcopy(mydict) -class Prescales: +class Prescales(object): # Item name | Prescale #---------------------------------------------------------- L1Prescales = {} diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py index ca823abc8cb86fffeea5cdf6100e1a7cdf40226c..bb5ac589aa178ded92fb48e2a6e3e275cb15df84 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py @@ -56,9 +56,11 @@ def setupMenu(flags): if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator + from AthenaCommon.Constants import VERBOSE from AthenaCommon.Logging import logging - logging.getLogger('ComponentAccumulator').setLevel(7) - + log = logging.getLogger('ComponentAccumulator') + log.setLevel(VERBOSE) + acc = ComponentAccumulator() from AthenaCommon.Configurable import Configurable @@ -83,7 +85,7 @@ if __name__ == "__main__": for seq, algs in fs.iteritems(): for alg in algs: if 'HypoTools' in alg.getProperties(): - print alg.getName(), [ t.getFullName() for t in alg.HypoTools ] + log.verbose("%s %s", alg.getName(), [ t.getFullName() for t in alg.HypoTools ]) f = open('newJOMenu.pkl', 'wb') acc.store(f) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py index e2c74aa1d362b9842da6bb2f98b7af6f301a733d..c615d0df863595402aedb9b59c86757f351032f1 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py @@ -9,8 +9,8 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming from AthenaCommon.CFElements import parOR, seqAND -class Node(): - """ base class representing one Alg + inputs + outputs, to be used to Draw dot diagrams and connect objects""" +class Node(object): + """base class representing one Alg + inputs + outputs, to be used to Draw dot diagrams and connect objects""" def __init__(self, Alg): self.name = ("%sNode")%( Alg.name()) self.Alg=Alg @@ -111,7 +111,7 @@ class AlgNode(Node): return "Alg::%s [%s] -> [%s]"%(self.Alg.name(), ' '.join(map(str, self.getInputList())), ' '.join(map(str, self.getOutputList()))) -class HypoToolConf(): +class HypoToolConf(object): """ Class to group info on hypotools""" def __init__(self, hypoToolGen): self.hypoToolGen = hypoToolGen @@ -143,7 +143,6 @@ class HypoAlgNode(AlgNode): self.previous=[] def addHypoTool (self, hypoToolConf): - print "here", hypoToolConf.chainDict if hypoToolConf.chainDict['chainName'] not in self.tools: ## HypoTools are private, so need to be created when added to the Alg ## this incantation may seem strange, however it is the only one which works @@ -210,7 +209,6 @@ class ComboMaker(AlgNode): from TriggerMenuMT.HLTMenuConfig.Menu import DictFromChainName dictDecoding = DictFromChainName.DictFromChainName() allMultis = dictDecoding.getChainMultFromName(chain) - print "WOOF allMultis", allMultis newdict = {chain : allMultis} for i in range(1, len(allMultis)): @@ -250,7 +248,7 @@ def isFilterAlg(alg): ########################################################## -class MenuSequence(): +class MenuSequence(object): """ Class to group reco sequences with the Hypo""" def __init__(self, Sequence, Maker, Hypo, HypoToolGen, CA=None ): self.name = CFNaming.menuSequenceName(Hypo.name()) @@ -266,7 +264,7 @@ class MenuSequence(): def replaceHypoForCombo(self, HypoAlg): log.debug("set new Hypo %s for combo sequence %s ", HypoAlg.name(), self.name) - self.hypo= HypoAlgNode( Alg=HypoAlg ) + self._hypo = HypoAlgNode( Alg=HypoAlg ) @property def maker(self): @@ -338,7 +336,7 @@ def DoMapSeedToL1Decoder(seed): ################################################# -class Chain: +class Chain(object): """Basic class to define the trigger menu """ def __init__(self, name, Seed, ChainSteps=[]): self.name = name @@ -355,8 +353,7 @@ class Chain: mult=1 else: mult=int(mult) -# print mult,single - for m in range(0,mult): + for m in range(0,mult): self.vseeds.append(single) # group_seed is used to se tthe seed type (EM, MU,JET), removing the actual threshold @@ -393,7 +390,6 @@ class Chain: from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import getChainDictFromChainName chainDict = getChainDictFromChainName(self.name, allChainDicts) - print "got here", chainDict for step in self.steps: if len(chainDict['chainParts']) != len(step.sequences): log.error("Error in step %s: found %d chain parts and %d sequences", step.name, len(chainDict['chainParts']), len(step.sequences)) @@ -409,7 +405,7 @@ class Chain: seq.hypo.addHypoTool(seq.hypoToolConf) -class CFSequence(): +class CFSequence(object): """Class to describe the ChainStep + filter """ @@ -470,7 +466,7 @@ class CFSequence(): self.filter, self.step ) -class ChainStep: +class ChainStep(object): """Class to describe one step of a chain; if more than one menuSequence, then the step is combo""" def __init__(self, name, Sequences=[]): self.name = name @@ -565,7 +561,7 @@ class InViewReco( ComponentAccumulator ): return self.viewMakerAlg -class RecoFragmentsPool: +class RecoFragmentsPool(object): """ Class to host all the reco fragments that need to be reused """ fragments = {} @classmethod diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py index 550b7bddb04e4840d44dfdb3f32a9d8a65ab7b2c..68d7fe34b22a4def943d0691b3328ae8e19614b3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py @@ -2,7 +2,7 @@ -class CFNaming (): +class CFNaming(object): """Static Class to collect all string manipulations on CF object names """ RECO_POSTFIX = "_reco" diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py index 1f9363c71bf000c8282e7b4a80ed9fa90e37b898..56dc93bbf2e62237b45ab6bb47c5b7373322dc0b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py @@ -11,7 +11,7 @@ import sys from AthenaCommon.Logging import logging log = logging.getLogger( 'TriggerConfigHLT' ) -class TriggerConfigHLT: +class TriggerConfigHLT(object): sCurrentTriggerConfig = None def currentTriggerConfig(): @@ -97,6 +97,6 @@ def getConfFromChainName(chainName, allChainDicts = None): sys.exit("ERROR, in getConfFromChainName: Wrong chain configuration") return [chainName] else: - print "TriggerConfigHLT.getConfFromChainName: Called chain " + chainName + " and hypoTool conf "+ str(chainPartNames) + log.info("TriggerConfigHLT.getConfFromChainName: Called chain %s and hypoTool conf %s", chainName, chainPartNames) return chainPartNames diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py index 6801d714076285f0eca6d6acf85fd8940c0a0597..edbfa5a8eea40e29bc292ec297e35d6268eda3ff 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py @@ -2,6 +2,9 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # +from AthenaCommon.Logging import logging +log = logging.getLogger('MuonSetup') + ### Output data name ### from TrigEDMConfig.TriggerEDMRun3 import recordable muFastInfo = "MuonL2SAInfo" @@ -525,12 +528,9 @@ def muEFSARecoSequence( RoIs, name ): efAlg.RoIs = "FSRoI" else: efAlg.RoIs = RoIs - print efAlg.RoIs muEFSARecoSequence += efAlg sequenceOut = themuoncreatoralg.MuonContainerLocation - - return muEFSARecoSequence, sequenceOut