Skip to content

Commit

Permalink
Merge pull request #63 from DUNE-DAQ/johnfreeman/daq-release_issue376…
Browse files Browse the repository at this point in the history 
…_renames_for_v5

JCF: update names as described in DUNE-DAQ/daq-release#376 and detail…
  • Loading branch information
@jcfreeman2
jcfreeman2 authored Jun 14, 2024
2 parents d26b36f + c4079c7 commit 9f32e95
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 49 deletions.
6 changes: 3 additions & 3 deletions python/integrationtest/config/hsi-segment.data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<ref class="NetworkConnectionRule" id="data-req-hsi-net-rule"/>
<ref class="NetworkConnectionRule" id="ts-hsi-net-rule"/>
</rel>
<rel name="link_handler" class="ReadoutModuleConf" id="def-hsi-handler"/>
<rel name="link_handler" class="DataHandlerConf" id="def-hsi-handler"/>
<rel name="generator" class="FakeHSIEventGeneratorConf" id="fakehsi"/>
</obj>

Expand Down Expand Up @@ -167,8 +167,8 @@
<rel name="broadcaster" class="RCBroadcaster" id="broadcaster-root"/>
</obj>

<obj class="ReadoutModuleConf" id="def-hsi-handler">
<attr name="template_for" type="class" val="HSIDataLinkHandler"/>
<obj class="DataHandlerConf" id="def-hsi-handler">
<attr name="template_for" type="class" val="HSIDataHandlerModule"/>
<attr name="input_data_type" type="string" val="HSIFrame"/>
<attr name="generate_timesync" type="bool" val="1"/>
<rel name="request_handler" class="RequestHandler" id="hsi-requesthandler-generic"/>
Expand Down
32 changes: 16 additions & 16 deletions python/integrationtest/config/trigger-segment-fakehsi.data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<rel name="runs_on" class="PhysicalHost" id="localhost"/>
</obj>

<obj class="CustomTriggerCandidateMakerConf" id="cstm-tc-generator">
<obj class="CustomTCMakerConf" id="cstm-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="CustomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="CustomTCMaker"/>
<attr name="trigger_types" type="u32">
<data val="3"/>
<data val="7"/>
Expand Down Expand Up @@ -188,11 +188,11 @@
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
<ref class="NetworkConnectionRule" id="ts-net-rule"/>
</rel>
<rel name="data_subscriber" class="DataReaderConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="ReadoutModuleConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="ModuleLevelTriggerConf" id="def-mlt-conf"/>
<rel name="data_subscriber" class="DataReceiverConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="MLTConf" id="def-mlt-conf"/>
<rel name="standalone_candidate_maker_confs">
<ref class="RandomTriggerCandidateMakerConf" id="random-tc-generator"/>
<ref class="RandomTCMakerConf" id="random-tc-generator"/>
</rel>
</obj>

Expand All @@ -209,25 +209,25 @@
<rel name="broadcaster" class="RCBroadcaster" id="broadcaster-root"/>
</obj>

<obj class="RandomTriggerCandidateMakerConf" id="random-tc-generator">
<obj class="RandomTCMakerConf" id="random-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="RandomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="RandomTCMakerModule"/>
<attr name="trigger_interval_ticks" type="u32" val="62500000"/>
<attr name="clock_frequency_hz" type="u32" val="62500000"/>
<attr name="time_distribution" type="enum" val="kUniform"/>
</obj>

<obj class="ReadoutModuleConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerActivity"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-ta-request-handler"/>
<rel name="latency_buffer" class="LatencyBuffer" id="def-latency-buf"/>
<rel name="data_processor" class="TADataProcessor" id="def-ta-processor"/>
</obj>

<obj class="ReadoutModuleConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerCandidate"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-tc-request-handler"/>
Expand Down Expand Up @@ -283,7 +283,7 @@
<attr name="mask_processing" type="bool" val="0"/>
<attr name="print_ta_info" type="bool" val="0"/>
<rel name="algorithms">
<ref class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo"/>
<ref class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo"/>
</rel>
</obj>

Expand Down Expand Up @@ -359,11 +359,11 @@
<ref class="NetworkConnectionRule" id="tc-net-rule"/>
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
</rel>
<rel name="data_subscriber" class="DataReaderConf" id="ta-subscriber-1"/>
<rel name="trigger_inputs_handler" class="ReadoutModuleConf" id="def-ta-handler"/>
<rel name="data_subscriber" class="DataReceiverConf" id="ta-subscriber-1"/>
<rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-ta-handler"/>
</obj>

<obj class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo">
<obj class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo">
<attr name="prescale" type="u32" val="100"/>
</obj>

Expand Down
28 changes: 14 additions & 14 deletions python/integrationtest/config/trigger-segment-notpg.data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<rel name="runs_on" class="PhysicalHost" id="localhost"/>
</obj>

<obj class="CustomTriggerCandidateMakerConf" id="cstm-tc-generator">
<obj class="CustomTCMakerConf" id="cstm-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="CustomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="CustomTCMaker"/>
<attr name="trigger_types" type="u32">
<data val="3"/>
<data val="7"/>
Expand Down Expand Up @@ -163,11 +163,11 @@
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
<ref class="NetworkConnectionRule" id="ts-net-rule"/>
</rel>
<rel name="data_subscriber" class="DataReaderConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="ReadoutModuleConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="ModuleLevelTriggerConf" id="def-mlt-conf"/>
<rel name="data_subscriber" class="DataReceiverConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="MLTConf" id="def-mlt-conf"/>
<rel name="standalone_candidate_maker_confs">
<ref class="RandomTriggerCandidateMakerConf" id="random-tc-generator"/>
<ref class="RandomTCMakerConf" id="random-tc-generator"/>
</rel>
</obj>

