diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
index ca894141e75b64392f51e220bb55708389439a38..cfebb7ba4890ab9fd9bc7a7dd633bb37c69e0d29 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
@@ -40,11 +40,13 @@ plots_resolution = ["res_et","res_Rphi","res_Reta","res_Rhad","res_ptvarcone20",
# Define triggers for tagging
monitoring_tags = [
+ 'HLT_e26_lhtight_nod0_e15_etcut_L1EM7_Zee',
'HLT_e24_lhmedium_ivarloose',
'HLT_e24_lhmedium_L1EM20VH',
'HLT_e24_lhmedium_nod0_ivarloose',
'HLT_e24_lhtight_nod0_ivarloose',
- 'HLT_e26_lhtight_nod0_ivarloose']
+ 'HLT_e26_lhtight_nod0_ivarloose'
+ ]
monitoring_jpsitags = [
'HLT_e5_lhtight_nod0_e4_etcut',
@@ -91,6 +93,7 @@ monitoringTP_electron = [
'HLT_e24_lhvloose_nod0_L1EM20VH',
'HLT_e24_lhmedium_nod0_L1EM20VH',
'HLT_e24_lhmedium_L1EM20VH',
+ 'HLT_e26_lhtight_nod0',
'HLT_e26_lhtight_nod0_ivarloose',
'HLT_e28_lhtight_idperf',
'HLT_e28_lhtight_nod0_ivarloose',
@@ -107,6 +110,7 @@ monitoring_photon = ['HLT_g25_medium_L1EM20VH',
'HLT_g35_loose',
'HLT_g20_tight_icalovloose_L1EM15VHI',
'HLT_g20_tight',
+ 'HLT_g22_tight',
'HLT_g120_loose',
'HLT_g140_loose',
'HLT_g200_loose'
@@ -145,7 +149,6 @@ validationTP_electron = [
# 2017
'HLT_e26_lhmedium_nod0',
'HLT_e24_lhmedium_nod0_L1EM20VH',
- 'HLT_e24_lhvloose_nod0_L1EM20VH',
'HLT_e19_lhvloose_nod0',
'HLT_e17_lhloose_nod0',
'HLT_e12_lhloose_nod0',
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
index 4795740792dc79f06235e975fa23516482229706..a5cfd272cb98d3fd0a9acae374c78e0491d2b3f3 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitorAlgorithm.py
@@ -24,7 +24,7 @@ def TrigEgammaMonConfig(inputFlags):
helper = AthMonitorCfgHelper(inputFlags,'TrigEgammaAthMonitorCfg')
# configure alg and ana tools
from TrigEgammaMonitoring.TrigEgammaMonitoringMTConfig import TrigEgammaMonAlgBuilder
- monAlgCfg = TrigEgammaMonAlgBuilder( helper, '2018', detailedHistograms=True ) # Using 2018 e/g tunings
+ monAlgCfg = TrigEgammaMonAlgBuilder( helper, '2018', detailedHistograms=False ) # Using 2018 e/g tunings
# build monitor and book histograms
monAlgCfg.configure()
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index e1dd78ab5ab347ae30523981d230d147db7ee043..dd7f8512513a3d91b7543940f53f95c79d26cc8e 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -167,9 +167,32 @@ class TrigEgammaMonAlgBuilder:
def setDefaultProperties(self):
# This will be removed for future.
- monitoring_electron = ['HLT_e5_etcut_L1EM3']
- monitoring_photon = ['HLT_g25_etcut_L1EM20VH','HLT_g25_loose_L1EM20VH','HLT_g25_medium_L1EM20VH', 'HLT_g25_tight_L1EM20VH', 'HLT_g140_loose_L1EM24VH']
- monitoringTP_electron = ['HLT_e26_lhtight_L1EM22VHI','HLT_e60_lhmedium_L1EM22VHI','HLT_e140_lhloose_L1EM22VHI']
+ monitoring_electron = [
+ 'HLT_e5_etcut_L1EM3',
+ 'HLT_e5_lhtight_noringer_L1EM3',
+ 'HLT_e5_lhtight_L1EM3',
+
+ ]
+
+ monitoring_photon = [
+ 'HLT_g20_tight_icaloloose_L1EM15VH',
+ 'HLT_g22_tight_L1EM15VH',
+ 'HLT_g25_etcut_L1EM20VH',
+ 'HLT_g25_loose_L1EM20VH',
+ 'HLT_g25_medium_L1EM20VH',
+ 'HLT_g25_tight_L1EM20VH',
+ 'HLT_g120_loose_L1EM22VHI',
+ 'HLT_g140_loose_L1EM24VH'
+ ]
+
+ monitoringTP_electron = [
+ 'HLT_e24_lhvloose_L1EM20VH',
+ 'HLT_e26_lhtight_L1EM22VHI',
+ 'HLT_e26_lhtight_ivarloose_L1EM22VHI',
+ 'HLT_e60_lhmedium_L1EM22VHI',
+ 'HLT_e140_lhloose_L1EM22VHI'
+ ]
+
#monitoring_tags = ['HLT_e24_lhtight_nod0_ivarloose', 'HLT_e26_lhtight_nod0_ivarloose']
#from TrigEgammaMonitoring.TrigEgammaMonitCategory import monitoring_tags, monitoringTP_electron, monitoring_photon , monitoring_electron
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 51b2249f068a4736748b1c809d7565b77f21309e..89be0d093aa1a0e0391296e73f1c21a3c441bc62 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -16,6 +16,9 @@ TrigSignatureMoniMT INFO -- #3136730292 Features
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
TrigSignatureMoniMT INFO -- #2280638160 Events 2 2 2 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #2280638160 Features 2 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VHI #3514903681
+TrigSignatureMoniMT INFO -- #3514903681 Events 1 1 1 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3514903681 Features 1 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 7 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1767768251 Features 7 0 0 0 - - - - - - - - -
@@ -229,6 +232,9 @@ TrigSignatureMoniMT INFO -- #2785977835 Features
TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946
TrigSignatureMoniMT INFO -- #9348946 Events 2 2 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e24_lhvloose_L1EM20VH #2442891649
+TrigSignatureMoniMT INFO -- #2442891649 Events 7 7 6 6 6 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #2442891649 Features 6 78 10 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - - - - - - - - 6
TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - - - - - - - - -
@@ -298,6 +304,9 @@ TrigSignatureMoniMT INFO -- #1959043579 Features
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
TrigSignatureMoniMT INFO -- #2970063918 Events 8 8 7 7 7 2 2 1 1 1 - - - - - 1
TrigSignatureMoniMT INFO -- #2970063918 Features 9 92 17 2 2 1 1 1 - - - - -
+TrigSignatureMoniMT INFO HLT_g120_loose_L1EM22VHI #1771279554
+TrigSignatureMoniMT INFO -- #1771279554 Events 6 6 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1771279554 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
TrigSignatureMoniMT INFO -- #3879926061 Events 6 6 0 0 0 - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - - -
@@ -322,6 +331,9 @@ TrigSignatureMoniMT INFO -- #2032419080 Features
TrigSignatureMoniMT INFO HLT_g20_tight_icalotight_L1EM15VH #2824200612
TrigSignatureMoniMT INFO -- #2824200612 Events 8 8 8 8 8 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #2824200612 Features 8 8 16 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g22_tight_L1EM15VH #1357440659
+TrigSignatureMoniMT INFO -- #1357440659 Events 8 8 7 7 7 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #1357440659 Features 7 7 13 5 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_etcut_L1EM20VH #1417839619
TrigSignatureMoniMT INFO -- #1417839619 Events 7 7 7 7 7 - - - - - - - - - - 7
TrigSignatureMoniMT INFO -- #1417839619 Features 11 11 10 - - - - - - - - - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index e9068580391476a4bab819016c6a12d0242c9686..8f864ecf55931667bf2a15a6cfe42957b58b7886 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -16,6 +16,9 @@ TrigSignatureMoniMT INFO -- #3136730292 Features
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
TrigSignatureMoniMT INFO -- #2280638160 Events 20 20 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VHI #3514903681
+TrigSignatureMoniMT INFO -- #3514903681 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3514903681 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - - - - - - - - -
@@ -229,6 +232,9 @@ TrigSignatureMoniMT INFO -- #2785977835 Features
TrigSignatureMoniMT INFO HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH #9348946
TrigSignatureMoniMT INFO -- #9348946 Events 20 20 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #9348946 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e24_lhvloose_L1EM20VH #2442891649
+TrigSignatureMoniMT INFO -- #2442891649 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2442891649 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1703681121 Features 1 2 0 - - - - - - - - - -
@@ -298,6 +304,9 @@ TrigSignatureMoniMT INFO -- #1959043579 Features
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
TrigSignatureMoniMT INFO -- #2970063918 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0
TrigSignatureMoniMT INFO -- #2970063918 Features 0 0 0 0 0 0 0 0 - - - - -
+TrigSignatureMoniMT INFO HLT_g120_loose_L1EM22VHI #1771279554
+TrigSignatureMoniMT INFO -- #1771279554 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1771279554 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
TrigSignatureMoniMT INFO -- #3879926061 Events 20 20 0 0 0 - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - - -
@@ -322,6 +331,9 @@ TrigSignatureMoniMT INFO -- #2032419080 Features
TrigSignatureMoniMT INFO HLT_g20_tight_icalotight_L1EM15VH #2824200612
TrigSignatureMoniMT INFO -- #2824200612 Events 20 20 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #2824200612 Features 0 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_g22_tight_L1EM15VH #1357440659
+TrigSignatureMoniMT INFO -- #1357440659 Events 20 20 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1357440659 Features 0 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_etcut_L1EM20VH #1417839619
TrigSignatureMoniMT INFO -- #1417839619 Events 20 20 3 3 2 - - - - - - - - - - 2
TrigSignatureMoniMT INFO -- #1417839619 Features 3 3 2 - - - - - - - - - -
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 791d355c33640f119baad6ef865baf14371deeff..8af44f9614549ec937cb962db8484daa0a6b13f5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -117,6 +117,7 @@ def setupMenu():
# Primary
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e24_lhvloose_L1EM20VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarmedium_L1EM22VHI', groups=SingleElectronGroup),
@@ -131,7 +132,7 @@ def setupMenu():
ChainProp(name='HLT_2e17_lhvloose_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
ChainProp(name='HLT_2e17_lhvloose_L12EM15VH', stream=[PhysicsStream], groups=MultiElectronGroup),
- #ChainProp(name='HLT_2e17_lhvloose_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup),
+ ChainProp(name='HLT_2e17_lhvloose_L12EM15VHI', stream=[PhysicsStream], groups=MultiElectronGroup),
ChainProp(name='HLT_2e24_lhvloose_L12EM20VH', stream=[PhysicsStream], groups=MultiElectronGroup),
ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH', stream=[PhysicsStream], groups=MultiElectronGroup),
@@ -150,11 +151,13 @@ def setupMenu():
ChainProp(name='HLT_g25_loose_L1EM20VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g25_medium_L1EM20VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g25_tight_L1EM20VH', groups=SinglePhotonGroup),
+ ChainProp(name='HLT_g22_tight_L1EM15VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g20_tight_L1EM15VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g20_tight_icaloloose_L1EM15VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g20_tight_icalomedium_L1EM15VH', groups=SinglePhotonGroup),
ChainProp(name='HLT_g20_tight_icalotight_L1EM15VH', groups=SinglePhotonGroup),
# Primary photon chains
+ ChainProp(name='HLT_g120_loose_L1EM22VHI', groups=SinglePhotonGroup),
ChainProp(name='HLT_g140_loose_L1EM22VHI', groups=SinglePhotonGroup),
ChainProp(name='HLT_2g35_medium_L12EM20VH', groups=MultiPhotonGroup),
ChainProp(name='HLT_g35_medium_g25_medium_L12EM20VH', groups=MultiPhotonGroup),