Add support for running with IOSvc

k4MarlinWrapper/CMakeLists.txt

@@ -54,6 +54,13 @@ target_include_directories(MarlinWrapper PUBLIC
   ${LCIO_INCLUDE_DIRS}
 )
 
+# k4MarlinWrapperUtils
+gaudi_add_library(k4MarlinWrapperUtils SHARED
+  SOURCES
+    src/components/StoreUtils.cpp
+  LINK k4FWCore::k4FWCore
+)
+
 # EDM4hep2lcio
 gaudi_add_module(EDM4hep2Lcio
   SOURCES
@@ -64,6 +71,7 @@ gaudi_add_module(EDM4hep2Lcio
     ${LCIO_LIBRARIES}
     ${Marlin_LIBRARIES}
     EDM4HEP::edm4hep
+    k4MarlinWrapperUtils
 )
 
 target_include_directories(EDM4hep2Lcio PUBLIC
@@ -80,6 +88,7 @@ gaudi_add_module(Lcio2EDM4hep
     EDM4HEP::edm4hep
     k4FWCore::k4FWCore
     k4EDM4hep2LcioConv::k4EDM4hep2LcioConv
+    k4MarlinWrapperUtils
 )
 
 target_include_directories(Lcio2EDM4hep PUBLIC

k4MarlinWrapper/examples/clicRec_e4h_input.py

@@ -19,10 +19,16 @@
 
 import os
 
-from Gaudi.Configuration import *
+from Gaudi.Configuration import DEBUG, WARNING
 
-from Configurables import LcioEvent, MarlinProcessorWrapper
-from k4MarlinWrapper.parseConstants import *
+from Configurables import MarlinProcessorWrapper
+from k4MarlinWrapper.parseConstants import parseConstants
+
+from Configurables import Lcio2EDM4hepTool, EDM4hep2LcioTool
+from Configurables import k4DataSvc, PodioInput, PodioOutput, EventDataSvc
+
+from k4FWCore import ApplicationMgr, IOSvc
+from k4FWCore.parseArgs import parser
 
 algList = []
 
@@ -33,22 +39,33 @@
 
 parseConstants(CONSTANTS)
 
-
-# For converters
-from Configurables import ToolSvc, Lcio2EDM4hepTool, EDM4hep2LcioTool
-
-
-from Configurables import k4DataSvc, PodioInput
-
-evtsvc = k4DataSvc("EventDataSvc")
-evtsvc.input = os.path.join(
-    "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+parser.add_argument(
+    "--iosvc", action="store_true", default=False, help="Use IOSvc instead of PodioDataSvc"
 )
-
-
-inp = PodioInput("InputReader")
-inp.OutputLevel = DEBUG
-
+parser.add_argument("--rec-output", help="Output file name for the REC file")
+parser.add_argument("--dst-output", help="Output file name for the DST file")
+
+args = parser.parse_known_args()[0]
+
+if args.iosvc:
+    evtsvc = EventDataSvc("EventDataSvc")
+    iosvc = IOSvc()
+    iosvc.Input = os.path.join(
+        "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+    )
+    iosvc.Output = "my_output.root"
+    iosvc.outputCommands = ["keep *", "drop RefinedVertexJets_PID_RefinedVertex"]
+else:
+    evtsvc = k4DataSvc("EventDataSvc")
+    evtsvc.input = os.path.join(
+        "$TEST_DIR/inputFiles/", os.environ.get("INPUTFILE", "ttbar_edm4hep_frame.root")
+    )
+
+    inp = PodioInput("InputReader")
+    inp.OutputLevel = DEBUG
+
+    out = PodioOutput("PodioOutput", filename="my_output.root")
+    out.outputCommands = ["keep *", "drop RefinedVertexJets_PID_RefinedVertex"]
 
 MyAIDAProcessor = MarlinProcessorWrapper("MyAIDAProcessor")
 MyAIDAProcessor.OutputLevel = WARNING
@@ -1167,7 +1184,7 @@
     "DropCollectionTypes": [],
     "FullSubsetCollections": ["EfficientMCParticles", "InefficientMCParticles"],
     "KeepCollectionNames": [],
-    "LCIOOutputFile": ["Output_REC_e4h_input.slcio"],
+    "LCIOOutputFile": [args.rec_output],
     "LCIOWriteMode": ["WRITE_NEW"],
 }
 
@@ -1233,7 +1250,7 @@
         "RefinedVertices",
         "RefinedVertices_RP",
     ],
-    "LCIOOutputFile": ["Output_DST_e4h_input.slcio"],
+    "LCIOOutputFile": [args.dst_output],
     "LCIOWriteMode": ["WRITE_NEW"],
 }
 
@@ -2428,15 +2445,6 @@
     "UseMCP": ["0"],
 }
 
