Skip to content

Introduced SocketDetectorToDaqConnection #303

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

Closed
denizergonul wants to merge 14 commits into from
Closed

Introduced SocketDetectorToDaqConnection #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6e83c72
Introduced SocketDetectorToDaqConnection
denizergonul Mar 6, 2026
1761a63
Merge branch 'develop' into dte/crt_topology_change
denizergonul Mar 10, 2026
4ababce
CRT and SocketWriter communicates via queues
denizergonul Mar 11, 2026
37ef260
Communicates via callbacks: CRT readers with socket writers, socket r…
denizergonul Mar 13, 2026
310b0a3
Revert changes
denizergonul Mar 13, 2026
8d9a006
Example conf uses fake reader
denizergonul Mar 17, 2026
ff928de
Merge branch 'develop' into dte/crt_topology_change
denizergonul Mar 17, 2026
cd65032
Added more streams to differentiate Grenoble/Bern with detector ID
denizergonul Mar 17, 2026
1cbddd5
TCP instead of UDP
denizergonul Mar 17, 2026
60d69ea
New schema added
denizergonul Mar 18, 2026
b125aeb
Merge remote-tracking branch 'origin/develop' into dte/crt_topology_c…
Mar 18, 2026
12d5b80
In readout_type_scan_test.py, increased the readout window sizes for …
Mar 19, 2026
bf85270
CRTReader is not a DataReader
denizergonul Mar 20, 2026
dd81634
Switch to IOM
denizergonul Mar 23, 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
27 changes: 26 additions & 1 deletion config/daqsystemtest/connections.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

<oks-data>

<info name="" type="" num-of-items="70" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260202T153912"/>
<info name="" type="" num-of-items="74" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105549" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260320T111440"/>

<include>
<file path="schema/confmodel/dunedaq.schema.xml"/>
Expand All @@ -74,6 +74,7 @@

<comments>
<comment creation-time="20250526T123756" created-by="dergonul" created-on="np04-srv-031.cern.ch" author="dergonul" text="Added CRT queue rules"/>
<comment creation-time="20260320T111440" created-by="dergonul" created-on="np04-srv-015.cern.ch" author="dergonul" text="Added queue rules for CRT frames"/>
</comments>


Expand Down Expand Up @@ -258,6 +259,16 @@
<rel name="descriptor" class="NetworkConnectionDescriptor" id="timesync-publisher"/>
</obj>

<obj class="QueueConnectionRule" id="crt-bern-sender-input-queue-rule">
<attr name="destination_class" type="class" val="DaqModule"/>
<rel name="descriptor" class="QueueDescriptor" id="crt-bern-sender-input"/>
</obj>

<obj class="QueueConnectionRule" id="crt-grenoble-sender-input-queue-rule">
<attr name="destination_class" type="class" val="DaqModule"/>
<rel name="descriptor" class="QueueDescriptor" id="crt-grenoble-sender-input"/>
</obj>

<obj class="QueueConnectionRule" id="fa-queue-rule">
<attr name="destination_class" type="class" val="FragmentAggregatorModule"/>
<rel name="descriptor" class="QueueDescriptor" id="fa-input"/>
Expand Down Expand Up @@ -313,6 +324,20 @@
<rel name="descriptor" class="QueueDescriptor" id="trigger-records"/>
</obj>

<obj class="QueueDescriptor" id="crt-bern-sender-input">
<attr name="uid_base" type="string" val="sender_input_"/>
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
<attr name="capacity" type="u32" val="10000"/>
<attr name="data_type" type="string" val="CRTBernFrame"/>
</obj>

<obj class="QueueDescriptor" id="crt-grenoble-sender-input">
<attr name="uid_base" type="string" val="sender_input_"/>
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
<attr name="capacity" type="u32" val="10000"/>
<attr name="data_type" type="string" val="CRTGrenobleFrame"/>
</obj>

<obj class="QueueDescriptor" id="data-req-queue-desc">
<attr name="uid_base" type="string" val="internal_data_requests_for_"/>
<attr name="queue_type" type="enum" val="kFollySPSCQueue"/>
Expand Down
32 changes: 10 additions & 22 deletions config/daqsystemtest/moduleconfs.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@
<rel name="command" class="FSMCommand" id="start"/>
<rel name="steps">
<ref class="DaqModulesGroupByType" id="socket-writer-data-source-step"/>
<ref class="DaqModulesGroupByType" id="data-source-step"/>
<ref class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step"/>
</rel>
</obj>

<obj class="ActionPlan" id="crt-readout-stop">
<attr name="execution_policy" type="enum" val="modules-in-parallel"/>
<rel name="command" class="FSMCommand" id="stop_trigger_sources"/>
<rel name="steps">
<ref class="DaqModulesGroupByType" id="data-source-step"/>
<ref class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step"/>
<ref class="DaqModulesGroupByType" id="socket-writer-data-source-step"/>
</rel>
</obj>
Expand Down Expand Up @@ -225,20 +225,12 @@
</rel>
</obj>

