diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 53d67ecd1ed85e14e48cc2ec2c08a6386c165951..b30591beb1cd83f0c119ba416e2fb810b1b92383 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -4814,7 +4814,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 @@ -5015,7 +5015,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 @@ -5129,7 +5129,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 @@ -9609,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: @@ -9697,6 +9703,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: @@ -9707,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: @@ -9923,12 +9935,88 @@ 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: + 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: 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 8446b978d33ffb3da7118b145400c09983eb076d..5d1fb0e425ceaa7899045ebaa117a300dff32d8b 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -1636,7 +1636,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 @@ -1664,7 +1664,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 @@ -1680,7 +1680,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 @@ -3729,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: @@ -3817,6 +3823,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: @@ -3827,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: @@ -4043,8 +4055,76 @@ 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: + 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: + eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_BGRP11: eventCount: 0 HLT_noalg_LArPEBCalib_L1RD0_EMPTY: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequences.py index 917782bf09535d445337e10aa21ccd44851d0812..b8dad61b1c96cc62cdd86c9eea8e70c320629e4c 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 'LATOMEPEB' == 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 0000000000000000000000000000000000000000..dc235143c146d28105c0669067b47fc674962618 --- /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, +] 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 72535388e3cc88873ca6657695fd474725c383fe..75c9ebc40ae4c050a068c3c2510920cc42fcc4d2 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, @@ -41,29 +40,15 @@ 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), - 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-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 = [] - 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), - + 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), ] TriggerFlags.BjetSlice.signatures = [ ChainProp(name='HLT_j0_ftf_boffperf_L1MU8F', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=PrimaryLegGroup+SingleBjetGroup), @@ -85,7 +70,6 @@ def setupMenu(): 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 46a5be5e10f8b217f3551626d18bbabe99292481..e2d55cc1bec4acf8f96e27b9e2d4f602530d3129 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', + 'LATOMEPEB', 'RPCPEBSecondaryReadout', 'SCTPEB', 'TilePEB', diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index d4c5d147dcce969051457608ebd72557b4630d62..6d35bcc632a523162ed6d9741577e11eef53c644 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -217,14 +217,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 @@ -476,14 +468,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 a309c891b309401a1b26d8f8ed2a8d1ec303d1ef..242aaee7d5b2cfbbc5f9500bf5375594fea0a63e 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,26 @@ 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), ] 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), ] TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [ @@ -63,6 +89,27 @@ 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_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_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=['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']), + 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']), @@ -79,8 +126,8 @@ 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_L1RD0_FILLED', 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), @@ -145,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']), @@ -153,7 +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_L1LAR-ZEE', 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']), @@ -161,6 +211,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 @@ -201,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), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py index cca589465285b4b5ce97640f6a7403e669950171..4eb2c1865cbe44a1145651268b746d2f2b3f65d2 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 diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py index e3d70ab815a661263d514e150676c28d63c0e78a..37444599bda3881e057d4cba2723b99b5a19f44d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py @@ -850,6 +850,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) @@ -1141,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) @@ -1158,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 e0676e0d4e23c1b628da5adf3c6fefc23ca583cb..3fe8cbe2c24dc52952cc3fe595fd26b18b3a5ca9 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,6 +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_RD0_BGRP7', 'L1_RD1_EMPTY', 'L1_RD2_EMPTY', 'L1_RD2_FILLED', @@ -238,6 +239,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',