-
-# Write output to EDM4hep
-from Configurables import PodioOutput
-
-out = PodioOutput("PodioOutput", filename="my_output.root")
-out.outputCommands = ["keep *", "drop RefinedVertexJets_PID_RefinedVertex"]
-
-
-algList.append(inp)
 algList.append(MyAIDAProcessor)
 algList.append(EventNumber)
 algList.append(InitDD4hep)
@@ -2486,8 +2494,8 @@
 # # algList.append(VertexFinderUnconstrained)  # Config.VertexUnconstrainedON
 algList.append(Output_REC)
 algList.append(Output_DST)
-algList.append(out)
 
-from Configurables import ApplicationMgr
+if not args.iosvc:
+    algList = [inp] + algList + [out]
 
 ApplicationMgr(TopAlg=algList, EvtSel="NONE", EvtMax=3, ExtSvc=[evtsvc], OutputLevel=WARNING)

k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h

@@ -21,6 +21,8 @@
 
 #include "k4MarlinWrapper/converters/IEDMConverter.h"
 
+#include "k4FWCore/IMetadataSvc.h"
+
 #include "k4EDM4hep2LcioConv/k4EDM4hep2LcioConv.h"
 
 #include <Gaudi/Property.h>
@@ -31,6 +33,7 @@
 #include <vector>
 
 class PodioDataSvc;
+class MetadataSvc;
 
 template <typename K, typename V> using ObjMapT = k4EDM4hep2LcioConv::VecMapT<K, V>;
 
