Skip to content

Commit 3e43874

Browse files
author
Kurt Biery
committed
Merge remote-tracking branch 'origin/develop' into kbiery/remove_integtest_hdf5_files
2 parents 26770db + 1238477 commit 3e43874

8 files changed

Lines changed: 183 additions & 50 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.12)
2-
project(daqsystemtest VERSION 4.8.0)
2+
project(daqsystemtest VERSION 4.8.1)
33

44
find_package(daq-cmake REQUIRED)
55

‎config/daqsystemtest/connections.data.xml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<oks-data>
6565

66-
<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"/>
66+
<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"/>
6767

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

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

7980

@@ -258,6 +259,16 @@
258259
<rel name="descriptor" class="NetworkConnectionDescriptor" id="timesync-publisher"/>
259260
</obj>
260261

262+
<obj class="QueueConnectionRule" id="crt-bern-sender-input-queue-rule">
263+
<attr name="destination_class" type="class" val="DaqModule"/>
264+
<rel name="descriptor" class="QueueDescriptor" id="crt-bern-sender-input"/>
265+
</obj>
266+
267+
<obj class="QueueConnectionRule" id="crt-grenoble-sender-input-queue-rule">
268+
<attr name="destination_class" type="class" val="DaqModule"/>
269+
<rel name="descriptor" class="QueueDescriptor" id="crt-grenoble-sender-input"/>
270+
</obj>
271+
261272
<obj class="QueueConnectionRule" id="fa-queue-rule">
262273
<attr name="destination_class" type="class" val="FragmentAggregatorModule"/>
263274
<rel name="descriptor" class="QueueDescriptor" id="fa-input"/>
@@ -313,6 +324,20 @@
313324
<rel name="descriptor" class="QueueDescriptor" id="trigger-records"/>
314325
</obj>
315326

327+
<obj class="QueueDescriptor" id="crt-bern-sender-input">
328+
<attr name="uid_base" type="string" val="sender_input_"/>
329+
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
330+
<attr name="capacity" type="u32" val="10000"/>
331+
<attr name="data_type" type="string" val="CRTBernFrame"/>
332+
</obj>
333+
334+
<obj class="QueueDescriptor" id="crt-grenoble-sender-input">
335+
<attr name="uid_base" type="string" val="sender_input_"/>
336+
<attr name="queue_type" type="enum" val="kFollyMPMCQueue"/>
337+
<attr name="capacity" type="u32" val="10000"/>
338+
<attr name="data_type" type="string" val="CRTGrenobleFrame"/>
339+
</obj>
340+
316341
<obj class="QueueDescriptor" id="data-req-queue-desc">
317342
<attr name="uid_base" type="string" val="internal_data_requests_for_"/>
318343
<attr name="queue_type" type="enum" val="kFollySPSCQueue"/>

‎config/daqsystemtest/moduleconfs.data.xml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@
139139
<rel name="command" class="FSMCommand" id="start"/>
140140
<rel name="steps">
141141
<ref class="DaqModulesGroupByType" id="socket-writer-data-source-step"/>
142-
<ref class="DaqModulesGroupByType" id="data-source-step"/>
142+
<ref class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step"/>
143143
</rel>
144144
</obj>
145145

146146
<obj class="ActionPlan" id="crt-readout-stop">
147147
<attr name="execution_policy" type="enum" val="modules-in-parallel"/>
148148
<rel name="command" class="FSMCommand" id="stop_trigger_sources"/>
149149
<rel name="steps">
150-
<ref class="DaqModulesGroupByType" id="data-source-step"/>
150+
<ref class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step"/>
151151
<ref class="DaqModulesGroupByType" id="socket-writer-data-source-step"/>
152152
</rel>
153153
</obj>
@@ -225,20 +225,12 @@
225225
</rel>
226226
</obj>
227227

228-
<obj class="CRTBernReaderConf" id="def-crt-bern-receiver-conf">
229-
<attr name="template_for" type="class" val="CRTBernReaderModule"/>
230-
<attr name="emulation_mode" type="bool" val="0"/>
231-
</obj>
232-
233-
<obj class="CRTGrenobleReaderConf" id="def-crt-grenoble-receiver-conf">
234-
<attr name="template_for" type="class" val="CRTGrenobleReaderModule"/>
235-
<attr name="emulation_mode" type="bool" val="0"/>
228+
<obj class="CRTBernFrameBuilderConf" id="def-crt-bern-frame-builder-conf">
229+
<attr name="template_for" type="class" val="CRTBernFrameBuilderModule"/>
236230
</obj>
237231