<obj class="CRTBernReaderConf" id="def-crt-bern-receiver-conf">
<attr name="template_for" type="class" val="CRTBernReaderModule"/>
<attr name="emulation_mode" type="bool" val="0"/>
</obj>

<obj class="CRTGrenobleReaderConf" id="def-crt-grenoble-receiver-conf">
<attr name="template_for" type="class" val="CRTGrenobleReaderModule"/>
<attr name="emulation_mode" type="bool" val="0"/>
<obj class="CRTBernFrameBuilderConf" id="def-crt-bern-frame-builder-conf">
<attr name="template_for" type="class" val="CRTBernFrameBuilderModule"/>
</obj>

<obj class="CRTReaderConf" id="def-emu-crt-receiver-conf">
<attr name="template_for" type="class" val="FDFakeReaderModule"/>
<attr name="emulation_mode" type="bool" val="1"/>
<rel name="emulation_conf" class="StreamEmulationParameters" id="crt-stream-emu"/>
<obj class="CRTGrenobleFrameBuilderConf" id="def-crt-grenoble-frame-builder-conf">
<attr name="template_for" type="class" val="CRTGrenobleFrameBuilderModule"/>
</obj>

<obj class="DFOConf" id="dfoconf-01">
Expand Down Expand Up @@ -267,17 +259,17 @@
</attr>
</obj>

<obj class="DaqModulesGroupByType" id="crt-bern-reader-data-source-step">
<obj class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step">
<attr name="optional" type="bool" val="0"/>
<attr name="modules" type="class">
<data val="CRTBernReaderModule"/>
<data val="CRTBernFrameBuilderModule"/>
</attr>
</obj>

<obj class="DaqModulesGroupByType" id="crt-grenoble-reader-data-source-step">
<obj class="DaqModulesGroupByType" id="crt-grenoble-frame-builder-data-source-step">
<attr name="optional" type="bool" val="0"/>
<attr name="modules" type="class">
<data val="CRTGrenobleReaderModule"/>
<data val="CRTGrenobleFrameBuilderModule"/>
</attr>
</obj>

Expand Down Expand Up @@ -745,14 +737,10 @@
<obj class="SocketReaderConf" id="def-socket-reader-conf">
<attr name="template_for" type="class" val="SocketReaderModule"/>
<attr name="emulation_mode" type="bool" val="0"/>
<attr name="socket_type" type="enum" val="UDP"/>
<attr name="local_ip" type="string" val="127.0.0.1"/>
</obj>

<obj class="SocketWriterConf" id="def-socket-writer-conf">
<attr name="template_for" type="class" val="SocketWriterModule"/>
<attr name="socket_type" type="enum" val="UDP"/>
<attr name="remote_ip" type="string" val="127.0.0.1"/>
</obj>

<obj class="StreamEmulationParameters" id="crt-stream-emu">
Expand Down
133 changes: 111 additions & 22 deletions config/daqsystemtest/ru-segment.data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@

<oks-data>

<info name="" type="" num-of-items="49" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105615" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260202T153912"/>
<info name="" type="" num-of-items="62" oks-format="data" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20231207T105615" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260305T122304"/>

<include>
<file path="schema/confmodel/dunedaq.schema.xml"/>
<file path="schema/appmodel/application.schema.xml"/>
<file path="schema/appmodel/fdmodules.schema.xml"/>
<file path="schema/appmodel/wiec.schema.xml"/>
<file path="schema/appmodel/socket.schema.xml"/>
<file path="config/daqsystemtest/connections.data.xml"/>
<file path="config/daqsystemtest/moduleconfs.data.xml"/>
<file path="config/daqsystemtest/hosts.data.xml"/>
Expand Down Expand Up @@ -103,10 +104,11 @@
<comment creation-time="20250325T145413" created-by="dergonul" created-on="np04-srv-015.cern.ch" author="dergonul" text="Disabled TP"/>
<comment creation-time="20250526T125136" created-by="dergonul" created-on="np04-srv-031.cern.ch" author="dergonul" text="Added crt-bern and crt-grenoble"/>
<comment creation-time="20250805T092423" created-by="dergonul" created-on="np04-srv-028.cern.ch" author="dergonul" text="Emu CRT configs"/>
<comment creation-time="20260225T104925" created-by="dergonul" created-on="np04-srv-015.cern.ch" author="dergonul" text="Introduced SocketDetectorToDaqConnection"/>
</comments>


