Skip to content

Commit

Permalink
Merge pull request #55 from DUNE-DAQ/eflumerf/NewConfigFiles
Browse files Browse the repository at this point in the history
Eflumerf/new config files
  • Loading branch information
eflumerf authored Apr 11, 2024
2 parents b65b74c + 27c3f93 commit e0440fa
Show file tree
Hide file tree
Showing 9 changed files with 1,776 additions and 1,093 deletions.
265 changes: 265 additions & 0 deletions python/integrationtest/config/df-segment-1df-tpw.data.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
<?xml version="1.0" encoding="ASCII"?>

<!-- oks-data version 2.2 -->


<!DOCTYPE oks-data [
<!ELEMENT oks-data (info, (include)?, (comments)?, (obj)+)>
<!ELEMENT info EMPTY>
<!ATTLIST info
name CDATA #IMPLIED
type CDATA #IMPLIED
num-of-items CDATA #REQUIRED
oks-format CDATA #FIXED "data"
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 obj (attr | rel)*>
<!ATTLIST obj
class CDATA #REQUIRED
id CDATA #REQUIRED
>
<!ELEMENT attr (data)*>
<!ATTLIST attr
name CDATA #REQUIRED
type (bool|s8|u8|s16|u16|s32|u32|s64|u64|float|double|date|time|string|uid|enum|class|-) "-"
val CDATA ""
>
<!ELEMENT data EMPTY>
<!ATTLIST data
val CDATA #REQUIRED
>
<!ELEMENT rel (ref)*>
<!ATTLIST rel
name CDATA #REQUIRED
class CDATA ""
id CDATA ""
>
<!ELEMENT ref EMPTY>
<!ATTLIST ref
class CDATA #REQUIRED
id CDATA #REQUIRED
>
]>

<oks-data>

<info name="" type="" num-of-items="17" oks-format="data" oks-version="oks-08-03-04-11-g3f5bde7 built &quot;Feb 21 2023&quot;" created-by="gjc" created-on="thinkpad" creation-time="20231207T105629" last-modified-by="glehmann" last-modified-on="np04-srv-019.cern.ch" last-modification-time="20240325T124934"/>

<include>
<file path="schema/coredal/dunedaq.schema.xml"/>
<file path="schema/appdal/application.schema.xml"/>
<file path="config/appdal/connections.data.xml"/>
<file path="config/appdal/moduleconfs.data.xml"/>
<file path="config/appdal/fsm.data.xml"/>
</include>

<comments>
<comment creation-time="20231207T111607" created-by="gjc" created-on="thinkpad" author="gjc" text="u"/>
<comment creation-time="20231207T111909" created-by="gjc" created-on="thinkpad" author="gjc" text="h"/>
<comment creation-time="20240112T145841" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="Adding storage"/>
<comment creation-time="20240112T163053" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="Add TRB"/>
<comment creation-time="20240112T170242" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="Add queue"/>
<comment creation-time="20240112T170541" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="Add network connections"/>
<comment creation-time="20240208T092804" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="reorder"/>
<comment creation-time="20240220T094213" created-by="glehmann" created-on="np04-srv-024.cern.ch" author="Unknown" text="updated configuration to use a dedicated app for TA making"/>
<comment creation-time="20240306T200127" created-by="glehmann" created-on="np04-srv-024.cern.ch" author="Unknown" text="added TP stream writer"/>
<comment creation-time="20240307T084519" created-by="glehmann" created-on="np04-srv-024.cern.ch" author="Unknown" text="added dataflow"/>
<comment creation-time="20240312T202726" created-by="eflumerf" created-on="ironvirt9.mshome.net" author="eflumerf" text="Trivial edit to reorder objects"/>
<comment creation-time="20240325T124934" created-by="glehmann" created-on="np04-srv-019.cern.ch" author="Unknown" text="adjusted to name changes in connections"/>
</comments>



<obj class="PhysicalHost" id="localhost">
<rel name="contains">
<ref class="ProcessingResource" id="localhost_cpus"/>
</rel>
</obj>

<obj class="ProcessingResource" id="localhost_cpus">
<attr name="cpu_cores" type="u16">
<data val="0"/>
<data val="1"/>
<data val="2"/>
<data val="3"/>
</attr>
</obj>

<obj class="VirtualHost" id="vlocalhost">
<rel name="uses">
<ref class="ProcessingResource" id="localhost_cpus"/>
</rel>
<rel name="runs_on" class="PhysicalHost" id="localhost"/>
</obj>

<obj class="DFApplication" id="df-01">
<attr name="application_name" type="string" val="daq_application"/>
<attr name="commandline_parameters" type="string">
<data val="--name"/>
<data val="df-01"/>
<data val="-c"/>
<data val="rest://localhost:3339"/>
<data val="-i"/>
<data val="${DAQAPP_CLI_INFO_SVC}"/>
<data val="--configurationService"/>
<data val="${DAQAPP_CLI_CONFIG_SVC}"/>
</attr>
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
<rel name="source_id" class="SourceIDConf" id="srcid-df-01"/>
<rel name="queue_rules">
<ref class="QueueConnectionRule" id="trigger-record-q-rule"/>
</rel>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="td-trb-net-rule"/>
<ref class="NetworkConnectionRule" id="frag-net-rule"/>
<ref class="NetworkConnectionRule" id="df-token-net-rule"/>
<ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
<ref class="NetworkConnectionRule" id="data-req-readout-net-rule"/>
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
</rel>
<rel name="trb" class="TRBConf" id="trb-01"/>
<rel name="data_writer" class="DataWriterConf" id="dw-01"/>
<rel name="uses" class="DFHWConf" id="dfhw-01"/>
</obj>

