From 4b141a14f19d4709f7bb4a62e28ffebc2ceb0683 Mon Sep 17 00:00:00 2001 From: Alessandro Thea Date: Wed, 12 Nov 2025 23:17:41 +0100 Subject: [PATCH 1/7] RandomTCMaker conf updated --- config/daqsystemtest/moduleconfs.data.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index 994e1be..9a0e108 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -657,7 +657,10 @@ - + + + + @@ -797,12 +800,6 @@ - - - - - - From ad16bfb97f8b2a828b77f6595b34031c2f64f611 Mon Sep 17 00:00:00 2001 From: Alessandro Thea Date: Sat, 15 Nov 2025 08:35:42 +0100 Subject: [PATCH 2/7] Replaced rtcm offset with backshift to highight the value is subtracked from 'now' --- config/daqsystemtest/moduleconfs.data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index 9a0e108..b8a4f00 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -658,7 +658,7 @@ - + From 01400de93da56d3e3eb6515f767e545568ca8cdd Mon Sep 17 00:00:00 2001 From: Alessandro Thea Date: Sat, 15 Nov 2025 08:38:23 +0100 Subject: [PATCH 3/7] candidate_backshift_ts changed to s64 --- config/daqsystemtest/moduleconfs.data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index b8a4f00..f5dd92a 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -658,7 +658,7 @@ - + From 6f42c777b05195f91061f9fc1043b7c069fa464a Mon Sep 17 00:00:00 2001 From: Alessandro Thea Date: Mon, 24 Nov 2025 14:13:56 +0100 Subject: [PATCH 4/7] Re-creating `def-random-readout` --- config/daqsystemtest/moduleconfs.data.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index f5dd92a..054116a 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -800,6 +800,12 @@ + + + + + + From a6ca97189ffce8fe77fde8193a1dece7dde7e86d Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Tue, 25 Nov 2025 11:54:02 -0600 Subject: [PATCH 5/7] Properly set TC readout window sizes for daqsystemtest after updates in config --- config/daqsystemtest/moduleconfs.data.xml | 6 +++--- integtest/fake_data_producer_test.py | 9 +++++---- integtest/long_window_readout_test.py | 9 +++++---- integtest/readout_type_scan_test.py | 18 ++++++++++-------- integtest/trigger_bitwords_test.py | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index 5e8098b..5fb598f 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -694,9 +694,9 @@ - - - + + + diff --git a/integtest/fake_data_producer_test.py b/integtest/fake_data_producer_test.py index f8f5770..1007730 100644 --- a/integtest/fake_data_producer_test.py +++ b/integtest/fake_data_producer_test.py @@ -79,11 +79,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, }, ) ) diff --git a/integtest/long_window_readout_test.py b/integtest/long_window_readout_test.py index 3b646e8..7d9ffce 100644 --- a/integtest/long_window_readout_test.py +++ b/integtest/long_window_readout_test.py @@ -130,11 +130,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, }, ) ) diff --git a/integtest/readout_type_scan_test.py b/integtest/readout_type_scan_test.py index 47a3f3b..6f1a0d6 100644 --- a/integtest/readout_type_scan_test.py +++ b/integtest/readout_type_scan_test.py @@ -232,11 +232,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, }, ) ) @@ -246,11 +247,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, }, ) ) diff --git a/integtest/trigger_bitwords_test.py b/integtest/trigger_bitwords_test.py index c1f4ed5..6353164 100644 --- a/integtest/trigger_bitwords_test.py +++ b/integtest/trigger_bitwords_test.py @@ -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( From 97aa623fb29c1140bc2a8a938af5aec4054d5033 Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Tue, 25 Nov 2025 12:28:21 -0600 Subject: [PATCH 6/7] Revert "RandomTCMaker conf updated" --- config/daqsystemtest/moduleconfs.data.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index 5e8098b..e2649a2 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -693,10 +693,7 @@ - - - - + From 6c831e612f7657c65794a42516a0b3840717d3aa Mon Sep 17 00:00:00 2001 From: Wesley Ketchum Date: Wed, 26 Nov 2025 10:46:51 -0600 Subject: [PATCH 7/7] Reapply "RandomTCMaker conf updated" This reverts commit 97aa623fb29c1140bc2a8a938af5aec4054d5033. --- config/daqsystemtest/moduleconfs.data.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/daqsystemtest/moduleconfs.data.xml b/config/daqsystemtest/moduleconfs.data.xml index e2649a2..5e8098b 100644 --- a/config/daqsystemtest/moduleconfs.data.xml +++ b/config/daqsystemtest/moduleconfs.data.xml @@ -693,7 +693,10 @@ - + + + +