<obj class="CRTReaderApplication" id="crt-data-source-01">
<obj class="CRTFrameBuilderApplication" id="crt-data-source-01">
<attr name="application_name" type="string" val="daq_application"/>
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
<rel name="exposes_service">
Expand All @@ -117,14 +119,14 @@
<ref class="ActionPlan" id="crt-readout-start"/>
<ref class="ActionPlan" id="crt-readout-stop"/>
</rel>
<rel name="data_writers">
<ref class="SocketWriterConf" id="def-socket-writer-conf"/>
</rel>
<rel name="data_reader" class="CRTReaderConf" id="def-emu-crt-receiver-conf"/>
<rel name="queue_rules">
<ref class="QueueConnectionRule" id="crt-bern-sender-input-queue-rule"/>
</rel>
<rel name="detector_frame_builder" class="CRTBernFrameBuilderConf" id="def-crt-bern-frame-builder-conf"/>
<rel name="data_writer" class="SocketWriterConf" id="def-socket-writer-conf"/>
<rel name="detector_connections">
<ref class="NetworkDetectorToDaqConnection" id="socket_crt"/>
<ref class="SocketDetectorToDaqConnection" id="socket_crt"/>
</rel>
<rel name="callback_desc" class="DataMoveCallbackDescriptor" id="crt-bern-raw-input"/>
</obj>

<obj class="DPDKPortConfiguration" id="dpdk_e810_conf">
Expand Down Expand Up @@ -158,14 +160,29 @@

<obj class="DetectorStream" id="stream_1007">
<attr name="source_id" type="u32" val="1007"/>
<rel name="geo_id" class="GeoId" id="g_13_1_1_0"/>
<rel name="geo_id" class="GeoId" id="g_12_1_1_0"/>
</obj>

<obj class="DetectorStream" id="stream_1008">
<attr name="source_id" type="u32" val="1008"/>
<rel name="geo_id" class="GeoId" id="g_12_1_1_1"/>
</obj>

<obj class="DetectorStream" id="stream_1009">
<attr name="source_id" type="u32" val="1009"/>
<rel name="geo_id" class="GeoId" id="g_12_2_1_0"/>
</obj>

<obj class="DetectorStream" id="stream_101">
<attr name="source_id" type="u32" val="101"/>
<rel name="geo_id" class="GeoId" id="g_3_1_1_1"/>
</obj>

<obj class="DetectorStream" id="stream_1010">
<attr name="source_id" type="u32" val="1010"/>
<rel name="geo_id" class="GeoId" id="g_12_2_1_1"/>
</obj>

<obj class="DetectorStream" id="stream_102">
<attr name="source_id" type="u32" val="102"/>
<rel name="geo_id" class="GeoId" id="g_3_1_1_2"/>
Expand Down Expand Up @@ -202,12 +219,52 @@
<attr name="slot_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_12_1_1_1">
<attr name="detector_id" type="u32" val="12"/>
<attr name="crate_id" type="u32" val="1"/>
<attr name="slot_id" type="u32" val="1"/>
<attr name="stream_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_12_2_1_0">
<attr name="detector_id" type="u32" val="12"/>
<attr name="crate_id" type="u32" val="2"/>
<attr name="slot_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_12_2_1_1">
<attr name="detector_id" type="u32" val="12"/>
<attr name="crate_id" type="u32" val="2"/>
<attr name="slot_id" type="u32" val="1"/>
<attr name="stream_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_13_1_1_0">
<attr name="detector_id" type="u32" val="13"/>
<attr name="crate_id" type="u32" val="1"/>
<attr name="slot_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_13_1_1_1">
<attr name="detector_id" type="u32" val="13"/>
<attr name="crate_id" type="u32" val="1"/>
<attr name="slot_id" type="u32" val="1"/>
<attr name="stream_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_13_2_1_0">
<attr name="detector_id" type="u32" val="13"/>
<attr name="crate_id" type="u32" val="2"/>
<attr name="slot_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_13_2_1_1">
<attr name="detector_id" type="u32" val="13"/>
<attr name="crate_id" type="u32" val="2"/>
<attr name="slot_id" type="u32" val="1"/>
<attr name="stream_id" type="u32" val="1"/>
</obj>

<obj class="GeoId" id="g_3_1_1_0">
<attr name="detector_id" type="u32" val="3"/>
<attr name="crate_id" type="u32" val="1"/>
Expand Down Expand Up @@ -300,13 +357,6 @@
<rel name="net_receiver" class="DPDKReceiver" id="ru-2-rcv"/>
</obj>

<obj class="NetworkDetectorToDaqConnection" id="socket_crt">
<rel name="net_senders">
<ref class="SocketDataSender" id="socket_sender_crt"/>
</rel>
<rel name="net_receiver" class="SocketReceiver" id="socket-ru-1-rcv"/>
</obj>

