Skip to content

Modified integtests to make use of new utility functions for setting trigger config params #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bieryAtFnal wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Modified integtests to make use of new utility functions for setting trigger config params #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e349bf
Modified various integtests to clean up the setting of trigger and re…
May 29, 2026
086f35a
Fixed trigger_params function call - should be RTCM, not fake_hsi.
May 29, 2026
14ce80d
Merge remote-tracking branch 'origin/develop' into kbiery/integtest_t…
Jun 18, 2026
1f30a10
Merge remote-tracking branch 'origin/develop' into kbiery/integtest_t…
Jun 29, 2026
d97a8ab
Modified the integtests to take into account Michal's suggestions in …
Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions integtest/disabled_output_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,12 @@
conf_dict.op_env = "integtest"
conf_dict.config_session_name= "disabled"
conf_dict.tpg_enabled = False
utility_functions.set_rtcm_trigger_params(conf_dict, trigger_rate=trigger_rate)
# We accept the default values for all of the other integtest config parameters
# (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_class="RandomTCMakerConf",
updates={"trigger_rate_hz": trigger_rate},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCDataProcessor",
Expand Down
30 changes: 3 additions & 27 deletions integtest/hdf5_compression_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@
conf_dict.op_env = "integtest"
conf_dict.config_session_name= "hdf5compression"
conf_dict.tpg_enabled = True
conf_dict.fake_hsi_enabled = True
utility_functions.enable_fake_hsi_trigger(conf_dict, trigger_rate=10.0,
readout_window_before_ticks=120000,
readout_window_after_ticks=1000)
conf_dict.dro_map_config.det_id = 2 # det_id = 2 for kHD_PDS
conf_dict.frame_file = "asset://?checksum=a8990a9eb3a505d4ded62dfdfa9e2681" # run 36012 DAPHNE data
#conf_dict.frame_file = "file:///home/nfs/biery/dunedaq/12MayFDv5.3.2DevInstrUpdate/sourcecode/dfmodules/integtest/np02vdcoldbox_run035227_sample_hd_pds.bin"
Expand All @@ -138,32 +140,6 @@
)
)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="FakeHSIEventGeneratorConf",
updates={"trigger_rate": 10.0},
)
)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="HSISignalWindow",
updates={
"time_before": 1000,
"time_after": 500,
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-hsi-tc-map",
updates={
"time_before": 120000,
"time_after": 1000,
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="DataStoreConf",
Expand Down
16 changes: 4 additions & 12 deletions integtest/insufficient_disk_space_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,10 @@
conf_dict.n_df_apps = number_of_dataflow_apps
conf_dict.fake_hsi_enabled = False
conf_dict.remove_hdf5_files = True

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="RandomTCMakerConf",
updates={
"trigger_rate_hz": trigger_rate,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": readout_window_time_before,
"candidate_window_after_ts": readout_window_time_after
},
)
)
utility_functions.set_rtcm_trigger_params(conf_dict, trigger_rate=trigger_rate,
readout_window_backshift_ticks=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(
Expand Down
32 changes: 8 additions & 24 deletions integtest/large_trigger_record_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,11 @@
conf_dict.tpg_enabled = False
conf_dict.n_df_apps = number_of_dataflow_apps
conf_dict.remove_hdf5_files = True
utility_functions.set_rtcm_trigger_params(conf_dict, trigger_rate=trigger_rate,
readout_window_backshift_ticks=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="RandomTCMakerConf",
updates={
"trigger_rate_hz": trigger_rate,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": readout_window_time_before,
"candidate_window_after_ts": readout_window_time_after
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="DataStoreConf",
Expand Down Expand Up @@ -133,19 +126,10 @@
)
)
oversize_conf = copy.deepcopy(conf_dict) # Copy before setting the readout window

# Now set the readout window for the over-size case
oversize_conf.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="RandomTCMakerConf",
updates={
"trigger_rate_hz": trigger_rate,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": 2.5 * readout_window_time_before,
"candidate_window_after_ts": readout_window_time_after
},
)
)
utility_functions.set_rtcm_trigger_params(oversize_conf, trigger_rate=trigger_rate,
readout_window_backshift_ticks=0,
readout_window_before_ticks=int(2.5*readout_window_time_before),
readout_window_after_ticks=readout_window_time_after)

confgen_arguments = {
"TRSize_55PercentOfMaxFileSize": conf_dict,
Expand Down
29 changes: 2 additions & 27 deletions integtest/max_file_size_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,12 @@
conf_dict.op_env = "integtest"
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.remove_hdf5_files = True
utility_functions.enable_fake_hsi_trigger(conf_dict, trigger_rate=10.0,
readout_window_before_ticks=52000, readout_window_after_ticks=1000)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
Expand All @@ -125,32 +126,6 @@
)
)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="FakeHSIEventGeneratorConf",
updates={"trigger_rate": 10.0},
)
)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="HSISignalWindow",
updates={
"time_before": 1000,
"time_after": 500,
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-hsi-tc-map",
updates={
"time_before": 52000,
"time_after": 1000,
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="DataStoreConf",
Expand Down
30 changes: 2 additions & 28 deletions integtest/multiple_data_writers_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,35 +85,9 @@
conf_dict.dro_map_config.n_apps = number_of_readout_apps
conf_dict.op_env = "integtest"
conf_dict.config_session_name= "multidatawriter"
conf_dict.fake_hsi_enabled = True
conf_dict.n_data_writers = 3

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="FakeHSIEventGeneratorConf",
updates={"trigger_rate": 10.0},
)
)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="HSISignalWindow",
updates={
"time_before": 1000,
"time_after": 500,
},
)
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-hsi-tc-map",
updates={
"time_before": 52000,
"time_after": 1000,
},
)
)
utility_functions.enable_fake_hsi_trigger(conf_dict, trigger_rate=10.0,
readout_window_before_ticks=52000, readout_window_after_ticks=1000)

conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
Expand Down
9 changes: 1 addition & 8 deletions integtest/offline_prod_run_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,12 @@
conf_dict.op_env = "integtest"
conf_dict.config_session_name= "prodruntype"
conf_dict.tpg_enabled = False
conf_dict.fake_hsi_enabled = True
utility_functions.enable_fake_hsi_trigger(conf_dict, trigger_rate=1.0)

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="FakeHSIEventGeneratorConf",
updates={"trigger_rate": 1.0},
)
)

confgen_arguments = {"OfflineProdRun": conf_dict}
# The commands to run in dunerc, as a list
dunerc_command_list = (
Expand Down
13 changes: 2 additions & 11 deletions integtest/trmonrequestor_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,8 @@
conf_dict.tpg_enabled = False
conf_dict.trmon_app_enabled = True
conf_dict.n_df_apps = number_of_dataflow_apps


substitution = data_classes.attribute_substitution(
obj_id="random-tc-generator",
obj_class="RandomTCMakerConf",
updates={
"trigger_rate_hz": trigger_rate,
"candidate_backshift_ts": 0,
},
)
conf_dict.config_substitutions.append(substitution)
utility_functions.set_rtcm_trigger_params(conf_dict, trigger_rate=trigger_rate,
readout_window_backshift_ticks=0)

substitution = data_classes.attribute_substitution(
obj_id="tr_mon_dw-01",
Expand Down
Loading