From d93935fcc920dd32d372db60397c0148b890d6cf Mon Sep 17 00:00:00 2001 From: Titus Mombaecher Date: Tue, 13 May 2025 22:55:03 +0200 Subject: [PATCH 1/2] update recomon to use the monitoring stream --- MooreOnlineConf/options/reco.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/MooreOnlineConf/options/reco.py b/MooreOnlineConf/options/reco.py index 540759b30..0e77a80df 100644 --- a/MooreOnlineConf/options/reco.py +++ b/MooreOnlineConf/options/reco.py @@ -28,7 +28,7 @@ from RecoConf.hlt2_tracking import ( make_PrKalmanFilter_Velo_tracks, make_TrackBestTrackCreator_tracks, ) -from MooreOnlineConf.utils import update_and_reset +from MooreOnlineConf.utils import update_and_reset, passes_rb, RoutingBit from RecoConf.event_filters import require_gec from Hlt2Conf.settings.defaults import get_default_hlt1_filter_code_for_hlt2 from Moore.streams import Stream, Streams @@ -73,10 +73,7 @@ def with_update_and_reset(): ]) # only filter on SMOG collisions that fly into LHCb if task_type == "RecoPhysMon": - rb_filter = HltRoutingBitsFilter( - RawBanks=default_raw_banks('HltRoutingBits'), - RequireMask=(1 << 14, 0, 0), # Physics events - PassOnError=False) + rb_filter = passes_rb(RoutingBit.PHYSICS) return Reconstruction( "with_update_and_reset", [reco_node], filters=[ @@ -84,10 +81,7 @@ def with_update_and_reset(): update_and_reset(), odin_bb_filter, rb_filter ]) elif task_type == "RecoSMOGMon": - rb_filter = HltRoutingBitsFilter( - RawBanks=default_raw_banks('HltRoutingBits'), - RequireMask=(1 << 15, 0, 0), # SMOG physics - PassOnError=False) + rb_filter = passes_rb(RoutingBit.SMOG) return Reconstruction( "with_update_and_reset", [reco_node], filters=[ @@ -95,10 +89,7 @@ def with_update_and_reset(): update_and_reset(), odin_be_filter, rb_filter ]) else: - rb_filter = HltRoutingBitsFilter( - RawBanks=default_raw_banks('HltRoutingBits'), - RequireMask=(1 << 1, 0, 0), # Lumi events - PassOnError=False) + rb_filter = passes_rb(RoutingBit.LUMI) return Reconstruction( "with_update_and_reset", [reco_node], filters=[ -- GitLab From 0b0d021ffa0b5c8bfbb0d7f6cdc2b25c1287af03 Mon Sep 17 00:00:00 2001 From: Titus Mombaecher Date: Wed, 14 May 2025 01:38:29 +0200 Subject: [PATCH 2/2] remove unused imports --- MooreOnlineConf/options/reco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MooreOnlineConf/options/reco.py b/MooreOnlineConf/options/reco.py index 0e77a80df..bc9821579 100644 --- a/MooreOnlineConf/options/reco.py +++ b/MooreOnlineConf/options/reco.py @@ -63,7 +63,7 @@ def with_update_and_reset(): children=[hlt1_non_event_data_node, hlt2_reco.node]) if options.input_type.lower() == 'online': - from PyConf.Algorithms import LHCb__IOVReset as IOVReset, OdinTypesFilter, HltRoutingBitsFilter + from PyConf.Algorithms import LHCb__IOVReset as IOVReset, OdinTypesFilter from PyConf.application import make_odin, default_raw_banks odin_bb_filter = OdinTypesFilter( ODIN=make_odin(), BXTypes=['BeamCrossing']) -- GitLab