Test interleaved Insert and Process

Author: nathanwbrei

src/libraries/JANA/JFactory.cc

@@ -95,7 +95,7 @@ void JFactory::Create(const JEvent& event) {
     // ---------------------------------------------------------------------
 
     // Check if init had _previously_ excepted but the cache was since cleared
-    if (mInitStatus == InitStatus::Excepted && mStatus == Status::Empty) {
+    if (mInitStatus == InitStatus::InitExcepted && mStatus == Status::Empty) {
         for (auto* output : GetOutputs()) {
             output->LagrangianStore(*event.GetFactorySet(), JDatabundle::Status::Excepted);
         }
@@ -191,7 +191,7 @@ void JFactory::Create(const JEvent& event) {
 }
 
 void JFactory::DoInit() {
-    if (mInitStatus != InitStatus::NotRun) {
+    if (mInitStatus != InitStatus::InitNotRun) {
         return;
     }
     for (auto* parameter : m_parameters) {
@@ -202,17 +202,17 @@ void JFactory::DoInit() {
     }
     try {
         CallWithJExceptionWrapper("JFactory::Init", [&](){ Init(); });
-        mInitStatus = InitStatus::Run;
+        mInitStatus = InitStatus::InitRun;
     }
     catch (...) {
-        mInitStatus = InitStatus::Excepted;
+        mInitStatus = InitStatus::InitExcepted;
         mException = std::current_exception();
         throw;
     }
 }
 
 void JFactory::DoFinish() {
-    if (mInitStatus == InitStatus::Run) {
+    if (mInitStatus == InitStatus::InitRun) {
         if (mPreviousRunNumber != -1) {
             CallWithJExceptionWrapper("JFactory::EndRun", [&](){ EndRun(); });
         }

src/libraries/JANA/JFactory.h

@@ -34,7 +34,7 @@ class JFactory : public jana::components::JComponent,
                  public jana::components::JHasOutputs {
 public:
 
-    enum class InitStatus {NotRun, Run, Excepted};
+    enum class InitStatus {InitNotRun, InitRun, InitExcepted};
     enum class Status {Empty, Processed, Inserted, Excepted};
 
     enum JFactory_Flags_t {
@@ -70,6 +70,7 @@ class JFactory : public jana::components::JComponent,
 
     std::string GetFactoryName() const { return m_type_name; }
     Status GetStatus() const { return mStatus; }
+    InitStatus GetInitStatus() const { return mInitStatus; }
     JCallGraphRecorder::JDataOrigin GetInsertOrigin() const { return m_insert_origin; } ///< If objects were placed here by JEvent::Insert() this records whether that call was made from a source or factory.
 
     uint32_t GetPreviousRunNumber(void) const { return mPreviousRunNumber; }
@@ -186,7 +187,7 @@ class JFactory : public jana::components::JComponent,
     std::string mObjectName;
 
     Status mStatus = Status::Empty;
-    InitStatus mInitStatus = InitStatus::NotRun;
+    InitStatus mInitStatus = InitStatus::InitNotRun;
     JCallGraphRecorder::JDataOrigin m_insert_origin = JCallGraphRecorder::ORIGIN_NOT_AVAILABLE; // (see note at top of JCallGraphRecorder.h)
     std::exception_ptr mException;
 };

src/programs/unit_tests/Components/PodioTests.cc

@@ -1,4 +1,5 @@
 
+#include "JANA/Components/JDatabundle.h"
 #include "JANA/JApplicationFwd.h"
 #include "PodioDatamodel/ExampleHit.h"
 #include <catch.hpp>
@@ -494,7 +495,36 @@ TEST_CASE("PodioTests_ExceptionInFactoryInit") {
         }
         REQUIRE(frame->get<ExampleHitCollection>("ExampleHit").size() == 1);
     }
+}
+
+TEST_CASE("PodioTests_InterleavedInsertAndProcess") {
+    JApplication app;
+    app.Add(new JFactoryGeneratorT<ExceptingPodioFactory>);
+    app.SetParameterValue("myfac:except", 0); // Disable exceptions
+    app.Initialize();
+
+    JEvent event(&app);
+
+    auto databundle = event.GetFactorySet()->GetDatabundle("ExampleHit");
+    REQUIRE(databundle->GetStatus() == JDatabundle::Status::Empty);
+    REQUIRE(databundle->GetFactory() != nullptr);
+    REQUIRE(databundle->GetFactory()->GetStatus() == JFactory::Status::Empty);
+    REQUIRE(databundle->GetFactory()->GetInitStatus() == JFactory::InitStatus::InitNotRun);
+
+
+    // Insert hits. This will NOT trigger Init
+    ExampleHitCollection hits;
+    hits.push_back(MutableExampleHit());
+    event.InsertCollection<ExampleHit>(std::move(hits), "ExampleHit");
+
+    event.GetCollectionBase("ExampleHit");
+    REQUIRE(databundle->GetFactory()->GetInitStatus() == JFactory::InitStatus::InitNotRun);
+
+    event.Clear();
 
+    // Trigger Init and Process
+    event.GetCollectionBase("ExampleHit");
+    REQUIRE(databundle->GetFactory()->GetInitStatus() == JFactory::InitStatus::InitRun);
 }
 
 } // namespace