238-
<obj class="CRTReaderConf" id="def-emu-crt-receiver-conf">
239-
<attr name="template_for" type="class" val="FDFakeReaderModule"/>
240-
<attr name="emulation_mode" type="bool" val="1"/>
241-
<rel name="emulation_conf" class="StreamEmulationParameters" id="crt-stream-emu"/>
232+
<obj class="CRTGrenobleFrameBuilderConf" id="def-crt-grenoble-frame-builder-conf">
233+
<attr name="template_for" type="class" val="CRTGrenobleFrameBuilderModule"/>
242234
</obj>
243235

244236
<obj class="DFOConf" id="dfoconf-01">
@@ -267,17 +259,17 @@
267259
</attr>
268260
</obj>
269261

270-
<obj class="DaqModulesGroupByType" id="crt-bern-reader-data-source-step">
262+
<obj class="DaqModulesGroupByType" id="crt-bern-frame-builder-data-source-step">
271263
<attr name="optional" type="bool" val="0"/>
272264
<attr name="modules" type="class">
273-
<data val="CRTBernReaderModule"/>
265+
<data val="CRTBernFrameBuilderModule"/>
274266
</attr>
275267
</obj>
276268

277-
<obj class="DaqModulesGroupByType" id="crt-grenoble-reader-data-source-step">
269+
<obj class="DaqModulesGroupByType" id="crt-grenoble-frame-builder-data-source-step">
278270
<attr name="optional" type="bool" val="0"/>
279271
<attr name="modules" type="class">
280-
<data val="CRTGrenobleReaderModule"/>
272+
<data val="CRTGrenobleFrameBuilderModule"/>
281273
</attr>
282274
</obj>
283275

@@ -745,14 +737,10 @@
745737
<obj class="SocketReaderConf" id="def-socket-reader-conf">
746738
<attr name="template_for" type="class" val="SocketReaderModule"/>
747739
<attr name="emulation_mode" type="bool" val="0"/>
748-
<attr name="socket_type" type="enum" val="UDP"/>
749-
<attr name="local_ip" type="string" val="127.0.0.1"/>
750740
</obj>
751741

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

758746
<obj class="StreamEmulationParameters" id="crt-stream-emu">

‎config/daqsystemtest/ru-segment.data.xml‎

Lines changed: 111 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,14 @@
6363

6464
<oks-data>
6565

66-
<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"/>
66+
<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"/>
6767

6868
<include>
6969
<file path="schema/confmodel/dunedaq.schema.xml"/>
7070
<file path="schema/appmodel/application.schema.xml"/>
7171
<file path="schema/appmodel/fdmodules.schema.xml"/>
7272
<file path="schema/appmodel/wiec.schema.xml"/>
73+
<file path="schema/appmodel/socket.schema.xml"/>
7374
<file path="config/daqsystemtest/connections.data.xml"/>
7475
<file path="config/daqsystemtest/moduleconfs.data.xml"/>
7576
<file path="config/daqsystemtest/hosts.data.xml"/>
@@ -103,10 +104,11 @@
103104
<comment creation-time="20250325T145413" created-by="dergonul" created-on="np04-srv-015.cern.ch" author="dergonul" text="Disabled TP"/>
104105
<comment creation-time="20250526T125136" created-by="dergonul" created-on="np04-srv-031.cern.ch" author="dergonul" text="Added crt-bern and crt-grenoble"/>
105106
<comment creation-time="20250805T092423" created-by="dergonul" created-on="np04-srv-028.cern.ch" author="dergonul" text="Emu CRT configs"/>
107+
<comment creation-time="20260225T104925" created-by="dergonul" created-on="np04-srv-015.cern.ch" author="dergonul" text="Introduced SocketDetectorToDaqConnection"/>
106108
</comments>
107109

108110

109-
<obj class="CRTReaderApplication" id="crt-data-source-01">
111+
<obj class="CRTFrameBuilderApplication" id="crt-data-source-01">
110112
<attr name="application_name" type="string" val="daq_application"/>
111113
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
112114
<rel name="exposes_service">
@@ -117,14 +119,14 @@
117119
<ref class="ActionPlan" id="crt-readout-start"/>
118120
<ref class="ActionPlan" id="crt-readout-stop"/>
119121
</rel>
120-
<rel name="data_writers">
121-
<ref class="SocketWriterConf" id="def-socket-writer-conf"/>
122-
</rel>
123-
<rel name="data_reader" class="CRTReaderConf" id="def-emu-crt-receiver-conf"/>
122+
<rel name="queue_rules">
123+
<ref class="QueueConnectionRule" id="crt-bern-sender-input-queue-rule"/>
124+
</rel>
125+
<rel name="detector_frame_builder" class="CRTBernFrameBuilderConf" id="def-crt-bern-frame-builder-conf"/>
126+
<rel name="data_writer" class="SocketWriterConf" id="def-socket-writer-conf"/>
124127
<rel name="detector_connections">
125-
<ref class="NetworkDetectorToDaqConnection" id="socket_crt"/>
128+
<ref class="SocketDetectorToDaqConnection" id="socket_crt"/>
126129
</rel>
127-
<rel name="callback_desc" class="DataMoveCallbackDescriptor" id="crt-bern-raw-input"/>
128130
</obj>
129131