<obj class="NetworkDevice" id="ru_1_readout">
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
<attr name="ip_address" type="string">
Expand All @@ -330,7 +380,25 @@
<obj class="NetworkInterface" id="crt_101_asio0">
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
<attr name="ip_address" type="string">
<data val="123.456.101.000"/>
<data val="127.0.0.1"/>
</attr>
<attr name="interface_name" type="string" val="asio0"/>
<attr name="network_name" type="enum" val="Control"/>
</obj>

<obj class="NetworkInterface" id="crt_101_asio1">
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
<attr name="ip_address" type="string">
<data val="127.0.0.1"/>
</attr>
<attr name="interface_name" type="string" val="asio1"/>
<attr name="network_name" type="enum" val="Control"/>
</obj>

<obj class="NetworkInterface" id="socket_ru_1_readout">
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
<attr name="ip_address" type="string">
<data val="127.0.0.1"/>
</attr>
<attr name="interface_name" type="string" val="asio0"/>
<attr name="network_name" type="enum" val="Control"/>
Expand Down Expand Up @@ -486,7 +554,7 @@
<rel name="data_reader" class="SocketReaderConf" id="def-socket-reader-conf"/>
<rel name="fragment_aggregator" class="FragmentAggregatorConf" id="frag-agg-01"/>
<rel name="detector_connections">
<ref class="NetworkDetectorToDaqConnection" id="socket_crt"/>
<ref class="SocketDetectorToDaqConnection" id="socket_crt"/>
</rel>
<rel name="callback_desc" class="DataMoveCallbackDescriptor" id="crt-bern-raw-input"/>
</obj>
Expand All @@ -504,23 +572,44 @@

<obj class="Segment" id="socket-ru-segment">
<rel name="applications">
<ref class="CRTReaderApplication" id="crt-data-source-01"/>
<ref class="CRTFrameBuilderApplication" id="crt-data-source-01"/>
<ref class="ReadoutApplication" id="socket-ru-01"/>
</rel>
<rel name="controller" class="RCApplication" id="socket-ru-controller"/>
</obj>

<obj class="SocketDataSender" id="socket_sender_crt">
<attr name="port" type="u32" val="1234"/>
<attr name="control_host" type="string" val="localhost"/>
<attr name="socket_type" type="enum" val="UDP"/>
<attr name="local_port" type="u32" val="12345"/>
<attr name="remote_port" type="u32" val="20001"/>
<rel name="streams">
<ref class="DetectorStream" id="stream_1007"/>
<ref class="DetectorStream" id="stream_1008"/>
</rel>
<rel name="uses" class="NetworkInterface" id="crt_101_asio0"/>
</obj>

<obj class="SocketDataSender" id="socket_sender_crt_2">
<attr name="socket_type" type="enum" val="TCP"/>
<attr name="local_port" type="u32" val="12346"/>
<attr name="remote_port" type="u32" val="20002"/>
<rel name="streams">
<ref class="DetectorStream" id="stream_1009"/>
<ref class="DetectorStream" id="stream_1010"/>
</rel>
<rel name="uses" class="NetworkInterface" id="crt_101_asio1"/>
</obj>

<obj class="SocketDetectorToDaqConnection" id="socket_crt">
<rel name="net_senders">
<ref class="SocketDataSender" id="socket_sender_crt"/>
<ref class="SocketDataSender" id="socket_sender_crt_2"/>
</rel>
<rel name="net_receiver" class="SocketReceiver" id="socket-ru-1-rcv"/>
</obj>

<obj class="SocketReceiver" id="socket-ru-1-rcv">
<rel name="uses" class="NetworkDevice" id="ru_1_readout"/>
<rel name="uses" class="NetworkInterface" id="socket_ru_1_readout"/>
</obj>

<obj class="SourceIDConf" id="tp-srcid-1000">
Expand Down
6 changes: 3 additions & 3 deletions docs/bundle_script_overview.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ The following tests will be run:

The following tests will be run:
asiolibs/socket_reader_test.py
crtmodules/crt_reader_test.py
crtmodules/crt_frame_builder_test.py

(dbt) [biery@daq]$ dunedaq_integtest_bundle.sh -r local -k tp --list-only

Expand Down Expand Up @@ -143,7 +143,7 @@ The following tests will be run:
Looking for integtests in _all_ repos...

asiolibs/socket_reader_test.py
crtmodules/crt_reader_test.py
crtmodules/crt_frame_builder_test.py
daqsystemtest/3ru_1df_multirun_test.py
daqsystemtest/3ru_3df_multirun_test.py
daqsystemtest/example_system_test.py
Expand Down Expand Up @@ -205,7 +205,7 @@ dfmodules/trmonrequestor_test.py
Looking for integtests in the _asiolibs crtmodules_ repo(s)...

asiolibs/socket_reader_test.py
crtmodules/crt_reader_test.py
crtmodules/crt_frame_builder_test.py

(dbt) [biery@daq]$ list_available_integtests.sh asdf jklp

Expand Down
Loading
Loading