PodioDataSvc: only check event count when n = -1

k4FWCore/include/k4FWCore/PodioDataSvc.h

@@ -83,5 +83,7 @@ class PodioDataSvc : public DataSvc {
   /// Jump to nth events at the beginning. Set by option FirstEventEntry
   /// This option is helpful when we want to debug an event in the middle of a file
   unsigned m_1stEvtEntry{0};
+  /// If running with --num-event=-1
+  bool m_unbounded{false};
 };
 #endif  // CORE_PODIODATASVC_H

k4FWCore/src/PodioDataSvc.cpp

@@ -2,6 +2,7 @@
 #include "GaudiKernel/IConversionSvc.h"
 #include "GaudiKernel/IEventProcessor.h"
 #include "GaudiKernel/ISvcLocator.h"
+#include "GaudiKernel/IProperty.h"
 
 #include "k4FWCore/DataWrapper.h"
 
@@ -44,6 +45,18 @@ StatusCode PodioDataSvc::initialize() {
     m_metadataframe = podio::Frame();
   }
 
+  IProperty* property;
+  auto sc = service("ApplicationMgr", property);
+  if (sc == StatusCode::FAILURE) {
+    error() << "Could not get ApplicationMgr properties" << std::endl;
+  }
+  Gaudi::Property<int> evtMax;
+  evtMax.assign(property->getProperty("EvtMax"));
+
+  if (evtMax == -1) {
+    m_unbounded = true;
+  }
+
   return status;
 }
 /// Service reinitialisation
@@ -91,9 +104,16 @@ StatusCode PodioDataSvc::i_setRoot(std::string root_path, DataObject* pRootObj)
 }
 
 void PodioDataSvc::endOfRead() {
+  m_eventNum++;
+
+  // Only check if we read the last available event when running with n = -1
+  if (!m_unbounded) {
+    return;
+  }
+
   StatusCode sc;
   if (m_eventMax != -1) {
-    if (m_eventNum++ >= m_eventMax - 1) {  // we start counting at 0 thus the -1.
+    if (m_eventNum >= m_eventMax - 1) {  // we start counting at 0 thus the -1.
       info() << "Reached end of file with event " << m_eventMax << endmsg;
       IEventProcessor* eventProcessor;
       sc = service("ApplicationMgr", eventProcessor);