fixes for random and custom TC maker plugins

DUNE-DAQ · Sep 5, 2023 · 06a5582 · 06a5582
1 parent 922fb72
commit 06a5582
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/plugins/CustomTriggerCandidateMaker.cpp b/plugins/CustomTriggerCandidateMaker.cpp
@@ -58,7 +58,7 @@ CustomTriggerCandidateMaker::CustomTriggerCandidateMaker(const std::string& name
 void
 CustomTriggerCandidateMaker::init(const nlohmann::json& obj)
 {
-  m_time_sync_source = get_iom_receiver<dfmessages::TimeSync>(appfwk::connection_uid(obj, "time_sync_source"));
+  m_time_sync_source = get_iom_receiver<dfmessages::TimeSync>(".*");
   m_trigger_candidate_sink =
     get_iom_sender<triggeralgs::TriggerCandidate>(appfwk::connection_uid(obj, "trigger_candidate_sink"));
 }

diff --git a/plugins/RandomTriggerCandidateMaker.cpp b/plugins/RandomTriggerCandidateMaker.cpp
@@ -50,9 +50,9 @@ RandomTriggerCandidateMaker::RandomTriggerCandidateMaker(const std::string& name
 void
 RandomTriggerCandidateMaker::init(const nlohmann::json& obj)
 {
-  m_time_sync_source = get_iom_receiver<dfmessages::TimeSync>(appfwk::connection_uid(obj, "time_sync_source"));
+  m_time_sync_source = get_iom_receiver<dfmessages::TimeSync>(".*");
   m_trigger_candidate_sink =
-    get_iom_sender<triggeralgs::TriggerCandidate>(appfwk::connection_uid(obj, "trigger_candiate_sink"));
+    get_iom_sender<triggeralgs::TriggerCandidate>(appfwk::connection_uid(obj, "trigger_candidate_sink"));
 }
 
 void
@@ -68,7 +68,7 @@ RandomTriggerCandidateMaker::get_info(opmonlib::InfoCollector& ci, int /*level*/
 void
 RandomTriggerCandidateMaker::do_configure(const nlohmann::json& obj)
 {
-  m_conf = obj.get<randomtriggercandidatemaker::ConfParams>();
+  m_conf = obj.get<randomtriggercandidatemaker::Conf>();
 }
 
 void

diff --git a/plugins/RandomTriggerCandidateMaker.hpp b/plugins/RandomTriggerCandidateMaker.hpp
@@ -78,7 +78,7 @@ class RandomTriggerCandidateMaker : public dunedaq::appfwk::DAQModule
   std::shared_ptr<iomanager::ReceiverConcept<dfmessages::TimeSync>> m_time_sync_source;
   std::shared_ptr<iomanager::SenderConcept<triggeralgs::TriggerCandidate>> m_trigger_candidate_sink;
 
-  randomtriggercandidatemaker::ConfParams m_conf;
+  randomtriggercandidatemaker::Conf m_conf;
 
   int get_interval(std::mt19937& gen);
 

diff --git a/schema/trigger/randomtriggercandidatemaker.jsonnet b/schema/trigger/randomtriggercandidatemaker.jsonnet
@@ -8,7 +8,7 @@ local types = {
   timestamp_estimation: s.enum("timestamp_estimation", ["kTimeSync", "kSystemClock"]),
   distribution_type: s.enum("distribution_type", ["kUniform", "kPoisson"]),
 
-  conf : s.record("ConfParams", [
+  conf : s.record("Conf", [
     s.field("trigger_interval_ticks", self.ticks, 64000000,
       doc="Interval between triggers in 16 ns time ticks (default 1.024 s) "),