From 5d64a1691a8dd67f5215cd8519749cb2600d4398 Mon Sep 17 00:00:00 2001 From: Kurt Biery Date: Sun, 8 Mar 2026 12:29:31 -0500 Subject: [PATCH] In the integtests, renamed the drunc_config session parameter to config_session_name and renamed drunc_config session_name as daq_session_name to help make their meaning more clear. Also removed obsolete references to data_rate_slowdown_factor. --- integtest/disabled_output_test.py | 10 +--------- integtest/hdf5_compression_test.py | 2 +- integtest/insufficient_disk_space_test.py | 2 +- integtest/large_trigger_record_test.py | 2 +- integtest/max_file_size_test.py | 10 +--------- integtest/multiple_data_writers_test.py | 2 +- integtest/offline_prod_run_test.py | 10 +--------- integtest/trmonrequestor_test.py | 11 +++++------ 8 files changed, 12 insertions(+), 37 deletions(-) diff --git a/integtest/disabled_output_test.py b/integtest/disabled_output_test.py index 5553b752..141ca3d3 100644 --- a/integtest/disabled_output_test.py +++ b/integtest/disabled_output_test.py @@ -15,7 +15,6 @@ number_of_data_producers = 2 run_duration = 20 # seconds trigger_rate = 1.0 # Hz -data_rate_slowdown_factor = 1 # Default values for validation parameters expected_number_of_data_files = 2 @@ -88,20 +87,13 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "disabled" +conf_dict.config_session_name= "disabled" conf_dict.tpg_enabled = False # We accept the default values for all of the other fields in the drunc_config data structure # (defined in integrationtest/src/integrationtest/data_classes.py), including the "frame_file", # which is the data file that is used to emulated the data. The current default for that field # specifies a set of WIBEth frames from a relatively recent run at EHN1.) -conf_dict.config_substitutions.append( - data_classes.attribute_substitution( - obj_id=conf_dict.session, - obj_class="Session", - updates={"data_rate_slowdown_factor": data_rate_slowdown_factor}, - ) -) conf_dict.config_substitutions.append( data_classes.attribute_substitution( obj_class="RandomTCMakerConf", diff --git a/integtest/hdf5_compression_test.py b/integtest/hdf5_compression_test.py index 884ea9cf..0a118af6 100644 --- a/integtest/hdf5_compression_test.py +++ b/integtest/hdf5_compression_test.py @@ -126,7 +126,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "hdf5compression" +conf_dict.config_session_name= "hdf5compression" conf_dict.tpg_enabled = True conf_dict.fake_hsi_enabled = True conf_dict.dro_map_config.det_id = 2 # det_id = 2 for kHD_PDS diff --git a/integtest/insufficient_disk_space_test.py b/integtest/insufficient_disk_space_test.py index e69d2d9c..0592ec48 100644 --- a/integtest/insufficient_disk_space_test.py +++ b/integtest/insufficient_disk_space_test.py @@ -97,7 +97,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "insufficient" +conf_dict.config_session_name= "insufficient" conf_dict.tpg_enabled = False conf_dict.n_df_apps = number_of_dataflow_apps conf_dict.fake_hsi_enabled = False diff --git a/integtest/large_trigger_record_test.py b/integtest/large_trigger_record_test.py index 30061b78..58888684 100644 --- a/integtest/large_trigger_record_test.py +++ b/integtest/large_trigger_record_test.py @@ -95,7 +95,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "largerecord" +conf_dict.config_session_name= "largerecord" conf_dict.tpg_enabled = False conf_dict.n_df_apps = number_of_dataflow_apps diff --git a/integtest/max_file_size_test.py b/integtest/max_file_size_test.py index a08167f8..f11e7779 100644 --- a/integtest/max_file_size_test.py +++ b/integtest/max_file_size_test.py @@ -17,7 +17,6 @@ # Values that help determine the running conditions number_of_data_producers = 2 number_of_readout_apps = 3 -data_rate_slowdown_factor = 1 # Default values for validation parameters check_for_logfile_errors = True @@ -108,20 +107,13 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "maxfilesize" +conf_dict.config_session_name= "maxfilesize" conf_dict.tpg_enabled = True conf_dict.fake_hsi_enabled = True conf_dict.frame_file = ( "asset://?checksum=dd156b4895f1b06a06b6ff38e37bd798" # WIBEth All Zeros ) -conf_dict.config_substitutions.append( - data_classes.attribute_substitution( - obj_id=conf_dict.session, - obj_class="Session", - updates={"data_rate_slowdown_factor": data_rate_slowdown_factor}, - ) -) conf_dict.config_substitutions.append( data_classes.attribute_substitution( obj_class="LatencyBuffer", updates={"size": 200000} diff --git a/integtest/multiple_data_writers_test.py b/integtest/multiple_data_writers_test.py index 02af9702..a7c2ab8d 100644 --- a/integtest/multiple_data_writers_test.py +++ b/integtest/multiple_data_writers_test.py @@ -84,7 +84,7 @@ conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.dro_map_config.n_apps = number_of_readout_apps conf_dict.op_env = "integtest" -conf_dict.session = "multidatawriter" +conf_dict.config_session_name= "multidatawriter" conf_dict.fake_hsi_enabled = True conf_dict.n_data_writers = 3 diff --git a/integtest/offline_prod_run_test.py b/integtest/offline_prod_run_test.py index 5b02a7c1..461391c7 100644 --- a/integtest/offline_prod_run_test.py +++ b/integtest/offline_prod_run_test.py @@ -11,7 +11,6 @@ # Values that help determine the running conditions number_of_data_producers = 1 -data_rate_slowdown_factor = 1 # 10 for ProtoWIB/DuneWIB run_duration = 5 # seconds # Default values for validation parameters @@ -65,17 +64,10 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "smallfootprint" +conf_dict.config_session_name= "prodruntype" conf_dict.tpg_enabled = False conf_dict.fake_hsi_enabled = True -conf_dict.config_substitutions.append( - data_classes.attribute_substitution( - obj_id=conf_dict.session, - obj_class="Session", - updates={"data_rate_slowdown_factor": data_rate_slowdown_factor}, - ) -) conf_dict.config_substitutions.append( data_classes.attribute_substitution(obj_class="LatencyBuffer", updates={"size": 50000}) ) diff --git a/integtest/trmonrequestor_test.py b/integtest/trmonrequestor_test.py index 55b4321f..50353d69 100755 --- a/integtest/trmonrequestor_test.py +++ b/integtest/trmonrequestor_test.py @@ -14,7 +14,6 @@ number_of_dataflow_apps = 2 run_duration = 20 # seconds trigger_rate = 1.0 # Hz -data_rate_slowdown_factor = 1 trmon_prescale = 3 # Default values for validation parameters @@ -63,7 +62,7 @@ conf_dict = data_classes.drunc_config() conf_dict.dro_map_config.n_streams = number_of_data_producers conf_dict.op_env = "integtest" -conf_dict.session = "trmonrequestor" +conf_dict.config_session_name= "trmonrequestor" conf_dict.tpg_enabled = False conf_dict.trmon_app_enabled = True conf_dict.n_df_apps = number_of_dataflow_apps @@ -122,17 +121,17 @@ def test_log_files(run_nanorc): # Check that at least some of the expected log files are present assert any( - f"{run_nanorc.session}_df-01" in str(logname) + f"{run_nanorc.daq_session_name}_df-01" in str(logname) for logname in run_nanorc.log_files ) assert any( - f"{run_nanorc.session}_dfo" in str(logname) for logname in run_nanorc.log_files + f"{run_nanorc.daq_session_name}_dfo" in str(logname) for logname in run_nanorc.log_files ) assert any( - f"{run_nanorc.session}_mlt" in str(logname) for logname in run_nanorc.log_files + f"{run_nanorc.daq_session_name}_mlt" in str(logname) for logname in run_nanorc.log_files ) assert any( - f"{run_nanorc.session}_ru" in str(logname) for logname in run_nanorc.log_files + f"{run_nanorc.daq_session_name}_ru" in str(logname) for logname in run_nanorc.log_files ) if check_for_logfile_errors: