diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py index 2d9e01ea32a3c94e7fe8b6200e99d0898e9b41c2..ba5f279afcded359db67478c864aeef3aa43ee8d 100644 --- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py +++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigMultiTrkComboHypoConfig.py @@ -100,6 +100,7 @@ def DiElecPrecisionComboHypoCfg(name): trigLevel = 'EF', doElectrons = True, outputTrigBphysCollection = 'HLT_DiElecPrecision') + hypo.mergedElectronChains = ['BPH-0DR3-EM7J15','HLT_e5_lhvloose_bBeeM6000_L1EM22VHI','HLT_e5_lhvloose_bBeeM6000_L14J15'] return hypo def NoMuonDiElecPrecisionComboHypoCfg(name): @@ -112,6 +113,7 @@ def NoMuonDiElecPrecisionComboHypoCfg(name): trigLevel = 'EF', doElectrons = True, outputTrigBphysCollection = 'HLT_NoMuonDiElecPrecision') + hypo.mergedElectronChains = ['BPH-0DR3-EM7J15','HLT_e5_lhvloose_bBeeM6000_L1EM22VHI','HLT_e5_lhvloose_bBeeM6000_L14J15'] return hypo def BmutrkComboHypoCfg(name): @@ -217,7 +219,8 @@ class TrigMultiTrkComboHypoConfig(object): if 'Lxy0' in chainDict['topo']: tool.LxyCut = 0.0 - if 'BPH-0DR3-EM7J15' in chainDict['L1item']: + electronMultiplicity = [int(chainPart['multiplicity']) for chainPart in chainDict['chainParts'] if chainPart['signature']=='Electron'] + if len(electronMultiplicity) == 1 and electronMultiplicity[0] == 1: tool.isMergedElectronChain = True if 'bJpsimutrk' in chainDict['topo']: diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index a1e298695f04237e8e031d90d63c8b0291fe325f..6c38de37a18d887535189379bc103b7655920dd0 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -79,18 +79,39 @@ HLT_2e5_lhvloose_bBeeM6000_L12EM3: 2: 14 3: 25 4: 3 -HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5: +HLT_2e5_lhvloose_bBeeM6000_L14J15: + eventCount: 0 + stepCounts: + 0: 10 + 1: 4 + 2: 4 + 3: 4 + stepFeatures: + 0: 35 + 1: 62 + 2: 12 + 3: 25 + 4: 3 +HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 8 + 1: 17 +HLT_2e5_lhvloose_bBeeM6000_L1EM22VHI: eventCount: 0 stepCounts: 0: 6 - 1: 2 - 2: 1 - 3: 1 + 1: 3 + 2: 3 + 3: 3 stepFeatures: - 0: 18 - 1: 50 - 2: 4 - 3: 9 + 0: 26 + 1: 33 + 2: 9 + 3: 16 + 4: 3 HLT_2g10_loose_mu20_L1MU14FCH: eventCount: 0 stepCounts: @@ -3538,6 +3559,19 @@ HLT_e5_lhtight_noringer_e9_etcut_Jpsiee_L1JPSI-1M5-EM7: eventCount: 0 HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB5_L1JPSI-1M5-EM7: eventCount: 0 +HLT_e5_lhvloose_bBeeM6000_L14J15: + eventCount: 0 + stepCounts: + 0: 13 + 1: 4 + 2: 4 + 3: 4 + stepFeatures: + 0: 35 + 1: 64 + 2: 12 + 3: 25 + 4: 3 HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15: eventCount: 0 stepCounts: @@ -3551,6 +3585,32 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15: 2: 18 3: 41 4: 9 +HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF: + eventCount: 0 + stepCounts: + 0: 11 + 1: 10 + 2: 9 + 3: 9 + stepFeatures: + 0: 29 + 1: 64 + 2: 16 + 3: 36 + 4: 9 +HLT_e5_lhvloose_bBeeM6000_L1EM22VHI: + eventCount: 0 + stepCounts: + 0: 10 + 1: 3 + 2: 3 + 3: 3 + stepFeatures: + 0: 26 + 1: 35 + 2: 9 + 3: 16 + 4: 3 HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF: eventCount: 0 stepCounts: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 3a210656b56d2258c7ece1c1680a8e993816b7d5..5814946ce9d9c17ef00b09829b2f46129f87d21b 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -34,18 +34,17 @@ HLT_2e5_lhvloose_bBeeM6000_L12EM3: 1: 49 2: 4 3: 5 -HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5: +HLT_2e5_lhvloose_bBeeM6000_L14J15: + eventCount: 0 +HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF: + eventCount: 0 +HLT_2e5_lhvloose_bBeeM6000_L1EM22VHI: eventCount: 0 stepCounts: - 0: 1 - 1: 1 - 2: 1 - 3: 1 + 0: 3 stepFeatures: - 0: 5 + 0: 9 1: 9 - 2: 2 - 3: 2 HLT_2g10_loose_mu20_L1MU14FCH: eventCount: 0 HLT_2g15_loose_25dphiAA_invmAA80_L1DPHI-M70-2eEM12M: @@ -1142,6 +1141,8 @@ HLT_e5_lhtight_noringer_e9_etcut_probe_1invmAB5_L1JPSI-1M5-EM7: 1: 8 2: 2 3: 8 +HLT_e5_lhvloose_bBeeM6000_L14J15: + eventCount: 0 HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15: eventCount: 0 stepCounts: @@ -1154,6 +1155,21 @@ HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15: 1: 19 2: 6 3: 7 +HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF: + eventCount: 0 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 2 + 1: 8 +HLT_e5_lhvloose_bBeeM6000_L1EM22VHI: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 9 + 1: 9 HLT_e5_lhvloose_j70_0eta320_j50_0eta490_j0_DJMASS1000j50_xe50_tcpufit_L1MJJ-500-NFF: eventCount: 0 HLT_e5_lhvloose_nopix_lrtloose_idperf_probe_g25_medium_L1EM20VH: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index ad3aaa7ab165e3919b9c308ab45ba3582fe08f82..d4c5d147dcce969051457608ebd72557b4630d62 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -193,10 +193,15 @@ def setupMenu(): #ATR-22749 ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L12EM3', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), - ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), ChainProp(name='HLT_e9_lhvloose_e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5', l1SeedThresholds=['EM7','EM3'], groups=BphysElectronGroup), ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15', l1SeedThresholds=['EM7'], groups=BphysElectronGroup), ChainProp(name='HLT_e9_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15', l1SeedThresholds=['EM7'], groups=BphysElectronGroup), + ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1EM22VHI', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), + ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1EM22VHI', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), + ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L1BPH-0M9-EM7-EM5_MU5VF', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), + ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L1BPH-0DR3-EM7J15_MU5VF', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), + ChainProp(name='HLT_2e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), + ChainProp(name='HLT_e5_lhvloose_bBeeM6000_L14J15', l1SeedThresholds=['EM3'], groups=BphysElectronGroup), #ART-23577 ChainProp(name='HLT_e20_lhloose_L1EM7_AFP_A_OR_C', l1SeedThresholds=['EM7'], groups=SingleElectronGroup+LowMuGroup),