Remove JEventProcessorArrow

JeffersonLab · Oct 17, 2024 · dc13597 · dc13597
1 parent 0322185
commit dc13597
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 97 deletions.
diff --git a/src/examples/SubeventCUDAExample/SubeventCUDAExample.cu b/src/examples/SubeventCUDAExample/SubeventCUDAExample.cu
@@ -4,10 +4,10 @@
 
 #include <JANA/JApplication.h>
 #include <JANA/JObject.h>
-#include <JANA/Engine/JSubeventArrow.h>
 #include <JANA/JEventSource.h>
 #include <JANA/JEventProcessor.h>
 #include "JANA/Engine/JTopologyBuilder.h"
+#include <JANA/Topology/JSubeventArrow.h>
 
 
 struct MyInput : public JObject {
@@ -128,8 +128,7 @@ int main() {
     JMailbox <SubeventWrapper<MyOutput>> subevents_out;
 
     auto split_arrow = new JSplitArrow<MyInput, MyOutput>("split", &processor, &events_in, &subevents_in);
-    auto subprocess_arrow = new JSubeventArrow<MyInput, MyOutput>("subprocess", &processor, &subevents_in,
-                                                                  &subevents_out);
+    auto subprocess_arrow = new JSubeventArrow<MyInput, MyOutput>("subprocess", &processor, &subevents_in, &subevents_out);
     auto merge_arrow = new JMergeArrow<MyInput, MyOutput>("merge", &processor, &subevents_out, &events_out);
 
     JApplication app;
@@ -140,12 +139,14 @@ int main() {
     source->SetNEvents(10); // limit ourselves to 10 events. Note that the 'jana:nevents' param won't work
     // here because we aren't using JComponentManager to manage the EventSource
 
-    auto topology = app.GetService<JTopologyBuilder>()->create_empty();
-    auto source_arrow = new JEventSourceArrow("simpleSource",
-                                              {source},
-                                              &events_in,
-                                              topology->event_pool);
-    auto proc_arrow = new JEventProcessorArrow("simpleProcessor", &events_out, nullptr, topology->event_pool);
+    auto topology = app.GetService<JTopologyBuilder>();
+    auto source_arrow = new JEventSourceArrow("simpleSource", {source});
+    source_arrow->set_input(topology->event_pool);
+    source_arrow->set_output(&events_in);
+
+    auto proc_arrow = new JEventMapArrow("simpleProcessor");
+    proc_arrow->set_input(&events_out);
+    proc_arrow->set_output(topology->event_pool);
     proc_arrow->add_processor(new SimpleProcessor);
 
     topology->arrows.push_back(source_arrow);

diff --git a/src/examples/SubeventExample/SubeventExample.cc b/src/examples/SubeventExample/SubeventExample.cc
@@ -8,9 +8,9 @@
 #include <JANA/JEventProcessor.h>
 
 #include <JANA/Topology/JEventSourceArrow.h>
-#include <JANA/Topology/JEventProcessorArrow.h>
+#include <JANA/Topology/JEventMapArrow.h>
 #include <JANA/Topology/JSubeventArrow.h>
-#include "JANA/Topology/JTopologyBuilder.h"
+#include <JANA/Topology/JTopologyBuilder.h>
 
 
 struct MyInput : public JObject {
@@ -111,7 +111,7 @@ int main() {
         source_arrow->set_input(topology->event_pool);
         source_arrow->set_output(&events_in);
 
-        auto proc_arrow = new JEventProcessorArrow("simpleProcessor");
+        auto proc_arrow = new JEventMapArrow("simpleProcessor");
         proc_arrow->set_input(&events_out);
         proc_arrow->set_output(topology->event_pool);
         proc_arrow->add_processor(new SimpleProcessor);

diff --git a/src/libraries/JANA/CMakeLists.txt b/src/libraries/JANA/CMakeLists.txt
@@ -17,7 +17,6 @@ set(JANA2_SOURCES
     Engine/JPerfMetrics.cc
     Engine/JPerfSummary.cc
 
-    Topology/JEventProcessorArrow.cc
     Topology/JEventSourceArrow.cc
     Topology/JEventMapArrow.cc
     Topology/JEventTapArrow.cc

diff --git a/src/libraries/JANA/Topology/JEventProcessorArrow.cc b/src/libraries/JANA/Topology/JEventProcessorArrow.cc
diff --git a/src/libraries/JANA/Topology/JEventProcessorArrow.h b/src/libraries/JANA/Topology/JEventProcessorArrow.h
diff --git a/src/libraries/JANA/Topology/JTopologyBuilder.cc b/src/libraries/JANA/Topology/JTopologyBuilder.cc
@@ -6,11 +6,11 @@
 #include "JTopologyBuilder.h"
 
 #include "JEventSourceArrow.h"
-#include "JEventProcessorArrow.h"
 #include "JEventMapArrow.h"
 #include "JEventTapArrow.h"
 #include "JUnfoldArrow.h"
 #include "JFoldArrow.h"
+#include <JANA/JEventProcessor.h>
 #include <JANA/Utils/JTablePrinter.h>
 
 

diff --git a/src/libraries/JANA/Utils/JCallGraphEntryMaker.h b/src/libraries/JANA/Utils/JCallGraphEntryMaker.h
@@ -18,11 +18,13 @@
 /// (and possibly other places).
 class JCallGraphEntryMaker{
 public:
+
     JCallGraphEntryMaker(JCallGraphRecorder &callgraphrecorder, JFactory *factory) : m_call_graph(callgraphrecorder), m_factory(factory){
         m_call_graph.StartFactoryCall(m_factory->GetObjectName(), m_factory->GetTag());
     }
+
     JCallGraphEntryMaker(JCallGraphRecorder &callgraphrecorder, std::string name) : m_call_graph(callgraphrecorder) {
-        // (This is used mainly for JEventProcessors and called from JEventProcessorArrow::execute )
+        // This is used mainly for JEventProcessors
         m_call_graph.StartFactoryCall(name, "");
     }
 

diff --git a/src/programs/unit_tests/Topology/SubeventTests.cc b/src/programs/unit_tests/Topology/SubeventTests.cc
@@ -7,8 +7,9 @@
 
 #include <JANA/JObject.h>
 #include <JANA/JEvent.h>
+#include <JANA/JEventProcessor.h>
 #include <JANA/Topology/JEventSourceArrow.h>
-#include <JANA/Topology/JEventProcessorArrow.h>
+#include <JANA/Topology/JEventMapArrow.h>
 #include <JANA/Topology/JSubeventArrow.h>
 #include <JANA/Topology/JTopologyBuilder.h>
 
@@ -105,7 +106,7 @@ TEST_CASE("Basic subevent arrow functionality") {
             source_arrow->set_input(topology.event_pool);
             source_arrow->set_output(&events_in);
 
-            auto proc_arrow = new JEventProcessorArrow("simpleProcessor");
+            auto proc_arrow = new JEventMapArrow("simpleProcessor");
             proc_arrow->set_input(&events_out);
             proc_arrow->set_output(topology.event_pool);
             proc_arrow->add_processor(new SimpleProcessor);