Excise SubeventMailbox

JeffersonLab · Dec 27, 2023 · 51248b0 · 51248b0
1 parent 0499f39
commit 51248b0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 231 deletions.
diff --git a/src/examples/SubeventExample/SubeventExample.cc b/src/examples/SubeventExample/SubeventExample.cc
@@ -4,7 +4,6 @@
 
 #include <JANA/JApplication.h>
 #include <JANA/JObject.h>
-#include <JANA/Engine/JSubeventMailbox.h>
 #include <JANA/Engine/JSubeventArrow.h>
 #include <JANA/JEventSource.h>
 #include <JANA/JEventProcessor.h>

diff --git a/src/libraries/JANA/Engine/JSubeventArrow.h b/src/libraries/JANA/Engine/JSubeventArrow.h
@@ -10,7 +10,7 @@
 #include "JArrow.h"
 #include <JANA/JEvent.h>
 
-/// SubtaskProcessor offers sub-event-level parallelism. The idea is to split parent
+/// SubeventProcessor offers sub-event-level parallelism. The idea is to split parent
 /// event S into independent subtasks T, and automatically bundling them with
 /// bookkeeping information X onto a Queue<pair<T,X>. process :: T -> U handles the stateless,
 /// parallel parts; its Arrow pushes messages on to a Queue<pair<U,X>, so that merge() :: S -> [U] -> V
@@ -36,6 +36,21 @@ struct JSubeventProcessor {
 
 };
 
+template <typename SubeventT>
+struct SubeventWrapper {
+
+    std::shared_ptr<JEvent>* parent;
+    SubeventT* data;
+    size_t id;
+    size_t total;
+
+    SubeventWrapper(std::shared_ptr<JEvent>* parent, SubeventT* data, size_t id, size_t total)
+    : parent(std::move(parent))
+    , data(data)
+    , id(id)
+    , total(total) {}
+};
+
 
 template <typename InputT, typename OutputT>
 class JSubeventArrow : public JArrow {

diff --git a/src/libraries/JANA/Engine/JSubeventMailbox.h b/src/libraries/JANA/Engine/JSubeventMailbox.h
diff --git a/src/programs/unit_tests/SubeventTests.cc b/src/programs/unit_tests/SubeventTests.cc
@@ -7,7 +7,6 @@
 
 #include <JANA/JObject.h>
 #include <JANA/JEvent.h>
-#include <JANA/Engine/JSubeventMailbox.h>
 #include <JANA/Engine/JSubeventArrow.h>
 #include "JANA/Engine/JArrowTopology.h"
 #include "JANA/Engine/JTopologyBuilder.h"
@@ -42,7 +41,7 @@ TEST_CASE("Create subevent processor") {
     REQUIRE(output->z == 29.6f);
 }
 
-
+#if 0
 TEST_CASE("Simplest working SubeventMailbox") {
 
     std::vector<SubeventWrapper<MyOutput>> unmerged;
@@ -123,7 +122,7 @@ TEST_CASE("SubeventMailbox with two overlapping events") {
     auto items_in_event = (*(merged[0]))->Get<MyOutput>();
     REQUIRE(items_in_event.size() == 4);
 }
-
+#endif
 
 TEST_CASE("Basic subevent arrow functionality") {