diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
index ba085f5274ab2d2c91a23753eb8b069979fe890a..8419ca99c3e29c617b812e5a9f60e143fe08358e 100644
--- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
@@ -1,4 +1,4 @@
-# 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 AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.Enums import BeamType
@@ -66,7 +66,7 @@ def TRT_TrackSegment_Cfg(flags):
from InDetConfig.TRT_StandaloneTrackFinderConfig import (
TRT_TrackSegment_TrackFinderCfg)
acc.merge(TRT_TrackSegment_TrackFinderCfg(flags,
- InputSegmentsCollection = 'TRTSegmentsTRT'))
+ InputSegmentsLocation = 'TRTSegmentsTRT'))
return acc
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 1c51d653d216b12f6377e242ffde33de5dab1999..d575d675436b6ea403678d201d37bd7f63120977 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -18,7 +18,10 @@ def CombinedTrackingPassFlagSets(flags):
# Primary Pass
flags = flags.cloneAndReplace(
"Tracking.ActiveConfig",
- f"Tracking.{flags.Tracking.PrimaryPassConfig.value}Pass")
+ f"Tracking.{flags.Tracking.PrimaryPassConfig.value}Pass",
+ # Keep original flags as some of the subsequent passes use
+ # lambda functions relying on them
+ keepOriginal=True)
flags_set += [flags]
# LRT pass
diff --git a/Reconstruction/VKalVrt/GNNVertexFitter/src/GNNVertexFitterAlg.cxx b/Reconstruction/VKalVrt/GNNVertexFitter/src/GNNVertexFitterAlg.cxx
index 45bad7ff963d6f3cd418c1d6acccf08a5eafb4a5..c3108d4759eefe8411b7a691f310f1e6991593a5 100644
--- a/Reconstruction/VKalVrt/GNNVertexFitter/src/GNNVertexFitterAlg.cxx
+++ b/Reconstruction/VKalVrt/GNNVertexFitter/src/GNNVertexFitterAlg.cxx
@@ -1,75 +1,76 @@
-/*
- Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GNNVertexFitterAlg.h"
-#include "xAODJet/JetContainer.h"
-#include "xAODTracking/VertexAuxContainer.h"
-#include "xAODTracking/VertexContainer.h"
-
-namespace Rec {
-
-GNNVertexFitterAlg::GNNVertexFitterAlg(const std::string &name, ISvcLocator *pSvcLocator)
- : AthReentrantAlgorithm(name, pSvcLocator), m_VtxTool("Rec::GNNVertexFitterTool/VtxTool", this) {
- declareProperty("VtxTool", m_VtxTool, "The GNN Vtxing Tool");
-}
-
-StatusCode GNNVertexFitterAlg::initialize() {
-
- // Retrieving the tool
- ATH_CHECK(m_VtxTool.retrieve());
-
- // Initializing Keys
- ATH_CHECK(m_inJetsKey.initialize());
- ATH_CHECK(m_outVertexKey.initialize());
- ATH_CHECK(m_pvContainerKey.initialize());
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode GNNVertexFitterAlg::execute(const EventContext &ctx) const {
-
- ATH_MSG_DEBUG("In GNNVertexFitterAlg::execute()");
-
- // Extract Jets
- SG::ReadHandle<xAOD::JetContainer> inJetContainer(m_inJetsKey, ctx);
- if (!inJetContainer.isValid()) {
- ATH_MSG_WARNING("No xAOD::JetContainer named " << m_inJetsKey.key() << " found in StoreGate");
- return StatusCode::FAILURE;
- }
-
- // Write new GNN Vertice Container
- SG::WriteHandle<xAOD::VertexContainer> outVertexContainer(m_outVertexKey, ctx);
- if (outVertexContainer.record(std::make_unique<xAOD::VertexContainer>(), std::make_unique<xAOD::VertexAuxContainer>())
- .isFailure()) {
- ATH_MSG_ERROR("Storegate record of VertexContainer failed.");
- return StatusCode::FAILURE;
- }
-
- const xAOD::Vertex *pv = nullptr;
- //-- Extract Primary Vertices
- SG::ReadHandle<xAOD::VertexContainer> pv_cont(m_pvContainerKey, ctx);
- if (!pv_cont.isValid()) {
- ATH_MSG_WARNING("No Primary Vertices container found in TDS");
- } else {
- //-- Extract PV itself
- for (auto v : *pv_cont) {
- if (v->vertexType() == xAOD::VxType::PriVtx) {
- pv = v;
- break;
- }
- }
- }
-
- // Perform a Vertex fit
- ATH_CHECK(m_VtxTool->fitAllVertices(inJetContainer.ptr(), outVertexContainer.ptr(), *pv, ctx));
-
- return StatusCode::SUCCESS;
-}
-
-StatusCode GNNVertexFitterAlg::finalize() {
- ATH_MSG_DEBUG("GNNVertexFitter::finalize()");
- return StatusCode::SUCCESS;
-}
-
-} // namespace Rec
+/*
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "GNNVertexFitterAlg.h"
+#include "xAODJet/JetContainer.h"
+#include "xAODTracking/VertexAuxContainer.h"
+#include "xAODTracking/VertexContainer.h"
+
+namespace Rec {
+
+GNNVertexFitterAlg::GNNVertexFitterAlg(const std::string &name, ISvcLocator *pSvcLocator)
+ : AthReentrantAlgorithm(name, pSvcLocator), m_VtxTool("Rec::GNNVertexFitterTool/VtxTool", this) {
+ declareProperty("VtxTool", m_VtxTool, "The GNN Vtxing Tool");
+}
+
+StatusCode GNNVertexFitterAlg::initialize() {
+
+ // Retrieving the tool
+ ATH_CHECK(m_VtxTool.retrieve());
+
+ // Initializing Keys
+ ATH_CHECK(m_inJetsKey.initialize());
+ ATH_CHECK(m_outVertexKey.initialize());
+ ATH_CHECK(m_pvContainerKey.initialize());
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode GNNVertexFitterAlg::execute(const EventContext &ctx) const {
+
+ ATH_MSG_DEBUG("In GNNVertexFitterAlg::execute()");
+
+ // Extract Jets
+ SG::ReadHandle<xAOD::JetContainer> inJetContainer(m_inJetsKey, ctx);
+ if (!inJetContainer.isValid()) {
+ ATH_MSG_WARNING("No xAOD::JetContainer named " << m_inJetsKey.key() << " found in StoreGate");
+ return StatusCode::FAILURE;
+ }
+
+ // Write new GNN Vertice Container
+ SG::WriteHandle<xAOD::VertexContainer> outVertexContainer(m_outVertexKey, ctx);
+ if (outVertexContainer.record(std::make_unique<xAOD::VertexContainer>(), std::make_unique<xAOD::VertexAuxContainer>())
+ .isFailure()) {
+ ATH_MSG_ERROR("Storegate record of VertexContainer failed.");
+ return StatusCode::FAILURE;
+ }
+
+ const xAOD::Vertex *pv = nullptr;
+ //-- Extract Primary Vertices
+ SG::ReadHandle<xAOD::VertexContainer> pv_cont(m_pvContainerKey, ctx);
+ if (!pv_cont.isValid()) {
+ ATH_MSG_WARNING("No Primary Vertices container found in TDS");
+ } else {
+ //-- Extract PV itself
+ for (auto v : *pv_cont) {
+ if (v->vertexType() == xAOD::VxType::PriVtx) {
+ pv = v;
+ break;
+ }
+ }
+ }
+ if (!pv) pv = pv_cont->front();
+
+ // Perform a Vertex fit
+ ATH_CHECK(m_VtxTool->fitAllVertices(inJetContainer.ptr(), outVertexContainer.ptr(), *pv, ctx));
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode GNNVertexFitterAlg::finalize() {
+ ATH_MSG_DEBUG("GNNVertexFitter::finalize()");
+ return StatusCode::SUCCESS;
+}
+
+} // namespace Rec
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
index edd3c681cb8a6447fbfef6ac8c11cf969a011657..d64bf024e2a407792d05ed8d8ea8c8a135533556 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
@@ -342,10 +342,7 @@ def hltCaloTopoClusterCalibratorCfg(flags, name, clustersin, clustersout, **kwar
return acc
##################### Unifying all cluster reco algs together ##################
-from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
-TrigEgammaKeys = getTrigEgammaKeys()
-TrigEgammaKeys_LRT = getTrigEgammaKeys(name = '_LRT')
-TrigEgammaKeys_HI = getTrigEgammaKeys(ion = True)
+from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
def hltCaloTopoClusteringCfg(
@@ -356,7 +353,9 @@ def hltCaloTopoClusteringCfg(
elif nameSuffix == "FS":
clustersKeyFromName = em_clusters
else:
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
clustersKeyFromName = TrigEgammaKeys.precisionTopoClusterContainer
+
clusters = clustersKeyFromName if clustersKey is None else clustersKey
acc = ComponentAccumulator()
acc.merge(
@@ -409,6 +408,7 @@ def egammaTopoClusteringCfg(flags, RoIs):
@AccumulatorCache
def egammaTopoClusteringCfg_LRT(flags, RoIs):
+ TrigEgammaKeys_LRT = getTrigEgammaKeys(flags, name = '_LRT')
cfg = hltCaloTopoClusteringCfg(flags, namePrefix="", nameSuffix="RoI_LRT", CellsName="CaloCells", monitorCells=True, roisKey=RoIs, clustersKey= TrigEgammaKeys_LRT.precisionTopoClusterContainer)
return cfg
@@ -433,8 +433,7 @@ def tauTopoClusteringCfg(flags, RoIs):
@AccumulatorCache
def hltCaloTopoClusteringHICfg(
flags, CellsName=None, roisKey="UNSPECIFIED", doLC=False,algSuffix='HIRoI', ion=True):
- from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
eventShape = TrigEgammaKeys.egEventShape
clustersKey = TrigEgammaKeys.precisionTopoClusterContainer
acc = ComponentAccumulator()
diff --git a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
index 87e9c3dd7d48365dbf5cb3f822a95d6cb3e9de45..becb2a13baa31b973aafe331dbb04dc75811170a 100644
--- a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
+++ b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
@@ -28,7 +28,7 @@ def NavConverterCfg(flags, chainsList = [], runTheChecker = False):
r2ToR3OutputName = getRun3NavigationContainerFromInput(flags)
- cnvAlg = CompFactory.Run2ToRun3TrigNavConverterV2("TrigRun2ToRun3NavConverter") # optional OutputLevel=2
+ cnvAlg = CompFactory.Run2ToRun3TrigNavConverterV2("TrigRun2ToRun3NavConverter") # optional OutputLevel=DEBUG
cnvAlg.TrigDecisionTool = tdt
cnvAlg.TrigNavReadKey = ""
cnvAlg.TrigConfigSvc = tdt.TrigConfigSvc
diff --git a/Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py b/Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
index 1b1b730392f16eaa18181e166ad914ea033b917e..6921cc5560fdc78f0bc837f83505b5f076d83316 100755
--- a/Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
+++ b/Trigger/TrigEvent/TrigNavTools/share/testTrigR2ToR3NavGraphConversionV2.py
@@ -38,11 +38,6 @@ from DerivationFrameworkPhys.TriggerListsHelper import TriggerListsHelper
triggerListsHelper = TriggerListsHelper(flags)
chains = triggerListsHelper.Run2TriggerNamesNoTau + triggerListsHelper.Run2TriggerNamesTau
-# these are cases to debug further
-#chains= ["HLT_g45_tight_L1EM22VHI_xe45noL1"]
-# chains=["HLT_e300_etcut"]
-# chains=["HLT_e28_lhtight_nod0_e15_etcut_L1EM7_Zee"]
-
from TrigNavTools.NavConverterConfig import NavConverterCfg
cfg.merge(NavConverterCfg(flags, chainsList=chains, runTheChecker=True))
@@ -58,7 +53,7 @@ cfg.merge(TileGMCfg(flags))
# cfg.getEventAlgo("TrigEDMChecker").doDumpTrigCompsiteNavigation=True
msg = cfg.getService('MessageSvc');
-msg.verboseLimit=0
+msg.verboseLimit=0 # this is option for verbose log
msg.debugLimit=0
msg.infoLimit=0
msg.warningLimit=0
diff --git a/Trigger/TrigEvent/TrigNavTools/src/NavigationTesterAlg.cxx b/Trigger/TrigEvent/TrigNavTools/src/NavigationTesterAlg.cxx
index 0e74c0bbb669df53a4f42c57cd40249529d32bec..a9fad01187b51903c200d97c2aefce6d67882c0e 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/NavigationTesterAlg.cxx
+++ b/Trigger/TrigEvent/TrigNavTools/src/NavigationTesterAlg.cxx
@@ -175,16 +175,54 @@ namespace Trig {
StatusCode NavigationTesterAlg::verifyCombinationsContent(const CombinationsSet& run2, const CombinationsSet& run3, const std::string& chain) const {
// compare combinations
- bool isSubset = std::includes(run3.begin(), run3.end(), run2.begin(), run2.end());
+
+ using xAODParticle = const xAOD::IParticle;
+
+ auto isSubsetPresent = [](const std::set<xAODParticle*>& subset, const CombinationsSet& run2) {
+ for (const auto& setInRun2 : run2) {
+ // Manual check for all particles in subset
+ bool allFound = true;
+ for (auto particle : subset) {
+ if (setInRun2.find(particle) == setInRun2.end()) {
+ allFound = false;
+ break; // If any particle is not found, no need to check further
+ }
+ }
+ if (allFound) return true; // Found all particles in this subset of Run2
+ }
+ return false; // Did not find the subset
+ };
+
+
+ auto isAnySubsetPresent = [&isSubsetPresent](const CombinationsSet& run3, const CombinationsSet& run2) {
+ for (const auto& subset : run3) {
+ if (isSubsetPresent(subset, run2)) {
+ return true; // At least one subset from Run3 is found in Run2
+ }
+ }
+ return false; // No subset from Run3 was found in Run2
+ };
+
+
+
+ bool result { false };
+ // hack for "HLT_e26_lhmedium_nod0_mu8noL1" case
+ if ( std::regex_match(chain, SpecialCases::specialEchain) ) {
+ result = isAnySubsetPresent(run3, run2);
+ } else {
+ // now subset checked on a level of objects, instead of group of objects
+ result = isAnySubsetPresent(run2, run3);
+ }
+
if (run2 != run3)
{
ATH_MSG_WARNING("Difference in combinations between Run2 and Run3 format for chain: " << chain << " parsed multiplicities " << ChainNameParser::multiplicities(chain));
ATH_MSG_WARNING("Run2 combs: " << run2);
ATH_MSG_WARNING("Run3 combs: " << run3);
}
- if (not isSubset)
+ if (not result) // previous not isSubset, loosened condition
{
- ATH_MSG_WARNING("NOT PASSED not isSubset failed, Run2 is not a subset of Run3 for chain: " << chain << " parsed multiplicities " << ChainNameParser::multiplicities(chain));
+ ATH_MSG_WARNING("NOT PASSED: failed, Run2 objects are not within a subset of Run3 objects for chain: " << chain << " parsed multiplicities " << ChainNameParser::multiplicities(chain));
ATH_MSG_WARNING("Run2 combs: " << run2);
ATH_MSG_WARNING("Run3 combs: " << run3);
if ( m_failOnDifference ) {
diff --git a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
index afef98d3fcff443a71d810156bb047af8341016f..945b7c644ef71cfbf54c00f82e5d6ef332e11920 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
+++ b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
@@ -475,6 +475,13 @@ StatusCode Run2ToRun3TrigNavConverterV2::extractTECtoChainMapping(TEIdToChainsMa
// we'll assign legs only to these TEs of the steps that have identical multiplicity pattern
// e.g. for the chain: HLT_2g25_loose_g20 the multiplicities are: [2, 1]
//
+
+ // hack for HLT.*tau.*xe.* case
+ if (std::regex_match(chainName, SpecialCases::tauXeChain)) {
+ if (multiplicities.size()==3) multiplicities={1,1};
+ else if (multiplicities.size()==2) multiplicities={1};
+ }
+
ATH_MSG_DEBUG("CHAIN " << chainName << " needs legs: " << multiplicities );
std::vector<unsigned int> teIdsLastHealthyStepIds;
@@ -495,7 +502,10 @@ StatusCode Run2ToRun3TrigNavConverterV2::extractTECtoChainMapping(TEIdToChainsMa
}
ATH_MSG_DEBUG("TE multiplicities seen in this step " << teCounts);
- if ( multiplicities == teCounts ) {
+ bool multiplicityCounts = multiplicities == teCounts;
+ // hack for HLT.*tau.*xe.* case
+ if(std::regex_match(chainName, SpecialCases::tauXeChain)) multiplicityCounts = true;
+ if ( multiplicityCounts ) {
teIdsLastHealthyStepIds = teIds;
ATH_MSG_DEBUG("There is a match, will assign chain leg IDs to TEs " << teCounts << " " << teIds);
for ( size_t legNumber = 0; legNumber < teIds.size(); ++ legNumber){
diff --git a/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h b/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
index a8447cf88f2b371e4a1d1d0b4a44f34453f7ccaf..61e80049737691ad495c6ccb9889674d77a5bd23 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
+++ b/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
@@ -10,5 +10,7 @@ namespace SpecialCases {
const std::regex egammaEtcut{".*etcut.*"};
const std::regex egammaCombinedWithEtcut{"HLT_(e|g).*_(e|g).*etcut.*"};
const std::regex isTopo{".*(Jpsi|Zee).*"};
+ const std::regex specialEchain{"HLT_e26_lhmedium_nod0_mu8noL1"};
+ const std::regex tauXeChain{"HLT.*tau.*xe.*"};
}
\ No newline at end of file
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/CMakeLists.txt b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/CMakeLists.txt
index 0e04fc15730a321646519d7dc917352860abdf70..9644a149d4d31190048c380fd6ff6930fdc8e89d 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/CMakeLists.txt
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( L1CaloFEXByteStream )
@@ -19,5 +19,4 @@ atlas_add_component( L1CaloFEXByteStream
LINK_LIBRARIES TrigT1ResultByteStreamLib xAODTrigger TrigConfData xAODTrigL1Calo PathResolver AthenaMonitoringKernelLib ${TDAQ-COMMON_LIBRARIES} )
# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-# atlas_install_data( data/* )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/python/L1CaloFEXByteStreamConfig.py b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/python/L1CaloFEXByteStreamConfig.py
index 59d898607b80b9b9440af0ecfd5f85fc9024ea15..d80d78b60e5eb23b7282610014dc151c2881c520 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/python/L1CaloFEXByteStreamConfig.py
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream/python/L1CaloFEXByteStreamConfig.py
@@ -1,5 +1,5 @@
#
-# 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 AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -258,7 +258,6 @@ def gFexInputByteStreamToolCfg(flags, name, *, writeBS=False):
tool = CompFactory.gFexInputByteStreamTool(name)
gfex_roi_moduleids = [0x3000]
tool.ROBIDs = [int(SourceIdentifier(SubDetector.TDAQ_CALO_FEAT_EXTRACT_DAQ, moduleid)) for moduleid in gfex_roi_moduleids]
- print ("[L1CaloFEXByteStreamConfig::gFexInputByteStreamToolCfg] tool.ROBIDs ", tool.ROBIDs)
if writeBS:
# write BS == read xAOD
diff --git a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py
index 4a51192d7e968bc5cdc736bad303d1b3486fbee6..fb86a899541f06b0a15ab3f261d672fe877c3e56 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring/python/L1TopoOnlineMonitoringConfig.py
@@ -1,11 +1,10 @@
-# 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 AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import CAtoGlobalWrapper
from AthenaConfiguration.Enums import Format
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
-from TrigConfIO.L1TriggerConfigAccess import L1MenuAccess
-from TrigConfigSvc.TrigConfigSvcCfg import getL1MenuFileName
+from TrigConfigSvc.TriggerConfigAccess import getL1MenuAccess
from libpyeformat_helper import SourceIdentifier, SubDetector
def getL1TopoOnlineMonitorHypo(flags):
@@ -23,8 +22,7 @@ def L1TopoOnlineMonitorHypoToolGen(chainDict):
def getL1TopoLabels(flags,connectors = {0: 'LegacyTopo0', 1: 'LegacyTopo1'}, bmax = 128):
topo_trigline_labels = ["" for i in range(bmax)]
- lvl1name = getL1MenuFileName(flags)
- lvl1access = L1MenuAccess(lvl1name)
+ lvl1access = getL1MenuAccess(flags)
for connector_id, connectorKey in connectors.items():
topo_triglines_dict = lvl1access.connector(connectorKey)['triggerlines']
if not isinstance(topo_triglines_dict, list):
@@ -50,8 +48,7 @@ def getL1TopoLabels(flags,connectors = {0: 'LegacyTopo0', 1: 'LegacyTopo1'}, bma
def getMultiplicityLabels(flags,topoModule):
topo_trigline_labels = ["" for i in range(128)]
- lvl1name = getL1MenuFileName(flags)
- lvl1access = L1MenuAccess(lvl1name)
+ lvl1access = getL1MenuAccess(flags)
topo_triglines_dict = lvl1access.connector(topoModule)['triggerlines']
for topo_trigline in topo_triglines_dict:
diff --git a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
index 72b4bec067d9a0d071c7d5a22c5af3d7dab2a637..441dedff838bf3ad596cdfd860bdd4a91f9233aa 100755
--- a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
+++ b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
'''
@@ -44,6 +44,9 @@ def get_parser():
parser.add_argument('--sizes',
action='store_true', default=False,
help='dump info about EDM sizes per result; implies --hltres')
+ parser.add_argument('--deserialize',
+ action='store_true', default=False,
+ help='deserialize EDM collections (slow!); implies --hltres')
parser.add_argument('--sizeSummary',
action='store_true', default=False,
help='dump summary info about EDM sizes at the end')
@@ -195,7 +198,7 @@ def hlt_rod_minor_version_from_event(event):
return hlt_rod_minor_version(rob)
-def hlt_result(event, print_sizes=False, conf_keys=False, runtime_metadata=False):
+def hlt_result(event, print_sizes=False, deserialize=False, conf_keys=False, runtime_metadata=False):
num_hlt_robs = 0
info_str = ""
for rob in event.children():
@@ -210,10 +213,10 @@ def hlt_result(event, print_sizes=False, conf_keys=False, runtime_metadata=False
rob.fragment_size_word()*4,
decode_status(rob)
)
- if print_sizes or conf_keys or runtime_metadata:
+ if print_sizes or deserialize or conf_keys or runtime_metadata:
if version[0] < 1:
raise RuntimeError('Cannot decode data from before Run 3, HLT ROD minor version needs to be >= 1.0')
- skip_payload = not conf_keys and not runtime_metadata
+ skip_payload = not conf_keys and not runtime_metadata and not deserialize
collections = hltResultMT.get_collections(rob, skip_payload=skip_payload)
if conf_keys:
conf_list = [c for c in collections if 'xAOD::TrigConfKeys_v' in c.name_persistent]
@@ -241,10 +244,19 @@ def hlt_result(event, print_sizes=False, conf_keys=False, runtime_metadata=False
meta.name_key, meta_obj.at(0))
if not meta_available:
info_str += '\n---- RuntimeMetadata unavailable in this ROB'
- if print_sizes:
+ if print_sizes or deserialize:
for coll in collections:
- indent = '----' if not coll.is_xAOD_decoration() else '------'
- info_str += '\n{:s} {:s}'.format(indent, str(coll))
+ indent = 4 if not coll.is_xAOD_decoration() else 6
+ info_str += '\n{:s} {:s}'.format('-'*indent, str(coll))
+ if deserialize and (coll_obj := coll.deserialise()) is not None:
+ try:
+ length = coll_obj.size() # all collections should have this method
+ except Exception:
+ length = None
+ if length is not None:
+ info_str += f' ({length} element' + ('s)' if length!=1 else ')')
+ info_str += '\n{:s} {:s}'.format(' '*indent, str(coll_obj))
+
info_str = 'Found {:d} HLT ROBs'.format(num_hlt_robs) + info_str
return info_str
@@ -339,8 +351,8 @@ def dump_info(bsfile, args):
print(stream_tags(event))
# HLT Result
- if args.efres or args.sizes or args.confKeys or args.runtimeMetadata:
- print(hlt_result(event, args.sizes, args.confKeys, args.runtimeMetadata))
+ if args.efres or args.sizes or args.deserialize or args.confKeys or args.runtimeMetadata:
+ print(hlt_result(event, args.sizes, args.deserialize, args.confKeys, args.runtimeMetadata))
# Size summary (after the loop over events)
if args.sizeSummary:
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index eb6012597e40e8724982124433873aa313782f37..e531f919f44522c9707489a134c84723e73f206f 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -5388,6 +5388,58 @@ HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
8: 2
9: 2
10: 2
+HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM26M:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ 5: 3
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ 10: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 7
+ 3: 3
+ 4: 3
+ 5: 3
+ 6: 1
+ 7: 2
+ 8: 2
+ 9: 2
+ 10: 2
+HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM26M:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 3
+ 2: 3
+ 3: 3
+ 4: 3
+ 5: 3
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ 10: 1
+ stepFeatures:
+ 0: 3
+ 1: 3
+ 2: 7
+ 3: 3
+ 4: 3
+ 5: 3
+ 6: 1
+ 7: 3
+ 8: 3
+ 9: 3
+ 10: 3
HLT_e26_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1eEM26M:
eventCount: 0
stepCounts:
@@ -6918,6 +6970,58 @@ HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
8: 2
9: 2
10: 2
+HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM28M:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ 10: 1
+ stepFeatures:
+ 0: 2
+ 1: 2
+ 2: 6
+ 3: 2
+ 4: 2
+ 5: 2
+ 6: 1
+ 7: 2
+ 8: 2
+ 9: 2
+ 10: 2
+HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM28M:
+ eventCount: 0
+ stepCounts:
+ 0: 2
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ 6: 1
+ 7: 1
+ 8: 1
+ 9: 1
+ 10: 1
+ stepFeatures:
+ 0: 2
+ 1: 2
+ 2: 6
+ 3: 2
+ 4: 2
+ 5: 2
+ 6: 1
+ 7: 3
+ 8: 3
+ 9: 3
+ 10: 3
HLT_e28_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1eEM28M:
eventCount: 0
stepCounts:
@@ -22679,6 +22783,94 @@ HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFC
6: 5
7: 5
8: 5
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 8
+ 6: 8
+ 7: 8
+ 8: 8
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 8
+ 6: 8
+ 7: 8
+ 8: 8
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
HLT_mu24_ivarmedium_tau25_perf_tracktwoMVA_probe_03dRAB_L1MU14FCH:
eventCount: 1
stepCounts:
@@ -24785,6 +24977,94 @@ HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFC
6: 5
7: 5
8: 5
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 8
+ 6: 8
+ 7: 8
+ 8: 8
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 8
+ 6: 8
+ 7: 8
+ 8: 8
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepCounts:
+ 0: 6
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 4
+ 6: 4
+ 7: 4
+ 8: 4
+ stepFeatures:
+ 0: 7
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ 5: 9
+ 6: 9
+ 7: 9
+ 8: 9
HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_probe_03dRAB_L1MU14FCH:
eventCount: 1
stepCounts:
@@ -29728,6 +30008,102 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
6: 51
7: 51
8: 3
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 14
+ 1: 1
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe90_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 14
+ 1: 2
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe75_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 13
+ 1: 1
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 14
+ 1: 1
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe90_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 4
+ 1: 2
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
+ stepFeatures:
+ 0: 14
+ 1: 2
+ 2: 5
+ 3: 5
+ 4: 5
+ 5: 5
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe75_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 13
+ 1: 1
+ 2: 2
+ 3: 2
+ 4: 2
+ 5: 2
? HLT_tau25_mediumRNN_tracktwoMVA_probe_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn177_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
: eventCount: 3
stepCounts:
@@ -30781,6 +31157,48 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
2: 56
3: 56
4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 1
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ 4: 1
+ stepFeatures:
+ 0: 53
+ 1: 53
+ 2: 53
+ 3: 53
+ 4: 8
HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 1
stepCounts:
@@ -31724,6 +32142,45 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
2: 51
3: 51
4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -31776,6 +32233,19 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
2: 51
3: 51
4: 5
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25:
+ eventCount: 0
+ stepCounts:
+ 0: 10
+ 1: 10
+ 2: 10
+ 3: 10
+ stepFeatures:
+ 0: 48
+ 1: 48
+ 2: 48
+ 3: 48
+ 4: 5
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
eventCount: 0
stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 6b166b450ea535608a76b48d1c83d9b5a220d844..011e684e6b013122c72b4db775a5b35752417ae3 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -2754,6 +2754,38 @@ HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
3: 1
4: 1
5: 1
+HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM26M:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM26M:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
HLT_e26_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1eEM26M:
eventCount: 0
stepCounts:
@@ -3758,6 +3790,38 @@ HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1e
3: 1
4: 1
5: 1
+HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM28M:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM28M:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ 4: 1
+ 5: 1
HLT_e28_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1TAU20IM_03dRAB_L1eEM28M:
eventCount: 0
stepCounts:
@@ -11798,6 +11862,22 @@ HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFC
eventCount: 0
stepFeatures:
0: 2
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
HLT_mu24_ivarmedium_tau25_perf_tracktwoMVA_probe_03dRAB_L1MU14FCH:
eventCount: 0
stepFeatures:
@@ -12412,6 +12492,22 @@ HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFC
eventCount: 0
stepFeatures:
0: 2
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
+HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH:
+ eventCount: 0
+ stepFeatures:
+ 0: 2
HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_probe_03dRAB_L1MU14FCH:
eventCount: 0
stepFeatures:
@@ -14869,6 +14965,30 @@ HLT_tau25_mediumRNN_tracktwoMVA_L1jTAU20:
: eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU12_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
: eventCount: 0
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe90_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe75_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe90_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
+HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe75_cell_xe100_pfopufit_L1jXE100:
+ eventCount: 0
+ stepFeatures:
+ 0: 1
? HLT_tau25_mediumRNN_tracktwoMVA_probe_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn177_pf_ftf_presel3c20XX1c20bg85_L1jJ85p0ETA21_3jJ40p0ETA25
: eventCount: 0
? HLT_tau25_mediumRNN_tracktwoMVA_probe_j65c_020jvt_j40c_020jvt_j25c_020jvt_j20c_020jvt_SHARED_j20c_020jvt_bgn285_pf_ftf_presel3c20XX1c20bgtwo85_L1jJ85p0ETA21_3jJ40p0ETA25
@@ -15295,6 +15415,42 @@ HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
1: 6
2: 6
3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -15798,6 +15954,42 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2
1: 6
2: 6
3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55:
eventCount: 0
stepCounts:
@@ -15836,6 +16028,18 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cT
1: 14
2: 14
3: 14
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ 2: 1
+ 3: 1
+ stepFeatures:
+ 0: 6
+ 1: 6
+ 2: 6
+ 3: 6
HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_4jJ30p0ETA25:
eventCount: 0
HLT_tau35_perf_tracktwoMVA_L1TAU20IM:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/PostExec.py b/Trigger/TriggerCommon/TriggerJobOpts/python/PostExec.py
index 4ed2481c63b251dc8cba8785ef4c9d6efb4b9183..cda13533a9821eee7d7fe1740681c3631e8cb4c2 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/PostExec.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/PostExec.py
@@ -54,7 +54,12 @@ def forceConditions(run, lb, iovDbSvc=None):
'/MUONALIGN/Onl/MDT/ENDCAP/SIDEA',
'/MUONALIGN/Onl/MDT/ENDCAP/SIDEC',
'/MUONALIGN/Onl/TGC/SIDEA',
- '/MUONALIGN/Onl/TGC/SIDEC']
+ '/MUONALIGN/Onl/TGC/SIDEC',
+ '/TRIGGER/L1Calo/V1/Calibration/EfexNoiseCuts',
+ '/TRIGGER/L1Calo/V1/Calibration/EfexEnergyCalib',
+ '/TRIGGER/L1Calo/V1/Calibration/JfexModuleSettings',
+ '/TRIGGER/L1Calo/V1/Calibration/JfexNoiseCuts',
+ '/TRIGGER/L1Calo/V1/Calibration/JfexSystemSettings']
from TrigCommon.AthHLT import get_sor_params
sor = get_sor_params(run)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 887e3cde8a0d8ff39c2ddcaa6ff66cf79f720f39..b128107cacba2f8129ca2ffe8231652eeb57bfb0 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -561,7 +561,7 @@ def triggerEDMGapFillerCfg( flags, edmSet, decObj=[], decObjHypoOut=[], extraInp
"xAOD::TrigCompositeContainer#HLT_RuntimeMetadata"]
acc = ComponentAccumulator()
- tool = CompFactory.HLTEDMCreator(f"GapFiller_{'' if edmSet==['BS'] else '_'+'_'.join(edmSet)}")
+ tool = CompFactory.HLTEDMCreator(f"GapFiller{'' if edmSet==['BS'] else '_'+'_'.join(edmSet)}")
alg = CompFactory.HLTEDMCreatorAlg("EDMCreatorAlg",
OutputTools = [tool])
alg.ExtraInputs = set(extraInputs)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/DictFromChainName.py
index 6daeb396136e1462b3454043f2b9dc2584a42680..acff5e1f270f3b31ce6e766e51eea083b31bf6fd 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/DictFromChainName.py
@@ -31,8 +31,7 @@ def getOverallL1item(flags, chainName):
assert '_L1' in chainName, 'ERROR IN CHAIN {}, missing L1 seed at the end i.e. _L1...' .format(chainName)
from TriggerMenuMT.HLT.Menu.L1Seeds import valid_multiseeds, getSpecificL1Seeds
- from TrigConfIO.L1TriggerConfigAccess import L1MenuAccess
- from TrigConfigSvc.TrigConfigSvcCfg import getL1MenuFileName
+ from TrigConfigSvc.TriggerConfigAccess import getL1MenuAccess
# this assumes that the last string of a chain name is the overall L1 item
cNameParts = chainName.rsplit("_L1",1)
@@ -45,8 +44,7 @@ def getOverallL1item(flags, chainName):
return 'L1_EM24VHI,L1_MU20'
if l1seed in valid_multiseeds:
# For these item seed specifications we need to derive the precise list of item names from the L1Menu.
- lvl1name = getL1MenuFileName(flags)
- lvl1access = L1MenuAccess(lvl1name)
+ lvl1access = getL1MenuAccess(flags)
itemsDict = lvl1access.items(includeKeys = ['name','ctpid','triggerType'])
l1seedlist = getSpecificL1Seeds(l1seed, itemsDict, flags.Trigger.triggerMenuSetup)
return l1seedlist
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaFactoriesCfg.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaFactoriesCfg.py
index e57b10f42754620c549692125fdd23c4ed5ce3a9..a27a36bc9dc1e51f16adfd65ac821e777ca7e0ba 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaFactoriesCfg.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaFactoriesCfg.py
@@ -6,7 +6,7 @@ from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
def TrigEgammaRecCfg(flags, name= "trigEgammaRec"):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
egammaRec = CompFactory.egammaRecBuilder( name = name,
InputClusterContainerName = TrigEgammaKeys.precisionCaloTopoCollection, # input,
egammaRecContainer = TrigEgammaKeys.precisionCaloEgammaRecCollection, # output,
@@ -20,7 +20,7 @@ def TrigEgammaRecCfg(flags, name= "trigEgammaRec"):
def TrigEgammaSuperClusterBuilderCfg(flags, name, calibrationType, superClusterCollectionName, superegammaRecCollectionName):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
from egammaTools.egammaSwToolConfig import egammaSwToolCfg
from egammaMVACalib.egammaMVACalibConfig import egammaMVASvcCfg
trigMVAfolder = flags.Trigger.egamma.Calib.precCaloMVAVersion
@@ -39,11 +39,10 @@ def TrigEgammaSuperClusterBuilderCfg(flags, name, calibrationType, superClusterC
def TrigCaloClustersInConeToolCfg(flags, ion):
acc = ComponentAccumulator()
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion =ion)
if ion:
- TrigEgammaKeys = getTrigEgammaKeys(ion =ion)
name = "TrigCaloClustersInConeToolHI"
else:
- TrigEgammaKeys = getTrigEgammaKeys()
name = "TrigCaloClustersInConeTool"
tool = CompFactory.xAOD.CaloClustersInConeTool(name = name,
CaloClusterLocation = TrigEgammaKeys.precisionTopoClusterContainer)
@@ -109,13 +108,12 @@ def TrigCaloIsolationToolCfg(flags):
def TrigPhotonIsoBuilderCfg(flags, ion = False):
acc = ComponentAccumulator()
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
if ion:
name = 'TrigPhotonIsolationBuilderHI'
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
TrigCaloIsolationTool = TrigCaloIsolationToolCfg_HI(flags)
else:
name = 'TrigPhotonIsolationBuilder'
- TrigEgammaKeys = getTrigEgammaKeys()
TrigCaloIsolationTool = TrigCaloIsolationToolCfg(flags)
from xAODPrimitives.xAODIso import xAODIso as isoPar
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaKeys.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaKeys.py
index 542ec8d36578134c4f6f982fa0048e91e2e932c5..e3d65d203bf9489c6372e449d9a61cb1016361e5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaKeys.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaKeys.py
@@ -10,13 +10,12 @@ __all__ = [ "getTrigEgammaKeys" ]
from TrigEDMConfig.TriggerEDM import recordable
-from AthenaConfiguration.AllConfigFlags import initConfigFlags
-
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
class TrigEgammaKeysBase(object):
"""Base clas to configure TrigEgamma Container names. Containers will be record, collections not"""
- def __init__(self, ion=False):
+ def __init__(self, flags: AthConfigFlags, ion=False):
"""Static class to collect all string manipulation in fast electron sequences """
@@ -56,7 +55,7 @@ class TrigEgammaKeysBase(object):
#
self.TrigTRTHTCountsContainer = recordable("HLT_TrigTRTHTCounts")
self.egEventShape = recordable('HLT_HIEventShapeEG')
- self._flags = initConfigFlags()
+ self._flags = flags
@@ -72,8 +71,8 @@ class TrigEgammaKeysBase(object):
class TrigEgammaKeys_LRT(TrigEgammaKeysBase):
# This class contians modified base configuration class for LRT electron trigger chains
- def __init__(self,ion):
- TrigEgammaKeysBase.__init__(self,ion)
+ def __init__(self, flags: AthConfigFlags, ion):
+ TrigEgammaKeysBase.__init__(self, flags, ion)
self.fastTrackingRoIContainer = recordable("HLT_Roi_FastElectron_LRT")
self.fastElectronContainer = recordable('HLT_FastElectrons_LRT')
@@ -93,8 +92,8 @@ class TrigEgammaKeys_LRT(TrigEgammaKeysBase):
class TrigEgammaKeys_GSF(TrigEgammaKeysBase):
# This class contians modified base configuration class for GSF electron trigger chains
- def __init__(self, ion):
- TrigEgammaKeysBase.__init__(self, ion)
+ def __init__(self, flags: AthConfigFlags, ion):
+ TrigEgammaKeysBase.__init__(self, flags, ion)
self.precisionElectronEMClusterContainer = recordable('HLT_TrigEMClusters_Electrons_GSF')
# from HLT_IDTrack_Electron to HLT_IDTrack_Electron by refit alg
@@ -112,8 +111,8 @@ class TrigEgammaKeys_GSF(TrigEgammaKeysBase):
class TrigEgammaKeys_LRTGSF(TrigEgammaKeysBase):
# This class contians modified base configuration class for LRT_GSF electron trigger chains
- def __init__(self, ion):
- TrigEgammaKeysBase.__init__(self, ion)
+ def __init__(self, flags: AthConfigFlags, ion):
+ TrigEgammaKeysBase.__init__(self, flags, ion)
self.precisionElectronEMClusterContainer = recordable('HLT_TrigEMClusters_Electrons_LRTGSF')
# from HLT_IDTrack_Electron to HLT_IDTrack_Electron by refit alg
@@ -133,15 +132,18 @@ class TrigEgammaKeys_LRTGSF(TrigEgammaKeysBase):
#
# Get keys from variant name
#
-def getTrigEgammaKeys(name='', ion=False):
+from AthenaConfiguration.AccumulatorCache import AccumulatorCache
+
+@AccumulatorCache
+def getTrigEgammaKeys(flags: AthConfigFlags, name='', ion=False):
_d = {
# Dictionary that maps a string to a configuration setting for electron and photon chains
- '' : TrigEgammaKeysBase(ion),
- '_noGSF' : TrigEgammaKeysBase(ion),
- '_LRT' : TrigEgammaKeys_LRT(ion),
- '_GSF' : TrigEgammaKeys_GSF(ion),
- '_LRTGSF' : TrigEgammaKeys_LRTGSF(ion),
+ '' : TrigEgammaKeysBase(flags, ion),
+ '_noGSF' : TrigEgammaKeysBase(flags, ion),
+ '_LRT' : TrigEgammaKeys_LRT(flags, ion),
+ '_GSF' : TrigEgammaKeys_GSF(flags, ion),
+ '_LRTGSF' : TrigEgammaKeys_LRTGSF(flags, ion),
}
if name in _d.keys():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
index 6a820ea88c17845e0bdccabc48cb4a21dad8bf72..9745f869b9586bf9219a8b11d00599c3cdf72d17 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronMenuSequences.py
@@ -28,7 +28,7 @@ def fastElectronSequenceGenCfg(flags, name='FastElectron', variant='', is_probe_
reco.mergeReco(fastElectronRecoSequence(flags, name, InViewRoIs, variant))
theFastElectronHypo = CompFactory.TrigEgammaFastElectronHypoAlg("TrigEgammaFastElectronHypoAlg"+variant)
- TrigEgammaKeys = getTrigEgammaKeys(variant)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant)
theFastElectronHypo.Electrons = TrigEgammaKeys.fastElectronContainer
theFastElectronHypo.RunInView = True
from TrigEgammaHypo.TrigEgammaFastElectronHypoTool import TrigEgammaFastElectronHypoToolFromDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronRecoSequences.py
index 8fbef0970ecdc37a07d0a6f259cf38fdaa1d6da2..60a71b3f31cf21c0505229fa5c477472307acd62 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastElectronRecoSequences.py
@@ -14,7 +14,7 @@ def fastElectronRecoSequence(flags, name, RoIs, variant=''):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(variant)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant)
trackParticlesName = TrigEgammaKeys.fastTrackParticleContainer
# A simple algorithm to confirm that data has been inherited from parent view
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
index 8b9ff0268906717ed666e776cea3cb7fb7e89129..050907e997b603c7df26fab1694a37643f510e6d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/FastTrackingMenuSequences.py
@@ -12,7 +12,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
def fastTrackingSequenceGenCfg(flags, variant='', is_probe_leg = False):
""" second step: tracking....."""
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(variant)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant)
inViewRoIs = "EMIDRoIs"+variant
# calling the fastTracking Reco algo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
index 69cc3ba9c3aa3db4e5c385837a6fc6638c8959d2..3383b1ace42ef26210c553f6633cc7be66909471 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloMenuSequences.py
@@ -14,7 +14,7 @@ def tag(ion):
@AccumulatorCache
def precisionCaloSequenceGenCfg(flags, ion=False, is_probe_leg=False, variant=''):
""" Creates PrecisionCalo sequence """
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
hiInfo = 'HI' if ion else ''
# EV creator
InViewRoIs="PrecisionCaloRoIs"+ variant
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloRecoSequences.py
index e83eff96feb10597dad09b3b043bee2a54afb9e1..81935826d8b950c95d6e2821a2096ef187dc81b4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionCaloRecoSequences.py
@@ -11,9 +11,9 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
log = logging.getLogger(__name__)
-def precisionCaloElectronVDVCfg(name, InViewRoIs, ion=False, variant=''):
+def precisionCaloElectronVDVCfg(flags, name, InViewRoIs, ion=False, variant=''):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
dataObjects= [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+%s'%InViewRoIs ),
( 'CaloBCIDAverage' , 'StoreGateSvc+CaloBCIDAverage' ),
@@ -31,12 +31,12 @@ def precisionCaloElectronVDVCfg(name, InViewRoIs, ion=False, variant=''):
def precisionCaloRecoSequence(flags, RoIs, name = None, ion=False, variant=''):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion = ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion = ion)
log.debug('flags = %s',flags)
log.debug('RoIs = %s',RoIs)
- acc.merge(precisionCaloElectronVDVCfg(name+'VDV'+variant,RoIs,ion,variant=variant))
+ acc.merge(precisionCaloElectronVDVCfg(flags, name+'VDV'+variant,RoIs,ion,variant=variant))
from TrigCaloRec.TrigCaloRecConfig import egammaTopoClusteringCfg, egammaTopoClusteringCfg_LRT, hltCaloTopoClusteringHICfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
index 586e4618a9ae952d145a9d07765e6cc70b88f37b..03d6ddd83b2476689f6215071a9097e815958e20 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences.py
@@ -24,7 +24,7 @@ def precisionElectronSequenceGenCfg(flags, ion=False, variant='',is_probe_leg =
# Configure the reconstruction algorithm sequence
from TriggerMenuMT.HLT.Electron.PrecisionElectronRecoSequences import precisionElectronRecoSequence
reco.mergeReco(precisionElectronRecoSequence(flags, inViewRoIs, ion, doGSF=False, doLRT = 'LRT' in variant))
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
selAcc = SelectionCA('PrecisionElectronMenuSequence'+variant,isProbe=is_probe_leg)
from TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool import TrigEgammaPrecisionElectronHypoToolFromDict, TrigEgammaPrecisionElectronHypoAlgCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
index 5ec7971c2e68d4dcff7b70a3b9974a813b0f95da..d9b80b10b29eb3545cb83f7cc2ed5eba87c7b7cc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronMenuSequences_GSF.py
@@ -25,7 +25,7 @@ def precisionElectron_GSFSequenceGenCfg(flags, ion=False, variant='_GSF', is_pro
# Configure the reconstruction algorithm sequence
from TriggerMenuMT.HLT.Electron.PrecisionElectronRecoSequences import precisionElectronRecoSequence
reco.mergeReco(precisionElectronRecoSequence(flags, inViewRoIs, ion, doGSF='GSF' in variant, doLRT = 'LRT' in variant))
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
selAcc = SelectionCA('PrecisionElectronMenuSequence'+variant,isProbe=is_probe_leg)
from TrigEgammaHypo.TrigEgammaPrecisionElectronHypoTool import TrigEgammaPrecisionElectronHypoToolFromDict, TrigEgammaPrecisionElectronHypoAlgCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
index f41252264ead5f0e6ae05856f413402e4f390c92..1186b17cb62d4dd7d5d28360104ac2c8b89e5401 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
@@ -41,13 +41,13 @@ def precisionElectronRecoSequence(flags, RoIs, ion=False, doGSF=True, doLRT=Fals
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
# makes datakeys based on LRT, GSF, noGSF, LRTGSF
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
# taking care of VDV before GSF related data comes in
if doLRT:
- TrigEgammaKeys_noGSF = getTrigEgammaKeys('_LRT')
+ TrigEgammaKeys_noGSF = getTrigEgammaKeys(flags, '_LRT')
else:
- TrigEgammaKeys_noGSF = getTrigEgammaKeys()
+ TrigEgammaKeys_noGSF = getTrigEgammaKeys(flags)
# following reduces if-else checking for later implementations
if doGSF:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.py
index c770b749f42dc30c3a8713d1362169375067d77f..cfd489f4fda1fe7d5b3b77126499e3b2297b32f6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionTracks_GSFRefittedSequence.py
@@ -20,7 +20,7 @@ def precisionTracks_GSFRefitted(flags, RoIs, ion=False, variant=''):
tag+=variant
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(variant, ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, variant, ion=ion)
precisionGsfVDV = CompFactory.AthViews.ViewDataVerifier("PrecisionTrackViewDataVerifier_forGSFRefit"+tag+'VDV')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
index b39bb3adfc0b82f6dce6b432797c0206f5ed91df..a57c80f3a9ad45302f44d7442c127dacd5d9babf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/HeavyIon/HeavyIonMenuSequences.py
@@ -23,7 +23,7 @@ def egammaFSHIEventShapeMakerCfg(flags):
InputCellKey=cellMakerAcc.getPrimary().CellsName,
NaviTowerKey="",
InputTowerKey="",
- OutputContainerKey=getTrigEgammaKeys(ion=True).egEventShape)
+ OutputContainerKey=getTrigEgammaKeys(flags, ion=True).egEventShape)
acc.addEventAlgo(eventShapeMakerAlg)
return acc
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
index 7efb131f69c9eec9a0f30a49644106824bb5f093..08abed553e369b67359979bd9e78c71059499c0e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
@@ -1045,7 +1045,6 @@ def getDevSignatures():
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1TAU20IM_2TAU12IM_4J12p0ETA25', l1SeedThresholds=['TAU20IM','TAU12IM']+2*['FSNOSEED'], stream=['VBFDelayed'], groups=DevGroup+TauBJetGroup),
ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_4j20c_020jvt_SHARED_j20c_020jvt_bgn185_pf_ftf_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55', l1SeedThresholds=['cTAU30M','cTAU20M']+2*['FSNOSEED'], stream=['VBFDelayed'], groups=DevGroup+TauBJetGroup+Topo2Group),
-
# b+τ test chains for HH→bbττ
# this is a scan in
# τ pₜ: [ 20 , 25 , 35 ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
index 0b08c8ab5461aea7b43a8ff15c1b56b03bad35f3..e4d023e1c4927c361ad62b0fc8e1e48334ccf355 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
@@ -295,6 +295,30 @@ def getMCSignatures():
]
chains['Bjet'] = [
+
+ ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
+ ChainProp(name="HLT_j280_0eta290_020jvt_bgn177_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j340_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj190_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
+ ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj200_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
+ ChainProp(name="HLT_j210_0eta290_020jvt_bgn160_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j255_0eta290_020jvt_bgn170_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j280_0eta290_020jvt_bgn170_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j340_0eta290_020jvt_bgn177_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
+ ChainProp(name="HLT_j165_0eta290_020jvt_bgn160_j55_0eta290_020jvt_bgn160_pf_ftf_preselj140b85XXj45b85_L1J100", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=PrimaryLegGroup+MultiBjetGroup),
+ ChainProp(name="HLT_j225_0eta290_020jvt_bgn177_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
+ ChainProp(name='HLT_j275_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
+ ChainProp(name='HLT_j300_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
+ ChainProp(name='HLT_j30_0eta290_020jvt_boffperf_pf_ftf_L1J20', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J20'], monGroups=['bJetMon:t0','idMon:t0']),
+ ChainProp(name='HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1J20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J20'], monGroups=['bJetMon:shifter','idMon:shifter']),
+ ChainProp(name='HLT_j60_0eta290_020jvt_boffperf_pf_ftf_L1J50', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
+ ChainProp(name='HLT_j80_0eta290_020jvt_boffperf_pf_ftf_L1J50', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
+ ChainProp(name='HLT_j100_0eta290_020jvt_boffperf_pf_ftf_preselj80_L1J50', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
+ ChainProp(name='HLT_j150_0eta290_020jvt_boffperf_pf_ftf_preselj120_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:t0','idMon:t0']),
+ ChainProp(name='HLT_j200_0eta290_020jvt_boffperf_pf_ftf_preselj140_L1J100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:shifter']),
+ ChainProp(name='HLT_j300_0eta290_020jvt_boffperf_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:t0','idMon:shifter']),
+
+
# B-tagger training
ChainProp(name='HLT_j20_0eta290_020jvt_boffperf_pf_ftf_L1J15', l1SeedThresholds=['FSNOSEED'], groups=SingleBjetGroup+SupportLegGroup, monGroups=['bJetMon:online']),
ChainProp(name='HLT_j20_0eta290_020jvt_boffperf_pf_ftf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], groups=SingleBjetGroup+SupportLegGroup, monGroups=['bJetMon:online']),
@@ -760,6 +784,17 @@ def getMCSignatures():
ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
ChainProp(name="HLT_tau30_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
ChainProp(name="HLT_tau30_idperf_tracktwoMVA_tau20_idperf_tracktwoMVA_03dRAB30_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup+LegacyTopoGroup),
+
+
+ #ATR-29439
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau30_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB_L1cTAU30M_2cTAU20M_3jJ30p0ETA25' , l1SeedThresholds=['cTAU30M','cTAU20M'], stream=['VBFDelayed'], groups=SupportPhIGroup+MultiTauGroup),
+
]
chains['Calib'] = [
@@ -813,6 +848,13 @@ def getMCSignatures():
]
chains['Combined'] += [
+ # ATR-29443
+ ChainProp(name="HLT_j95_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_tcpufit_L1XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
+ ChainProp(name="HLT_j95_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_pfopufit_L1XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
+ ChainProp(name='HLT_mu10_j225_0eta290_020jvt_boffperf_pf_ftf_preselj180_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
+ ChainProp(name='HLT_mu10_j300_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
+ ChainProp(name='HLT_mu10_j360_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
+
# Primary e+mu
ChainProp(name='HLT_e7_lhmedium_mu24_L1MU14FCH',l1SeedThresholds=['EM3','MU14FCH'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
ChainProp(name='HLT_e7_lhmedium_mu24_L1MU18VFCH',l1SeedThresholds=['EM3','MU18VFCH'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
index 039a0d3934fa0bd631745673d88269579c709912..972979cd50b8261801c210f78e325a999741951c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
@@ -1467,25 +1467,6 @@ def setupMenu(menu_name):
chains['Bjet'] += [
# Legacy L1Calo primaries with gn1
# Single b-jet
- ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
- ChainProp(name="HLT_j280_0eta290_020jvt_bgn177_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- ChainProp(name="HLT_j340_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- # Backup
- ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj190_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
- ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj200_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
- ChainProp(name="HLT_j210_0eta290_020jvt_bgn160_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- ChainProp(name="HLT_j255_0eta290_020jvt_bgn170_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- ChainProp(name="HLT_j280_0eta290_020jvt_bgn170_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- ChainProp(name="HLT_j340_0eta290_020jvt_bgn177_pf_ftf_preselj225_L1J100", l1SeedThresholds=['FSNOSEED'], groups=PrimaryLegGroup+SingleBjetGroup),
- # Looser b-tagging
- ChainProp(name="HLT_j225_0eta290_020jvt_bgn177_pf_ftf_preselj180_L1J100", l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
- ChainProp(name='HLT_j275_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
- ChainProp(name='HLT_j300_0eta290_020jvt_bgn185_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
-
- # Asymmetric 2b
- ChainProp(name="HLT_j165_0eta290_020jvt_bgn160_j55_0eta290_020jvt_bgn160_pf_ftf_preselj140b85XXj45b85_L1J100", l1SeedThresholds=['FSNOSEED','FSNOSEED'], groups=PrimaryLegGroup+MultiBjetGroup),
- # Run 2 HH4b low-threshold chain
-
# HH4b primaries
# Muon+jet legacy seeded, backup for L1Topo muon-in-jet
@@ -1498,16 +1479,6 @@ def setupMenu(menu_name):
# Support chain
ChainProp(name='HLT_5j35c_020jvt_j25c_020jvt_SHARED_j25c_020jvt_boffperf_pf_ftf_presel6c25_L14jJ40', l1SeedThresholds=['FSNOSEED']*3, stream=['VBFDelayed'], groups=SupportPhIGroup+MultiBjetGroup),
- # Low-threshold support
- ChainProp(name='HLT_j30_0eta290_020jvt_boffperf_pf_ftf_L1J20', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J20'], monGroups=['bJetMon:t0','idMon:t0']),
- ChainProp(name='HLT_j45_0eta290_020jvt_boffperf_pf_ftf_L1J20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J20'], monGroups=['bJetMon:shifter','idMon:shifter']),
- ChainProp(name='HLT_j60_0eta290_020jvt_boffperf_pf_ftf_L1J50', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
- ChainProp(name='HLT_j80_0eta290_020jvt_boffperf_pf_ftf_L1J50', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
- ChainProp(name='HLT_j100_0eta290_020jvt_boffperf_pf_ftf_preselj80_L1J50', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J50'], monGroups=['bJetMon:t0','idMon:t0']),
- ChainProp(name='HLT_j150_0eta290_020jvt_boffperf_pf_ftf_preselj120_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:t0','idMon:t0']),
- ChainProp(name='HLT_j200_0eta290_020jvt_boffperf_pf_ftf_preselj140_L1J100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:shifter']),
- ChainProp(name='HLT_j300_0eta290_020jvt_boffperf_pf_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream,'express'], groups=SupportLegGroup+SingleBjetGroup+['RATE:CPS_J100'], monGroups=['bJetMon:t0','idMon:shifter']),
-
# Phase I inputs GN1
# Single b-jet
ChainProp(name="HLT_j210_0eta290_020jvt_bgn170_pf_ftf_preselj180_L1jJ160", l1SeedThresholds=['FSNOSEED'], groups=PrimaryPhIGroup+SingleBjetGroup, monGroups=['bJetMon:online']),
@@ -1651,7 +1622,7 @@ def setupMenu(menu_name):
ChainProp(name='HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRAB30_L1eTAU80_2cTAU30M_DR-eTAU30eTAU20', stream=[PhysicsStream,'express'], l1SeedThresholds=['eTAU80','cTAU30M'], groups=PrimaryPhIGroup+MultiTauGroup+Topo2Group, monGroups=['tauMon:online','tauMon:shifter']),
ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55', l1SeedThresholds=['cTAU30M','cTAU20M'], stream=[PhysicsStream,'express'], groups=PrimaryPhIGroup+MultiTauGroup+Topo2Group, monGroups=['tauMon:online','tauMon:shifter']),
- ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M-jJ55', l1SeedThresholds=['cTAU30M','cTAU20M'], groups=SupportPhIGroup+MultiTauGroup+Topo2Group, monGroups=['tauMon:t0']), # Backup item with dR between isolated eTAU
+ ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRAB30_L1cTAU30M_2cTAU20M_DR-eTAU30MeTAU20M-jJ55', l1SeedThresholds=['cTAU30M','cTAU20M'], groups=PrimaryPhIGroup+MultiTauGroup+Topo2Group, monGroups=['tauMon:t0']), # Backup item with dR between isolated eTAU
### New Boosted Di Tau chain
ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_03dRAB10_L1cTAU20M_DR-eTAU20eTAU12-jJ40', l1SeedThresholds=['cTAU20M','eTAU12'], groups=MultiTauGroup+SupportPhIGroup+Topo2Group),
@@ -2185,7 +2156,6 @@ def setupMenu(menu_name):
# tau + electron triggers
ChainProp(name='HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','eTAU12'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaTauGroup),
ChainProp(name='HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1eEM18M_2eTAU20M_4jJ30', l1SeedThresholds=['eEM18M','eTAU20M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaTauGroup),
- #ChainProp(name='HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1eEM18M_2eTAU20_4jJ30', l1SeedThresholds=['eEM18M','eTAU20'], stream=[PhysicsStream], groups=SupportPhIGroup+EgammaTauGroup), ERROR [checkL1HLTConsistency] chain HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1eEM18M_2eTAU20_4jJ30: L1item: L1_eEM18M_2eTAU20_4jJ30, not found in the items list of the L1Menu L1Menu_Dev_pp_run3_v1_22.0.58.json
# ATR-27373
ChainProp(name='HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','eTAU12'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaTauGroup),
@@ -2234,11 +2204,11 @@ def setupMenu(menu_name):
ChainProp(name='HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoMVA_probe_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBETAU40'], stream=['Main'], groups=TagAndProbeLegGroup+SingleMuonGroup),
ChainProp(name='HLT_mu24_ivarmedium_tau60_mediumRNN_tracktwoLLP_probe_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBETAU40'], stream=['Main'], groups=TagAndProbeLegGroup+SingleMuonGroup),
-
-
# Phase-I tau+X chains with muon L1
ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['idMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
@@ -2254,6 +2224,8 @@ def setupMenu(menu_name):
# ATR-25512
ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau25_idperf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['idMon:t0']),
ChainProp(name='HLT_mu26_ivarmedium_tau25_perf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
ChainProp(name='HLT_mu26_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
@@ -2268,6 +2240,8 @@ def setupMenu(menu_name):
ChainProp(name='HLT_mu26_ivarmedium_tau180_mediumRNN_tracktwoLLP_probe_L1eTAU140_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU140'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
# ATR-27343
ChainProp(name='HLT_mu24_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu24_ivarmedium_tau25_idperf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['idMon:t0']),
ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu24_ivarmedium_tau25_perf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
@@ -2282,6 +2256,8 @@ def setupMenu(menu_name):
# ATR-25512
ChainProp(name='HLT_mu24_ivarmedium_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_mu24_ivarmedium_tau25_idperf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['idMon:t0']),
ChainProp(name='HLT_mu24_ivarmedium_tau25_perf_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
ChainProp(name='HLT_mu24_ivarmedium_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup, monGroups=['tauMon:t0']),
@@ -2316,6 +2292,8 @@ def setupMenu(menu_name):
# Phase-I tau+X chains with elec L1
ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_e26_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_e26_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEcTAU30M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
@@ -2330,6 +2308,8 @@ def setupMenu(menu_name):
#
ChainProp(name='HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1eTAU12_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEeTAU12'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
ChainProp(name='HLT_e28_lhtight_ivarloose_tau20_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
+ ChainProp(name='HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEeTAU20'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
+ ChainProp(name='HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEeTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_e28_lhtight_ivarloose_tau25_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup, monGroups=['tauMon:t0']),
ChainProp(name='HLT_e28_lhtight_ivarloose_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU20M_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEcTAU20M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
ChainProp(name='HLT_e28_lhtight_ivarloose_tau35_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1eEM28M', l1SeedThresholds=['eEM28M','PROBEcTAU30M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleElectronGroup),
@@ -2343,6 +2323,8 @@ def setupMenu(menu_name):
# MET + tau tag and probe chains (ATR-23507)
ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU12','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU30M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU35M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
@@ -2354,6 +2336,8 @@ def setupMenu(menu_name):
ChainProp(name='HLT_tau180_mediumRNN_tracktwoLLP_probe_xe65_cell_xe90_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU140','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
# ATR-25512
ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU12','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU30M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_probe_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU35M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
@@ -2365,6 +2349,8 @@ def setupMenu(menu_name):
ChainProp(name='HLT_tau180_mediumRNN_tracktwoLLP_probe_xe65_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU140','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
# ATR-25512 another higher HLT threshold
ChainProp(name='HLT_tau20_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU12','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
+ ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_L1eTAU20M_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEeTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau25_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU20M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau35_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU30M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
ChainProp(name='HLT_tau40_mediumRNN_tracktwoMVA_probe_xe75_cell_xe100_pfopufit_L1jXE100', l1SeedThresholds=['PROBEcTAU35M','FSNOSEED','FSNOSEED'], groups=TagAndProbePhIGroup+TauMETGroup),
@@ -2665,10 +2651,6 @@ def setupMenu(menu_name):
# Muon-in-jet
ChainProp(name='HLT_mu4_j20_0eta290_020jvt_boffperf_pf_ftf_dRAB03_L1MU3V_J15', l1SeedThresholds=['MU3V','FSNOSEED'], groups=SupportLegGroup+SingleBjetGroup),
# ATR-26032
- ChainProp(name='HLT_mu10_j225_0eta290_020jvt_boffperf_pf_ftf_preselj180_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
- ChainProp(name='HLT_mu10_j300_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
- ChainProp(name='HLT_mu10_j360_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1J100', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportLegGroup+SingleBjetGroup),
- #
ChainProp(name='HLT_mu10_j225_0eta290_020jvt_boffperf_pf_ftf_preselj180_dRAB04_L1jJ160', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportPhIGroup+SingleBjetGroup),
ChainProp(name='HLT_mu10_j300_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1jJ160', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportPhIGroup+SingleBjetGroup),
ChainProp(name='HLT_mu10_j360_0eta290_020jvt_boffperf_pf_ftf_preselj225_dRAB04_L1jJ160', l1SeedThresholds=['MU8F','FSNOSEED'], stream=[PhysicsStream], groups=SupportPhIGroup+SingleBjetGroup),
@@ -2846,10 +2828,8 @@ def setupMenu(menu_name):
ChainProp(name='HLT_xe80_tcpufit_dedxtrk50_medium_L1gXEJWOJ100', groups=PrimaryPhIGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
# [ATR-25500] Switch to dl1d for bjet+met+met triggers, and now to GN1
- ChainProp(name="HLT_j95_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_tcpufit_L1XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
ChainProp(name="HLT_2j45_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_tcpufit_L12jJ40_jXE110", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+BjetMETGroup),
ChainProp(name="HLT_3j35_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe70_tcpufit_L13jJ40p0ETA25_jXE80", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+BjetMETGroup),
- ChainProp(name="HLT_j95_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_pfopufit_L1XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
ChainProp(name="HLT_2j45_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe85_pfopufit_L12jJ40_jXE110", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+BjetMETGroup),
ChainProp(name="HLT_3j35_0eta290_020jvt_bgn160_pf_ftf_xe50_cell_xe70_pfopufit_L13jJ40p0ETA25_jXE80", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+BjetMETGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
index d076de58948612292f4b51ceaa51af1d27f39d2e..22bf8bd0ea1e7442225bdc378d06105b0a61dd30 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonMenuSequences.py
@@ -10,7 +10,7 @@ from AthenaConfiguration.AccumulatorCache import AccumulatorCache
def fastPhotonSequenceGenCfg(flags,is_probe_leg=False):
"""Creates secpond step photon sequence"""
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
InViewRoIs = "EMIDRoIs"
# Spawn View on SuperRoI encompassing all clusters found within the L1 RoI
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonRecoSequences.py
index 339df8920e92ec35545be6b545ff5af6fced5934..efe2b527d69d4cf7204719936c5e86356d5ac7a2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/FastPhotonRecoSequences.py
@@ -26,7 +26,7 @@ def fastPhotonRecoSequence(flags, RoIs, name = None):
acc.merge(fastPhotonVDVCfg(name+'VDV',RoIs))
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
thePhotonFex = CompFactory.TrigEgammaFastPhotonReAlgo("EgammaFastPhotonFex_1")
thePhotonFex.TrigEMClusterName = CaloMenuDefs.L2CaloClusters # From commom staff
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
index 3a5369317339c5d7bcbe75816b5e37ff038eff13..ccbe06acd825ce45f1783c7e312f95c6fc0f5347 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/HipTRTMenuSequences.py
@@ -13,7 +13,7 @@ def TRTHitGeneratorSequenceGenCfg(flags, is_probe_leg = False):
recAcc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
""" hipTRT step ....."""
inViewRoIs = "TRTHitGenerator"
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
index 299fcfe2a5a467040e1e241dd254327510c98aa6..1308bf780be6eaccc98c071502613d3d8901e7d1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloMenuSequences.py
@@ -14,7 +14,7 @@ def tag(ion):
@AccumulatorCache
def precisionCaloSequenceGenCfg(flags, ion=False, is_probe_leg=False):
""" Creates PrecisionCalo sequence """
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
hiInfo = 'HI' if ion else ''
# EV creator
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloRecoSequences.py
index ae677de48f24e56a7bcf2e5248a1a0cf4f95247c..739efeb3e44ef0395b1da437093e99bcbca38e24 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionCaloRecoSequences.py
@@ -11,9 +11,9 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
log = logging.getLogger(__name__)
-def precisionCaloPhotonVDVCfg(name, InViewRoIs, ion=False):
+def precisionCaloPhotonVDVCfg(flags, name, InViewRoIs, ion=False):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
dataObjects= [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+%s'%InViewRoIs ),
( 'CaloBCIDAverage' , 'StoreGateSvc+CaloBCIDAverage' ),
( 'SG::AuxElement' , 'StoreGateSvc+EventInfo.averageInteractionsPerCrossing' )]
@@ -31,11 +31,11 @@ def precisionCaloRecoSequence(flags, RoIs, name = None, ion=False):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(ion = ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion = ion)
log.debug('flags = %s',flags)
log.debug('RoIs = %s',RoIs)
- acc.merge(precisionCaloPhotonVDVCfg(name+'VDV',RoIs,ion))
+ acc.merge(precisionCaloPhotonVDVCfg(flags,name+'VDV',RoIs,ion))
from TrigCaloRec.TrigCaloRecConfig import egammaTopoClusteringCfg, hltCaloTopoClusteringHICfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
index cc5388c53108aba780b06f23c104cfa8218bf52d..6537dc16bd770df4b34f91b16b56a9fe8980c3dd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoMenuSequences.py
@@ -18,7 +18,7 @@ def precisionPhotonCaloIsoSequenceGenCfg(flags, name, ion=False, is_probe_leg=Fa
InViewRoIs = "PrecisionPhotonCaloIsoRoIs"
hiInfo = 'HI' if ion is True else ''
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
roiTool = CompFactory.ViewCreatorPreviousROITool()
recoAcc = InViewRecoCA(tag(ion),InViewRoIs=InViewRoIs, RoITool = roiTool, RequireParentView = True, isProbe=is_probe_leg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
index 92c46b824ec3416b5f8125b362eab5fa024d324a..5875ecfc9f74fc40e9a20fd89813234cde2f10f3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
@@ -7,9 +7,9 @@ from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
from AthenaCommon.Logging import logging
log = logging.getLogger(__name__)
-def precisionPhotonCaloIsoVDVCfg(name, InViewRoIs, ion=False):
+def precisionPhotonCaloIsoVDVCfg(flags, name, InViewRoIs, ion=False):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
caloClusters = TrigEgammaKeys.precisionPhotonCaloClusterContainer
dataObjects = [( 'xAOD::CaloClusterContainer' , 'StoreGateSvc+%s' % caloClusters ),
( 'xAOD::CaloClusterContainer' , 'StoreGateSvc+%s' % TrigEgammaKeys.precisionTopoClusterContainer), # this is for the calo isolation tool
@@ -38,7 +38,7 @@ def precisionPhotonCaloIsoRecoSequence(flags, RoIs, name = None, ion=False):
log.debug('retrieve(precisionPhotonCaloIsoRecoSequence,None,RoIs = %s)',RoIs)
- acc.merge(precisionPhotonCaloIsoVDVCfg(name+'VDV',RoIs,ion))
+ acc.merge(precisionPhotonCaloIsoVDVCfg(flags, name+'VDV',RoIs,ion))
# Add CaloIsolationTool
from TriggerMenuMT.HLT.Egamma.TrigEgammaFactoriesCfg import TrigPhotonIsoBuilderCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
index 8fa96740ebafcedf5bb355b072dd237ac6268d26..45fcb1b39ec18b133319eefc6074436cd772d966 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
@@ -21,7 +21,7 @@ def precisionPhotonSequenceGenCfg(flags, ion=False, is_probe_leg=False):
InViewRoIs="PrecisionPhotonRoIs"
# Configure the reconstruction algorithm sequence
- TrigEgammaKeys = getTrigEgammaKeys(ion = ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion = ion)
hiInfo = 'HI' if ion is True else ''
probeInfo = '_probe' if is_probe_leg is True else ''
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
index 61169e3b96d21ae6afa7ef08dcd797dcb5dc0d41..fdbc348e97c3b9939223189b2a65fe8a17849c39 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
@@ -7,9 +7,9 @@ from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
from AthenaCommon.Logging import logging
log = logging.getLogger(__name__)
-def precisionPhotonVDVCfg(name, InViewRoIs, ion=False):
+def precisionPhotonVDVCfg(flags, name, InViewRoIs, ion=False):
acc = ComponentAccumulator()
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
caloClusters = TrigEgammaKeys.precisionPhotonCaloClusterContainer
dataObjects = [( 'xAOD::CaloClusterContainer' , 'StoreGateSvc+%s' % caloClusters ),
( 'EgammaRecContainer', 'StoreGateSvc+%s' % TrigEgammaKeys.precisionPhotonSuperClusterCollection),
@@ -45,7 +45,7 @@ def precisionPhotonRecoSequence(flags, RoIs, name = None, ion=False):
log.debug('retrieve(precisionPhotonRecoSequence,None,RoIs = %s)',RoIs)
- acc.merge(precisionPhotonVDVCfg(name+'VDV',RoIs,ion))
+ acc.merge(precisionPhotonVDVCfg(flags, name+'VDV',RoIs,ion))
if ion:
TrigTopoEgammaPhoton = TrigTopoEgammaPhotonCfg_HI(flags)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactoriesCfg.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactoriesCfg.py
index 7203ccf4c41531bfa910cbde54ca0b981314a4e4..cb5311c4fecb605a8ff784c1ff6c7a0c890c0560 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactoriesCfg.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactoriesCfg.py
@@ -12,7 +12,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
def PrecisionPhotonCaloIsoMonitorCfg(flags, name = 'PrecisionPhotonCaloIsoEgammaBuilderMon', ion=False):
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion = ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion = ion)
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorPrecisionCfg
monTool = egammaMonitorPrecisionCfg(flags, name)
collectionIn = TrigEgammaKeys.precisionPhotonContainer
@@ -27,7 +27,7 @@ def PrecisionPhotonCaloIsoMonitorCfg(flags, name = 'PrecisionPhotonCaloIsoEgamma
def TrigEMClusterToolCfg(flags, ion=False):
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion = ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion = ion)
from egammaMVACalib.egammaMVACalibConfig import egammaMVASvcCfg
tool = CompFactory.EMClusterTool('TrigEMClusterTool_photon',
OutputClusterContainerName = TrigEgammaKeys.precisionPhotonEMClusterContainer,
@@ -38,7 +38,7 @@ def TrigEMClusterToolCfg(flags, ion=False):
def TrigTopoEgammaPhotonCfg(flags):
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys()
+ TrigEgammaKeys = getTrigEgammaKeys(flags)
from egammaTools.EMShowerBuilderConfig import EMShowerBuilderCfg
from egammaTools.EMPIDBuilderConfig import EMPIDBuilderPhotonCfg
TrigTopoEgammaPhotons = CompFactory.xAODEgammaBuilder( name = 'TrigTopoEgammaPhotons',
@@ -58,7 +58,7 @@ def TrigTopoEgammaPhotonCfg(flags):
def TrigTopoEgammaPhotonCfg_HI(flags):
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion=True)
+ TrigEgammaKeys = getTrigEgammaKeys(flags,ion=True)
from egammaTools.EMShowerBuilderConfig import EMShowerBuilderCfg
from egammaTools.EMPIDBuilderConfig import EMPIDBuilderPhotonCfg
TrigTopoEgammaPhotons = CompFactory.xAODEgammaBuilder( name = 'TrigTopoEgammaPhotons_HI',
@@ -79,7 +79,7 @@ def PrecisionPhotonTopoMonitorCfg(flags, ion=False,name = 'PrecisionPhotonTopoMo
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags,ion=ion)
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorPrecisionCfg
monTool = egammaMonitorPrecisionCfg(flags, name+('HI' if ion is True else ''))
@@ -96,7 +96,7 @@ def PrecisionPhotonSuperClusterMonitorCfg(flags, ion = False, name ='PrecisionPh
acc = ComponentAccumulator()
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
- TrigEgammaKeys = getTrigEgammaKeys(ion=ion)
+ TrigEgammaKeys = getTrigEgammaKeys(flags, ion=ion)
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorSuperClusterCfg
monTool = egammaMonitorSuperClusterCfg(flags, name+('HI' if ion is True else ''))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index 6d64b44e5b562a5cf7908d39355842be336108de..2c445b0c8ce2a2572b894c84fca38182ab01fb5a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -513,7 +513,10 @@ class ItemDef:
MenuItem('L1_eTAU80_2eTAU60').setLogic(d.eTAU80 & d.eTAU60.x(2) & physcond).setTriggerType(TT.calo)
MenuItem('L1_cTAU30M_2cTAU20M_4jJ30p0ETA25').setLogic(d.cTAU30M & d.cTAU20M.x(2) & d.jJ300ETA25.x(4) & physcond).setTriggerType(TT.calo)
MenuItem('L1_cTAU35M_2cTAU30M_2jJ55_3jJ50').setLogic(d.cTAU35M & d.cTAU30M.x(2) & d.jJ55.x(2) & d.jJ50.x(3) & physcond).setTriggerType(TT.calo)
+ # ATR-29439
+ MenuItem('L1_cTAU30M_2cTAU20M_3jJ30p0ETA25').setLogic(d.cTAU30M & d.cTAU20M.x(2) & d.jJ300ETA25.x(3) & physcond).setTriggerType(TT.calo)
+
#UPC TAU
MenuItem('L1_2TAU1_VTE50' ).setLogic( d.HA1.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
MenuItem('L1_2TAU2_VTE50' ).setLogic( d.HA2.x(2) & Not(d.TE50) & physcond).setTriggerType(TT.calo)
@@ -1896,7 +1899,12 @@ class ItemDef:
MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ55').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_0DR28_eTAU30ab_eTAU20ab & physcond)
MenuItem('L1_cTAU20M_DR-eTAU20eTAU12-jJ40').setLogic( d.cTAU20M & d.TOPO_2DISAMB_jJ40ab_0DR10_eTAU20ab_eTAU12ab & physcond)
MenuItem('L1_eTAU80_2cTAU30M_DR-eTAU30eTAU20').setLogic( d.eTAU80 & d.cTAU30M.x(2) & d.TOPO_0DR28_eTAU30ab_eTAU20ab & physcond)
-
+ # ATR-29439
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ50ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ40ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+ MenuItem('L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30').setLogic( d.cTAU30M & d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ30ab_0DR28_eTAU30ab_eTAU20ab & physcond)
+
+
# ATR-26902
MenuItem('L1_2cTAU20M_4DR28-eTAU30eTAU20-jJ55').setLogic ( d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_4DR28_eTAU30ab_eTAU20ab & physcond)
MenuItem('L1_2cTAU20M_4DR32-eTAU30eTAU20-jJ55').setLogic ( d.cTAU20M.x(2) & d.TOPO_2DISAMB_jJ55ab_4DR32_eTAU30ab_eTAU20ab & physcond)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index b3fd46d012a07b3aad1253753a43ce143ef2ef34..36bd32ba665bfa3860e24cf0088f97b0caada2f1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -1350,8 +1350,14 @@ class TopoAlgoDef:
# DISAMB Lines with DR Cut
- # output lines = 2DISAMB-jJ55ab-0DR25-eTAU30ab-eTAU20ab'
- # '2DISAMB-jJ55ab-0DR28-eTAU30ab-eTAU20ab',
+ # output lines = '2DISAMB-jJ55ab-0DR25-eTAU30ab-eTAU20ab'
+ # '2DISAMB-jJ55ab-0DR28-eTAU30ab-eTAU20ab'
+ # '2DISAMB-jJ50ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ50ab-0DR28-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ40ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ40ab-0DR28-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ30ab-0DR25-eTAU30ab-eTAU20ab',
+ # '2DISAMB-jJ30ab-0DR28-eTAU30ab-eTAU20ab']
DISAMB_DR_jJ_eTau_eTau_Map = [
{
"algoname": "2DISAMB_jJ55ab_DR_eTAU_eTAU",
@@ -1373,6 +1379,69 @@ class TopoAlgoDef:
"nleading3": HW.jJetOutputWidthSelect,
"inputwidth3": HW.jJetOutputWidthSelect,
"olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ50ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25,28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 50,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ40ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25, 28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 40,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
+ },
+ {
+ "algoname": "2DISAMB_jJ30ab_DR_eTAU_eTAU",
+ "disamb" : 2,
+ "minDR" : 0,
+ "maxDR" : [25, 28],
+ "otype1" : "eTAU",
+ "ocut1" : 30,
+ "olist1": "ab",
+ "nleading1": HW.eTauOutputWidthSelect,
+ "inputwidth1": HW.eTauOutputWidthSelect,
+ "otype2" : "eTAU",
+ "ocut2" : 20,
+ "nleading2": HW.eTauOutputWidthSelect,
+ "inputwidth2": HW.eTauOutputWidthSelect,
+ "olist2": "ab",
+ "otype3" : "jJ",
+ "ocut3" : 30,
+ "nleading3": HW.jJetOutputWidthSelect,
+ "inputwidth3": HW.jJetOutputWidthSelect,
+ "olist3": "ab",
}
]
for x in DISAMB_DR_jJ_eTau_eTau_Map:
@@ -1390,7 +1459,6 @@ class TopoAlgoDef:
obj3, d.minDR, d.maxDR[bitId], obj1, obj2))
alg = AlgConf.DisambiguationDRIncl3( name = d.algoname, inputs = inputList, outputs = toponames )
-
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('InputWidth3', d.inputwidth3)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
index d20f5319a6bf17460574f0d41dc8a26d2be89ac8..792034faf0b335a87f050ae33e34c61e29f7115d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1.py
@@ -73,6 +73,11 @@ def defineMenu():
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU20',
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_4DPHI99-eTAU30eTAU12',
'L1_cTAU20M_cTAU12M_4jJ30p0ETA24_0DETA24_10DPHI99-eTAU30eTAU12',
+ #ATR-29439
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ50',
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ40',
+ 'L1_cTAU30M_2cTAU20M_DR-eTAU30eTAU20-jJ30',
+ 'L1_cTAU30M_2cTAU20M_3jJ30p0ETA25',
#ATR-27252
'L1_eTAU60_2cTAU20M_jXE80',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
index f39bc031585b7ff253cb2656df958b9ae1270ca1..7c932e0d3aec4ae42ac4cbecd64bfef6bbc98d59 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
@@ -54,7 +54,18 @@ def defineInputsMenu():
'0INVM70-2DR15-eEM12sl1-eEM12sl6']),
TopoMenuDef( 'INVM_BOOSTDR_Ranges_Asymm_eEMsl6', outputbits = (12,13), outputlines = ['0INVM30-2DR15-eEM12sl1-eEM9sl6',
- '25INVM70-13DR25-eEM12sl1-eEM9sl6']),
+ '25INVM70-13DR25-eEM12sl1-eEM9sl6']),
+ ]
+ if conn["name"] == "Topo3El":
+ for group in conn["algorithmGroups"]:
+ if group["fpga"]==0 and group["clock"]==1:
+ group["algorithms"] += [
+ TopoMenuDef( '2DISAMB_jJ50ab_DR_eTAU_eTAU', outputbits = (10,11), outputlines = ['2DISAMB-jJ50ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ50ab-0DR28-eTAU30ab-eTAU20ab']),
+ TopoMenuDef( '2DISAMB_jJ40ab_DR_eTAU_eTAU', outputbits = (12,13), outputlines = ['2DISAMB-jJ40ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ40ab-0DR28-eTAU30ab-eTAU20ab']),
+ TopoMenuDef( '2DISAMB_jJ30ab_DR_eTAU_eTAU', outputbits = (14,15), outputlines = ['2DISAMB-jJ30ab-0DR25-eTAU30ab-eTAU20ab',
+ '2DISAMB-jJ30ab-0DR28-eTAU30ab-eTAU20ab']),
]
#----------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_dump.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_dump.py
index bf19d0c5811ec8c6531ad875d19bcbea58eda5c9..2e1ee948fd3a79eebc99a80555ca698d1004d5b8 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_dump.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_dump.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
"""
Dumps the trigger menu, optionally running some checks for name
@@ -79,6 +79,7 @@ def run():
if args.check_l1 or args.dump_dicts:
args.parse_names = True
+ flags.Trigger.triggerConfig='FILE'
flags.Input.Files=[]
flags.Trigger.triggerMenuSetup=menu_name
flags.lock()