130132
<obj class="DPDKPortConfiguration" id="dpdk_e810_conf">
@@ -158,14 +160,29 @@
158160

159161
<obj class="DetectorStream" id="stream_1007">
160162
<attr name="source_id" type="u32" val="1007"/>
161-
<rel name="geo_id" class="GeoId" id="g_13_1_1_0"/>
163+
<rel name="geo_id" class="GeoId" id="g_12_1_1_0"/>
164+
</obj>
165+
166+
<obj class="DetectorStream" id="stream_1008">
167+
<attr name="source_id" type="u32" val="1008"/>
168+
<rel name="geo_id" class="GeoId" id="g_12_1_1_1"/>
169+
</obj>
170+
171+
<obj class="DetectorStream" id="stream_1009">
172+
<attr name="source_id" type="u32" val="1009"/>
173+
<rel name="geo_id" class="GeoId" id="g_12_2_1_0"/>
162174
</obj>
163175

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

181+
<obj class="DetectorStream" id="stream_1010">
182+
<attr name="source_id" type="u32" val="1010"/>
183+
<rel name="geo_id" class="GeoId" id="g_12_2_1_1"/>
184+
</obj>
185+
169186
<obj class="DetectorStream" id="stream_102">
170187
<attr name="source_id" type="u32" val="102"/>
171188
<rel name="geo_id" class="GeoId" id="g_3_1_1_2"/>
@@ -202,12 +219,52 @@
202219
<attr name="slot_id" type="u32" val="1"/>
203220
</obj>
204221

222+
<obj class="GeoId" id="g_12_1_1_1">
223+
<attr name="detector_id" type="u32" val="12"/>
224+
<attr name="crate_id" type="u32" val="1"/>
225+
<attr name="slot_id" type="u32" val="1"/>
226+
<attr name="stream_id" type="u32" val="1"/>
227+
</obj>
228+
229+
<obj class="GeoId" id="g_12_2_1_0">
230+
<attr name="detector_id" type="u32" val="12"/>
231+
<attr name="crate_id" type="u32" val="2"/>
232+
<attr name="slot_id" type="u32" val="1"/>
233+
</obj>
234+
235+
<obj class="GeoId" id="g_12_2_1_1">
236+
<attr name="detector_id" type="u32" val="12"/>
237+
<attr name="crate_id" type="u32" val="2"/>
238+
<attr name="slot_id" type="u32" val="1"/>
239+
<attr name="stream_id" type="u32" val="1"/>
240+
</obj>
241+
205242
<obj class="GeoId" id="g_13_1_1_0">
206243
<attr name="detector_id" type="u32" val="13"/>
207244
<attr name="crate_id" type="u32" val="1"/>
208245
<attr name="slot_id" type="u32" val="1"/>
209246
</obj>
210247

248+
<obj class="GeoId" id="g_13_1_1_1">
249+
<attr name="detector_id" type="u32" val="13"/>
250+
<attr name="crate_id" type="u32" val="1"/>
251+
<attr name="slot_id" type="u32" val="1"/>
252+
<attr name="stream_id" type="u32" val="1"/>
253+
</obj>
254+
255+
<obj class="GeoId" id="g_13_2_1_0">
256+
<attr name="detector_id" type="u32" val="13"/>
257+
<attr name="crate_id" type="u32" val="2"/>
258+
<attr name="slot_id" type="u32" val="1"/>
259+
</obj>
260+
261+
<obj class="GeoId" id="g_13_2_1_1">
262+
<attr name="detector_id" type="u32" val="13"/>
263+
<attr name="crate_id" type="u32" val="2"/>
264+
<attr name="slot_id" type="u32" val="1"/>
265+
<attr name="stream_id" type="u32" val="1"/>
266+
</obj>
267+
211268
<obj class="GeoId" id="g_3_1_1_0">
212269
<attr name="detector_id" type="u32" val="3"/>
213270
<attr name="crate_id" type="u32" val="1"/>
@@ -300,13 +357,6 @@
300357
<rel name="net_receiver" class="DPDKReceiver" id="ru-2-rcv"/>
301358
</obj>
302359

