diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py index 2fda1ed37ff5e4d50bd4e6e1681413bbdbb79865..ad4c4554025f019ea441b38f89e9e967b8a2c2ad 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringMTConfig.py @@ -175,6 +175,12 @@ class TrigEgammaMonAlgBuilder: ] monitoring_photon = [ + 'HLT_g20_loose_L1EM15VHI', + 'HLT_g20_medium_L1EM15VHI', + 'HLT_g20_tight_L1EM15VHI', + 'HLT_g20_tight_icalotight_L1EM15VHI', + 'HLT_g20_tight_icalomedium_L1EM15VHI', + 'HLT_g20_tight_icaloloose_L1EM15VHI', 'HLT_g20_loose_L1EM15VH', 'HLT_g20_medium_L1EM15VH', 'HLT_g20_tight_L1EM15VH', @@ -192,6 +198,12 @@ class TrigEgammaMonAlgBuilder: monitoringTP_electron = [ 'HLT_e24_lhvloose_L1EM20VH', + 'HLT_e26_lhloose_L1EM15VH', + 'HLT_e26_lhmedium_L1EM15VH', + 'HLT_e26_lhtight_L1EM15VH', + 'HLT_e26_lhtight_ivarloose_L1EM15VH', + 'HLT_e26_lhtight_ivarmedium_L1EM15VH', + 'HLT_e26_lhtight_ivartight_L1EM15VH', 'HLT_e26_lhloose_L1EM22VHI', 'HLT_e26_lhmedium_L1EM22VHI', 'HLT_e26_lhtight_L1EM22VHI', diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index f7c1ffcee6812b3bec7d7ee2cbd793467dc0ce9d..c3bfd6e3d3659a4220fecc6491e4245132d49bf5 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -80,18 +80,36 @@ HLT_2g20_tight_L12EM15VH: 0: 2 stepFeatures: 0: 2 +HLT_2g20_tight_L12EM15VHI: + eventCount: 0 + stepCounts: + 0: 1 + stepFeatures: + 0: 1 HLT_2g20_tight_icaloloose_L12EM15VH: eventCount: 0 stepCounts: 0: 2 stepFeatures: 0: 2 +HLT_2g20_tight_icaloloose_L12EM15VHI: + eventCount: 0 + stepCounts: + 0: 1 + stepFeatures: + 0: 1 HLT_2g22_tight_L12EM15VH: eventCount: 0 stepCounts: 0: 2 stepFeatures: 0: 2 +HLT_2g22_tight_L12EM15VHI: + eventCount: 0 + stepCounts: + 0: 1 + stepFeatures: + 0: 1 HLT_2g25_loose_g15_loose_L12EM20VH: eventCount: 0 HLT_2g35_etcut_L12EM20VH: @@ -556,6 +574,20 @@ HLT_e26_etcut_L1EM22VHI: 1: 136 2: 7 3: 7 +HLT_e26_lhloose_L1EM15VH: + eventCount: 4 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 6 + 4: 4 + stepFeatures: + 0: 6 + 1: 78 + 2: 10 + 3: 6 + 4: 4 HLT_e26_lhloose_L1EM22VHI: eventCount: 4 stepCounts: @@ -570,6 +602,20 @@ HLT_e26_lhloose_L1EM22VHI: 2: 8 3: 5 4: 4 +HLT_e26_lhmedium_L1EM15VH: + eventCount: 4 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 6 + 4: 4 + stepFeatures: + 0: 6 + 1: 78 + 2: 10 + 3: 6 + 4: 4 HLT_e26_lhmedium_L1EM22VHI: eventCount: 4 stepCounts: @@ -602,6 +648,20 @@ HLT_e26_lhmedium_mu8noL1_L1EM22VHI: 4: 4 5: 2 6: 2 +HLT_e26_lhtight_L1EM15VH: + eventCount: 4 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 6 + 4: 4 + stepFeatures: + 0: 6 + 1: 78 + 2: 10 + 3: 6 + 4: 4 HLT_e26_lhtight_L1EM22VHI: eventCount: 4 stepCounts: @@ -942,6 +1002,18 @@ HLT_g20_loose_L1EM15VH: 1: 9 2: 18 3: 6 +HLT_g20_loose_L1EM15VHI: + eventCount: 5 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 5 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 + 3: 5 HLT_g20_loose_LArPEB_L1EM15: eventCount: 6 stepCounts: @@ -968,6 +1040,18 @@ HLT_g20_medium_L1EM15VH: 1: 8 2: 16 3: 6 +HLT_g20_medium_L1EM15VHI: + eventCount: 5 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 5 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 + 3: 5 HLT_g20_tight_L1EM15VH: eventCount: 5 stepCounts: @@ -980,6 +1064,18 @@ HLT_g20_tight_L1EM15VH: 1: 8 2: 16 3: 5 +HLT_g20_tight_L1EM15VHI: + eventCount: 5 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 5 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 + 3: 5 HLT_g20_tight_icaloloose_L1EM15VH: eventCount: 5 stepCounts: @@ -992,6 +1088,18 @@ HLT_g20_tight_icaloloose_L1EM15VH: 1: 8 2: 16 3: 5 +HLT_g20_tight_icaloloose_L1EM15VHI: + eventCount: 5 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 5 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 + 3: 5 HLT_g20_tight_icalomedium_L1EM15VH: eventCount: 5 stepCounts: @@ -1004,6 +1112,18 @@ HLT_g20_tight_icalomedium_L1EM15VH: 1: 8 2: 16 3: 5 +HLT_g20_tight_icalomedium_L1EM15VHI: + eventCount: 5 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + 3: 5 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 + 3: 5 HLT_g20_tight_icalotight_L1EM15VH: eventCount: 0 stepCounts: @@ -1014,6 +1134,16 @@ HLT_g20_tight_icalotight_L1EM15VH: 0: 8 1: 8 2: 16 +HLT_g20_tight_icalotight_L1EM15VHI: + eventCount: 0 + stepCounts: + 0: 6 + 1: 6 + 2: 6 + stepFeatures: + 0: 6 + 1: 6 + 2: 11 HLT_g22_tight_L1EM15VH: eventCount: 5 stepCounts: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index bf246be7e29155538fa1a0075cb40cae07a6d4da..c72d4f9b14395735196944683e264d3bb0d2f723 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -46,10 +46,16 @@ HLT_2g15_tight_dPhi15_L1DPHI-M70-2EM12I: eventCount: 0 HLT_2g20_tight_L12EM15VH: eventCount: 0 +HLT_2g20_tight_L12EM15VHI: + eventCount: 0 HLT_2g20_tight_icaloloose_L12EM15VH: eventCount: 0 +HLT_2g20_tight_icaloloose_L12EM15VHI: + eventCount: 0 HLT_2g22_tight_L12EM15VH: eventCount: 0 +HLT_2g22_tight_L12EM15VHI: + eventCount: 0 HLT_2g25_loose_g15_loose_L12EM20VH: eventCount: 0 HLT_2g35_etcut_L12EM20VH: @@ -304,12 +310,18 @@ HLT_e26_etcut_L1EM22VHI: stepFeatures: 0: 1 1: 2 +HLT_e26_lhloose_L1EM15VH: + eventCount: 0 HLT_e26_lhloose_L1EM22VHI: eventCount: 0 +HLT_e26_lhmedium_L1EM15VH: + eventCount: 0 HLT_e26_lhmedium_L1EM22VHI: eventCount: 0 HLT_e26_lhmedium_mu8noL1_L1EM22VHI: eventCount: 0 +HLT_e26_lhtight_L1EM15VH: + eventCount: 0 HLT_e26_lhtight_L1EM22VHI: eventCount: 0 HLT_e26_lhtight_ivarloose_L1EM22VHI: @@ -496,18 +508,30 @@ HLT_g140_loose_L1EM22VHI: eventCount: 0 HLT_g20_loose_L1EM15VH: eventCount: 0 +HLT_g20_loose_L1EM15VHI: + eventCount: 0 HLT_g20_loose_LArPEB_L1EM15: eventCount: 0 HLT_g20_medium_L1EM15VH: eventCount: 0 +HLT_g20_medium_L1EM15VHI: + eventCount: 0 HLT_g20_tight_L1EM15VH: eventCount: 0 +HLT_g20_tight_L1EM15VHI: + eventCount: 0 HLT_g20_tight_icaloloose_L1EM15VH: eventCount: 0 +HLT_g20_tight_icaloloose_L1EM15VHI: + eventCount: 0 HLT_g20_tight_icalomedium_L1EM15VH: eventCount: 0 +HLT_g20_tight_icalomedium_L1EM15VHI: + eventCount: 0 HLT_g20_tight_icalotight_L1EM15VH: eventCount: 0 +HLT_g20_tight_icalotight_L1EM15VHI: + eventCount: 0 HLT_g22_tight_L1EM15VH: eventCount: 0 HLT_g25_etcut_L1EM20VH: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 5d800a8a7c063c4048ab119a1a0fa839b3662f4e..f05f5f11a2bbef15569b0605a446619ce9770463 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -119,6 +119,9 @@ def setupMenu(): # Primary ChainProp(name='HLT_e17_lhvloose_nod0_L1EM15VH', groups=SingleElectronGroup), ChainProp(name='HLT_e24_lhvloose_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), ChainProp(name='HLT_e26_lhloose_L1EM22VHI', groups=SingleElectronGroup), ChainProp(name='HLT_e26_lhmedium_L1EM22VHI', groups=SingleElectronGroup), ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup), @@ -156,6 +159,12 @@ def setupMenu(): 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_loose_L1EM15VHI', groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_medium_L1EM15VHI', groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_tight_L1EM15VHI', groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_tight_icaloloose_L1EM15VHI', groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_tight_icalomedium_L1EM15VHI', groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_tight_icalotight_L1EM15VHI', groups=SinglePhotonGroup), ChainProp(name='HLT_g20_loose_L1EM15VH', groups=SinglePhotonGroup), ChainProp(name='HLT_g20_medium_L1EM15VH', groups=SinglePhotonGroup), ChainProp(name='HLT_g20_tight_L1EM15VH', groups=SinglePhotonGroup), @@ -168,8 +177,10 @@ def setupMenu(): ChainProp(name='HLT_2g35_medium_L12EM20VH', groups=MultiPhotonGroup), ChainProp(name='HLT_g35_medium_g25_medium_L12EM20VH', groups=MultiPhotonGroup), ChainProp(name='HLT_2g20_tight_L12EM15VH', groups=MultiPhotonGroup), - #ChainProp(name='HLT_2g22_tight_L12EM15VHI', groups=MultiPhotonGroup), + ChainProp(name='HLT_2g20_tight_L12EM15VHI', groups=MultiPhotonGroup), + ChainProp(name='HLT_2g22_tight_L12EM15VHI', groups=MultiPhotonGroup), ChainProp(name='HLT_2g20_tight_icaloloose_L12EM15VH', groups=MultiPhotonGroup), + ChainProp(name='HLT_2g20_tight_icaloloose_L12EM15VHI', groups=MultiPhotonGroup), ChainProp(name='HLT_2g22_tight_L12EM15VH', groups=MultiPhotonGroup), ChainProp(name='HLT_2g50_loose_L12EM20VH', groups=MultiPhotonGroup),