From d3f9b665e75aa84d419e110e28981fddc0ae0722 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Fri, 29 May 2026 09:44:21 -0500 Subject: [PATCH 1/2] Modified the integtest to clean up the setting of trigger and readout window parameters and start making use of common functions to set those params. --- integtest/change_rate_test.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/integtest/change_rate_test.py b/integtest/change_rate_test.py index 96ecec01..32cff911 100644 --- a/integtest/change_rate_test.py +++ b/integtest/change_rate_test.py @@ -6,6 +6,7 @@ import integrationtest.log_file_checks as log_file_checks import integrationtest.basic_checks as basic_checks import integrationtest.data_classes as data_classes +import integrationtest.utility_functions2 as utility_functions from integrationtest.verbosity_helper import IntegtestVerbosityLevels import functools @@ -82,28 +83,14 @@ conf_dict.op_env = "integtest" conf_dict.config_session_name = "changerate" conf_dict.tpg_enabled = False +utility_functions.set_RTCM_trigger_params(conf_dict, trigger_rate=1.0, + readout_window_before_ticks=readout_window_time_before, + readout_window_after_ticks=readout_window_time_after) conf_dict.config_substitutions.append( data_classes.attribute_substitution(obj_class="LatencyBuffer", updates={"size": 50000}) ) -conf_dict.config_substitutions.append( - data_classes.attribute_substitution( - obj_class="RandomTCMakerConf", - updates={"trigger_rate_hz": 1.0}, - ) -) - -conf_dict.config_substitutions.append( - data_classes.attribute_substitution( - obj_class="TCReadoutMap", - updates={ - "time_before": readout_window_time_before, - "time_after": readout_window_time_after, - }, - ) -) - confgen_arguments = {"MinimalSystem": conf_dict} # The commands to run in dunerc, as a list dunerc_command_list = ( From 00da78391ab389d45d51bc1861233c7f77bcd28a Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Tue, 30 Jun 2026 13:11:34 -0500 Subject: [PATCH 2/2] Modified the integtests to take into account Michal's suggestions in DUNE-DAQ/integrationtest#161 --- integtest/change_rate_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integtest/change_rate_test.py b/integtest/change_rate_test.py index b8480ae6..233a2dbc 100644 --- a/integtest/change_rate_test.py +++ b/integtest/change_rate_test.py @@ -82,7 +82,7 @@ conf_dict.op_env = "integtest" conf_dict.config_session_name = "changerate" conf_dict.tpg_enabled = False -utility_functions.set_RTCM_trigger_params(conf_dict, trigger_rate=1.0, +utility_functions.set_rtcm_trigger_params(conf_dict, trigger_rate=1.0, readout_window_before_ticks=readout_window_time_before, readout_window_after_ticks=readout_window_time_after)