Detemplatize JPipelineArrow

JeffersonLab · Oct 17, 2024 · ca19a09 · ca19a09
1 parent a5a3f31
commit ca19a09
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 20 deletions.
diff --git a/src/libraries/JANA/Topology/JEventMapArrow.cc b/src/libraries/JANA/Topology/JEventMapArrow.cc
@@ -25,7 +25,7 @@ void JEventMapArrow::add_processor(JEventProcessor* processor) {
     m_procs.push_back(processor);
 }
 
-void JEventMapArrow::process(Event* event, bool& success, JArrowMetrics::Status& status) {
+void JEventMapArrow::process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status) {
 
     LOG_DEBUG(m_logger) << "Executing arrow " << get_name() << " for event# " << (*event)->GetEventNumber() << LOG_END;
     for (JEventSource* source : m_sources) {

diff --git a/src/libraries/JANA/Topology/JEventMapArrow.h b/src/libraries/JANA/Topology/JEventMapArrow.h
@@ -11,10 +11,8 @@ class JEventUnfolder;
 class JEventProcessor;
 class JEvent;
 
-using Event = std::shared_ptr<JEvent>;
-using EventQueue = JMailbox<Event*>;
 
-class JEventMapArrow : public JPipelineArrow<JEventMapArrow, Event> {
+class JEventMapArrow : public JPipelineArrow<JEventMapArrow> {
 
 private:
     std::vector<JEventSource*> m_sources;
@@ -28,7 +26,7 @@ class JEventMapArrow : public JPipelineArrow<JEventMapArrow, Event> {
     void add_unfolder(JEventUnfolder* unfolder);
     void add_processor(JEventProcessor* proc);
 
-    void process(Event* event, bool& success, JArrowMetrics::Status& status);
+    void process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status);
 
     void initialize() final;
     void finalize() final;

diff --git a/src/libraries/JANA/Topology/JEventProcessorArrow.cc b/src/libraries/JANA/Topology/JEventProcessorArrow.cc
@@ -16,7 +16,7 @@ void JEventProcessorArrow::add_processor(JEventProcessor* processor) {
     m_processors.push_back(processor);
 }
 
-void JEventProcessorArrow::process(Event* event, bool& success, JArrowMetrics::Status& status) {
+void JEventProcessorArrow::process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status) {
 
 
     LOG_DEBUG(m_logger) << "Executing arrow " << get_name() << " for event# " << (*event)->GetEventNumber() << LOG_END;

diff --git a/src/libraries/JANA/Topology/JEventProcessorArrow.h b/src/libraries/JANA/Topology/JEventProcessorArrow.h
@@ -6,20 +6,16 @@
 #include <JANA/JEventProcessor.h>
 #include <JANA/Topology/JPipelineArrow.h>
 
-class JEventPool;
 
-using Event = std::shared_ptr<JEvent>;
-using EventQueue = JMailbox<Event*>;
-
-class JEventProcessorArrow : public JPipelineArrow<JEventProcessorArrow, Event> {
+class JEventProcessorArrow : public JPipelineArrow<JEventProcessorArrow> {
 
 private:
     std::vector<JEventProcessor*> m_processors;
 
 public:
     JEventProcessorArrow(std::string name);
     void add_processor(JEventProcessor* processor);
-    void process(Event* event, bool& success, JArrowMetrics::Status& status);
+    void process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status);
     void initialize() final;
     void finalize() final;
 };

diff --git a/src/libraries/JANA/Topology/JEventTapArrow.cc b/src/libraries/JANA/Topology/JEventTapArrow.cc
@@ -16,7 +16,7 @@ void JEventTapArrow::add_processor(JEventProcessor* proc) {
     m_procs.push_back(proc);
 }
 
-void JEventTapArrow::process(Event* event, bool& success, JArrowMetrics::Status& status) {
+void JEventTapArrow::process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status) {
 
     LOG_DEBUG(m_logger) << "Executing arrow " << get_name() << " for event# " << (*event)->GetEventNumber() << LOG_END;
     for (JEventProcessor* proc : m_procs) {

diff --git a/src/libraries/JANA/Topology/JEventTapArrow.h b/src/libraries/JANA/Topology/JEventTapArrow.h
@@ -5,14 +5,11 @@
 
 #include <JANA/Topology/JPipelineArrow.h>
 
-class JEventPool;
 class JEventProcessor;
 class JEvent;
 
-using Event = std::shared_ptr<JEvent>;
-using EventQueue = JMailbox<Event*>;
 
-class JEventTapArrow : public JPipelineArrow<JEventTapArrow, Event> {
+class JEventTapArrow : public JPipelineArrow<JEventTapArrow> {
 
 private:
     std::vector<JEventProcessor*> m_procs;
@@ -21,7 +18,7 @@ class JEventTapArrow : public JPipelineArrow<JEventTapArrow, Event> {
     JEventTapArrow(std::string name);
 
     void add_processor(JEventProcessor* proc);
-    void process(Event* event, bool& success, JArrowMetrics::Status& status);
+    void process(std::shared_ptr<JEvent>* event, bool& success, JArrowMetrics::Status& status);
     void initialize() final;
     void finalize() final;
 };

diff --git a/src/libraries/JANA/Topology/JPipelineArrow.h b/src/libraries/JANA/Topology/JPipelineArrow.h
@@ -8,9 +8,9 @@
 #include <JANA/Topology/JMailbox.h>
 #include <JANA/Topology/JPool.h>
 
-using EventT = std::shared_ptr<JEvent>;
+using MessageT = std::shared_ptr<JEvent>;
 
-template <typename DerivedT, typename MessageT=EventT>
+template <typename DerivedT>
 class JPipelineArrow : public JArrow {
 private:
     Place m_input {this, true, 1, 1};