Skip to content
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

Jump to bottom

fixed the assignment of the token count in several integration tests #280

Merged
merged 3 commits into from
Apr 3, 2023
Merged

fixed the assignment of the token count in several integration tests #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4faa5e9
initial changes to try to correctly specify dataflow token_count para…
bieryAtFnal Apr 1, 2023
a77352c
updated the token_count calculation in tpstream_writing_test to take …
bieryAtFnal Apr 2, 2023
bc1d2db
added forgotten math package import to tpstream_writing_test.py
bieryAtFnal Apr 2, 2023
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
2 changes: 1 addition & 1 deletion integtest/3ru_1df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

swtpg_conf = copy.deepcopy(conf_dict)
swtpg_conf["readout"]["enable_software_tpg"] = True
swtpg_conf["dataflow"]["apps"][0]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
swtpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)

dqm_conf = copy.deepcopy(conf_dict)
dqm_conf["dqm"]["enable_dqm"] = True
Expand Down
3 changes: 1 addition & 2 deletions integtest/3ru_3df_multirun_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@

swtpg_conf = copy.deepcopy(conf_dict)
swtpg_conf["readout"]["enable_software_tpg"] = True
for df_app in range(number_of_dataflow_apps):
swtpg_conf["dataflow"]["apps"][df_app]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))
swtpg_conf["dataflow"]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))

dqm_conf = copy.deepcopy(conf_dict)
dqm_conf["dqm"]["enable_dqm"] = True
Expand Down
1 change: 1 addition & 0 deletions integtest/long_window_readout_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after

conf_dict["dataflow"]["token_count"] = token_count
conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
for df_app in range(number_of_dataflow_apps):
dfapp_conf = {}
Expand Down
2 changes: 1 addition & 1 deletion integtest/multi_output_file_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

swtpg_conf = copy.deepcopy(conf_dict)
swtpg_conf["readout"]["enable_software_tpg"] = True
swtpg_conf["dataflow"]["apps"][0]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)
swtpg_conf["dataflow"]["token_count"] = max(10, 3*number_of_data_producers*number_of_readout_apps)

confgen_arguments={"WIB1_System": conf_dict,
"Software_TPG_System": swtpg_conf,
Expand Down
3 changes: 2 additions & 1 deletion integtest/tpstream_writing_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
import os
import re
import math
import urllib.request

import dfmodules.data_file_checks as data_file_checks
Expand Down Expand Up @@ -83,12 +84,12 @@
conf_dict["trigger"]["tpset_output_path"] = output_dir
conf_dict["readout"]["enable_software_tpg"] = True

conf_dict["dataflow"]["token_count"] = int(math.ceil(max(10, 3*number_of_data_producers*number_of_readout_apps)/number_of_dataflow_apps))
conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
for df_app in range(number_of_dataflow_apps):
dfapp_conf = {}
dfapp_conf["app_name"] = f"dataflow{df_app}"
dfapp_conf["output_path"] = output_dir
dfapp_conf["token_count"] = 3*number_of_readout_apps
conf_dict["dataflow"]["apps"].append(dfapp_conf)

confgen_arguments={"Software_TPG_System": conf_dict }
Expand Down
1 change: 1 addition & 0 deletions integtest/z.insufficient_disk_space_test.not_yet_working
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ conf_dict["trigger"]["trigger_rate_hz"] = trigger_rate
conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after

conf_dict["dataflow"]["token_count"] = token_count
conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
for df_app in range(number_of_dataflow_apps):
dfapp_conf = {}
Expand Down
1 change: 1 addition & 0 deletions integtest/z.large_trigger_record_test.not_yet_working
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ conf_dict["trigger"]["trigger_rate_hz"] = trigger_rate
conf_dict["trigger"]["trigger_window_before_ticks"] = readout_window_time_before
conf_dict["trigger"]["trigger_window_after_ticks"] = readout_window_time_after

conf_dict["dataflow"]["token_count"] = token_count
conf_dict["dataflow"]["apps"] = [] # Remove preconfigured dataflow0 app
for df_app in range(number_of_dataflow_apps):
dfapp_conf = {}
Expand Down