diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 6aefacc6b0f03131db657346b0ada349f8500a13..4d1e9babe2f94fa17ae3bf9922cba5b3ed68e8d8 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -910,36 +910,52 @@ HLT_eb_medium_L1RD2_FILLED: 0: 19 HLT_g120_loose_L1EM22VHI: eventCount: 0 +HLT_g12_loose_LArPEB_L1EM10VH: + eventCount: 6 + stepCounts: + 0: 9 + 1: 9 + 2: 9 + 3: 6 + 4: 6 + stepFeatures: + 0: 11 + 1: 11 + 2: 25 + 3: 6 + 4: 6 HLT_g140_etcut_L1EM22VHI: eventCount: 0 HLT_g140_etcut_L1EM24VHI: eventCount: 0 HLT_g140_loose_L1EM22VHI: eventCount: 0 -HLT_g20_etcut_LArPEB_L1EM15: - eventCount: 12 +HLT_g20_loose_L1EM15VH: + eventCount: 6 stepCounts: - 0: 14 - 1: 14 - 2: 12 - 3: 12 + 0: 8 + 1: 8 + 2: 8 + 3: 6 stepFeatures: - 0: 24 - 1: 24 - 2: 22 - 3: 20 -HLT_g20_loose_L1EM15VH: + 0: 9 + 1: 9 + 2: 18 + 3: 6 +HLT_g20_loose_LArPEB_L1EM15: eventCount: 6 stepCounts: 0: 8 1: 8 2: 8 3: 6 + 4: 6 stepFeatures: 0: 9 1: 9 2: 18 3: 6 + 4: 6 HLT_g20_medium_L1EM15VH: eventCount: 6 stepCounts: @@ -1110,28 +1126,44 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: 0: 5 1: 5 2: 8 -HLT_g5_etcut_L1EM3: - eventCount: 20 +HLT_g3_loose_LArPEB_L1EM3: + eventCount: 9 stepCounts: - 0: 20 - 1: 20 - 2: 20 + 0: 17 + 1: 17 + 2: 17 + 3: 9 + 4: 9 stepFeatures: - 0: 137 - 1: 137 - 2: 190 -HLT_g5_etcut_LArPEB_L1EM3: + 0: 63 + 1: 63 + 2: 124 + 3: 12 + 4: 12 +HLT_g40_loose_LArPEB_L1EM20VHI: + eventCount: 5 + stepCounts: + 0: 5 + 1: 5 + 2: 5 + 3: 5 + 4: 5 + stepFeatures: + 0: 5 + 1: 5 + 2: 10 + 3: 5 + 4: 5 +HLT_g5_etcut_L1EM3: eventCount: 20 stepCounts: 0: 20 1: 20 2: 20 - 3: 20 stepFeatures: 0: 137 1: 137 2: 190 - 3: 118 HLT_g5_loose_L1EM3: eventCount: 9 stepCounts: @@ -1168,6 +1200,34 @@ HLT_g5_tight_L1EM3: 1: 45 2: 82 3: 9 +HLT_g60_loose_LArPEB_L1EM20VHI: + eventCount: 3 + stepCounts: + 0: 3 + 1: 3 + 2: 3 + 3: 3 + 4: 3 + stepFeatures: + 0: 3 + 1: 3 + 2: 7 + 3: 3 + 4: 3 +HLT_g80_loose_LArPEB_L1EM20VHI: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + 2: 1 + 3: 1 + 4: 1 + stepFeatures: + 0: 1 + 1: 1 + 2: 3 + 3: 1 + 4: 1 HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20: eventCount: 0 HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 815c22c654fade54854d1597ecdd7915a7a82682..4ac2bde132fc0350a2affc8b68849c4985eaafbd 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -486,26 +486,18 @@ HLT_eb_medium_L1RD2_FILLED: 0: 7 HLT_g120_loose_L1EM22VHI: eventCount: 0 +HLT_g12_loose_LArPEB_L1EM10VH: + eventCount: 0 HLT_g140_etcut_L1EM22VHI: eventCount: 0 HLT_g140_etcut_L1EM24VHI: eventCount: 0 HLT_g140_loose_L1EM22VHI: eventCount: 0 -HLT_g20_etcut_LArPEB_L1EM15: - eventCount: 3 - stepCounts: - 0: 4 - 1: 4 - 2: 3 - 3: 3 - stepFeatures: - 0: 5 - 1: 5 - 2: 4 - 3: 4 HLT_g20_loose_L1EM15VH: eventCount: 0 +HLT_g20_loose_LArPEB_L1EM15: + eventCount: 0 HLT_g20_medium_L1EM15VH: eventCount: 0 HLT_g20_tight_L1EM15VH: @@ -552,28 +544,32 @@ HLT_g35_medium_g25_medium_L12EM20VH: eventCount: 0 HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: eventCount: 0 -HLT_g5_etcut_L1EM3: - eventCount: 13 +HLT_g3_loose_LArPEB_L1EM3: + eventCount: 2 stepCounts: - 0: 13 - 1: 13 - 2: 13 + 0: 11 + 1: 11 + 2: 11 + 3: 2 + 4: 2 stepFeatures: - 0: 41 - 1: 41 - 2: 50 -HLT_g5_etcut_LArPEB_L1EM3: + 0: 17 + 1: 17 + 2: 33 + 3: 2 + 4: 2 +HLT_g40_loose_LArPEB_L1EM20VHI: + eventCount: 0 +HLT_g5_etcut_L1EM3: eventCount: 13 stepCounts: 0: 13 1: 13 2: 13 - 3: 13 stepFeatures: 0: 41 1: 41 2: 50 - 3: 36 HLT_g5_loose_L1EM3: eventCount: 2 stepCounts: @@ -610,6 +606,10 @@ HLT_g5_tight_L1EM3: 1: 13 2: 29 3: 1 +HLT_g60_loose_LArPEB_L1EM20VHI: + eventCount: 0 +HLT_g80_loose_LArPEB_L1EM20VHI: + eventCount: 0 HLT_j0_aggSEP1000htSEP30etSEP0eta320_L1J20: eventCount: 0 HLT_j0_aggSEP500htSEP30etSEP0eta320_L1J20: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index d18ce32d6d255db59ba5cc7c7816abbf2e6b4d77..b6850fe03fd615de64c8aa9a452df2dda4e93271 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -176,9 +176,14 @@ def setupMenu(): # 3photon chains ChainProp(name='HLT_2g25_loose_g15_loose_L12EM20VH', groups=MultiPhotonGroup), - # ATR-19360 - ChainProp(name='HLT_g5_etcut_LArPEB_L1EM3',stream=['LArCells'], groups=SinglePhotonGroup), - + # ATR-21355 + ChainProp(name='HLT_g3_loose_LArPEB_L1EM3',stream=['LArCells'], groups=SinglePhotonGroup), + ChainProp(name='HLT_g12_loose_LArPEB_L1EM10VH',stream=['LArCells'], groups=SinglePhotonGroup), + ChainProp(name='HLT_g20_loose_LArPEB_L1EM15',stream=['LArCells'], groups=SinglePhotonGroup), + ChainProp(name='HLT_g40_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), + ChainProp(name='HLT_g60_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), + ChainProp(name='HLT_g80_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), + # for moving to PhysicsP1, ATR-21242 ChainProp(name='HLT_g140_etcut_L1EM22VHI', groups=SinglePhotonGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py index c8fffc17ee4b9a60a4e9f2c44cd8ceb2922e6050..1c83644ab2440873c7406804f1ff565c4091cd6d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py @@ -13,7 +13,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainDefInMenu import ChainProp import TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 as physics_menu -from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import PhysicsStream,SingleMuonGroup,SinglePhotonGroup,EgammaStreamersGroup,TauStreamersGroup,JetStreamersGroup,METStreamersGroup,MinBiasGroup,ZeroBiasGroup +from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import PhysicsStream,SingleMuonGroup,EgammaStreamersGroup,TauStreamersGroup,JetStreamersGroup,METStreamersGroup,MinBiasGroup,ZeroBiasGroup def addP1Signatures(): @@ -30,7 +30,6 @@ def addP1Signatures(): ] TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [ - ChainProp(name='HLT_g20_etcut_LArPEB_L1EM15',stream=['LArCells'], groups=SinglePhotonGroup), ] TriggerFlags.METSlice.signatures = TriggerFlags.METSlice.signatures() + [