<obj class="DFHWConf" id="dfhw-01">
<rel name="uses">
<ref class="StorageDevice" id="storage-01"/>
</rel>
</obj>

<obj class="DFOApplication" id="dfo-01">
<attr name="application_name" type="string" val="daq_application"/>
<attr name="commandline_parameters" type="string">
<data val="--name"/>
<data val="dfo-01"/>
<data val="-c"/>
<data val="rest://localhost:3342"/>
<data val="-i"/>
<data val="${DAQAPP_CLI_INFO_SVC}"/>
<data val="--configurationService"/>
<data val="${DAQAPP_CLI_CONFIG_SVC}"/>
</attr>
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="td-dfo-net-rule"/>
<ref class="NetworkConnectionRule" id="ti-net-rule"/>
<ref class="NetworkConnectionRule" id="df-token-net-rule"/>
</rel>
<rel name="dfo" class="DFOConf" id="dfoconf-01"/>
</obj>

<obj class="DataStoreConf" id="default_tp_store_conf">
<attr name="type" type="string" val="HDF5DataStore"/>
<attr name="directory_path" type="string" val="./"/>
<attr name="mode" type="enum" val="all-per-file"/>
<attr name="max_file_size" type="u64" val="4294967296"/>
<attr name="disable_unique_filename_suffix" type="bool" val="0"/>
<attr name="free_space_safety_factor" type="s32" val="5"/>
<rel name="file_layout_params" class="HDF5FileLayoutParams" id="tp_file_layout"/>
<rel name="filename_params" class="FilenameParams" id="tp-file-params"/>
</obj>

<obj class="FilenameParams" id="tp-file-params">
<attr name="overall_prefix" type="string" val="tpstream"/>
<attr name="run_number_prefix" type="string" val="run"/>
<attr name="digits_for_run_number" type="s32" val="6"/>
<attr name="digits_for_file_index" type="s32" val="4"/>
<attr name="writer_identifier" type="string" val="tp_writer"/>
<attr name="digits_for_trigger_number" type="s32" val="6"/>
</obj>

<obj class="HDF5FileLayoutParams" id="tp_file_layout">
<attr name="record_name_prefix" type="string" val="TimeSlice"/>
<attr name="digits_for_record_number" type="s32" val="6"/>
<attr name="digits_for_sequence_number" type="s32" val="0"/>
<attr name="record_header_dataset_name" type="string" val="TimeSliceHeader"/>
<attr name="raw_data_group_name" type="string" val="RawData"/>
<attr name="view_group_name" type="string" val="Views"/>
<rel name="path_params_list">
<ref class="HDF5PathParams" id="TPC"/>
</rel>
</obj>

<obj class="RCApplication" id="df-controller">
<attr name="commandline_parameters" type="string">
<data val="${DAQAPP_CLI_CONFIG_SVC}"/>
<data val="grpc://localhost:3338"/>
<data val="df-segment"/>
<data val="test-session"/>
</attr>
<attr name="application_name" type="string" val="drunc-controller"/>
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
<rel name="fsm" class="FSMconfiguration" id="fsmConf-1"/>
<rel name="broadcaster" class="RCBroadcaster" id="broadcaster-root"/>
</obj>

<obj class="Segment" id="df-segment">
<rel name="applications">
<ref class="TPStreamWriterApplication" id="tp-stream-writer"/>
<ref class="DFOApplication" id="dfo-01"/>
<ref class="DFApplication" id="df-01"/>
</rel>
<rel name="controller" class="RCApplication" id="df-controller"/>
</obj>

<obj class="SourceIDConf" id="srcid-df-01">
<attr name="sid" type="u32" val="1"/>
<attr name="subsystem" type="enum" val="TR_Builder"/>
</obj>

<obj class="SourceIDConf" id="srcid-tp-stream-writer">
<attr name="sid" type="u32" val="4"/>
<attr name="subsystem" type="enum" val="TR_Builder"/>
</obj>

<obj class="StorageDevice" id="storage-01">
<attr name="storage" type="u32" val="1000"/>
</obj>

<obj class="TPStreamWriterApplication" id="tp-stream-writer">
<attr name="application_name" type="string" val="daq_application"/>
<attr name="commandline_parameters" type="string">
<data val="--name"/>
<data val="tp-stream-writer"/>
<data val="-c"/>
<data val="rest://localhost:3343"/>
<data val="-i"/>
<data val="${DAQAPP_CLI_INFO_SVC}"/>
<data val="--configurationService"/>
<data val="${DAQAPP_CLI_CONFIG_SVC}"/>
</attr>
<rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
<rel name="source_id" class="SourceIDConf" id="srcid-tp-stream-writer"/>
<rel name="network_rules">
<ref class="NetworkConnectionRule" id="tpset-net-rule"/>
</rel>
<rel name="tp_writer" class="TPStreamWriterConf" id="tp-stream-writer-conf"/>
</obj>

<obj class="TPStreamWriterConf" id="tp-stream-writer-conf">
<attr name="tp_accumulation_interval" type="u64" val="62500000"/>
<rel name="data_store_params" class="DataStoreConf" id="default_tp_store_conf"/>
</obj>

</oks-data>
Loading

0 comments on commit e0440fa

Please sign in to comment.