From b2f159a44f3da21bd1680eb2692937936c6d3e20 Mon Sep 17 00:00:00 2001 From: Mario Campanelli <Mario.Campanelli@cern.ch> Date: Mon, 7 Sep 2020 18:19:58 +0200 Subject: [PATCH] atr-21370 added cscmon chain, added new CSC stream addednew PEB instructions and changed references --- .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref | 3 +++ .../TriggerTest/share/ref_data_v1Dev_build.ref | 3 +++ .../CalibCosmicMon/MonitorChainConfiguration.py | 2 ++ .../CommonSequences/EventBuildingSequenceSetup.py | 6 ++++++ .../python/HLTMenuConfig/Menu/EventBuildingInfo.py | 3 ++- .../python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 1 + .../TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py | 1 + 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref index 85e7a32e448..561c191c9c7 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref @@ -97,6 +97,9 @@ TrigSignatureMoniMT INFO -- #628534730 Features TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480 TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20 TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - - +TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179 +TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20 +TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710 TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 71a15cc83e4..65440850a53 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -97,6 +97,9 @@ TrigSignatureMoniMT INFO -- #628534730 Features TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480 TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20 TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - - +TrigSignatureMoniMT INFO HLT_cscmon_L1All #1000936179 +TrigSignatureMoniMT INFO -- #1000936179 Events 20 20 - - - - - - - - - - - - 20 +TrigSignatureMoniMT INFO -- #1000936179 Features - - - - - - - - - - - - TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710 TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - - - - - - - 0 TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - - diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py index 1f183f1ad18..404aa8e7ec4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py @@ -33,6 +33,8 @@ class MonitorChainConfiguration(ChainConfigurationBase): if self.chainPartName == 'costmonitor': pass # costmonitor is a streamer so has no steps + elif self.chainPartName == 'cscmon': + pass elif self.chainPartName == 'timeburner': chainSteps.append(self.getTimeBurnerStep()) else: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py index 2f5ed63c63a..ba9d34e8bd2 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py @@ -93,6 +93,12 @@ def pebInfoWriterTool(name, eventBuildType): tool.addSubDets([SubDetector.FORWARD_ALPHA, SubDetector.TDAQ_CTP ]) + elif 'CSCPEB' in eventBuildType: + tool = StaticPEBInfoWriterToolCfg(name) + tool.addSubDets([ + SubDetector.CSC + ]) + elif eventBuildType in DataScoutingInfo.getAllDataScoutingIdentifiers(): # Pure DataScouting configuration tool = StaticPEBInfoWriterToolCfg(name) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py index 5ba898dd6b8..59c6455c6cd 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/EventBuildingInfo.py @@ -29,7 +29,8 @@ PartialEventBuildingIdentifiers = [ 'RPCPEBSecondaryReadout', 'SCTPEB', 'TilePEB', - 'AlfaPEB' + 'AlfaPEB', + 'CSCPEB' ] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py index c5007019874..4290266565a 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py @@ -135,6 +135,7 @@ def setupMenu(): TriggerFlags.StreamingSlice.signatures = [ ] TriggerFlags.MonitorSlice.signatures = [ + ChainProp(name='HLT_cscmon_L1All', l1SeedThresholds=['FSNOSEED'], stream=['CSC'], groups=['RATE:Monitoring','BW:Other']), ] # Random Seeded EB chains which select at the HLT based on L1 TBP bits diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py index c7365ef4c5f..11f817b1526 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/StreamInfo.py @@ -46,6 +46,7 @@ _all_streams = [ StreamInfo('express', 'express', True, True), # MONITORING STREAMS StreamInfo('IDMonitoring', 'monitoring', True, True), + StreamInfo('CSC', 'monitoring', True, True), # CALIBRATION STREAMS StreamInfo('BeamSpot', 'calibration', True, False), StreamInfo('LArCells', 'calibration', False, False), -- GitLab