@@ -64,6 +67,9 @@ class EDM4hep2LcioTool : public AlgTool, virtual public IEDMConverter {
 
   PodioDataSvc*                   m_podioDataSvc;
   ServiceHandle<IDataProviderSvc> m_eventDataSvc;
+  SmartIF<IMetadataSvc>           m_metadataSvc;
+  std::vector<std::string>        m_collectionNames;
+  std::map<uint32_t, std::string> m_idToName;
 
   void convertTracks(TrackMap& tracks_vec, const std::string& e4h_coll_name, const std::string& lcio_coll_name,
                      lcio::LCEventImpl* lcio_event);

k4MarlinWrapper/k4MarlinWrapper/converters/Lcio2EDM4hep.h

@@ -22,6 +22,8 @@
 #include <Gaudi/Property.h>
 #include <GaudiKernel/AlgTool.h>
 
+#include "k4FWCore/IMetadataSvc.h"
+
 #include "k4MarlinWrapper/converters/IEDMConverter.h"
 
 #include <lcio.h>
@@ -58,7 +60,8 @@ class Lcio2EDM4hepTool : public AlgTool, virtual public IEDMConverter {
   Gaudi::Property<std::map<std::string, std::string>> m_collNames{this, "collNameMapping", {}};
   Gaudi::Property<bool>                               m_convertAll{this, "convertAll", true};
 
-  ServiceHandle<IDataProviderSvc> m_eds;
+  ServiceHandle<IDataProviderSvc> m_eventDataSvc;
+  SmartIF<IMetadataSvc>           m_metadataSvc;
   PodioDataSvc*                   m_podioDataSvc;
 
   // **********************************

k4MarlinWrapper/src/components/EDM4hep2Lcio.cpp

@@ -17,16 +17,26 @@
  * limitations under the License.
  */
 #include "k4MarlinWrapper/converters/EDM4hep2Lcio.h"
+#include <GaudiKernel/StatusCode.h>
 #include "GlobalConvertedObjectsMap.h"
+#include "StoreUtils.h"
+
+#include "UTIL/PIDHandler.h"
 
 #include "edm4hep/Constants.h"
+#include "edm4hep/utils/ParticleIDUtils.h"
 
 #include "k4FWCore/DataHandle.h"
+#include "k4FWCore/FunctionalUtils.h"
 #include "k4FWCore/MetaDataHandle.h"
 #include "k4FWCore/PodioDataSvc.h"
 
 #include "GaudiKernel/AnyDataWrapper.h"
+#include "GaudiKernel/IDataManagerSvc.h"
+#include "GaudiKernel/IDataProviderSvc.h"
+#include "GaudiKernel/SmartDataPtr.h"
 
+#include <functional>
 #include <memory>
 
 DECLARE_COMPONENT(EDM4hep2LcioTool);
@@ -55,11 +65,17 @@ EDM4hep2LcioTool::EDM4hep2LcioTool(const std::string& type, const std::string& n
 }
 
 StatusCode EDM4hep2LcioTool::initialize() {
-  StatusCode sc  = m_eventDataSvc.retrieve();
+  StatusCode sc = m_eventDataSvc.retrieve();
+  if (sc == StatusCode::FAILURE) {
+    error() << "Could not retrieve the EventDataSvc;" << endmsg;
+    return StatusCode::FAILURE;
+  }
+
   m_podioDataSvc = dynamic_cast<PodioDataSvc*>(m_eventDataSvc.get());
 
-  if (sc == StatusCode::FAILURE) {
-    error() << "Error retrieving Event Data Service" << endmsg;
+  m_metadataSvc = service("MetadataSvc", false);
+  if (!m_podioDataSvc && !m_metadataSvc) {
+    error() << "Could not retrieve MetadataSvc" << endmsg;
     return StatusCode::FAILURE;
   }
 
@@ -277,7 +293,7 @@ void EDM4hep2LcioTool::convertEventHeader(const std::string& e4h_coll_name, lcio
 
 podio::CollectionBase* EDM4hep2LcioTool::getEDM4hepCollection(const std::string& collName) const {
   DataObject* p;
-  auto        sc = m_podioDataSvc->retrieveObject(collName, p);
+  auto        sc = m_eventDataSvc->retrieveObject(collName, p);
   if (sc.isFailure()) {
     throw GaudiException("Collection not found", name(), StatusCode::FAILURE);
   }
@@ -340,8 +356,14 @@ void EDM4hep2LcioTool::convertAdd(const std::string& e4h_coll_name, const std::s
   } else if (fulltype == "edm4hep::EventHeader") {
     convertEventHeader(e4h_coll_name, lcio_event);
   } else if (fulltype == "edm4hep::ParticleID") {
-    pidCollections.emplace_back(e4h_coll_name, static_cast<const edm4hep::ParticleIDCollection*>(collPtr),
-                                edm4hep::utils::PIDHandler::getAlgoInfo(metadata, e4h_coll_name));
+    std::optional<edm4hep::utils::ParticleIDMeta> pidInfo;
+    if (m_podioDataSvc) {
+      pidInfo = edm4hep::utils::PIDHandler::getAlgoInfo(metadata, e4h_coll_name);
+    } else {
+      pidInfo = m_metadataSvc->get<edm4hep::utils::ParticleIDMeta>(e4h_coll_name);
+    }
+
+    pidCollections.emplace_back(e4h_coll_name, static_cast<const edm4hep::ParticleIDCollection*>(collPtr), pidInfo);
   } else if (fulltype == "edm4hep::RecDqDx") {
     dQdxCollections.emplace_back(e4h_coll_name, static_cast<const edm4hep::RecDqdxCollection*>(collPtr));
   }
@@ -362,8 +384,16 @@ void EDM4hep2LcioTool::convertAdd(const std::string& e4h_coll_name, const std::s
 // Parse property parameters and convert the indicated collections.
 // Use the collection names in the parameters to read and write them
 StatusCode EDM4hep2LcioTool::convertCollections(lcio::LCEventImpl* lcio_event) {
-  const auto& edmEvent    = m_podioDataSvc->getEventFrame();
-  const auto  collections = edmEvent.getAvailableCollections();
+  std::optional<std::reference_wrapper<const podio::Frame>> edmEvent;
+  if (m_collectionNames.empty() && m_podioDataSvc) {
+    edmEvent          = m_podioDataSvc->getEventFrame();
+    m_collectionNames = edmEvent.value().get().getAvailableCollections();
+  } else if (m_collectionNames.empty()) {
+    std::optional<std::map<uint32_t, std::string>> idToNameOpt(std::move(m_idToName));
+    auto                                           collections = getAvailableCollectionsFromStore(this, idToNameOpt);
+    m_idToName                                                 = std::move(idToNameOpt.value());
+    m_collectionNames.insert(m_collectionNames.end(), collections.begin(), collections.end());
+  }
   // Start off with the pre-defined collection name mappings
   auto collsToConvert{m_collNames.value()};
   // We *always* want to convert the EventHeader
@@ -372,7 +402,7 @@ StatusCode EDM4hep2LcioTool::convertCollections(lcio::LCEventImpl* lcio_event) {
     info() << "Converting all collections from EDM4hep to LCIO" << endmsg;
     // And simply add the rest, exploiting the fact that emplace will not
     // replace existing entries with the same key
-    for (const auto& name : collections) {
+    for (const auto& name : m_collectionNames) {
       collsToConvert.emplace(name, name);
     }
   }
@@ -399,13 +429,39 @@ StatusCode EDM4hep2LcioTool::convertCollections(lcio::LCEventImpl* lcio_event) {
   }
   debug() << "Event: " << lcio_event->getEventNumber() << " Run: " << lcio_event->getRunNumber() << endmsg;
 
-  // Deal with
   EDM4hep2LCIOConv::sortParticleIDs(pidCollections);
+  if (!m_podioDataSvc) {
+    DataObject* p;
+    StatusCode  code = m_eventDataSvc->retrieveObject("/Event" + k4FWCore::frameLocation, p);
+    if (code.isSuccess()) {
+      auto* frame = dynamic_cast<AnyDataWrapper<podio::Frame>*>(p);
+      edmEvent    = std::cref(frame->getData());
+    } else {
+      auto frame = podio::Frame{};
+      edmEvent   = frame;
+    }
+  }
   for (const auto& pidCollMeta : pidCollections) {
-    const auto algoId = attachParticleIDMetaData(lcio_event, edmEvent, pidCollMeta);
+    auto algoId = attachParticleIDMetaData(lcio_event, edmEvent.value(), pidCollMeta);
     if (!algoId.has_value()) {
-      warning() << "Could not determine algorithm type for ParticleID collection " << pidCollMeta.name
-                << " for setting consistent metadata" << endmsg;
+      // Now go over the collections that have been produced in a functional algorithm (if any)
+      bool found = false;
+      if (!m_podioDataSvc) {
+        const auto id = (*pidCollMeta.coll)[0].getParticle().id().collectionID;
+        if (auto it = m_idToName.find(id); it != m_idToName.end()) {
+          auto name = it->second;
+          if (pidCollMeta.metadata.has_value()) {
+            UTIL::PIDHandler pidHandler(lcio_event->getCollection(name));
+            algoId =
+                pidHandler.addAlgorithm(pidCollMeta.metadata.value().algoName, pidCollMeta.metadata.value().paramNames);
+            found = true;
+          }
+        }
+      }
+      if (!found) {
+        warning() << "Could not determine algorithm type for ParticleID collection " << pidCollMeta.name
+                  << " for setting consistent metadata" << endmsg;
+      }
     }
     convertParticleIDs(collection_pairs.particleIDs, pidCollMeta.name, algoId.value_or(-1));
   }