diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
index 7b8c93e6aca79ac932a90249bda672b67d77c701..7dccd81c9210b034650e9f63842179ab036347af 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py
@@ -172,6 +172,7 @@ class TrigEgammaMonAlgBuilder:
'HLT_e5_etcut_L1EM3',
'HLT_e5_lhtight_noringer_L1EM3',
'HLT_e5_lhtight_L1EM3',
+ 'HLT_e5_lhtight_gsf_L1EM3',
]
@@ -199,6 +200,8 @@ class TrigEgammaMonAlgBuilder:
monitoringTP_electron = [
'HLT_e17_lhvloose_L1EM15VHI',
+ 'HLT_e17_lhvloose_gsf_L1EM15VHI',
+ 'HLT_e24_lhvloose_gsf_L1EM20VH',
'HLT_e24_lhvloose_L1EM20VH',
'HLT_e26_lhloose_L1EM15VH',
'HLT_e26_lhmedium_L1EM15VH',
@@ -208,7 +211,8 @@ class TrigEgammaMonAlgBuilder:
'HLT_e26_lhtight_ivartight_L1EM15VH',
'HLT_e26_lhloose_L1EM22VHI',
'HLT_e26_lhmedium_L1EM22VHI',
- 'HLT_e26_lhtight_L1EM22VHI',
+ 'HLT_e26_lhtight_gsf_L1EM22VHI',
+ 'HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI',
'HLT_e26_lhtight_ivarloose_L1EM22VHI',
'HLT_e26_lhtight_ivarmedium_L1EM22VHI',
'HLT_e26_lhtight_ivartight_L1EM22VHI',
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index e8d491bd8f844df3b13b332083c86feeca89ada2..5ce44550e7fcb968b02c58840d9187f47250bfa9 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -592,6 +592,48 @@ HLT_e17_lhloose_mu14_L1EM15VH_MU10:
6: 4
7: 4
8: 4
+HLT_e17_lhvloose_L1EM15VH:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 7
+ 2: 5
+ 3: 5
+ 4: 5
+HLT_e17_lhvloose_L1EM15VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
+HLT_e17_lhvloose_gsf_L1EM15VHI:
+ eventCount: 4
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 4
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 4
HLT_e17_lhvloose_nod0_L1EM15VH:
eventCount: 5
stepCounts:
@@ -652,6 +694,20 @@ HLT_e24_lhvloose_L1EM20VH:
2: 5
3: 5
4: 5
+HLT_e24_lhvloose_gsf_L1EM20VH:
+ eventCount: 5
+ stepCounts:
+ 0: 6
+ 1: 5
+ 2: 5
+ 3: 5
+ 4: 5
+ stepFeatures:
+ 0: 6
+ 1: 7
+ 2: 5
+ 3: 5
+ 4: 5
HLT_e26_etcut_L1EM22VHI:
eventCount: 5
stepCounts:
@@ -780,6 +836,20 @@ HLT_e26_lhtight_gsf_L1EM22VHI:
2: 4
3: 4
4: 4
+HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI:
+ eventCount: 3
+ stepCounts:
+ 0: 5
+ 1: 4
+ 2: 4
+ 3: 4
+ 4: 3
+ stepFeatures:
+ 0: 5
+ 1: 6
+ 2: 4
+ 3: 4
+ 4: 3
HLT_e26_lhtight_ivarloose_L1EM22VHI:
eventCount: 3
stepCounts:
@@ -956,6 +1026,20 @@ HLT_e5_lhtight_L1EM3:
2: 74
3: 43
4: 5
+HLT_e5_lhtight_gsf_L1EM3:
+ eventCount: 4
+ stepCounts:
+ 0: 18
+ 1: 15
+ 2: 15
+ 3: 15
+ 4: 4
+ stepFeatures:
+ 0: 57
+ 1: 128
+ 2: 74
+ 3: 43
+ 4: 5
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 4
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 970410e869591d6faa3737cf1d44f8e108027dc5..4f829f61c044ccc36c0f6fa352b6d02bc8b859d3 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -324,6 +324,12 @@ HLT_e140_lhloose_nod0_L1EM22VHI:
eventCount: 0
HLT_e17_lhloose_mu14_L1EM15VH_MU10:
eventCount: 0
+HLT_e17_lhvloose_L1EM15VH:
+ eventCount: 0
+HLT_e17_lhvloose_L1EM15VHI:
+ eventCount: 0
+HLT_e17_lhvloose_gsf_L1EM15VHI:
+ eventCount: 0
HLT_e17_lhvloose_nod0_L1EM15VH:
eventCount: 0
HLT_e17_lhvloose_nod0_L1EM15VHI:
@@ -338,6 +344,8 @@ HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH:
eventCount: 0
HLT_e24_lhvloose_L1EM20VH:
eventCount: 0
+HLT_e24_lhvloose_gsf_L1EM20VH:
+ eventCount: 0
HLT_e26_etcut_L1EM22VHI:
eventCount: 1
stepCounts:
@@ -366,6 +374,8 @@ HLT_e26_lhtight_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_gsf_L1EM22VHI:
eventCount: 0
+HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI:
+ eventCount: 0
HLT_e26_lhtight_ivarloose_L1EM22VHI:
eventCount: 0
HLT_e26_lhtight_ivarmedium_L1EM22VHI:
@@ -472,6 +482,18 @@ HLT_e5_lhtight_L1EM3:
1: 17
2: 11
3: 8
+HLT_e5_lhtight_gsf_L1EM3:
+ eventCount: 0
+ stepCounts:
+ 0: 9
+ 1: 7
+ 2: 6
+ 3: 6
+ stepFeatures:
+ 0: 17
+ 1: 17
+ 2: 11
+ 3: 8
HLT_e5_lhtight_nod0_L1EM3:
eventCount: 0
stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 7441ed68d8381fe498722cd67bbf68c90d27f715..c880aafcf297bdd0d00efc9e8166376846428c80 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -97,15 +97,15 @@ class ElectronChainConfiguration(ChainConfigurationBase):
'lhvloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
'lhmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
'lhtightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhloosegsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivarmedium': ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhmediumgsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivarloose' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivarmedium' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
- 'lhtightgsfivartight' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivarmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhlooseivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivarmediumgsf': ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhmediumivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivarloosegsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivarmediumgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
+ 'lhtightivartightgsf' : ['getFastCalo', 'getFastElectron', 'getPrecisionCaloElectron', 'getPrecisionTracking', 'getPrecisionGSFElectron'],
}
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 1243a7d10e4bd367ac6232560f792b50b3c3d935..17a90ba629299e0a289d28743f2e842c94fb36b9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -104,12 +104,17 @@ def setupMenu():
ChainProp(name='HLT_e5_lhloose_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhmedium_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_L1EM3', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e5_lhtight_gsf_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_nod0_L1EM3', groups=SingleElectronGroup),
# Primary
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_L1EM15VH', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_L1EM15VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e17_lhvloose_gsf_L1EM15VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e24_lhvloose_L1EM20VH', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e24_lhvloose_gsf_L1EM20VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhloose_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhmedium_L1EM15VH', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_L1EM15VH', groups=SingleElectronGroup),
@@ -118,6 +123,7 @@ def setupMenu():
ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_gsf_L1EM22VHI', groups=SingleElectronGroup), #Placeholder for GSF chain
ChainProp(name='HLT_e26_lhtight_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivarmedium_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_ivartight_L1EM22VHI', groups=SingleElectronGroup),
ChainProp(name='HLT_e26_lhtight_nod0_L1EM22VHI', groups=SingleElectronGroup),