From 2de330c3bb9d11eb567faae388359ba05960ce18 Mon Sep 17 00:00:00 2001
From: Gianantonio Pezzullo <g.pezzullo@yale.edu>
Date: Mon, 22 Mar 2021 15:18:41 +0000
Subject: [PATCH] primary tau triggers
(cherry picked from commit cd9be91f9d42030359acf4504c89d7ebf1532727)
---
.../TrigComboHypo/ATLAS_CHECK_THREAD_SAFETY | 1 -
.../TrigComboHypo/CMakeLists.txt | 16 ----
.../src/components/TrigComboHypo_entries.cxx | 2 -
.../TrigHypoCommonTools/CMakeLists.txt | 1 +
.../TrigHypoCommonTools}/TrigComboHypoTool.h | 0
.../python/TrigHypoCommonTools.py} | 8 +-
.../src/TrigComboHypoTool.cxx | 19 +++--
.../TrigHypoCommonTools_entries.cxx | 4 +-
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 18 ++---
.../share/ref_data_v1Dev_build.ref | 18 ++---
.../Combined/GenerateCombinedChainDefs.py | 4 +-
.../python/HLTMenuConfig/Menu/LS2_v1.py | 73 ++++++++++---------
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 27 ++++---
.../HLTMenuConfig/Menu/SignatureDicts.py | 2 +-
14 files changed, 96 insertions(+), 97 deletions(-)
delete mode 100644 Trigger/TrigHypothesis/TrigComboHypo/ATLAS_CHECK_THREAD_SAFETY
delete mode 100644 Trigger/TrigHypothesis/TrigComboHypo/CMakeLists.txt
delete mode 100644 Trigger/TrigHypothesis/TrigComboHypo/src/components/TrigComboHypo_entries.cxx
rename Trigger/TrigHypothesis/{TrigComboHypo/src => TrigHypoCommonTools/TrigHypoCommonTools}/TrigComboHypoTool.h (100%)
rename Trigger/TrigHypothesis/{TrigComboHypo/python/TrigComboHypo.py => TrigHypoCommonTools/python/TrigHypoCommonTools.py} (65%)
rename Trigger/TrigHypothesis/{TrigComboHypo => TrigHypoCommonTools}/src/TrigComboHypoTool.cxx (79%)
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigHypothesis/TrigComboHypo/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 383b349ee2eb..000000000000
--- a/Trigger/TrigHypothesis/TrigComboHypo/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-Trigger/TrigHypothesis/TrigComboHypo
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigComboHypo/CMakeLists.txt
deleted file mode 100644
index a0d03e7593fc..000000000000
--- a/Trigger/TrigHypothesis/TrigComboHypo/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-# Declare the package name:
-atlas_subdir( TrigComboHypo )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core MathCore Hist )
-
-# Component(s) in the package:
-atlas_add_component( TrigComboHypo
- src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CxxUtils DecisionHandlingLib EventInfo GaudiKernel ITrackToVertex MuidEvent Particle PathResolver StoreGateLib TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigMuonEvent TrigNavStructure TrigParticle TrigSteeringEvent TrigTopoEvent TrkTrack TrkTrackSummary VxVertex egammaEvent tauEvent xAODBase xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTau xAODTracking xAODTrigger MVAUtils tauRecToolsLib)
-
-# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/src/components/TrigComboHypo_entries.cxx b/Trigger/TrigHypothesis/TrigComboHypo/src/components/TrigComboHypo_entries.cxx
deleted file mode 100644
index 274a746213ac..000000000000
--- a/Trigger/TrigHypothesis/TrigComboHypo/src/components/TrigComboHypo_entries.cxx
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "../TrigComboHypoTool.h"
-DECLARE_COMPONENT( TrigComboHypoTool )
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
index 93055d0016b6..4b23bc6fd60f 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/CMakeLists.txt
@@ -11,3 +11,4 @@ atlas_add_component( TrigHypoCommonTools
# Install files from the package:
atlas_install_headers( TrigHypoCommonTools )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/src/TrigComboHypoTool.h b/Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/TrigComboHypoTool.h
similarity index 100%
rename from Trigger/TrigHypothesis/TrigComboHypo/src/TrigComboHypoTool.h
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/TrigHypoCommonTools/TrigComboHypoTool.h
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/python/TrigComboHypo.py b/Trigger/TrigHypothesis/TrigHypoCommonTools/python/TrigHypoCommonTools.py
similarity index 65%
rename from Trigger/TrigHypothesis/TrigComboHypo/python/TrigComboHypo.py
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/python/TrigHypoCommonTools.py
index 4feebbb75aec..2bc107c9c3e7 100644
--- a/Trigger/TrigHypothesis/TrigComboHypo/python/TrigComboHypo.py
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/python/TrigHypoCommonTools.py
@@ -8,19 +8,19 @@
# Author: G. Pezzullo
######################################################################
-from TrigComboHypo.TrigComboHypoConf import *
+from TrigHypoCommonTools.TrigHypoCommonToolsConf import *
from AthenaCommon.Logging import logging
## Parsing variable cut function
def setVarCut (obj, var, val):
- logging.getLogger("[TrigComboHyp::setVarCut] TrigComboHypoConfig").debug(obj.name)
+ logging.getLogger("[TrigComboHyp::setVarCut] TrigHypoCommonToolsConfig").debug(obj.name)
for i in range(len(var)):
- logging.getLogger("[TrigComboHyp::setVarCut] TrigComboHypoConfig").debug('Update variable cut: %s = %f'%(var[i],val[i]))
+ logging.getLogger("[TrigComboHyp::setVarCut] TrigHypoCommonToolsConfig").debug('Update variable cut: %s = %f'%(var[i],val[i]))
obj.__setattr__(var[i], val[i])
class TrigComboHypoTool (TrigComboHypoTool):
__slots__ = []
def __init__(self, name = "TrigComboHypoTool", var = [], val = []):
- logging.getLogger("[TrigComboHyp::TrigComboHypoTool] TrigComboHypoTool intialize").debug(self.name)
+ logging.getLogger("[TrigComboHypoTool] intialize").debug(self.name)
super(TrigComboHypoTool, self).__init__(name)
setVarCut(self, var, val)
diff --git a/Trigger/TrigHypothesis/TrigComboHypo/src/TrigComboHypoTool.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
similarity index 79%
rename from Trigger/TrigHypothesis/TrigComboHypo/src/TrigComboHypoTool.cxx
rename to Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
index 4e4d1446d97c..183bd6f3b93f 100644
--- a/Trigger/TrigHypothesis/TrigComboHypo/src/TrigComboHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/TrigComboHypoTool.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-#include "TrigComboHypoTool.h"
+#include "TrigHypoCommonTools/TrigComboHypoTool.h"
#include <cmath>
@@ -49,23 +49,32 @@ bool TrigComboHypoTool::executeAlg(std::vector<LegDecision> &combination) const
auto monitorIt = Monitored::Group( m_monTool, varOfAccepted, varOfProcessed);
//check that we found the two legs
- if (combination.size() < 2){
+ int nCombs(combination.size());
+ if (nCombs < 2){
ATH_MSG_ERROR("Number of legs found is less than 2! N_legs = " << combination.size() );
return false;
}
+ if ( (m_legA >= nCombs) || (m_legB >= nCombs)){
+ ATH_MSG_ERROR("One or both leg indexes are out of range: n_combinations = " << combination.size() <<", legA = "<<m_legA<<", legB = "<< m_legB );
+ return false;
+ }
+
auto EL= combination[m_legA].second;
auto legA_pLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
if (!legA_pLink.isValid()){
ATH_MSG_ERROR("link for "<<m_legA<<" not valid");
return false;
}
- EL = combination[m_legB].second;
+ ATH_MSG_DEBUG("link for legA: "<<m_legA<<" is valid");
+
+ EL = combination[m_legB].second;
auto legB_pLink = TrigCompositeUtils::findLink<xAOD::IParticleContainer>( *EL, featureString() ).link;
if (!legB_pLink.isValid()){
ATH_MSG_ERROR("link for "<<m_legB<<" not valid");
return false;
}
+ ATH_MSG_DEBUG("link for legB: "<<m_legB<<" is valid");
TLorentzVector hlv1 = (*legA_pLink)->p4();
TLorentzVector hlv2 = (*legB_pLink)->p4();
@@ -90,11 +99,11 @@ bool TrigComboHypoTool::executeAlg(std::vector<LegDecision> &combination) const
ATH_MSG_DEBUG("Found a combination with " << varOfProcessed);
if (varOfProcessed < m_varMin || varOfProcessed > m_varMax){
- ATH_MSG_DEBUG("Combination failed var cut: " << varOfProcessed << " not in [" << m_varMin << "," << m_varMax << "]");
+ ATH_MSG_DEBUG("Combination failed var cut: "<< m_varTag <<"= "<< varOfProcessed << " not in [" << m_varMin << "," << m_varMax << "]");
pass=false;
}else{
varOfAccepted = value;
- ATH_MSG_DEBUG( m_varTag << varOfAccepted << " is within [" <<m_varMin<< "," << m_varMax << "] This selection passed! ");
+ ATH_MSG_DEBUG( m_varTag <<"= "<< varOfAccepted << " is within [" <<m_varMin<< "," << m_varMax << "] This selection passed! ");
}
return pass;
diff --git a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
index f324dc6eb964..6f0ffa8489b8 100644
--- a/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHypoCommonTools/src/components/TrigHypoCommonTools_entries.cxx
@@ -1,5 +1,7 @@
#include "TrigHypoCommonTools/L1InfoHypo.h"
#include "TrigHypoCommonTools/L1InfoHypoTool.h"
+#include "TrigHypoCommonTools/TrigComboHypoTool.h"
DECLARE_COMPONENT(L1InfoHypo)
-DECLARE_COMPONENT(L1InfoHypoTool)
\ No newline at end of file
+DECLARE_COMPONENT(L1InfoHypoTool)
+DECLARE_COMPONENT(TrigComboHypoTool)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 26ae99c3e624..5cad299a7308 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -940,7 +940,7 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
6: 2
7: 2
8: 2
-HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM15VHI_2TAU12IM_4J12:
+HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM15VHI_2TAU12IM_4J12:
eventCount: 2
stepCounts:
0: 3
@@ -1100,7 +1100,7 @@ HLT_e24_lhmedium_g25_medium_L12EM20VH:
eventCount: 0
stepFeatures:
0: 3
-HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM22VHI:
+HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM22VHI:
eventCount: 3
stepCounts:
0: 5
@@ -3090,7 +3090,7 @@ HLT_mu14_L1MU10:
1: 8
2: 8
3: 8
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU12IM_3J12:
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU12IM_3J12:
eventCount: 1
stepCounts:
0: 6
@@ -3114,7 +3114,7 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU12IM
7: 1
8: 1
9: 1
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU20IM:
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU20IM:
eventCount: 1
stepCounts:
0: 5
@@ -3176,7 +3176,7 @@ HLT_mu20_2mu4noL1_L1MU20:
3: 7
4: 2
5: 2
-HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU20:
+HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU20:
eventCount: 3
stepCounts:
0: 7
@@ -4418,7 +4418,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM:
2: 8
3: 8
4: 4
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1TAU20IM_2TAU12IM_4J12p0ETA25:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 0
stepCounts:
0: 5
@@ -4431,7 +4431,7 @@ HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L
2: 8
3: 8
4: 2
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1DR-TAU20ITAU12I-J25:
eventCount: 0
stepCounts:
0: 6
@@ -4595,14 +4595,14 @@ HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2T
0: 12
1: 7
2: 2
-HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I:
+HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 11
1: 3
-HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40:
+HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU60_2TAU40:
eventCount: 0
stepCounts:
0: 2
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 3a1d5b182203..49d3a0559576 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -577,7 +577,7 @@ HLT_e14_lhtight_noringer_e4_etcut_Jpsiee_L1JPSI-1M5-EM12:
0: 47
HLT_e17_lhloose_mu14_L1EM15VH_MU10:
eventCount: 0
-HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM15VHI_2TAU12IM_4J12:
+HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM15VHI_2TAU12IM_4J12:
eventCount: 0
HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35:
eventCount: 0
@@ -605,7 +605,7 @@ HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH:
eventCount: 0
HLT_e24_lhmedium_g25_medium_L12EM20VH:
eventCount: 0
-HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM22VHI:
+HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM22VHI:
eventCount: 0
HLT_e24_lhmedium_mu8noL1_L1EM22VHI:
eventCount: 0
@@ -1787,11 +1787,11 @@ HLT_mu14_L1MU10:
stepFeatures:
0: 1
1: 1
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU12IM_3J12:
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU12IM_3J12:
eventCount: 0
stepFeatures:
0: 1
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU20IM:
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU20IM:
eventCount: 0
stepFeatures:
0: 1
@@ -1807,7 +1807,7 @@ HLT_mu20_2mu4noL1_L1MU20:
stepFeatures:
0: 1
1: 1
-HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU20:
+HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU20:
eventCount: 0
stepFeatures:
0: 1
@@ -2882,14 +2882,14 @@ HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM:
2: 2
3: 2
4: 1
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1TAU20IM_2TAU12IM_4J12p0ETA25:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU20IM_2TAU12IM_4J12p0ETA25:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 8
1: 2
-HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25:
+HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1DR-TAU20ITAU12I-J25:
eventCount: 0
stepCounts:
0: 1
@@ -3042,11 +3042,11 @@ HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2T
eventCount: 0
stepFeatures:
0: 4
-HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I:
+HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1TAU60_DR-TAU20ITAU12I:
eventCount: 0
stepFeatures:
0: 4
-HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40:
+HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU60_2TAU40:
eventCount: 0
HLT_timeburner_L1All:
eventCount: 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
index fd14357f222d..e48672810e31 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Combined/GenerateCombinedChainDefs.py
@@ -46,8 +46,8 @@ def addTopoInfo(theChainConfig, chainDict, listOfChainDefs, lengthOfChainConfigs
return theChainConfig
-def TrigComboHypoToolFromDict(chainDict):#, topoInfo): #I'm not sure why when I try to change the constructor in order to specify the topoInfo to use, I get the error:
- from TrigComboHypo.TrigComboHypoConf import TrigComboHypoTool
+def TrigComboHypoToolFromDict(chainDict):
+ from TrigHypoCommonTools.TrigHypoCommonToolsConf import TrigComboHypoTool
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram
name = chainDict['chainName']
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 181e615d7d18..e8a1d7733e80 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -19,7 +19,8 @@ from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import (PhysicsStream,
MultiMETGroup, SingleJetGroup, MultiJetGroup, SingleBjetGroup, MultiBjetGroup,
SingleTauGroup, MultiTauGroup, BphysicsGroup, EgammaMuonGroup, EgammaMETGroup,
MuonJetGroup, MuonTauGroup, TauMETGroup, MuonMETGroup, EgammaJetGroup,
- EgammaTauGroup, MinBiasGroup)
+ EgammaTauGroup, MinBiasGroup,
+ PrimaryLegGroup)
def setupMenu():
@@ -588,7 +589,7 @@ def setupMenu():
ChainProp(name="HLT_tau200_mediumRNN_track_L1TAU100", groups=SingleTauGroup),
ChainProp(name="HLT_tau200_mediumRNN_tracktwo_L1TAU100", groups=SingleTauGroup),
ChainProp(name="HLT_tau200_mediumRNN_tracktwoEF_L1TAU100", groups=SingleTauGroup),
- ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100", groups=PrimaryLegGroup+SingleTauGroup),
ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVABDT_L1TAU100", groups=SingleTauGroup),
ChainProp(name="HLT_tau200_medium1_track_L1TAU100", groups=SingleTauGroup),
ChainProp(name="HLT_tau200_medium1_tracktwo_L1TAU100", groups=SingleTauGroup),
@@ -598,12 +599,12 @@ def setupMenu():
# ATR-21797
# the following 3 chains were in serial mode in Run-2
- ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=MultiTauGroup),
- ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_L1TAU60_DR-TAU20ITAU12I",l1SeedThresholds=['TAU60','TAU12IM'], groups=MultiTauGroup),
- ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup),
+ ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau60_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU60_2TAU40", l1SeedThresholds=['TAU60','TAU40'], groups=PrimaryLegGroup+MultiTauGroup),
+ ChainProp(name="HLT_tau80_mediumRNN_tracktwoMVA_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1TAU60_DR-TAU20ITAU12I",l1SeedThresholds=['TAU60','TAU12IM'], groups=PrimaryLegGroup+MultiTauGroup),
+ ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00130_L1DR-TAU20ITAU12I-J25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=PrimaryLegGroup+MultiTauGroup),
# ATR-20450
- ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1TAU20IM_2TAU12IM_4J12p0ETA25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=MultiTauGroup),
+ ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1TAU20IM_2TAU12IM_4J12p0ETA25", l1SeedThresholds=['TAU20IM','TAU12IM'], groups=PrimaryLegGroup+MultiTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
@@ -635,25 +636,25 @@ def setupMenu():
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
# groups need to be properly assigned here later
# Primary e-mu chains
- ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_e12_lhloose_2mu10_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_2e12_lhloose_mu10_L12EM8VH_MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
+ ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_e12_lhloose_2mu10_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_2e12_lhloose_mu10_L12EM8VH_MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
# Primary g-mu chains
- ChainProp(name='HLT_g25_medium_mu24_L1MU20',l1SeedThresholds=['EM15VH','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), #ATR-22594
- ChainProp(name='HLT_g35_loose_mu18_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_loose_mu18_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup), # unsure what EM seed should be
+ ChainProp(name='HLT_g25_medium_mu24_L1MU20',l1SeedThresholds=['EM15VH','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup), #ATR-22594
+ ChainProp(name='HLT_g35_loose_mu18_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_loose_mu18_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup), # unsure what EM seed should be
#LLP
- ChainProp(name='HLT_g15_loose_2mu10_msonly_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
+ ChainProp(name='HLT_g15_loose_2mu10_msonly_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
# Primary e-g chains: electron + photon stay in the same step - these need to be parallel merged!
# test
ChainProp(name='HLT_e3_etcut1step_g5_etcut_L12EM3',l1SeedThresholds=['EM3','EM3'], stream=[PhysicsStream], groups=MultiElectronGroup),
# primaries
- ChainProp(name='HLT_e24_lhmedium_g25_medium_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], stream=[PhysicsStream], groups=['Primary:Legacy']+MultiElectronGroup),
- ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], stream=[PhysicsStream], groups=['Primary:Legacy']+MultiElectronGroup), # unsure about l1SeedThresholds
+ ChainProp(name='HLT_e24_lhmedium_g25_medium_L12EM20VH', l1SeedThresholds=['EM20VH','EM20VH'], stream=[PhysicsStream], groups=PrimaryLegGroup+MultiElectronGroup),
+ ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], stream=[PhysicsStream], groups=PrimaryLegGroup+MultiElectronGroup), # unsure about l1SeedThresholds
# Test chains for muon + jet/MET merging/aligning
ChainProp(name='HLT_mu6_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], stream=[PhysicsStream], groups=MuonMETGroup),
@@ -661,31 +662,31 @@ def setupMenu():
#ATR-22107
ChainProp(name='HLT_e24_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=EgammaMuonGroup),
- ChainProp(name='HLT_e26_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_e28_lhmedium_mu8noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_e9_lhvloose_mu20_mu8noL1_L1MU20', l1SeedThresholds=['EM3','MU20','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
- ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=['Primary:Legacy']+EgammaMuonGroup),
+ ChainProp(name='HLT_e26_lhmedium_mu8noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_e28_lhmedium_mu8noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_e9_lhvloose_mu20_mu8noL1_L1MU20', l1SeedThresholds=['EM3','MU20','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','MU6','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_tight_icalotight_mu18noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
+ ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM24VHI', l1SeedThresholds=['EM24VHI','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
# tau+X chains (ATR-21609) TODO: need T&P-like merging
- ChainProp(name='HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=EgammaTauGroup),
- # This is the next one to implement
+ ChainProp(name='HLT_e24_lhmedium_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM22VHI', l1SeedThresholds=['EM22VHI','TAU8'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaTauGroup),
+ # need to add dRtt to chain below. How do we avoid overlap between taus and jets?
#ChainProp(name="HLT_tau25_mediumRNN_tracktwoMVA_tau20_mediumRNN_tracktwoMVA_j70_j50_L1MJJ-500-NFF", l1SeedThresholds=['TAU8','TAU8','J20','J20'], stream=[PhysicsStream], groups=['MultiTauGroup','MultiJetGroup']),
#ATR-22108: combined tau+X chains: TODO: add dRtt, need T&P-like merging
- ChainProp(name='HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2TAU12IM_XE40', l1SeedThresholds=['TAU40','TAU12IM','XE40'], stream=[PhysicsStream], groups=TauMETGroup), # ATR-22966
- ChainProp(name='HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35', l1SeedThresholds=['EM15VHI','TAU12IM','XE35'], stream=[PhysicsStream], groups=TauMETGroup),
- ChainProp(name='HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35', l1SeedThresholds=['MU10','TAU12IM','XE35'], stream=[PhysicsStream], groups=TauMETGroup),
- ChainProp(name='HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1EM15VHI_2TAU12IM_4J12', l1SeedThresholds=['EM15VHI','TAU12IM'], stream=[PhysicsStream], groups=EgammaTauGroup),
-
- ChainProp(name='HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=MuonTauGroup),
- ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU20IM', l1SeedThresholds=['MU10','TAU20IM'], stream=[PhysicsStream], groups=MuonTauGroup),
- ChainProp(name='HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg00110_L1MU10_TAU12IM_3J12', l1SeedThresholds=['MU10','TAU12IM'], stream=[PhysicsStream], groups=MuonTauGroup),
+ ChainProp(name='HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1TAU40_2TAU12IM_XE40', l1SeedThresholds=['TAU40','TAU12IM','XE40'], stream=[PhysicsStream], groups=PrimaryLegGroup+TauMETGroup), # ATR-22966
+ ChainProp(name='HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1EM15VHI_2TAU12IM_XE35', l1SeedThresholds=['EM15VHI','TAU12IM','XE35'], stream=[PhysicsStream], groups=PrimaryLegGroup+TauMETGroup),
+ ChainProp(name='HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_L1MU10_TAU12IM_XE35', l1SeedThresholds=['MU10','TAU12IM','XE35'], stream=[PhysicsStream], groups=PrimaryLegGroup+TauMETGroup),
+ ChainProp(name='HLT_e17_lhmedium_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1EM15VHI_2TAU12IM_4J12', l1SeedThresholds=['EM15VHI','TAU12IM'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaTauGroup),
+
+ ChainProp(name='HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU20', l1SeedThresholds=['MU20','TAU8'], stream=[PhysicsStream], groups=PrimaryLegGroup+MuonTauGroup),
+ ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU20IM', l1SeedThresholds=['MU10','TAU20IM'], stream=[PhysicsStream], groups=PrimaryLegGroup+MuonTauGroup),
+ ChainProp(name='HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRleg000leg001100_L1MU10_TAU12IM_3J12', l1SeedThresholds=['MU10','TAU12IM'], stream=[PhysicsStream], groups=PrimaryLegGroup+MuonTauGroup),
# photon + multijets (ATR-22594)
ChainProp(name='HLT_g85_tight_3j50_L1EM22VHI',l1SeedThresholds=['EM22VHI','FSNOSEED'],stream=[PhysicsStream], groups=EgammaJetGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 5e63af8a4cae..4d3601a39394 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -42,6 +42,11 @@ JetStreamersGroup = ['RATE:SeededStreamers', 'BW:Jet']
METStreamersGroup = ['RATE:SeededStreamers', 'BW:MET']
BCIDmonGroup = ['MON:BCID']
PrimaryGroup = ['Primary']
+PrimaryLegGroup = ['Primary:Legacy']
+PrimaryPhIGroup = ['Primary:PhaseI']
+SupportGroup = ['Support']
+SupportLegGroup = ['Support:Legacy']
+SupportPhIGroup = ['Support:PhaseI']
def setupMenu():
@@ -57,16 +62,16 @@ def setupMenu():
TriggerFlags.MuonSlice.signatures = [
#ATR-20049
- ChainProp(name='HLT_2mu6_L12MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup),
+ ChainProp(name='HLT_2mu6_L12MU6', l1SeedThresholds=['MU6'], groups=SupportGroup+MultiMuonGroup),
#Planned Primaries
#-- 1 mu iso
- ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SupportGroup+SingleMuonGroup),
ChainProp(name='HLT_mu26_ivarmedium_L1MU20', groups=PrimaryGroup+SingleMuonGroup, monGroups=['muonMon:shifter','idMon:t0']),
ChainProp(name='HLT_mu28_ivarmedium_L1MU20', groups=PrimaryGroup+SingleMuonGroup),
#-- 1 mu
- ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SingleMuonGroup),
- ChainProp(name="HLT_mu26_L1MU20", groups=SingleMuonGroup),
- ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SingleMuonGroup),
+ ChainProp(name='HLT_mu6_idperf_L1MU6', groups=SupportGroup+SingleMuonGroup),
+ ChainProp(name="HLT_mu26_L1MU20", groups=SupportGroup+SingleMuonGroup),
+ ChainProp(name='HLT_mu24_idperf_L1MU20', groups=SupportGroup+SingleMuonGroup),
ChainProp(name='HLT_mu50_L1MU20', groups=PrimaryGroup+SingleMuonGroup),
ChainProp(name='HLT_mu60_0eta105_msonly_L1MU20', groups=PrimaryGroup+SingleMuonGroup),
ChainProp(name='HLT_mu60_L1MU20', groups=PrimaryGroup+SingleMuonGroup),
@@ -98,14 +103,14 @@ def setupMenu():
TriggerFlags.EgammaSlice.signatures = [
# ElectronChains----------
- ChainProp(name='HLT_e26_etcut_L1EM22VHI', groups=SingleElectronGroup + BCIDmonGroup),
- ChainProp(name='HLT_2e17_etcut_L12EM15VH', stream=[PhysicsStream], groups=MultiElectronGroup),
- ChainProp(name='HLT_g140_etcut_L1EM24VHI', groups=SinglePhotonGroup),
- ChainProp(name='HLT_2g35_etcut_L12EM20VH', groups=MultiPhotonGroup),
+ ChainProp(name='HLT_e26_etcut_L1EM22VHI', groups=SupportGroup+SingleElectronGroup+BCIDmonGroup),
+ ChainProp(name='HLT_2e17_etcut_L12EM15VH', stream=[PhysicsStream], groups=SupportGroup+MultiElectronGroup),
+ ChainProp(name='HLT_g140_etcut_L1EM24VHI', groups=SupportGroup+SinglePhotonGroup),
+ ChainProp(name='HLT_2g35_etcut_L12EM20VH', groups=SupportGroup+MultiPhotonGroup),
]
TriggerFlags.METSlice.signatures = [
- ChainProp(name='HLT_xe65_cell_L1XE50', groups=SingleMETGroup + BCIDmonGroup),
+ ChainProp(name='HLT_xe65_cell_L1XE50', groups=SingleMETGroup+BCIDmonGroup),
ChainProp(name='HLT_xe100_mht_L1XE50', groups=SingleMETGroup),
ChainProp(name='HLT_xe100_tcpufit_L1XE50', groups=SingleMETGroup),
ChainProp(name='HLT_xe100_trkmht_L1XE50', groups=SingleMETGroup),
@@ -146,7 +151,7 @@ def setupMenu():
TriggerFlags.TauSlice.signatures = [
#ATR-20049
- ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100", groups=SingleTauGroup),
+ ChainProp(name="HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100", groups=PrimaryLegGroup+SingleTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = [
#ATR-20049
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 4045dcf7b4e0..949a07fb74fb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -923,7 +923,7 @@ UnconventionalTrackingChainParts_Default = {
#==========================================================
# Combined Chains
#==========================================================
-AllowedTopos_comb = ['03dRleg000leg00110']
+AllowedTopos_comb = ['03dRleg000leg001100','03dRleg000leg00130']
# ---- Combined Dictionary of all allowed Values ----
CombinedChainParts = deepcopy(PhotonChainParts)
--
GitLab