diff --git a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx index 7a36adff029abcdba94f35c66b38a5b04774657f..a0370219a9804e890789b28a2b4c5d8f1e289545 100644 --- a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx +++ b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx @@ -4264,21 +4264,11 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue ss << " node [shape=rectangle]" << std::endl; ss << " rankdir = BT" << std::endl; - const std::vector<std::string> vetoList = { // Patterns to ignore when dumping all - "HLT_TrigCostContainer", - "L1DecoderSummary" - }; - // Now process them for (const std::string& key : keys) { - bool veto = false; - for (const std::string& vetoStr : vetoList) { - if (m_doDumpAllTrigComposite && key.find(vetoStr) != std::string::npos) { - veto = true; - break; - } + if (m_doDumpAllTrigComposite && key.find("HLTNav_") != 0) { // Nav containers should always start with HLTNav_ + continue; } - if (veto) continue; ATH_CHECK( evtStore()->retrieve( container, key ) ); // ss << " rank=same" << std::endl; // dot cannot handle this is seems bool writtenHeader = false; diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 58158500e436adf7151e767e36d3d009b07a78dd..7279f659cd74137c5c5bb75732cc9b01a8c6c7ee 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -855,7 +855,7 @@ def addHLTNavigationToEDMList(edmList, allDecisions, hypoDecisions): HLTNavEDMTargets = '' from AthenaConfiguration.AllConfigFlags import ConfigFlags - if not ConfigFlags.Trigger.doOnlineNavigationCompactificaiton: + if not ConfigFlags.Trigger.doOnlineNavigationCompactification: # If we are not compacting the online EDM, then we must write out all of the individual collections # ESD is added for MC support HLTNavEDMTargets = 'BS ESD' diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py index 513bec161d22f58e6a9dc41583c9102da13b8467..0b88935deb1c6dfed21c0927a5debd526cb6065a 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py @@ -657,7 +657,7 @@ def triggerRunCfg( flags, menu=None ): mergingAlg = triggerMergeViewsAndAddMissingEDMCfg( flags, [edmSet] , hypos, viewMakers, decObj, decObjHypoOut ) acc.addEventAlgo( mergingAlg, sequenceName="HLTFinalizeSeq" ) - if flags.Trigger.doOnlineNavigationCompactificaiton: + if flags.Trigger.doOnlineNavigationCompactification: from TrigNavSlimmingMT.TrigNavSlimmingMTConfig import getTrigNavSlimmingMTOnlineConfig onlineSlimAlg = getTrigNavSlimmingMTOnlineConfig() acc.addEventAlgo( onlineSlimAlg, sequenceName="HLTFinalizeSeq" ) diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py index 3b989598d14f03e755e05755d040a0b76139034c..f7e2d53986275cafa9f3aaa1411041cac6be57cd 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py @@ -107,7 +107,7 @@ def createTriggerFlags(): flags.addFlag('Trigger.doConfigVersionConversion', True) # Flag to control the scheduling of online Run 3 trigger navigation compactification into a single collection (uses slimming framework). - flags.addFlag('Trigger.doOnlineNavigationCompactificaiton', True) + flags.addFlag('Trigger.doOnlineNavigationCompactification', True) # Flag to control the scheduling of offline Run 3 trigger navigation slimming in RAWtoESD, RAWtoAOD, AODtoDAOD or RAWtoALL transforms. flags.addFlag('Trigger.doNavigationSlimming', False) # Defaulting to False until validated (July 2021) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py index b44abdc99892811a84bb722e1c7dd1d6ecdc61d7..610492c6dbd09509f8d3b442fc25b38ebf63d4bc 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py @@ -209,7 +209,7 @@ def makeHLTTree(newJO=False, triggerConfigHLT = None): # C) Finally, we create the EDM output hltFinalizeSeq += conf2toConfigurable(edmAlg) - if ConfigFlags.Trigger.doOnlineNavigationCompactificaiton: + if ConfigFlags.Trigger.doOnlineNavigationCompactification: onlineSlimAlg = getTrigNavSlimmingMTOnlineConfig() hltFinalizeSeq += conf2toConfigurable(onlineSlimAlg)