Expand All @@ -184,25 +184,25 @@
<rel name="broadcaster" class="RCBroadcaster" id="broadcaster-root"/>
</obj>

<obj class="RandomTriggerCandidateMakerConf" id="random-tc-generator">
<obj class="RandomTCMakerConf" id="random-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="RandomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="RandomTCMakerModule"/>
<attr name="trigger_interval_ticks" type="u32" val="62500000"/>
<attr name="clock_frequency_hz" type="u32" val="62500000"/>
<attr name="time_distribution" type="enum" val="kUniform"/>
</obj>

<obj class="ReadoutModuleConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerActivity"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-ta-request-handler"/>
<rel name="latency_buffer" class="LatencyBuffer" id="def-latency-buf"/>
<rel name="data_processor" class="TADataProcessor" id="def-ta-processor"/>
</obj>

<obj class="ReadoutModuleConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerCandidate"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-tc-request-handler"/>
Expand Down Expand Up @@ -256,7 +256,7 @@
<attr name="mask_processing" type="bool" val="0"/>
<attr name="print_ta_info" type="bool" val="0"/>
<rel name="algorithms">
<ref class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo"/>
<ref class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo"/>
</rel>
</obj>

Expand Down Expand Up @@ -306,7 +306,7 @@
<attr name="time_after" type="u32" val="1000"/>
</obj>

<obj class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo">
<obj class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo">
<attr name="prescale" type="u32" val="100"/>
</obj>

Expand Down
32 changes: 16 additions & 16 deletions python/integrationtest/config/trigger-segment.data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<rel name="runs_on" class="PhysicalHost" id="localhost"/>
</obj>

<obj class="CustomTriggerCandidateMakerConf" id="cstm-tc-generator">
<obj class="CustomTCMakerConf" id="cstm-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="CustomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="CustomTCMaker"/>
<attr name="trigger_types" type="u32">
<data val="3"/>
<data val="7"/>
Expand Down Expand Up @@ -163,11 +163,11 @@
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
<ref class="NetworkConnectionRule" id="ts-net-rule"/>
</rel>
<rel name="data_subscriber" class="DataReaderConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="ReadoutModuleConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="ModuleLevelTriggerConf" id="def-mlt-conf"/>
<rel name="data_subscriber" class="DataReceiverConf" id="tc-subscriber-1"/>
<rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-tc-handler"/>
<rel name="mlt_conf" class="MLTConf" id="def-mlt-conf"/>
<rel name="standalone_candidate_maker_confs">
<ref class="RandomTriggerCandidateMakerConf" id="random-tc-generator"/>
<ref class="RandomTCMakerConf" id="random-tc-generator"/>
</rel>
</obj>

Expand All @@ -184,25 +184,25 @@
<rel name="broadcaster" class="RCBroadcaster" id="broadcaster-root"/>
</obj>

<obj class="RandomTriggerCandidateMakerConf" id="random-tc-generator">
<obj class="RandomTCMakerConf" id="random-tc-generator">
<attr name="timestamp_method" type="enum" val="kTimeSync"/>
<attr name="template_for" type="class" val="RandomTriggerCandidateMaker"/>
<attr name="template_for" type="class" val="RandomTCMakerModule"/>
<attr name="trigger_interval_ticks" type="u32" val="62500000"/>
<attr name="clock_frequency_hz" type="u32" val="62500000"/>
<attr name="time_distribution" type="enum" val="kUniform"/>
</obj>

<obj class="ReadoutModuleConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-ta-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerActivity"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-ta-request-handler"/>
<rel name="latency_buffer" class="LatencyBuffer" id="def-latency-buf"/>
<rel name="data_processor" class="TADataProcessor" id="def-ta-processor"/>
</obj>

<obj class="ReadoutModuleConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandler"/>
<obj class="DataHandlerConf" id="def-tc-handler">
<attr name="template_for" type="class" val="TriggerDataHandlerModule"/>
<attr name="input_data_type" type="string" val="TriggerCandidate"/>
<attr name="generate_timesync" type="bool" val="0"/>
<rel name="request_handler" class="RequestHandler" id="def-tc-request-handler"/>
Expand Down Expand Up @@ -252,7 +252,7 @@
<attr name="mask_processing" type="bool" val="0"/>
<attr name="print_ta_info" type="bool" val="0"/>
<rel name="algorithms">
<ref class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo"/>
<ref class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo"/>
</rel>
</obj>

Expand Down Expand Up @@ -321,11 +321,11 @@
<ref class="NetworkConnectionRule" id="tc-net-rule"/>
<ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
</rel>
<rel name="data_subscriber" class="DataReaderConf" id="ta-subscriber-1"/>
<rel name="trigger_inputs_handler" class="ReadoutModuleConf" id="def-ta-handler"/>
<rel name="data_subscriber" class="DataReceiverConf" id="ta-subscriber-1"/>
<rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-ta-handler"/>
</obj>

<obj class="TriggerCandidateMakerPrescalePlugin" id="tc-pass-through-algo">
<obj class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo">
<attr name="prescale" type="u32" val="100"/>
</obj>

Expand Down

0 comments on commit 9f32e95

Please sign in to comment.