Remove unnecessary track keeping of id:name mapping

Author: tmadlener

k4MarlinWrapper/k4MarlinWrapper/converters/EDM4hep2Lcio.h

@@ -79,7 +79,6 @@ class EDM4hep2LcioTool : public AlgTool, virtual public IEDMConverter {
   /// A (caching) "map" of original to new collection names that will be populated
   /// during the first conversion
   std::unordered_map<std::string, std::string> m_collsToConvert{};
-  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/src/components/EDM4hep2Lcio.cpp

@@ -532,12 +532,10 @@ StatusCode EDM4hep2LcioTool::convertCollections(lcio::LCEventImpl* lcio_event) {
       // Always check the contents of the TES because algorithms that do not use
       // the PodioDataSvc (e.g. all Functional ones) go to the TES directly and
       // the PodioDataSvc Frame doesn't now about them.
-      std::optional<std::map<uint32_t, std::string>> idToNameOpt(std::move(m_idToName));
-      for (const auto& name : getAvailableCollectionsFromStore(this, idToNameOpt)) {
+      for (const auto& name : getAvailableCollectionsFromStore(this)) {
         const auto& [_, inserted] = collNameMapping.emplace(name, name);
         debug() << fmt::format("Adding '{}' from TES to conversion? {}", name, inserted) << endmsg;
       }
-      m_idToName = std::move(idToNameOpt.value());
 
       for (auto&& [origName, newName] : collNameMapping) {
         m_collsToConvert.emplace(std::move(origName), std::move(newName));

k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp

@@ -74,8 +74,7 @@ bool Lcio2EDM4hepTool::collectionExist(const std::string& collection_name) {
   if (m_podioDataSvc) {
     collections = m_podioDataSvc->getEventFrame().getAvailableCollections();
   } else {
-    std::optional<std::map<uint32_t, std::string>> dummy = std::nullopt;
-    collections = getAvailableCollectionsFromStore(this, dummy, true);
+    collections = getAvailableCollectionsFromStore(this, true);
   }
   if (std::find(collections.begin(), collections.end(), collection_name) != collections.end()) {
     debug() << "Collection named " << collection_name << " already registered, skipping conversion." << endmsg;

k4MarlinWrapper/src/components/StoreUtils.cpp

@@ -39,9 +39,7 @@
 // store that can be found in Writer.cpp in k4FWCore with some modifications
 // that are specific to the usage of this function in the converters, like
 // returning also a map from collection ID to collection name
-std::vector<std::string> getAvailableCollectionsFromStore(const AlgTool* thisClass,
-                                                          std::optional<std::map<uint32_t, std::string>>& idToName,
-                                                          bool returnFrameCollections) {
+std::vector<std::string> getAvailableCollectionsFromStore(const AlgTool* thisClass, bool returnFrameCollections) {
   std::vector<std::string> collectionNames;
 
   SmartIF<IDataManagerSvc> mgr;
@@ -98,19 +96,6 @@ std::vector<std::string> getAvailableCollectionsFromStore(const AlgTool* thisCla
     auto name = pReg->name().substr(1, pReg->name().size() - 1);
     thisClass->verbose() << "Adding '" << name << "' as collection name obtained from TES" << endmsg;
     collectionNames.push_back(name);
-    if (idToName) {
-      if (functionalWrapper) {
-        thisClass->verbose() << fmt::format("Retrieving id for '{}': {:0>8x}", name,
-                                            functionalWrapper->getData()->getID())
-                             << endmsg;
-        idToName->emplace(functionalWrapper->getData()->getID(), std::move(name));
-      } else {
-        thisClass->verbose() << fmt::format("Retrieving id for '{}': {:0>8x}", name,
-                                            algorithmWrapper->collectionBase()->getID())
-                             << endmsg;
-        idToName->emplace(algorithmWrapper->collectionBase()->getID(), std::move(name));
-      }
-    }
   }
   return collectionNames;
 }

k4MarlinWrapper/src/components/StoreUtils.h

@@ -27,7 +27,6 @@
 // here with some additions to make it useful for converting both from EDM4hep
 // to LCIO and vice versa
 std::vector<std::string> getAvailableCollectionsFromStore(const AlgTool* thisClass,
-                                                          std::optional<std::map<uint32_t, std::string>>& idToName,
                                                           bool returnFrameCollections = false);
 
 k4MarlinWrapper::GlobalConvertedObjectsMap& getGlobalObjectMap(AlgTool* thisTool);