diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 0e3f6e3c918126dc0b744865c923ff6ac0cd7962..38891e1d45fb81abd4b9e7485c89c2762a713295 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -1424,20 +1424,8 @@ HLT_eb_medium_L1RD2_FILLED: 0: 19 HLT_g120_loose_L1EM22VHI: eventCount: 0 -HLT_g12_loose_LArPEB_L1EM10VH: - eventCount: 6 - stepCounts: - 0: 9 - 1: 9 - 2: 9 - 3: 6 - 4: 6 - stepFeatures: - 0: 11 - 1: 11 - 2: 22 - 3: 6 - 4: 6 +HLT_g12_loose_LArPEBHLT_L1EM10VH: + eventCount: 0 HLT_g140_etcut_L1EM22VHI: eventCount: 0 HLT_g140_etcut_L1EM24VHI: @@ -1468,20 +1456,8 @@ HLT_g20_loose_L1EM15VHI: 1: 6 2: 9 3: 5 -HLT_g20_loose_LArPEB_L1EM15: - eventCount: 6 - stepCounts: - 0: 8 - 1: 8 - 2: 8 - 3: 6 - 4: 6 - stepFeatures: - 0: 9 - 1: 9 - 2: 15 - 3: 6 - 4: 6 +HLT_g20_loose_LArPEBHLT_L1EM15: + eventCount: 0 HLT_g20_medium_L1EM15VH: eventCount: 6 stepCounts: @@ -1754,34 +1730,10 @@ HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: 0: 5 1: 5 2: 6 -HLT_g3_loose_LArPEB_L1EM3: - eventCount: 9 - stepCounts: - 0: 17 - 1: 17 - 2: 17 - 3: 9 - 4: 9 - stepFeatures: - 0: 63 - 1: 63 - 2: 114 - 3: 15 - 4: 15 -HLT_g40_loose_LArPEB_L1EM20VHI: - eventCount: 5 - stepCounts: - 0: 5 - 1: 5 - 2: 5 - 3: 5 - 4: 5 - stepFeatures: - 0: 5 - 1: 5 - 2: 8 - 3: 5 - 4: 5 +HLT_g3_loose_LArPEBHLT_L1EM3: + eventCount: 0 +HLT_g40_loose_LArPEBHLT_L1EM20VHI: + eventCount: 0 HLT_g5_etcut_L1EM3: eventCount: 20 stepCounts: @@ -1828,34 +1780,10 @@ HLT_g5_tight_L1EM3: 1: 45 2: 76 3: 8 -HLT_g60_loose_LArPEB_L1EM20VHI: - eventCount: 3 - stepCounts: - 0: 3 - 1: 3 - 2: 3 - 3: 3 - 4: 3 - stepFeatures: - 0: 3 - 1: 3 - 2: 5 - 3: 3 - 4: 3 -HLT_g80_loose_LArPEB_L1EM20VHI: - eventCount: 1 - stepCounts: - 0: 1 - 1: 1 - 2: 1 - 3: 1 - 4: 1 - stepFeatures: - 0: 1 - 1: 1 - 2: 3 - 3: 1 - 4: 1 +HLT_g60_loose_LArPEBHLT_L1EM20VHI: + eventCount: 0 +HLT_g80_loose_LArPEBHLT_L1EM20VHI: + eventCount: 0 HLT_g85_tight_3j50_L1EM22VHI: eventCount: 0 HLT_g90_loose_xe90_cell_L1EM22VHI: @@ -1882,6 +1810,10 @@ HLT_j0_fbdjshared_L1J20: 0: 177 HLT_j0_perf_L1J12_EMPTY: eventCount: 0 +HLT_j140_320eta490_LArPEBHLT_L1J75_31ETA49: + eventCount: 0 +HLT_j165_LArPEBHLT_L1J100: + eventCount: 0 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100: eventCount: 0 stepCounts: @@ -1958,6 +1890,8 @@ HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j40_LArPEBHLT_L1J20: + eventCount: 0 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20: eventCount: 19 stepCounts: @@ -2230,6 +2164,8 @@ HLT_j60_j0_fbdjshared_L1J20: 0: 7 stepFeatures: 0: 372 +HLT_j75_320eta490_LArPEBHLT_L1J30_31ETA49: + eventCount: 0 HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20: eventCount: 0 HLT_j80_L1J15: @@ -2266,6 +2202,10 @@ HLT_j85_pf_ftf_L1J20: stepFeatures: 0: 19 1: 22 +HLT_larpebcalib_LArPEBCalib_L1RD0_BGRP11: + eventCount: 0 +HLT_larpebcalib_LArPEBCalib_L1RD0_EMPTY: + eventCount: 0 HLT_larnoiseburst_L1XE60: eventCount: 6 stepCounts: diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 23f4bfbc4d272e99a23601701eb80cc0d977228c..3458a0802abb881f67917f9e6cc9a04df20a1f38 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -722,7 +722,7 @@ HLT_eb_medium_L1RD2_FILLED: 0: 7 HLT_g120_loose_L1EM22VHI: eventCount: 0 -HLT_g12_loose_LArPEB_L1EM10VH: +HLT_g12_loose_LArPEBHLT_L1EM10VH: eventCount: 0 HLT_g140_etcut_L1EM22VHI: eventCount: 0 @@ -734,7 +734,7 @@ HLT_g20_loose_L1EM15VH: eventCount: 0 HLT_g20_loose_L1EM15VHI: eventCount: 0 -HLT_g20_loose_LArPEB_L1EM15: +HLT_g20_loose_LArPEBHLT_L1EM15: eventCount: 0 HLT_g20_medium_L1EM15VH: eventCount: 0 @@ -798,7 +798,7 @@ HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1EM22VHI: eventCount: 0 HLT_g35_tight_icalotight_mu18noL1_L1EM22VHI: eventCount: 0 -HLT_g3_loose_LArPEB_L1EM3: +HLT_g3_loose_LArPEBHLT_L1EM3: eventCount: 3 stepCounts: 0: 11 @@ -812,7 +812,7 @@ HLT_g3_loose_LArPEB_L1EM3: 2: 30 3: 3 4: 3 -HLT_g40_loose_LArPEB_L1EM20VHI: +HLT_g40_loose_LArPEBHLT_L1EM20VHI: eventCount: 0 HLT_g5_etcut_L1EM3: eventCount: 13 @@ -860,9 +860,9 @@ HLT_g5_tight_L1EM3: 1: 13 2: 26 3: 1 -HLT_g60_loose_LArPEB_L1EM20VHI: +HLT_g60_loose_LArPEBHLT_L1EM20VHI: eventCount: 0 -HLT_g80_loose_LArPEB_L1EM20VHI: +HLT_g80_loose_LArPEBHLT_L1EM20VHI: eventCount: 0 HLT_g85_tight_3j50_L1EM22VHI: eventCount: 0 @@ -890,6 +890,10 @@ HLT_j0_perf_L1J12_EMPTY: 0: 8 stepFeatures: 0: 129 +HLT_j140_320eta490_LArPEBHLT_L1J75_31ETA49: + eventCount: 0 +HLT_j165_LArPEBHLT_L1J100: + eventCount: 0 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100: eventCount: 0 HLT_j260_320eta490_L1J20: @@ -918,6 +922,14 @@ HLT_j360_subjesgscIS_ftf_bdl1r77_split_L1J100: eventCount: 0 HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100: eventCount: 0 +HLT_j40_LArPEBHLT_L1J20: + eventCount: 5 + stepCounts: + 0: 5 + 1: 5 + stepFeatures: + 0: 6 + 1: 5 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20: eventCount: 7 stepCounts: @@ -1162,6 +1174,14 @@ HLT_j60_j0_fbdjshared_L1J20: 0: 1 stepFeatures: 0: 19 +HLT_j75_320eta490_LArPEBHLT_L1J30_31ETA49: + eventCount: 1 + stepCounts: + 0: 1 + 1: 1 + stepFeatures: + 0: 1 + 1: 1 HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20: eventCount: 0 HLT_j80_L1J15: @@ -1204,6 +1224,18 @@ HLT_j85_pf_ftf_L1J20: 1: 3 HLT_larnoiseburst_L1XE60: eventCount: 0 +HLT_larpebcalib_LArPEBCalib_L1RD0_BGRP11: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_larpebcalib_LArPEBCalib_L1RD0_EMPTY: + eventCount: 20 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 HLT_mb_sp_L1RD0_FILLED: eventCount: 20 stepCounts: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py index 3cabf621154a1fb93c9dd92d2c1dd436496bf6fe..1cc616bacc9376ca0e23b22c46008173d78659aa 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py @@ -45,7 +45,7 @@ def pebInfoWriterTool(name, eventBuildType): Create PEBInfoWriterTool configuration for the eventBuildType ''' tool = None - if 'BeamSpotPEB' in eventBuildType: + if 'BeamSpotPEB' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addSubDets([ SubDetector.PIXEL_BARREL, @@ -58,23 +58,44 @@ def pebInfoWriterTool(name, eventBuildType): SubDetector.SCT_ENDCAP_C_SIDE, SubDetector.TDAQ_CTP ]) - elif 'LArPEB' in eventBuildType: + elif 'LArPEBCalib' == eventBuildType: + tool = StaticPEBInfoWriterToolCfg(name) + tool.addSubDets([SubDetector.LAR_EM_BARREL_A_SIDE, + SubDetector.LAR_EM_BARREL_C_SIDE, + SubDetector.LAR_EM_ENDCAP_A_SIDE, + SubDetector.LAR_EM_ENDCAP_C_SIDE, + SubDetector.LAR_HAD_ENDCAP_A_SIDE, + SubDetector.LAR_HAD_ENDCAP_C_SIDE, + SubDetector.LAR_FCAL_A_SIDE, + SubDetector.LAR_FCAL_C_SIDE, + SubDetector.LAR_EM_BARREL_ENDCAP_A_SIDE, + SubDetector.LAR_EM_BARREL_ENDCAP_C_SIDE, + SubDetector.LAR_EM_HAD_ENDCAP_A_SIDE, + SubDetector.LAR_EM_HAD_ENDCAP_C_SIDE, + SubDetector.TDAQ_CTP + ]) + elif 'LArPEBHLT' == eventBuildType: tool = RoIPEBInfoWriterToolCfg(name) tool.addRegSelDets(['Pixel', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']) tool.MaxRoIs = 5 tool.addHLTResultToROBList() # add the main (full) HLT result to the list tool.addCTPResultToROBList() # add the CTP result to the list - elif 'RPCPEBSecondaryReadout' in eventBuildType: + elif 'LArPEB' == eventBuildType: + tool = RoIPEBInfoWriterToolCfg(name) + tool.addRegSelDets(['Pixel', 'SCT', 'TRT', 'TTEM', 'TTHEC', 'FCALEM', 'FCALHAD']) + tool.MaxRoIs = 5 + tool.addCTPResultToROBList() # add the CTP result to the list + elif 'RPCPEBSecondaryReadout' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addROBs([0x610080, 0x620080]) - elif 'SCTPEB' in eventBuildType: + elif 'SCTPEB' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addSubDets([SubDetector.SCT_BARREL_A_SIDE, SubDetector.SCT_BARREL_C_SIDE, SubDetector.SCT_ENDCAP_A_SIDE, SubDetector.SCT_ENDCAP_C_SIDE ]) - elif 'TilePEB' in eventBuildType: + elif 'TilePEB' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addSubDets([SubDetector.TILECAL_LASER_CRATE, SubDetector.TILECAL_BARREL_A_SIDE, @@ -88,12 +109,12 @@ def pebInfoWriterTool(name, eventBuildType): SubDetector.TDAQ_CALO_JET_PROC_DAQ, # = 0x74 SubDetector.TDAQ_CALO_JET_PROC_ROI # = 0x75 ]) - elif 'AlfaPEB' in eventBuildType: + elif 'AlfaPEB' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addSubDets([SubDetector.FORWARD_ALPHA, SubDetector.TDAQ_CTP ]) - elif 'CSCPEB' in eventBuildType: + elif 'CSCPEB' == eventBuildType: tool = StaticPEBInfoWriterToolCfg(name) tool.addSubDets([ SubDetector.MUON_CSC_ENDCAP_A_SIDE, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index 59c6455c6cd53faf590ffa547cfa422eec7883da..b838b6f5d844318aecb633f10ceb5fdaae4915ce 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -25,6 +25,8 @@ LArPEB, LumiPEB, RPCPEB, RPCPEBSecondaryReadout, TrkPEB, JetDS, PhotonDS # PEB identifiers PartialEventBuildingIdentifiers = [ 'BeamSpotPEB', + 'LArPEBCalib', + 'LArPEBHLT', 'LArPEB', 'RPCPEBSecondaryReadout', 'SCTPEB', diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 4313b4def306c12a0d428777d917c57750da3dae..69f78fd894d7c663417155e353492d225bed953c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -204,13 +204,13 @@ def setupMenu(): # 3photon chains ChainProp(name='HLT_2g25_loose_g15_loose_L12EM20VH', groups=MultiPhotonGroup), - # ATR-21355 - ChainProp(name='HLT_g3_loose_LArPEB_L1EM3',stream=['LArCells'], groups=SinglePhotonGroup), - ChainProp(name='HLT_g12_loose_LArPEB_L1EM10VH',stream=['LArCells'], groups=SinglePhotonGroup), - ChainProp(name='HLT_g20_loose_LArPEB_L1EM15',stream=['LArCells'], groups=SinglePhotonGroup), - ChainProp(name='HLT_g40_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), - ChainProp(name='HLT_g60_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), - ChainProp(name='HLT_g80_loose_LArPEB_L1EM20VHI',stream=['LArCells'], groups=SinglePhotonGroup), + # 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]), # for moving to PhysicsP1, ATR-21242 ChainProp(name='HLT_g140_etcut_L1EM22VHI', groups=SinglePhotonGroup), @@ -312,6 +312,14 @@ def setupMenu(): # ATR-20624 ChainProp(name='HLT_j0_perf_L1J12_EMPTY', 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',stream=['LArCells'], groups=['PS:Online',SingleJetGroup]), + ChainProp(name='HLT_j75_320eta490_LArPEBHLT_L1J30_31ETA49',stream=['LArCells'], groups=['PS:Online',SingleJetGroup]), + ChainProp(name='HLT_j140_320eta490_LArPEBHLT_L1J75_31ETA49',stream=['LArCells'], groups=['PS:Online',SingleJetGroup]), + ChainProp(name='HLT_j165_LArPEBHLT_L1J100',stream=['LArCells'], groups=['PS:Online',SingleJetGroup]), + + + # TLA test chain, ATR-20395 ChainProp(name='HLT_JetDS_j0_L1J100', stream=['JetDS'], groups=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 57157c72196539909bf03748ca12880d518772e9..27cca2bb495336a897ed2a1bcefed77f2cd939c4 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 @@ -58,6 +58,8 @@ def addP1Signatures(): ChainProp(name='HLT_mb_sp_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['PS:Online',MinBiasGroup]), ] TriggerFlags.CalibSlice.signatures = TriggerFlags.CalibSlice.signatures() + [ + ChainProp(name='HLT_larpebcalib_LArPEBCalib_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), + ChainProp(name='HLT_larpebcalib_LArPEBCalib_L1RD0_BGRP11', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_larnoiseburst_L1XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['RATE:Calibration','BW:Detector']), ] TriggerFlags.CosmicSlice.signatures = TriggerFlags.CosmicSlice.signatures() + [ diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py index c323619924cbf675880ca6a33443fb7caa5794f7..545a3d9426102d4af21aabaa56fc0a38697c99f3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py @@ -701,7 +701,7 @@ AllowedCalibChainIdentifiers = ['csccalib', 'larcalib', 'tilelarcalib', 'alfacalib', 'larnoiseburst','ibllumi', 'l1satmon', 'zdcpeb', - 'calibAFP', + 'calibAFP', 'larpebcalib', ] # ---- Calib Chain Dictionary of all allowed Values ---- diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py index 7f87048c5ed6d8f5637516a513f744722482316f..96fcfaf61c45e69edb80c8627f8409f202bb846f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py @@ -59,6 +59,7 @@ _all_streams = [ StreamInfo('SCTNoise', 'calibration', False, False), StreamInfo('Tile', 'calibration', False, False), StreamInfo('ALFACalib', 'calibration', False, False), + StreamInfo('LArPEB', 'calibration', False, False), # HI STREAMS StreamInfo('HardProbes', 'physics', True, True), StreamInfo('MinBias', 'physics', True, True), 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 cc30de41caa4da64b48acef3e21514d86f967457..fd27694b3862aa3c2463b5a16543daeb8f58fc0f 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 @@ -201,7 +201,8 @@ def defineMenu(): 'L1_EM12_XS20', 'L1_EM15_XS30', # RNDM - 'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO', 'L1_RD0_EMPTY', 'L1_RD0_ABORTGAPNOTCALIB', 'L1_RD0_FIRSTEMPTY', + 'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO', 'L1_RD0_EMPTY', 'L1_RD0_ABORTGAPNOTCALIB', + 'L1_RD0_FIRSTEMPTY', 'L1_RD0_BGRP11', 'L1_RD1_EMPTY', 'L1_RD2_EMPTY', 'L1_RD2_FILLED', diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/menu_config_tests.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/menu_config_tests.py index f372e8b54c4466c8f1e40fc6568cbd61a18752d5..4d3b8e8416d179285bb71a80882415fb1bca604d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/menu_config_tests.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/menu_config_tests.py @@ -166,7 +166,7 @@ class PartialEventBuildingChecks(MenuVerification): eb_identifiers = EventBuildingInfo.getAllEventBuildingIdentifiers() for chain_name, chain_config in config['chains'].items(): - peb_identifiers = [idf for idf in eb_identifiers if idf in chain_name] + peb_identifiers = [idf for idf in eb_identifiers if '_'+idf+'_' in chain_name] peb_writers = [seq for seq in chain_config['sequencers'] if 'PEBInfoWriter' in seq] is_peb_chain = (len(peb_identifiers) > 0 or len(peb_writers) > 0)