Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion config/daqsystemtest/moduleconfs.data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,10 @@
<attr name="template_for" type="class" val="RandomTCMakerModule"/>
<attr name="trigger_rate_hz" type="float" val="1"/>
<attr name="time_distribution" type="enum" val="kUniform"/>
<rel name="tc_readout" class="TCReadoutMap" id="def-random-readout"/>
<attr name="candidate_type_name" type="string" val="kRandom"/>
<attr name="candidate_backshift_ts" type="s64" val="0"/>
<attr name="candidate_window_before_ts" type="u32" val="2000"/>
<attr name="candidate_window_after_ts" type="u32" val="5"/>
</obj>

<obj class="RequestHandler" id="def-data-request-handler">
Expand Down
9 changes: 5 additions & 4 deletions integtest/fake_data_producer_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,12 @@

doublewindow_conf.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-random-readout",
obj_class="RandomTCMakerConf",
obj_id = "random-tc-generator",
updates={
"time_before": 2000,
"time_after": 2001,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": 2000,
"candidate_window_after_ts": 2001,
},
)
)
Expand Down
9 changes: 5 additions & 4 deletions integtest/long_window_readout_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,12 @@
)
conf_dict.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-random-readout",
obj_class="RandomTCMakerConf",
obj_id = "random-tc-generator",
updates={
"time_before": readout_window_time_before,
"time_after": readout_window_time_after,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": readout_window_time_before,
"candidate_window_after_ts": readout_window_time_after,
},
)
)
Expand Down
18 changes: 10 additions & 8 deletions integtest/readout_type_scan_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,11 +229,12 @@

daphne_stream_conf.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-random-readout",
obj_class="RandomTCMakerConf",
obj_id = "random-tc-generator",
updates={
"time_before": 62000,
"time_after": 500,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": 62000,
"candidate_window_after_ts": 500,
},
)
)
Expand All @@ -243,11 +244,12 @@
daphne_conf.frame_file = "asset://?checksum=a8990a9eb3a505d4ded62dfdfa9e2681" # np02vd_run036012_sample_membrane_pds
daphne_conf.config_substitutions.append(
data_classes.attribute_substitution(
obj_class="TCReadoutMap",
obj_id = "def-random-readout",
obj_class="RandomTCMakerConf",
obj_id = "random-tc-generator",
updates={
"time_before": 62000,
"time_after": 500,
"candidate_backshift_ts": 0,
"candidate_window_before_ts": 62000,
"candidate_window_after_ts": 500,
},
)
)
Expand Down
2 changes: 1 addition & 1 deletion integtest/trigger_bitwords_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
data_classes.attribute_substitution(
obj_id="random-tc-generator",
obj_class="RandomTCMakerConf",
updates={"trigger_rate_hz": 40},)
updates={"trigger_rate_hz": 40, "candidate_backshift_ts": 0, "candidate_window_before_ts": 62500, "candidate_window_after_ts": 62500},)
)
coincidence_bitword_conf.config_substitutions.append(
data_classes.attribute_substitution(
Expand Down