CRT topology change

CMakeLists.txt

@@ -16,12 +16,12 @@ find_package(fmt REQUIRED)
 
 find_package(Boost COMPONENTS unit_test_framework program_options REQUIRED)
 
-daq_add_dal_library(application.schema.xml hermes.schema.xml fdmodules.schema.xml trigger.schema.xml wiec.schema.xml PDS.schema.xml tde.schema.xml CTB.schema.xml CIB.schema.xml
+daq_add_dal_library(application.schema.xml hermes.schema.xml fdmodules.schema.xml trigger.schema.xml wiec.schema.xml socket.schema.xml PDS.schema.xml tde.schema.xml CTB.schema.xml CIB.schema.xml
   NAMESPACE dunedaq::appmodel DEP_PKGS confmodel
   SOURCES
   ConfigurationHelper.cpp
 	ConfigObjectFactory.cpp
-	CRTReaderApplication.cpp
+	CRTFrameBuilderApplication.cpp
 	CTBApplication.cpp
 	DaphneApplication.cpp
 	DFApplication.cpp

schema/appmodel/application.schema.xml

@@ -80,22 +80,21 @@
 
 <oks-schema>
 
-<info name="" type="" num-of-items="69" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20260203T131505"/>
+<info name="" type="" num-of-items="72" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260319T161203"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
 </include>
 
 
- <class name="CRTReaderApplication">
+ <class name="CRTFrameBuilderApplication">
   <superclass name="ResourceSetDisableAND"/>
   <superclass name="SmartDaqApplication"/>
   <attribute name="application_name" type="string" init-value="daq_application" is-not-null="yes"/>
-  <relationship name="data_writers" class-type="SocketDataWriterConf" low-cc="one" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
-  <relationship name="data_reader" class-type="DataReaderConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+  <relationship name="detector_frame_builder" class-type="DetectorFrameBuilderConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+  <relationship name="data_writer" class-type="SocketDataWriterConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
   <relationship name="detector_connections" class-type="DetectorToDaqConnection" low-cc="zero" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
-  <relationship name="callback_desc" class-type="DataMoveCallbackDescriptor" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
-  <method name="generate_modules" description="Generate daq module dal objects for streams of the CRTReaderApplication on the fly">
+  <method name="generate_modules" description="Generate daq module dal objects for streams of the CRTFrameBuilderApplication on the fly">
    <method-implementation language="c++" prototype="void generate_modules(std::shared_ptr&lt;appmodel::ConfigurationHelper&gt;) const override" body=""/>
   </method>
   <method name="contained_resources" description="">
@@ -192,6 +191,16 @@
   <relationship name="raw_data_callbacks" description="Configurations for raw data callbacks" class-type="DataMoveCallbackConf" low-cc="one" high-cc="many" is-composite="no" is-exclusive="no" is-dependent="no"/>
  </class>
 
+ <class name="DetectorFrameBuilderConf">
+  <attribute name="template_for" description="OKS class of the DetectorFrameBuilderModule that this config is a template for" type="class" init-value="DetectorFrameBuilderModule" is-not-null="yes"/>
+ </class>
+
+ <class name="DetectorFrameBuilderModule" is-abstract="yes">
+  <superclass name="DaqModule"/>
+  <relationship name="configuration" class-type="DetectorFrameBuilderConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+  <relationship name="connection" class-type="DetectorToDaqConnection" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+ </class> 
+
  <class name="DataRecorderConf">
   <attribute name="output_file" type="string"/>
   <attribute name="streaming_buffer_size" type="u32" init-value="1000" is-not-null="yes"/>
@@ -405,8 +414,8 @@
   <attribute name="capacity" type="u32" init-value="100" is-not-null="yes"/>
   <attribute name="data_type" description="string identifying type of data transferred through this queue" type="string" is-not-null="yes"/>
  </class>
-
- <class name="DataMoveCallbackConf">
+ 
+  <class name="DataMoveCallbackConf">
   <attribute name="source_id" type="u32" init-value="0" is-not-null="yes"/>
   <attribute name="data_type" description="Name of the output data type. Should be defined via a call to DUNE_DAQ_TYPESTRING" type="string" init-value="WIBEthFrame"/>
  </class>
@@ -527,8 +536,11 @@
  <class name="SocketDataWriterModule">
   <superclass name="DaqModule"/>
   <relationship name="configuration" class-type="SocketDataWriterConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
-  <relationship name="connections" class-type="NetworkDetectorToDaqConnection" low-cc="one" high-cc="many" is-composite="yes" is-exclusive="no" is-dependent="no"/>
-  <relationship name="raw_data_callback" description="Configuration for raw data callback" class-type="DataMoveCallbackConf" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+  <relationship name="connection" class-type="SocketDetectorToDaqConnection" low-cc="one" high-cc="one" is-composite="no" is-exclusive="no" is-dependent="no"/>
+ </class>
+
+ <class name="SocketDetectorToDaqConnection">
+  <superclass name="NetworkDetectorToDaqConnection"/>
  </class>
 
  <class name="SourceIDConf">

schema/appmodel/fdmodules.schema.xml

@@ -80,32 +80,32 @@
 
 <oks-schema>
 
-<info name="" type="" num-of-items="33" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="eflumerf" last-modified-on="ironvirt9.mshome.net" last-modification-time="20251104T211957"/>
+<info name="" type="" num-of-items="32" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260319T162022"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
  <file path="schema/appmodel/application.schema.xml"/>
 </include>
 
 
- <class name="CRTBernReaderConf">
-  <superclass name="DataReaderConf"/>
+ <class name="CRTBernFrameBuilderConf">
+  <superclass name="CRTFrameBuilderConf"/>
  </class>
 
- <class name="CRTBernReaderModule">
-  <superclass name="DataReaderModule"/>
+ <class name="CRTBernFrameBuilderModule">
+  <superclass name="DetectorFrameBuilderModule"/>
  </class>
 
- <class name="CRTGrenobleReaderConf">
-  <superclass name="DataReaderConf"/>
+ <class name="CRTGrenobleFrameBuilderConf">
+  <superclass name="CRTFrameBuilderConf"/>
  </class>
 
- <class name="CRTGrenobleReaderModule">
-  <superclass name="DataReaderModule"/>
+ <class name="CRTGrenobleFrameBuilderModule">
+  <superclass name="DetectorFrameBuilderModule"/>
  </class>
 
- <class name="CRTReaderConf">
-  <superclass name="DataReaderConf"/>
+ <class name="CRTFrameBuilderConf">
+  <superclass name="DetectorFrameBuilderConf"/>
  </class>
 
  <class name="DPDKPortConfiguration">
@@ -153,10 +153,6 @@
   <superclass name="NWDetDataSender"/>
  </class>
 
- <class name="FakeSocketWriterModule">
-  <superclass name="SocketDataWriterModule"/>
- </class>
-
  <class name="FelixCardControllerModule">
   <superclass name="DaqModule"/>
   <attribute name="super_chunk_size" description="Number of chunks in superchunk" type="u16" init-value="12" is-not-null="yes"/>
@@ -245,8 +241,6 @@
 
  <class name="SocketReaderConf">
   <superclass name="DataReaderConf"/>
-  <attribute name="socket_type" description="Socket type" type="enum" range="TCP,UDP" init-value="UDP" is-not-null="yes"/>
-  <attribute name="local_ip" description="Local IP address" type="string" init-value="127.0.0.1" is-not-null="yes"/>
  </class>
 
  <class name="SocketReaderModule">
@@ -259,8 +253,6 @@
 
  <class name="SocketWriterConf">
   <superclass name="SocketDataWriterConf"/>
-  <attribute name="socket_type" description="Socket type" type="enum" range="TCP,UDP" init-value="UDP" is-not-null="yes"/>
-  <attribute name="remote_ip" description="Remote IP address" type="string" init-value="127.0.0.1" is-not-null="yes"/>
  </class>
 
  <class name="SocketWriterModule">

schema/appmodel/socket.schema.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="ASCII"?>
+
+<!-- oks-schema version 2.2 -->
+
+
+<!DOCTYPE oks-schema [
+  <!ELEMENT oks-schema (info, (include)?, (comments)?, (class)+)>
+  <!ELEMENT info EMPTY>
+  <!ATTLIST info
+      name CDATA #IMPLIED
+      type CDATA #IMPLIED
+      num-of-items CDATA #REQUIRED
+      oks-format CDATA #FIXED "schema"
+      oks-version CDATA #REQUIRED
+      created-by CDATA #IMPLIED
+      created-on CDATA #IMPLIED
+      creation-time CDATA #IMPLIED
+      last-modified-by CDATA #IMPLIED
+      last-modified-on CDATA #IMPLIED
+      last-modification-time CDATA #IMPLIED
+  >
+  <!ELEMENT include (file)+>
+  <!ELEMENT file EMPTY>
+  <!ATTLIST file
+      path CDATA #REQUIRED
+  >
+  <!ELEMENT comments (comment)+>
+  <!ELEMENT comment EMPTY>
+  <!ATTLIST comment
+      creation-time CDATA #REQUIRED
+      created-by CDATA #REQUIRED
+      created-on CDATA #REQUIRED
+      author CDATA #REQUIRED
+      text CDATA #REQUIRED
+  >
+  <!ELEMENT class (superclass | attribute | relationship | method)*>
+  <!ATTLIST class
+      name CDATA #REQUIRED
+      description CDATA ""
+      is-abstract (yes|no) "no"
+  >
+  <!ELEMENT superclass EMPTY>
+  <!ATTLIST superclass name CDATA #REQUIRED>
+  <!ELEMENT attribute EMPTY>
+  <!ATTLIST attribute
+      name CDATA #REQUIRED
+      description CDATA ""
+      type (bool|s8|u8|s16|u16|s32|u32|s64|u64|float|double|date|time|string|uid|enum|class) #REQUIRED
+      range CDATA ""
+      format (dec|hex|oct) "dec"
+      is-multi-value (yes|no) "no"
+      init-value CDATA ""
+      is-not-null (yes|no) "no"
+      ordered (yes|no) "no"
+  >
+  <!ELEMENT relationship EMPTY>
+  <!ATTLIST relationship
+      name CDATA #REQUIRED
+      description CDATA ""
+      class-type CDATA #REQUIRED
+      low-cc (zero|one) #REQUIRED
+      high-cc (one|many) #REQUIRED
+      is-composite (yes|no) #REQUIRED
+      is-exclusive (yes|no) #REQUIRED
+      is-dependent (yes|no) #REQUIRED
+      ordered (yes|no) "no"
+  >
+  <!ELEMENT method (method-implementation*)>
+  <!ATTLIST method
+      name CDATA #REQUIRED
+      description CDATA ""
+  >
+  <!ELEMENT method-implementation EMPTY>
+  <!ATTLIST method-implementation
+      language CDATA #REQUIRED
+      prototype CDATA #REQUIRED
+      body CDATA ""
+  >
+]>
+
+<oks-schema>
+
+<info name="" type="" num-of-items="1" oks-format="schema" oks-version="862f2957270" created-by="dergonul" created-on="np04-srv-015.cern.ch" creation-time="20260318T105913" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260318T110035"/>
+
+<include>
+ <file path="schema/appmodel/application.schema.xml"/>
+</include>
+
+
+ <class name="SocketDataSender">
+  <superclass name="NWDetDataSender"/>
+  <attribute name="socket_type" description="Socket type" type="enum" range="TCP,UDP" init-value="UDP" is-not-null="yes"/>
+  <attribute name="local_port" type="u32" range="0..65535" init-value="0" is-not-null="yes"/>
+  <attribute name="remote_port" type="u32" range="1..65535" init-value="20001" is-not-null="yes"/>
+ </class>
+
+</oks-schema>

schema/appmodel/wiec.schema.xml

@@ -80,7 +80,7 @@
 
 <oks-schema>
 
-<info name="" type="" num-of-items="8" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="gjc" last-modified-on="latitude" last-modification-time="20250818T143705"/>
+<info name="" type="" num-of-items="7" oks-format="schema" oks-version="862f2957270" created-by="gjc" created-on="thinkpad" creation-time="20230616T091343" last-modified-by="dergonul" last-modified-on="np04-srv-015.cern.ch" last-modification-time="20260318T110034"/>
 
 <include>
  <file path="schema/confmodel/dunedaq.schema.xml"/>
@@ -120,13 +120,6 @@
   <attribute name="pulse_channels" description="Array of up to 16 true/false values, for whether to send pulser to each corresponding channel per LArASIC." type="bool" is-multi-value="yes"/>
  </class>
 
- <class name="SocketDataSender">
-  <superclass name="NWDetDataSender"/>
-  <attribute name="link_id" type="u32" is-not-null="yes"/>
-  <attribute name="port" type="u32" init-value="1234" is-not-null="yes"/>
-  <attribute name="control_host" type="string" init-value="localhost" is-not-null="yes"/>
- </class>
-
  <class name="WIBModule">
   <superclass name="DaqModule"/>
   <attribute name="wib_addr" type="string" init-value="tcp://192.168.121.1:1234" is-not-null="yes"/>