303-
<obj class="NetworkDetectorToDaqConnection" id="socket_crt">
304-
<rel name="net_senders">
305-
<ref class="SocketDataSender" id="socket_sender_crt"/>
306-
</rel>
307-
<rel name="net_receiver" class="SocketReceiver" id="socket-ru-1-rcv"/>
308-
</obj>
309-
310360
<obj class="NetworkDevice" id="ru_1_readout">
311361
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
312362
<attr name="ip_address" type="string">
@@ -330,7 +380,25 @@
330380
<obj class="NetworkInterface" id="crt_101_asio0">
331381
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
332382
<attr name="ip_address" type="string">
333-
<data val="123.456.101.000"/>
383+
<data val="127.0.0.1"/>
384+
</attr>
385+
<attr name="interface_name" type="string" val="asio0"/>
386+
<attr name="network_name" type="enum" val="Control"/>
387+
</obj>
388+
389+
<obj class="NetworkInterface" id="crt_101_asio1">
390+
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
391+
<attr name="ip_address" type="string">
392+
<data val="127.0.0.1"/>
393+
</attr>
394+
<attr name="interface_name" type="string" val="asio1"/>
395+
<attr name="network_name" type="enum" val="Control"/>
396+
</obj>
397+
398+
<obj class="NetworkInterface" id="socket_ru_1_readout">
399+
<attr name="mac_address" type="string" val="00:00:00:00:00:00"/>
400+
<attr name="ip_address" type="string">
401+
<data val="127.0.0.1"/>
334402
</attr>
335403
<attr name="interface_name" type="string" val="asio0"/>
336404
<attr name="network_name" type="enum" val="Control"/>
@@ -486,7 +554,7 @@
486554
<rel name="data_reader" class="SocketReaderConf" id="def-socket-reader-conf"/>
487555
<rel name="fragment_aggregator" class="FragmentAggregatorConf" id="frag-agg-01"/>
488556
<rel name="detector_connections">
489-
<ref class="NetworkDetectorToDaqConnection" id="socket_crt"/>
557+
<ref class="SocketDetectorToDaqConnection" id="socket_crt"/>
490558
</rel>
491559
<rel name="callback_desc" class="DataMoveCallbackDescriptor" id="crt-bern-raw-input"/>
492560
</obj>
@@ -504,23 +572,44 @@
504572

505573
<obj class="Segment" id="socket-ru-segment">
506574
<rel name="applications">
507-
<ref class="CRTReaderApplication" id="crt-data-source-01"/>
575+
<ref class="CRTFrameBuilderApplication" id="crt-data-source-01"/>
508576
<ref class="ReadoutApplication" id="socket-ru-01"/>
509577
</rel>
510578
<rel name="controller" class="RCApplication" id="socket-ru-controller"/>
511579
</obj>
512580

513581
<obj class="SocketDataSender" id="socket_sender_crt">
514-
<attr name="port" type="u32" val="1234"/>
515-
<attr name="control_host" type="string" val="localhost"/>
582+
<attr name="socket_type" type="enum" val="UDP"/>
583+
<attr name="local_port" type="u32" val="12345"/>
584+
<attr name="remote_port" type="u32" val="20001"/>
516585
<rel name="streams">
517586
<ref class="DetectorStream" id="stream_1007"/>
587+
<ref class="DetectorStream" id="stream_1008"/>
518588
</rel>
519589
<rel name="uses" class="NetworkInterface" id="crt_101_asio0"/>
520590
</obj>
521591

592+
<obj class="SocketDataSender" id="socket_sender_crt_2">
593+
<attr name="socket_type" type="enum" val="TCP"/>
594+
<attr name="local_port" type="u32" val="12346"/>
595+
<attr name="remote_port" type="u32" val="20002"/>
596+
<rel name="streams">
597+
<ref class="DetectorStream" id="stream_1009"/>
598+
<ref class="DetectorStream" id="stream_1010"/>
599+
</rel>
600+
<rel name="uses" class="NetworkInterface" id="crt_101_asio1"/>
601+
</obj>
602+
603+
<obj class="SocketDetectorToDaqConnection" id="socket_crt">
604+
<rel name="net_senders">
605+
<ref class="SocketDataSender" id="socket_sender_crt"/>
606+
<ref class="SocketDataSender" id="socket_sender_crt_2"/>
607+
</rel>
608+
<rel name="net_receiver" class="SocketReceiver" id="socket-ru-1-rcv"/>
609+
</obj>
610+
522611
<obj class="SocketReceiver" id="socket-ru-1-rcv">
523-
<rel name="uses" class="NetworkDevice" id="ru_1_readout"/>
612+
<rel name="uses" class="NetworkInterface" id="socket_ru_1_readout"/>
524613
</obj>
525614

526615
<obj class="SourceIDConf" id="tp-srcid-1000">

0 commit comments

Comments
 (0)