From 3fa09d83f3ab485d58f442c2ee2445d2c5cb6485 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-30.cern.ch> Date: Sun, 26 Sep 2021 12:58:16 +0200 Subject: [PATCH 01/16] LArPEB chains: change L1EM20VHI seed to L1EM22VHI, move to PhysicsP1 menu, add streamers in Cosmic and PhysicsP1 menu, update references --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 26 ++++++++++-- .../share/ref_v1Dev_decodeBS_build.ref | 26 ++++++++++-- .../HLTMenuConfig/Menu/Cosmic_run3_v1.py | 41 ++++++++++++------- .../python/HLTMenuConfig/Menu/LS2_v1.py | 16 -------- .../Menu/PhysicsP1_pp_run3_v1.py | 40 +++++++++++++++++- 5 files changed, 110 insertions(+), 39 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 59d441b65546..4ddfc797a4d5 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -4740,7 +4740,7 @@ HLT_g40_loose_L1EM20VH: 1: 10 2: 10 3: 6 -HLT_g40_loose_LArPEBHLT_L1EM20VHI: +HLT_g40_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g40_loose_mu40_msonly_L1MU14FCH: eventCount: 0 @@ -4941,7 +4941,7 @@ HLT_g60_loose_L1EM22VHI: 1: 7 2: 7 3: 3 -HLT_g60_loose_LArPEBHLT_L1EM20VHI: +HLT_g60_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g60_tight_icaloloose_2j55_pf_ftf_0eta200_ExoticPTF0p0dR1p2_L1EM22VHI: eventCount: 0 @@ -5055,7 +5055,7 @@ HLT_g80_loose_L1EM22VHI: 1: 6 2: 6 3: 2 -HLT_g80_loose_LArPEBHLT_L1EM20VHI: +HLT_g80_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g85_tight_3j50_L1EM22VHI: eventCount: 1 @@ -9749,6 +9749,26 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM10VH: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM15: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM22VHI: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM3: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J100: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J15: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J15p31ETA49: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J20: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J30p31ETA49: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J75p31ETA49: + eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 HLT_noalg_ZDCPEB_L1ZDC_A: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 08f501b6807f..f039f2ceaff4 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -1620,7 +1620,7 @@ HLT_g3_loose_LArPEBHLT_L1EM3: eventCount: 0 HLT_g40_loose_L1EM20VH: eventCount: 0 -HLT_g40_loose_LArPEBHLT_L1EM20VHI: +HLT_g40_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g40_loose_mu40_msonly_L1MU14FCH: eventCount: 0 @@ -1648,7 +1648,7 @@ HLT_g50_loose_L1EM20VH: eventCount: 0 HLT_g60_loose_L1EM22VHI: eventCount: 0 -HLT_g60_loose_LArPEBHLT_L1EM20VHI: +HLT_g60_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g60_tight_icaloloose_2j55_pf_ftf_0eta200_ExoticPTF0p0dR1p2_L1EM22VHI: eventCount: 0 @@ -1664,7 +1664,7 @@ HLT_g60_tight_icaloloose_2j85_pf_ftf_0eta200_ExoticPTF0p2dR1p2_L1EM22VHI: eventCount: 0 HLT_g80_loose_L1EM22VHI: eventCount: 0 -HLT_g80_loose_LArPEBHLT_L1EM20VHI: +HLT_g80_loose_LArPEBHLT_L1EM22VHI: eventCount: 0 HLT_g85_tight_3j50_L1EM22VHI: eventCount: 0 @@ -3923,6 +3923,26 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM10VH: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM15: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM22VHI: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1EM3: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J100: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J15: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J15p31ETA49: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J20: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J30p31ETA49: + eventCount: 0 +HLT_noalg_LArPEBHLT_L1J75p31ETA49: + eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 HLT_noalg_ZDCPEB_L1ZDC_A: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py index 72535388e3cc..1e45ec83fb31 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py @@ -41,29 +41,40 @@ def setupMenu(): ] TriggerFlags.EgammaSlice.signatures = [ - ChainProp(name='HLT_g3_etcut_LArPEB_L1EM3',stream=['LArCells'], groups=['RATE:SinglePhoton', 'BW:Egamma']), - ChainProp(name='HLT_g3_loose_LArPEBHLT_L1EM3', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence + ChainProp(name='HLT_g3_etcut_LArPEB_L1EM3', stream=['LArCells'], groups=['RATE:SinglePhoton', 'BW:Egamma']), + ChainProp(name='HLT_g3_loose_LArPEBHLT_L1EM3', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_g12_loose_LArPEBHLT_L1EM10VH', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g20_loose_LArPEBHLT_L1EM15', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g20_loose_LArPEBHLT_L1EM15', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), ] TriggerFlags.METSlice.signatures = [] TriggerFlags.JetSlice.signatures = [ - ChainProp(name='HLT_j40_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j25_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j25_320eta490_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - - ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), - ChainProp(name='HLT_j0_HT0_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), + # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence + ChainProp(name='HLT_j25_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j25_320eta490_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j40_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), + ChainProp(name='HLT_j0_HT0_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), ] TriggerFlags.BjetSlice.signatures = [ ChainProp(name='HLT_j0_ftf_boffperf_L1MU8F', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleBjetGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 6dcce746293d..058321a2d70b 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -210,14 +210,6 @@ def setupMenu(): # PhotonDS chains for TLA ChainProp(name='HLT_g35_loose_PhotonDS_L1EM22VHI',stream=['PhotonDS'], groups=PrimaryLegGroup+SinglePhotonGroup), - # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence - ChainProp(name='HLT_g3_loose_LArPEBHLT_L1EM3', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g12_loose_LArPEBHLT_L1EM10VH', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g20_loose_LArPEBHLT_L1EM15', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM20VHI',stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - #ATR-21882 ChainProp(name='HLT_2g15_tight_dPhi25_m80_L1DPHI-M70-2eEM12M', l1SeedThresholds=['eEM10L'], groups=PrimaryPhIGroup+MultiPhotonGroup), # TODO: mismatch between L1topo threshold and L1 seed to be fixed @@ -469,14 +461,6 @@ def setupMenu(): # ATR-20624 ChainProp(name='HLT_j0_perf_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=['PS:Online']+SingleJetGroup), - # ATR-21368 - cannot be moved to the calibSlice because they need to configure the jet sequence - ChainProp(name='HLT_j40_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j25_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j25_320eta490_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - # TLA test chains, ATR-20395 ChainProp(name='HLT_j20_JetDS_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=PrimaryLegGroup+SingleJetGroup), ChainProp(name='HLT_j20_JetDS_L1J50_DETA20-J50J', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=EOFTLALegGroup+SingleJetGroup), 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 65199269b0b5..11346554e6cd 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,8 +13,20 @@ 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,EgammaStreamersGroup, - TauStreamersGroup,JetStreamersGroup,METStreamersGroup,MinBiasGroup,ZeroBiasGroup,SupportLegGroup, LowMuGroup) +from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import ( + PhysicsStream, + SingleMuonGroup, + SinglePhotonGroup, + SingleJetGroup, + EgammaStreamersGroup, + TauStreamersGroup, + JetStreamersGroup, + METStreamersGroup, + MinBiasGroup, + ZeroBiasGroup, + SupportLegGroup, + LowMuGroup, +) def addP1Signatures(): @@ -31,12 +43,36 @@ def addP1Signatures(): ] TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [ + # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence + ChainProp(name='HLT_g3_loose_LArPEBHLT_L1EM3', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g12_loose_LArPEBHLT_L1EM10VH', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g20_loose_LArPEBHLT_L1EM15', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ] TriggerFlags.METSlice.signatures = TriggerFlags.METSlice.signatures() + [ ] TriggerFlags.JetSlice.signatures = TriggerFlags.JetSlice.signatures() + [ + # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence + ChainProp(name='HLT_j25_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j25_320eta490_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j40_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), ] TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [ -- GitLab From 3b554b77d14a9066f655bf5235451b9e03edc0b3 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-30.cern.ch> Date: Sun, 26 Sep 2021 15:55:35 +0200 Subject: [PATCH 02/16] MBTS triggers: add MBTS_A/C items to L1 menu, add streamers to PhysicsP1 menu, update references --- .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref | 4 ++++ .../TrigP1Test/share/ref_v1Dev_decodeBS_build.ref | 4 ++++ .../python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py | 3 +++ .../TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py | 3 +++ .../TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py | 1 + 5 files changed, 15 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 4ddfc797a4d5..20b875472902 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -9615,6 +9615,10 @@ HLT_noalg_L1MBTS_2_EMPTY: eventCount: 0 HLT_noalg_L1MBTS_2_UNPAIRED_ISO: eventCount: 0 +HLT_noalg_L1MBTS_A: + eventCount: 0 +HLT_noalg_L1MBTS_C: + eventCount: 0 HLT_noalg_L1MU5VF: eventCount: 11 HLT_noalg_L1MU5VF_AFP_A_AND_C: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index f039f2ceaff4..c6a7c3068d88 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -3793,6 +3793,10 @@ HLT_noalg_L1MBTS_2_EMPTY: eventCount: 0 HLT_noalg_L1MBTS_2_UNPAIRED_ISO: eventCount: 0 +HLT_noalg_L1MBTS_A: + eventCount: 0 +HLT_noalg_L1MBTS_C: + eventCount: 0 HLT_noalg_L1MU5VF: eventCount: 6 HLT_noalg_L1MU5VF_AFP_A_AND_C: 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 11346554e6cd..36d442fbdb09 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 @@ -193,6 +193,9 @@ def addP1Signatures(): # ChainProp(name='HLT_noalg_L1RD1_BGRP10', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Calibration','BW:Detector']), # MBTS + ChainProp(name='HLT_noalg_L1MBTS_A', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), + ChainProp(name='HLT_noalg_L1MBTS_C', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), + ChainProp(name='HLT_noalg_L1MBTS_1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), #ATR-21740 ChainProp(name='HLT_noalg_L1RD2_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), # ATR-21367 ChainProp(name='HLT_noalg_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],groups=ZeroBiasGroup),# ATR-21367 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py index 19d34e9730c1..16f3b5b089c6 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py @@ -822,6 +822,9 @@ class ItemDef: MBTS_4_C = d.MBTS_C.x(4) + MenuItem('L1_MBTS_A' ).setLogic( d.MBTS_A & physcond ).setTriggerType(TT.minb) + MenuItem('L1_MBTS_C' ).setLogic( d.MBTS_C & physcond ).setTriggerType(TT.minb) + MenuItem('L1_MBTS_1' ).setLogic( MBTS_1 & physcond ).setTriggerType(TT.minb) MenuItem('L1_MBTS_1_OVERLAY' ).setLogic( MBTS_1 & physcond ).setTriggerType(TT.zerobs) MenuItem('L1_MBTS_2' ).setLogic( MBTS_2 & physcond ).setTriggerType(TT.minb) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py index 2cf10d6e5761..4c04a22a5c23 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py @@ -228,6 +228,7 @@ def defineMenu(): 'L1_AFP_A_OR_C','L1_AFP_A_OR_C_MBTS_2', 'L1_AFP_A_AND_C_MBTS_2', # MBTS + 'L1_MBTS_A', 'L1_MBTS_C', 'L1_MBTS_1_EMPTY', 'L1_MBTS_1_1_EMPTY', 'L1_MBTS_2_EMPTY', 'L1_MBTS_1_UNPAIRED_ISO', 'L1_MBTS_1_1_UNPAIRED_ISO', 'L1_MBTS_2_UNPAIRED_ISO', 'L1_MBTS_1', 'L1_MBTS_1_1', 'L1_MBTS_2', -- GitLab From 2ded856617251aa281b21b308f0e33dca169aa46 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-30.cern.ch> Date: Sun, 26 Sep 2021 16:42:36 +0200 Subject: [PATCH 03/16] LArDigitalTrigger: add streamers with LArPEB output for L1_J400_LAR and L1_LAR-ZEE-eEM to PhysicsP1 menu, update references --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 8 ++++++++ .../TrigP1Test/share/ref_v1Dev_decodeBS_build.ref | 4 ++++ .../python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py | 2 ++ 3 files changed, 14 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 20b875472902..06f70bed9423 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -9743,12 +9743,20 @@ HLT_noalg_L1jTAU12: eventCount: 0 HLT_noalg_L1jTAU12M: eventCount: 0 +HLT_noalg_LArPEBCalib_L1J400_LAR: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 1 HLT_noalg_LArPEBCalib_L1LAR-ZEE: eventCount: 1 stepCounts: 0: 1 stepFeatures: 0: 1 +HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM: + eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index c6a7c3068d88..853f05ce1b9a 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -3921,8 +3921,12 @@ HLT_noalg_L1jTAU12: eventCount: 0 HLT_noalg_L1jTAU12M: eventCount: 0 +HLT_noalg_LArPEBCalib_L1J400_LAR: + eventCount: 0 HLT_noalg_LArPEBCalib_L1LAR-ZEE: eventCount: 0 +HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM: + eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: 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 36d442fbdb09..129598b45e28 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 @@ -185,7 +185,9 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_CSCPEB_L1J30p31ETA49_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), # LAr + ChainProp(name='HLT_noalg_LArPEBCalib_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), # TGC ChainProp(name='HLT_noalg_L1TGC_BURST', l1SeedThresholds=['FSNOSEED'], stream=['TgcNoiseBurst'],groups=['RATE:Calibration','BW:Detector']), -- GitLab From 64338d0dde69cc3089791a076d4bce6d9a49e648 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-30.cern.ch> Date: Sun, 26 Sep 2021 21:49:54 +0200 Subject: [PATCH 04/16] LArDigitalTrigger: fully add L1_BGRP7 in L1 menu, add streamer in PhysicsP1 menu, update references --- .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref | 2 ++ .../TrigP1Test/share/ref_v1Dev_decodeBS_build.ref | 2 ++ .../python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py | 1 + .../TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py | 1 + 4 files changed, 6 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 06f70bed9423..db4be304ac81 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -9463,6 +9463,8 @@ HLT_noalg_L1AFP_NSC_BGRP0: eventCount: 0 HLT_noalg_L1All: eventCount: 20 +HLT_noalg_L1BGRP7: + eventCount: 0 HLT_noalg_L1Bkg: eventCount: 0 HLT_noalg_L1CEP-CjJ50: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 853f05ce1b9a..299b54968f76 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -3641,6 +3641,8 @@ HLT_noalg_L1AFP_NSC_BGRP0: eventCount: 0 HLT_noalg_L1All: eventCount: 50 +HLT_noalg_L1BGRP7: + eventCount: 0 HLT_noalg_L1Bkg: eventCount: 0 HLT_noalg_L1CEP-CjJ50: 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 129598b45e28..d1e8502ee911 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 @@ -116,6 +116,7 @@ def addP1Signatures(): TriggerFlags.StreamingSlice.signatures = TriggerFlags.StreamingSlice.signatures() + [ ChainProp(name='HLT_noalg_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), ChainProp(name='HLT_noalg_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), + ChainProp(name='HLT_noalg_L1BGRP7', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), # ID monitoring ChainProp(name='HLT_noalg_idmon_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['IDMonitoring','express'],groups=['RATE:Monitoring','BW:Detector']), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py index 4c04a22a5c23..2a8f5a1a22dd 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py @@ -172,6 +172,7 @@ def defineMenu(): # RNDM 'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO', 'L1_RD0_EMPTY', 'L1_RD0_ABORTGAPNOTCALIB', 'L1_RD0_FIRSTEMPTY', 'L1_RD0_BGRP11', + 'L1_BGRP7', 'L1_RD1_EMPTY', 'L1_RD2_EMPTY', 'L1_RD2_FILLED', -- GitLab From 7687e9a03fcee4c96f0145c294034977ae854505 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-30.cern.ch> Date: Mon, 27 Sep 2021 00:07:45 +0200 Subject: [PATCH 05/16] LArPEB chains: move streamer to calib slice --- .../HLTMenuConfig/Menu/Cosmic_run3_v1.py | 24 +++++++++++++------ .../Menu/PhysicsP1_pp_run3_v1.py | 22 +++++++++-------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py index 1e45ec83fb31..e2a30c2e89b2 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py @@ -49,12 +49,6 @@ def setupMenu(): ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - - ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), ] TriggerFlags.METSlice.signatures = [] @@ -93,7 +87,23 @@ def setupMenu(): ChainProp(name='HLT_mb_sptrk_costr_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=['Rate:MinBias','BW:MinBias']), ChainProp(name='HLT_mb_sptrk_costr_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=['Rate:Cosmic_MinBias','BW:MinBias']), ] - TriggerFlags.CalibSlice.signatures = [] + TriggerFlags.CalibSlice.signatures = [ + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + + ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), + + ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), + ChainProp(name='HLT_j0_HT0_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), + ] TriggerFlags.CosmicSlice.signatures = [] TriggerFlags.StreamingSlice.signatures = [ 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 d1e8502ee911..b81912e1cc5c 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 @@ -50,10 +50,6 @@ def addP1Signatures(): ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ] TriggerFlags.METSlice.signatures = TriggerFlags.METSlice.signatures() + [ @@ -67,12 +63,6 @@ def addP1Signatures(): ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), ] TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [ @@ -99,6 +89,18 @@ def addP1Signatures(): TriggerFlags.CalibSlice.signatures = TriggerFlags.CalibSlice.signatures() + [ ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_BGRP11', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + # LAr noise burst chains ChainProp(name='HLT_larnoiseburst_L1XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_larnoiseburst_L1J75', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), -- GitLab From da0db1166cbd398c93914fa9835a2c7aee683546 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-32.cern.ch> Date: Wed, 29 Sep 2021 09:19:37 +0200 Subject: [PATCH 06/16] LArPEB chains: remove noalg_LArPEBHLT chains from Cosmic menu, change rate group in PhysicsP1 menu to Calibration/Detector --- .../HLTMenuConfig/Menu/Cosmic_run3_v1.py | 33 +------------------ .../Menu/PhysicsP1_pp_run3_v1.py | 26 +++++++-------- 2 files changed, 14 insertions(+), 45 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py index e2a30c2e89b2..674019a3688c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py @@ -43,30 +43,10 @@ def setupMenu(): TriggerFlags.EgammaSlice.signatures = [ # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence ChainProp(name='HLT_g3_etcut_LArPEB_L1EM3', stream=['LArCells'], groups=['RATE:SinglePhoton', 'BW:Egamma']), - ChainProp(name='HLT_g3_loose_LArPEBHLT_L1EM3', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g12_loose_LArPEBHLT_L1EM10VH', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g20_loose_LArPEBHLT_L1EM15', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g40_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g60_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_g80_loose_LArPEBHLT_L1EM22VHI', stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), ] TriggerFlags.METSlice.signatures = [] - TriggerFlags.JetSlice.signatures = [ - # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence - ChainProp(name='HLT_j25_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j25_320eta490_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j40_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_j165_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - + TriggerFlags.JetSlice.signatures = [ ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), ChainProp(name='HLT_j0_HT0_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), ] @@ -88,17 +68,6 @@ def setupMenu(): ChainProp(name='HLT_mb_sptrk_costr_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=['Rate:Cosmic_MinBias','BW:MinBias']), ] TriggerFlags.CalibSlice.signatures = [ - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), 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 0f9f51e5fd7c..4bf3997e0464 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 @@ -90,16 +90,16 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_BGRP11', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SinglePhotonGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['PS:Online']+SingleJetGroup), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), # LAr noise burst chains ChainProp(name='HLT_larnoiseburst_L1XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), @@ -192,9 +192,9 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_CSCPEB_L1J30p31ETA49_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), # LAr - ChainProp(name='HLT_noalg_LArPEBCalib_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'],groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), # TGC ChainProp(name='HLT_noalg_L1TGC_BURST', l1SeedThresholds=['FSNOSEED'], stream=['TgcNoiseBurst'],groups=['RATE:Calibration','BW:Detector']), -- GitLab From 88bbad9f2e03a672dd6f6bc7a2538ce21230c0f8 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 10:38:39 +0200 Subject: [PATCH 07/16] LArDigitalTrigger: add HLT_Roi_LArPEB TrigRoiDescriptorCollection to EDM --- Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index f11025c7574a..72ecbc57d248 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -195,6 +195,7 @@ TriggerHLTListRun3 = [ # PEB RoIs for full-scan chains ('TrigRoiDescriptorCollection#HLT_Roi_LArPEBHLT', 'BS ESD AODFULL AODSLIM', 'Steer'), + ('TrigRoiDescriptorCollection#HLT_Roi_LArPEB', 'BS ESD AODFULL AODSLIM', 'Steer'), # Run-2 L1 (temporary) ('xAOD::EmTauRoIContainer#LVL1EmTauRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'), -- GitLab From 3572d26a2e2d92acf71efe6053e4e057f07a8b93 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 11:35:02 +0200 Subject: [PATCH 08/16] LArDigitalTrigger: add LArPEB with LATOME-only configuration --- .../CommonSequences/EventBuildingSequences.py | 4 + .../CommonSequences/LATOMESourceIDs.py | 122 ++++++++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/LATOMESourceIDs.py diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py index 917782bf0953..9d8096fcd785 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py @@ -108,6 +108,10 @@ def pebInfoWriterTool(name, eventBuildType): tool.addRegSelDets(['Pixel', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']) tool.MaxRoIs = 5 tool.addCTPResultToROBList() # add the CTP result to the list + elif 'LArPEBDigitalTrigger' == eventBuildType: + from .LATOMESourceIDs import LATOMESourceIDs + tool = StaticPEBInfoWriterToolCfg(name) + tool.addROBs(LATOMESourceIDs) elif 'RPCPEBSecondaryReadout' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addROBs([0x610080, 0x620080]) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/LATOMESourceIDs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/LATOMESourceIDs.py new file mode 100644 index 000000000000..dc235143c146 --- /dev/null +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/LATOMESourceIDs.py @@ -0,0 +1,122 @@ +# +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# + +LATOMESourceIDs = [ + 0x411000, + 0x411001, + 0x411002, + 0x411003, + 0x411004, + 0x411005, + 0x411006, + 0x411007, + 0x411008, + 0x411009, + 0x41100a, + 0x41100b, + 0x41100c, + 0x41100d, + 0x41100e, + 0x41100f, + 0x421000, + 0x421001, + 0x421002, + 0x421003, + 0x421004, + 0x421005, + 0x421006, + 0x421007, + 0x421008, + 0x421009, + 0x42100a, + 0x42100b, + 0x42100c, + 0x42100d, + 0x42100e, + 0x42100f, + 0x431000, + 0x431001, + 0x431002, + 0x431003, + 0x431004, + 0x431005, + 0x431006, + 0x431007, + 0x431008, + 0x431009, + 0x43100a, + 0x43100b, + 0x43100c, + 0x43100d, + 0x43100e, + 0x43100f, + 0x441000, + 0x441001, + 0x441002, + 0x441003, + 0x441004, + 0x441005, + 0x441006, + 0x441007, + 0x441008, + 0x441009, + 0x44100a, + 0x44100b, + 0x44100c, + 0x44100d, + 0x44100e, + 0x44100f, + 0x491000, + 0x491001, + 0x491002, + 0x491003, + 0x491004, + 0x491005, + 0x491006, + 0x491007, + 0x491008, + 0x491009, + 0x49100a, + 0x49100b, + 0x49100c, + 0x49100d, + 0x49100e, + 0x49100f, + 0x4a1000, + 0x4a1001, + 0x4a1002, + 0x4a1003, + 0x4a1004, + 0x4a1005, + 0x4a1006, + 0x4a1007, + 0x4a1008, + 0x4a1009, + 0x4a100a, + 0x4a100b, + 0x4a100c, + 0x4a100d, + 0x4a100e, + 0x4a100f, + 0x4b1000, + 0x4b1001, + 0x4b1002, + 0x4b1003, + 0x4b1004, + 0x4b1005, + 0x4b1006, + 0x4b1007, + 0x4c1000, + 0x4c1001, + 0x4c1002, + 0x4c1003, + 0x4c1004, + 0x4c1005, + 0x4c1006, + 0x4c1007, + 0x481000, + 0x481001, + 0x471000, + 0x471001, +] -- GitLab From ea55a89ff88397e8ca7672fb021ce616fbe7b6ca Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 11:48:27 +0200 Subject: [PATCH 09/16] cleaning up RD0 items in L1 menu --- .../TriggerMenuMT/python/L1/Config/ItemDef.py | 8 ++------ .../TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py index b8db3388af0c..37444599bda3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py @@ -1144,6 +1144,8 @@ class ItemDef: MenuItem('L1_RD0_UNPAIRED_ISO' ).setLogic( d.RNDM0 & unpaired_isocond ).setTriggerType(TT.rand) MenuItem('L1_RD0_UNPAIRED_NONISO').setLogic( d.RNDM0 & unpaired_nonisocond).setTriggerType(TT.rand) MenuItem('L1_RD0_FIRSTEMPTY' ).setLogic( d.RNDM0 & firstempty ).setTriggerType(TT.rand) + MenuItem('L1_RD0_BGRP0' ).setLogic( d.RNDM0 & d.BGRP0 ).setTriggerType(TT.rand) + MenuItem('L1_RD0_BGRP7' ).setLogic( d.RNDM0 & bgrp7cond ).setTriggerType(TT.rand) MenuItem('L1_RD0_BGRP9' ).setLogic( d.RNDM0 & bgrp9cond ).setTriggerType(TT.rand) MenuItem('L1_RD0_BGRP10' ).setLogic( d.RNDM0 & alfacalib ).setTriggerType(TT.rand) MenuItem('L1_RD0_BGRP11' ).setLogic( d.RNDM0 & bgrp11cond ).setTriggerType(TT.rand) @@ -1161,12 +1163,6 @@ class ItemDef: MenuItem('L1_RD3_FILLED' ).setLogic( d.RNDM3 & physcond ).setTriggerType(TT.rand) MenuItem('L1_RD3_EMPTY' ).setLogic( d.RNDM3 & cosmiccond ).setTriggerType(TT.rand) - # BGRP - MenuItem('L1_BGRP0').setLogic( d.RNDM0 & d.BGRP0 ).setTriggerType(TT.rand) - MenuItem('L1_BGRP1').setLogic( d.RNDM0 & d.BGRP0 & d.BGRP1 ).setTriggerType(TT.rand) - MenuItem('L1_BGRP7').setLogic( d.RNDM0 & d.BGRP0 & d.BGRP7 ).setTriggerType(TT.rand) - MenuItem('L1_BGRP9').setLogic( d.RNDM0 & d.BGRP0 & d.BGRP9 ).setTriggerType(TT.rand) #fixed in ATR-14201 - MenuItem('L1_BPTX0_BGRP0', ctpid=0xf1).setLogic(d.BPTX0 & d.BGRP0).setTriggerType(TT.rand) MenuItem('L1_BPTX1_BGRP0', ctpid=0xf2).setLogic(d.BPTX1 & d.BGRP0).setTriggerType(TT.rand) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py index 8e18d702f291..3fe8cbe2c24d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py @@ -182,7 +182,7 @@ def defineMenu(): # RNDM 'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO', 'L1_RD0_EMPTY', 'L1_RD0_ABORTGAPNOTCALIB', 'L1_RD0_FIRSTEMPTY', 'L1_RD0_BGRP11', - 'L1_BGRP7', + 'L1_RD0_BGRP7', 'L1_RD1_EMPTY', 'L1_RD2_EMPTY', 'L1_RD2_FILLED', -- GitLab From d34914b22356ec5fc63c50401b0105b6220f8489 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 11:49:21 +0200 Subject: [PATCH 10/16] remove unused group --- .../TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py index 674019a3688c..65242bcf4e1f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py @@ -10,7 +10,6 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainDefInMenu import ChainProp from TriggerMenuMT.HLTMenuConfig.Menu.PhysicsP1_pp_run3_v1 import addP1Signatures from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import ( - SinglePhotonGroup, SingleJetGroup, SingleBjetGroup, SingleMuonGroup, -- GitLab From c47d3eee6b252c99029230d30abacd917c5ca6c8 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 11:50:03 +0200 Subject: [PATCH 11/16] LArDigitalTrigger: add LArPEB with LATOME-only configuration --- .../TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index 46a5be5e10f8..306a2c3984a5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -29,6 +29,7 @@ PartialEventBuildingIdentifiers = [ 'MuonTrkPEB', 'LArPEBHLT', 'LArPEB', + 'LArPEBDigitalTrigger', 'RPCPEBSecondaryReadout', 'SCTPEB', 'TilePEB', -- GitLab From a1b7fd6702e4478af9c79f128d6fd282c3f05c85 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 11:50:53 +0200 Subject: [PATCH 12/16] LArDigitalTrigger: add calibration_LArPEBDigitalTrigger stream --- .../TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py index cca589465285..4eb2c1865cbe 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py @@ -69,6 +69,7 @@ _all_streams = [ StreamInfo('Tile', 'calibration', False, False), StreamInfo('ALFACalib', 'calibration', False, False), StreamInfo('LArPEB', 'calibration', False, False), + StreamInfo('LArPEBDigitalTrigger', 'calibration', False, False), StreamInfo('L1TopoMismatches', 'calibration', False, True), StreamInfo('ZDCCalib', 'calibration', False, False), # HI STREAMS -- GitLab From 1a64ec5f896dc19f95c25c1f26627963a5380ec4 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 12:02:43 +0200 Subject: [PATCH 13/16] LArDigitalTrigger/MBTS chains: move L1RD0_BGRP7 to CosmicCalo, convert LArPEBHLT_L1EMX/JX streamers to LArPEBCalib (temporary), move LAr streamers to Main steam, add LArPEBCalib streamers (L1J400_LAR, L1LAR-ZEE, L1LAR-ZEE-eEM), add LArPEBDigitalTrigger_L1RD0 streamers, move some MBTS streamers to MinBias --- .../Menu/PhysicsP1_pp_run3_v1.py | 55 +++++++++++-------- 1 file changed, 32 insertions(+), 23 deletions(-) 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 4bf3997e0464..86bf086ff96e 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 @@ -90,17 +90,26 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_BGRP11', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBHLT_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - + ChainProp(name='HLT_noalg_LArPEBCalib_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + + ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + + ChainProp(name='HLT_noalg_LArPEBCalib_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1EM15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J15p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J20', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J30p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J75p31ETA49', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LArPEBCalib_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + # LAr noise burst chains ChainProp(name='HLT_larnoiseburst_L1XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_larnoiseburst_L1J75', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), @@ -118,8 +127,7 @@ def addP1Signatures(): TriggerFlags.StreamingSlice.signatures = TriggerFlags.StreamingSlice.signatures() + [ ChainProp(name='HLT_noalg_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), ChainProp(name='HLT_noalg_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), - ChainProp(name='HLT_noalg_L1BGRP7', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup), - + ChainProp(name='HLT_noalg_mb_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), ChainProp(name='HLT_noalg_mb_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), @@ -184,7 +192,8 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_L1J30_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Cosmic_Calo','RATE:Calibration','BW:Jet']), ChainProp(name='HLT_noalg_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_L1TAU8_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Cosmic_Calo','RATE:Calibration','BW:Jet']), - # + ChainProp(name='HLT_noalg_L1RD0_BGRP7', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_CSCPEB_L1EM3_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_CSCPEB_L1EM7_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_CSCPEB_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), @@ -192,9 +201,9 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_CSCPEB_L1J30p31ETA49_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArCellsEmpty'],groups=['RATE:Calibration','BW:Detector']), # LAr - ChainProp(name='HLT_noalg_LArPEBCalib_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_L1J400_LAR', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['RATE:Calibration','BW:Detector']), # TGC ChainProp(name='HLT_noalg_L1TGC_BURST', l1SeedThresholds=['FSNOSEED'], stream=['TgcNoiseBurst'],groups=['RATE:Calibration','BW:Detector']), @@ -245,12 +254,12 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_L1MBTSC14', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), #ATR-23216 ChainProp(name='HLT_noalg_L1MBTSC15', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup), #ATR-23216 - ChainProp(name='HLT_noalg_L1MBTS_1', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), - ChainProp(name='HLT_noalg_L1MBTS_2', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), - ChainProp(name='HLT_noalg_L1MBTS_1_1', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), - ChainProp(name='HLT_noalg_L1MBTS_1_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), - ChainProp(name='HLT_noalg_L1MBTS_2_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), - ChainProp(name='HLT_noalg_L1MBTS_1_1_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_1', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_2', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_1_1', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_1_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_2_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), + ChainProp(name='HLT_noalg_L1MBTS_1_1_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=MinBiasGroup+['PS:Online']+LowMuGroup+SupportLegGroup), ChainProp(name='HLT_noalg_L1CEP-CjJ60', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+SupportLegGroup), ChainProp(name='HLT_noalg_L1CEP-CjJ50', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=MinBiasGroup+['PS:Online']+SupportLegGroup), -- GitLab From bcbd761b97dc2d1335b8747f8aaf1b7fea11e7a1 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-23.cern.ch> Date: Thu, 30 Sep 2021 12:09:05 +0200 Subject: [PATCH 14/16] LArDigitalTrigger: add LAr streamers (L1J400_LAR, L1LAR-ZEE, L1LAR-ZEE-eEM), rename L1BGRP7 to L1RD0_BGRP7, convert LArPEBHLT_L1EMX/JX streamers to LArPEBCalib (temporary), add LArPEBDigitalTrigger_L1RD0 streamers --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 92 +++++++++++++++---- .../share/ref_v1Dev_decodeBS_build.ref | 88 ++++++++++++++---- 2 files changed, 142 insertions(+), 38 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 53bae7d5aaec..03d74fffe038 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -9545,8 +9545,6 @@ HLT_noalg_L1AFP_NSC_BGRP0: eventCount: 0 HLT_noalg_L1All: eventCount: 20 -HLT_noalg_L1BGRP7: - eventCount: 0 HLT_noalg_L1Bkg: eventCount: 0 HLT_noalg_L1CEP-CjJ50: @@ -9611,12 +9609,18 @@ HLT_noalg_L1J40: eventCount: 17 HLT_noalg_L1J400: eventCount: 1 +HLT_noalg_L1J400_LAR: + eventCount: 1 HLT_noalg_L1J50: eventCount: 14 HLT_noalg_L1J75: eventCount: 8 HLT_noalg_L1J85: eventCount: 7 +HLT_noalg_L1LAR-ZEE: + eventCount: 1 +HLT_noalg_L1LAR-ZEE-eEM: + eventCount: 0 HLT_noalg_L1MBTSA0: eventCount: 0 HLT_noalg_L1MBTSA1: @@ -9713,6 +9717,8 @@ HLT_noalg_L1PhysicsHigh_noPS: eventCount: 18 HLT_noalg_L1PhysicsVeryHigh_noPS: eventCount: 6 +HLT_noalg_L1RD0_BGRP7: + eventCount: 0 HLT_noalg_L1RD0_EMPTY: eventCount: 0 HLT_noalg_L1RD0_FILLED: @@ -9929,12 +9935,68 @@ HLT_noalg_L1jXEC50: eventCount: 0 HLT_noalg_L1jXEPerf50: eventCount: 0 +HLT_noalg_LArPEBCalib_L1EM10VH: + eventCount: 17 + stepCounts: + 0: 17 + stepFeatures: + 0: 17 +HLT_noalg_LArPEBCalib_L1EM15: + eventCount: 17 + stepCounts: + 0: 17 + stepFeatures: + 0: 17 +HLT_noalg_LArPEBCalib_L1EM22VHI: + eventCount: 10 + stepCounts: + 0: 10 + stepFeatures: + 0: 10 +HLT_noalg_LArPEBCalib_L1EM3: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_noalg_LArPEBCalib_L1J100: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_noalg_LArPEBCalib_L1J15: + eventCount: 20 + stepCounts: + 0: 8 + stepFeatures: + 0: 8 +HLT_noalg_LArPEBCalib_L1J15p31ETA49: + eventCount: 8 + stepCounts: + 0: 8 + stepFeatures: + 0: 8 +HLT_noalg_LArPEBCalib_L1J20: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_noalg_LArPEBCalib_L1J30p31ETA49: + eventCount: 4 + stepCounts: + 0: 4 + stepFeatures: + 0: 4 HLT_noalg_LArPEBCalib_L1J400_LAR: eventCount: 1 stepCounts: 0: 1 stepFeatures: 0: 1 +HLT_noalg_LArPEBCalib_L1J75p31ETA49: + eventCount: 0 HLT_noalg_LArPEBCalib_L1LAR-ZEE: eventCount: 1 stepCounts: @@ -9947,25 +10009,17 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM10VH: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM15: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM22VHI: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM3: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J100: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J15: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7: eventCount: 0 -HLT_noalg_LArPEBHLT_L1J15p31ETA49: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBHLT_L1J20: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J30p31ETA49: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J75p31ETA49: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY: eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 48a5a48c7008..e1b33494bf18 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -3665,8 +3665,6 @@ HLT_noalg_L1AFP_NSC_BGRP0: eventCount: 0 HLT_noalg_L1All: eventCount: 50 -HLT_noalg_L1BGRP7: - eventCount: 0 HLT_noalg_L1Bkg: eventCount: 0 HLT_noalg_L1CEP-CjJ50: @@ -3731,12 +3729,18 @@ HLT_noalg_L1J40: eventCount: 5 HLT_noalg_L1J400: eventCount: 0 +HLT_noalg_L1J400_LAR: + eventCount: 0 HLT_noalg_L1J50: eventCount: 4 HLT_noalg_L1J75: eventCount: 0 HLT_noalg_L1J85: eventCount: 0 +HLT_noalg_L1LAR-ZEE: + eventCount: 0 +HLT_noalg_L1LAR-ZEE-eEM: + eventCount: 0 HLT_noalg_L1MBTSA0: eventCount: 0 HLT_noalg_L1MBTSA1: @@ -3833,6 +3837,8 @@ HLT_noalg_L1PhysicsHigh_noPS: eventCount: 10 HLT_noalg_L1PhysicsVeryHigh_noPS: eventCount: 1 +HLT_noalg_L1RD0_BGRP7: + eventCount: 0 HLT_noalg_L1RD0_EMPTY: eventCount: 0 HLT_noalg_L1RD0_FILLED: @@ -4049,8 +4055,60 @@ HLT_noalg_L1jXEC50: eventCount: 0 HLT_noalg_L1jXEPerf50: eventCount: 0 +HLT_noalg_LArPEBCalib_L1EM10VH: + eventCount: 19 + stepCounts: + 0: 19 + stepFeatures: + 0: 19 +HLT_noalg_LArPEBCalib_L1EM15: + eventCount: 13 + stepCounts: + 0: 13 + stepFeatures: + 0: 13 +HLT_noalg_LArPEBCalib_L1EM22VHI: + eventCount: 5 + stepCounts: + 0: 5 + stepFeatures: + 0: 5 +HLT_noalg_LArPEBCalib_L1EM3: + eventCount: 40 + stepCounts: + 0: 40 + stepFeatures: + 0: 40 +HLT_noalg_LArPEBCalib_L1J100: + eventCount: 0 +HLT_noalg_LArPEBCalib_L1J15: + eventCount: 22 + stepCounts: + 0: 2 + stepFeatures: + 0: 2 +HLT_noalg_LArPEBCalib_L1J15p31ETA49: + eventCount: 2 + stepCounts: + 0: 2 + stepFeatures: + 0: 2 +HLT_noalg_LArPEBCalib_L1J20: + eventCount: 16 + stepCounts: + 0: 16 + stepFeatures: + 0: 16 +HLT_noalg_LArPEBCalib_L1J30p31ETA49: + eventCount: 1 + stepCounts: + 0: 1 + stepFeatures: + 0: 1 HLT_noalg_LArPEBCalib_L1J400_LAR: eventCount: 0 +HLT_noalg_LArPEBCalib_L1J75p31ETA49: + eventCount: 0 HLT_noalg_LArPEBCalib_L1LAR-ZEE: eventCount: 0 HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM: @@ -4059,25 +4117,17 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM10VH: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM15: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM22VHI: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1EM3: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J100: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J15: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7: eventCount: 0 -HLT_noalg_LArPEBHLT_L1J15p31ETA49: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBHLT_L1J20: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J30p31ETA49: - eventCount: 0 -HLT_noalg_LArPEBHLT_L1J75p31ETA49: +HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED: + eventCount: 50 + stepCounts: + 0: 50 + stepFeatures: + 0: 50 +HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY: eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 -- GitLab From e7d68562c990153623c9d4871752d037aac2e285 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@pc-tbed-pub-21.cern.ch> Date: Thu, 30 Sep 2021 17:26:46 +0200 Subject: [PATCH 15/16] clean-up and renaming --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 24 +++++++++---------- .../share/ref_v1Dev_decodeBS_build.ref | 24 +++++++++---------- .../TrigEDMConfig/python/TriggerEDMRun3.py | 1 - .../CommonSequences/EventBuildingSequences.py | 2 +- .../HLTMenuConfig/Menu/Cosmic_run3_v1.py | 9 ++----- .../HLTMenuConfig/Menu/EventBuildingInfo.py | 2 +- .../Menu/PhysicsP1_pp_run3_v1.py | 8 +++---- 7 files changed, 32 insertions(+), 38 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 03d74fffe038..b30591beb1cd 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -9935,6 +9935,18 @@ HLT_noalg_L1jXEC50: eventCount: 0 HLT_noalg_L1jXEPerf50: eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_BGRP7: + eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_EMPTY: + eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_FILLED: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY: + eventCount: 0 HLT_noalg_LArPEBCalib_L1EM10VH: eventCount: 17 stepCounts: @@ -10009,18 +10021,6 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7: - eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY: - eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED: - eventCount: 20 - stepCounts: - 0: 20 - stepFeatures: - 0: 20 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY: - eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 HLT_noalg_ZDCPEB_L1ZDC_A: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index e1b33494bf18..5d1fb0e425ce 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -4055,6 +4055,18 @@ HLT_noalg_L1jXEC50: eventCount: 0 HLT_noalg_L1jXEPerf50: eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_BGRP7: + eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_EMPTY: + eventCount: 0 +HLT_noalg_LATOMEPEB_L1RD0_FILLED: + eventCount: 50 + stepCounts: + 0: 50 + stepFeatures: + 0: 50 +HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY: + eventCount: 0 HLT_noalg_LArPEBCalib_L1EM10VH: eventCount: 19 stepCounts: @@ -4117,18 +4129,6 @@ HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7: - eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY: - eventCount: 0 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED: - eventCount: 50 - stepCounts: - 0: 50 - stepFeatures: - 0: 50 -HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY: - eventCount: 0 HLT_noalg_SCTPEB_L1RD0_EMPTY: eventCount: 0 HLT_noalg_ZDCPEB_L1ZDC_A: diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 72ecbc57d248..f11025c7574a 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -195,7 +195,6 @@ TriggerHLTListRun3 = [ # PEB RoIs for full-scan chains ('TrigRoiDescriptorCollection#HLT_Roi_LArPEBHLT', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('TrigRoiDescriptorCollection#HLT_Roi_LArPEB', 'BS ESD AODFULL AODSLIM', 'Steer'), # Run-2 L1 (temporary) ('xAOD::EmTauRoIContainer#LVL1EmTauRoIs' , 'ESD AODFULL AODSLIM AODVERYSLIM AODBLSSLIM', 'L1'), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py index 9d8096fcd785..b8dad61b1c96 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py @@ -108,7 +108,7 @@ def pebInfoWriterTool(name, eventBuildType): tool.addRegSelDets(['Pixel', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']) tool.MaxRoIs = 5 tool.addCTPResultToROBList() # add the CTP result to the list - elif 'LArPEBDigitalTrigger' == eventBuildType: + elif 'LATOMEPEB' == eventBuildType: from .LATOMESourceIDs import LATOMESourceIDs tool = StaticPEBInfoWriterToolCfg(name) tool.addROBs(LATOMESourceIDs) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py index 65242bcf4e1f..75c9ebc40ae4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py @@ -42,6 +42,7 @@ def setupMenu(): TriggerFlags.EgammaSlice.signatures = [ # ATR-21355 - cannot be moved to the calibSlice because they need to configure the photon/ sequence ChainProp(name='HLT_g3_etcut_LArPEB_L1EM3', stream=['LArCells'], groups=['RATE:SinglePhoton', 'BW:Egamma']), + ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), ] TriggerFlags.METSlice.signatures = [] @@ -66,15 +67,9 @@ def setupMenu(): ChainProp(name='HLT_mb_sptrk_costr_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=['Rate:MinBias','BW:MinBias']), ChainProp(name='HLT_mb_sptrk_costr_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], groups=['Rate:Cosmic_MinBias','BW:MinBias']), ] - TriggerFlags.CalibSlice.signatures = [ - ChainProp(name='HLT_e5_etcut_L1EM3',stream=['Main'], groups=['RATE:SingleElectron', 'BW:Egamma']), - - ChainProp(name='HLT_j15_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), - ChainProp(name='HLT_j0_HT0_L1J12_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleJetGroup), - ] + TriggerFlags.CalibSlice.signatures = [] TriggerFlags.CosmicSlice.signatures = [] TriggerFlags.StreamingSlice.signatures = [ - ChainProp(name='HLT_noalg_L1TRT_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic','express'],groups=['RATE:SeededStreamers','BW:Other']), ChainProp(name='HLT_noalg_L1TRT_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic'],groups=['RATE:SeededStreamers','BW:Other']), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index 306a2c3984a5..e2d55cc1bec4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -29,7 +29,7 @@ PartialEventBuildingIdentifiers = [ 'MuonTrkPEB', 'LArPEBHLT', 'LArPEB', - 'LArPEBDigitalTrigger', + 'LATOMEPEB', 'RPCPEBSecondaryReadout', 'SCTPEB', 'TilePEB', 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 86bf086ff96e..5b98f519cec1 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 @@ -94,10 +94,10 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1LAR-ZEE-eEM', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LArPEBDigitalTrigger_L1RD0_BGRP7', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_BGRP7', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1EM10VH', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), -- GitLab From 52c66c16bd8628a7225ec4b5c8b968c09cb53118 Mon Sep 17 00:00:00 2001 From: Stefanie Morgenstern <shanisch@lxplus7101.cern.ch> Date: Thu, 30 Sep 2021 18:49:58 +0200 Subject: [PATCH 16/16] correct stream for HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY --- .../python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5b98f519cec1..242aaee7d5b2 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 @@ -96,7 +96,7 @@ def addP1Signatures(): ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_FIRSTEMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LATOMEPEB_L1RD0_BGRP7', l1SeedThresholds=['FSNOSEED'], stream=['LArPEBDigitalTrigger'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1EM3', l1SeedThresholds=['FSNOSEED'], stream=['LArCells'], groups=['RATE:Calibration','BW:Detector']), -- GitLab