diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
index e58ef2be8b62ea604229a20c87b5b8cb548db19f..4a21402f606f4bfd2383a6d061973d5dd7f261d0 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitCategory.py
@@ -2,33 +2,34 @@
# l1 trigger to monitor:
met_triggers_l1_shifter = [
- "L1_XE10",
"L1_XE50",
+ "L1_XE55",
]
met_triggers_l1_expert = [
- "L1_XE55",
+ "L1_XE10",
"L1_XE60",
]
# hlt triggers to monitor
met_triggers_hlt_shifter = [
- "HLT_xe30_cell_L1XE10",
- "HLT_xe30_cell_xe30_tcpufit_L1XE10",
- "HLT_xe30_tcpufit_L1XE10",
- "HLT_xe65_cell_L1XE50",
+ "HLT_xe70_mht",
+ "HLT_xe90_mht_L1XE50",
+ "HLT_xe100_mht_L1XE50",
+ "HLT_xe110_mht_L1XE50",
+ "HLT_xe90_pufit_L1XE50",
+ "HLT_xe100_pufit_L1XE50",
+ "HLT_xe100_pufit_L1XE55",
+ "HLT_xe110_pufit_L1XE50",
+ "HLT_xe110_pufit_L1XE55",
+ "HLT_xe110_pufit_xe70_L1XE50",
"HLT_xe110_pufit_xe65_L1XE50",
]
met_triggers_hlt_expert = [
- "HLT_xe110_pufit_xe70_L1XE60",
- "HLT_xe110_pufit_L1XE50",
- "HLT_xe110_pufit_L1XE55",
- "HLT_xe100_pufit_L1XE55",
+ "HLT_xe30_cell_L1XE10",
"HLT_xe90_pufit_L1XE50",
- "HLT_xe110_mht_L1XE50",
- "HLT_xe90_mht_L1XE50",
- "HLT_xe70_mht_L1XE50",
+ "HLT_xe100_pufit_L1XE55",
]
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
index 83fab2f277f7cc1cad24eee4e933f34701785978..92ce87e24258e3dee316de4e26d74e4b1a7f2fc1 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitorAlgorithm.py
@@ -39,6 +39,12 @@ def TrigMETMonConfig(inputFlags):
# # yourself, the AddAlgorithm method will still configure the base
# # properties and add the algorithm to the monitoring sequence.
# helper.AddAlgorithm(myExistingAlg)
+
+
+ ### check Run2 or Run3 MT
+ mt_chains = True
+ if ( inputFlags.Trigger.EDMVersion < 3 ) :
+ mt_chains = False
### STEP 3 ###
@@ -48,12 +54,11 @@ def TrigMETMonConfig(inputFlags):
# to enable a trigger filter, for example:
# TrigMETMonAlg.TriggerChain = 'HLT_xe30_cell_L1XE10'
# without filters, all events are processed.
- TrigMETMonChain1Alg.TriggerChain = 'HLT_xe65_cell_L1XE50'
+ if mt_chains:
+ TrigMETMonChain1Alg.TriggerChain = 'HLT_xe65_cell_L1XE50'
+ else:
+ TrigMETMonChain1Alg.TriggerChain = 'HLT_xe110_pufit_xe65_L1XE50'
- ### check Run2 or Run3 MT
- mt_chains = True
- if ( inputFlags.Trigger.EDMVersion < 3 ) :
- mt_chains = False
### container name selection
if mt_chains: # these are temporary, needs to be changed
@@ -72,7 +77,7 @@ def TrigMETMonConfig(inputFlags):
TrigMETMonAlg.l1_gjwoj_key = 'LVL1EnergySumRoI'
TrigMETMonAlg.l1_gpufit_key = 'LVL1EnergySumRoI'
TrigMETMonAlg.hlt_cell_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET'
- TrigMETMonAlg.hlt_mt_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht'
+ TrigMETMonAlg.hlt_mht_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht'
TrigMETMonAlg.hlt_tc_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl'
TrigMETMonAlg.hlt_tc_em_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl'
TrigMETMonAlg.hlt_tcpufit_key = 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC'
@@ -112,8 +117,9 @@ def TrigMETMonConfig(inputFlags):
TrigMETMonAlg.HLTChain02 = 'HLT_xe110_mht_L1XE50'
TrigMETMonAlg.HLTChain03 = 'HLT_xe110_tcpufit_L1XE50'
TrigMETMonAlg.HLTChain05 = 'HLT_xe110_pfsum_L1XE50'
- TrigMETMonAlg.HLTChain10 = 'HLT_xe110_pfsum_cssk_L1XE50'
- TrigMETMonAlg.HLTChain11 = 'HLT_xe110_pfsum_vssk_L1XE50'
+ TrigMETMonAlg.HLTChain11 = 'HLT_xe110_pfsum_cssk_L1XE50'
+ TrigMETMonAlg.HLTChain12 = 'HLT_xe110_pfsum_vssk_L1XE50'
+ TrigMETMonAlg.HLTChain13 = 'HLT_xe100_pfopufit_L1XE50'
else:
TrigMETMonAlg.L1Chain02 = 'L1_XE10'
TrigMETMonAlg.L1Chain03 = 'L1_XE30'
@@ -121,14 +127,17 @@ def TrigMETMonConfig(inputFlags):
TrigMETMonAlg.L1Chain05 = 'L1_XE60'
TrigMETMonAlg.L1Chain06 = 'L1_XE70'
TrigMETMonAlg.L1Chain07 = 'L1_XE75'
- TrigMETMonAlg.HLTChain01 = 'HLT_xe70_mht_L1XE50'
+ TrigMETMonAlg.HLTChain01 = 'HLT_xe70_mht'
TrigMETMonAlg.HLTChain02 = 'HLT_xe90_mht_L1XE50'
- TrigMETMonAlg.HLTChain03 = 'HLT_xe110_mht_L1XE50'
- TrigMETMonAlg.HLTChain04 = 'HLT_xe90_pufit_L1XE50'
- TrigMETMonAlg.HLTChain05 = 'HLT_xe100_pufit_L1XE50'
- TrigMETMonAlg.HLTChain06 = 'HLT_xe110_pufit_L1XE50'
- TrigMETMonAlg.HLTChain07 = 'HLT_xe110_pufit_xe65_L1XE50'
- TrigMETMonAlg.HLTChain08 = 'HLT_xe110_pufit_xe70_L1XE50'
+ TrigMETMonAlg.HLTChain03 = 'HLT_xe100_mht_L1XE50'
+ TrigMETMonAlg.HLTChain04 = 'HLT_xe110_mht_L1XE50'
+ TrigMETMonAlg.HLTChain05 = 'HLT_xe90_pufit_L1XE50'
+ TrigMETMonAlg.HLTChain06 = 'HLT_xe100_pufit_L1XE50'
+ TrigMETMonAlg.HLTChain07 = 'HLT_xe100_pufit_L1XE55'
+ TrigMETMonAlg.HLTChain08 = 'HLT_xe110_pufit_L1XE50'
+ TrigMETMonAlg.HLTChain09 = 'HLT_xe110_pufit_L1XE55'
+ TrigMETMonAlg.HLTChain11 = 'HLT_xe110_pufit_xe65_L1XE50'
+ TrigMETMonAlg.HLTChain12 = 'HLT_xe110_pufit_xe70_L1XE50'
### STEP 4 ###
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
index 5d3a89716dddfa0b9379965b5e22b11387d80454..70cecadb6682ed15e3e8a0687981ec6db937ef99 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/src/TrigMETMonitorAlgorithm.cxx
@@ -7,54 +7,31 @@
TrigMETMonitorAlgorithm::TrigMETMonitorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
: AthMonitorAlgorithm(name,pSvcLocator)
- , m_offline_met_key("MET_Reference_AntiKt4EMPFlow")
- , m_hlt_electron_key("HLT_egamma_Electrons_GSF")
- , m_hlt_muon_key("HLT_MuonsCB_FS")
- , m_lvl1_roi_key("LVL1EnergySumRoI")
- , m_lvl1_jnc_key("jNOISECUT_MET")
- , m_lvl1_jrho_key("jXERHO_MET")
- , m_lvl1_gnc_key("gXENOISECUT_MET")
- , m_lvl1_grho_key("gXERHO_MET")
- , m_lvl1_gjwoj_key("gXEJWOJ_MET")
- , m_lvl1_gpufit_key("gXEPUFIT_MET")
- , m_hlt_cell_met_key("HLT_MET_cell")
- , m_hlt_mht_met_key("HLT_MET_mht")
- , m_hlt_tc_met_key("HLT_MET_tc")
- , m_hlt_tc_em_met_key("HLT_MET_tc_em")
- , m_hlt_tcpufit_met_key("HLT_MET_tcpufit")
- , m_hlt_trkmht_met_key("HLT_MET_trkmht")
- , m_hlt_pfsum_met_key("HLT_MET_pfsum")
- , m_hlt_pfsum_cssk_met_key("HLT_MET_pfsum_cssk")
- , m_hlt_pfsum_vssk_met_key("HLT_MET_pfsum_vssk")
- , m_hlt_pfopufit_met_key("HLT_MET_pfopufit")
- , m_hlt_cvfpufit_met_key("HLT_MET_cvfpufit")
- , m_hlt_mhtpufit_pf_met_key("HLT_MET_mhtpufit_pf_subjesgscIS")
- , m_hlt_mhtpufit_em_met_key("HLT_MET_mhtpufit_em_subjesgscIS")
, m_trigDecTool("Trig::TrigDecisionTool/TrigDecisionTool")
{
- declareProperty("offline_met_key", m_offline_met_key);
- declareProperty("hlt_electron_key", m_hlt_electron_key);
- declareProperty("hlt_muon_key", m_hlt_muon_key);
- declareProperty("l1_roi_key", m_lvl1_roi_key);
- declareProperty("l1_jnc_key", m_lvl1_jnc_key);
- declareProperty("l1_jrho_key", m_lvl1_jrho_key);
- declareProperty("l1_gnc_key", m_lvl1_gnc_key);
- declareProperty("l1_grho_key", m_lvl1_grho_key);
- declareProperty("l1_gjwoj_key", m_lvl1_gjwoj_key);
- declareProperty("l1_gpufit_key", m_lvl1_gpufit_key);
- declareProperty("hlt_cell_key", m_hlt_cell_met_key);
- declareProperty("hlt_mht_key", m_hlt_mht_met_key);
- declareProperty("hlt_tc_key", m_hlt_tc_met_key);
- declareProperty("hlt_tc_em_key", m_hlt_tc_em_met_key);
- declareProperty("hlt_tcpufit_key", m_hlt_tcpufit_met_key);
- declareProperty("hlt_trkmht_key", m_hlt_trkmht_met_key);
- declareProperty("hlt_pfsum_key", m_hlt_pfsum_met_key);
- declareProperty("hlt_pfsum_cssk_key", m_hlt_pfsum_cssk_met_key);
- declareProperty("hlt_pfsum_vssk_key", m_hlt_pfsum_vssk_met_key);
- declareProperty("hlt_pfopufit_key", m_hlt_pfopufit_met_key);
- declareProperty("hlt_cvfpufit_key", m_hlt_cvfpufit_met_key);
- declareProperty("hlt_mhtpufit_pf_key", m_hlt_mhtpufit_pf_met_key);
- declareProperty("hlt_mhtpufit_em_key", m_hlt_mhtpufit_em_met_key);
+ declareProperty("offline_met_key", m_offline_met_key = "MET_Reference_AntiKt4EMPFlow");
+ declareProperty("hlt_electron_key", m_hlt_electron_key = "HLT_egamma_Electrons_GSF");
+ declareProperty("hlt_muon_key", m_hlt_muon_key = "HLT_MuonsCB_FS");
+ declareProperty("l1_roi_key", m_lvl1_roi_key = "LVL1EnergySumRoI");
+ declareProperty("l1_jnc_key", m_lvl1_jnc_key = "jNOISECUT_MET");
+ declareProperty("l1_jrho_key", m_lvl1_jrho_key = "jXERHO_MET");
+ declareProperty("l1_gnc_key", m_lvl1_gnc_key = "gXENOISECUT_MET");
+ declareProperty("l1_grho_key", m_lvl1_grho_key = "gXERHO_MET");
+ declareProperty("l1_gjwoj_key", m_lvl1_gjwoj_key = "gXEJWOJ_MET");
+ declareProperty("l1_gpufit_key", m_lvl1_gpufit_key = "gXEPUFIT_MET");
+ declareProperty("hlt_cell_key", m_hlt_cell_met_key = "HLT_MET_cell");
+ declareProperty("hlt_mht_key", m_hlt_mht_met_key = "HLT_MET_mht");
+ declareProperty("hlt_tc_key", m_hlt_tc_met_key = "HLT_MET_tc");
+ declareProperty("hlt_tc_em_key", m_hlt_tc_em_met_key = "HLT_MET_tc_em");
+ declareProperty("hlt_tcpufit_key", m_hlt_tcpufit_met_key = "HLT_MET_tcpufit");
+ declareProperty("hlt_trkmht_key", m_hlt_trkmht_met_key = "HLT_MET_trkmht");
+ declareProperty("hlt_pfsum_key", m_hlt_pfsum_met_key = "HLT_MET_pfsum");
+ declareProperty("hlt_pfsum_cssk_key", m_hlt_pfsum_cssk_met_key = "HLT_MET_pfsum_cssk");
+ declareProperty("hlt_pfsum_vssk_key", m_hlt_pfsum_vssk_met_key = "HLT_MET_pfsum_vssk");
+ declareProperty("hlt_pfopufit_key", m_hlt_pfopufit_met_key = "HLT_MET_pfopufit");
+ declareProperty("hlt_cvfpufit_key", m_hlt_cvfpufit_met_key = "HLT_MET_cvfpufit");
+ declareProperty("hlt_mhtpufit_pf_key", m_hlt_mhtpufit_pf_met_key = "HLT_MET_mhtpufit_pf_subjesgscIS");
+ declareProperty("hlt_mhtpufit_em_key", m_hlt_mhtpufit_em_met_key = "HLT_MET_mhtpufit_em_subjesgscIS");
declareProperty("L1Chain01", m_L1Chain01="L1_XE50");
declareProperty("L1Chain02", m_L1Chain02="L1_jXENC50");