Cleanup and minor refactoring

Author: tmadlener

include/podio/RNTupleReader.h

@@ -162,14 +162,7 @@ class RNTupleReader {
   std::unordered_map<std::string, std::vector<unsigned>> m_readerEntries{};
   std::unordered_map<std::string, unsigned> m_totalEntries{};
 
-  // struct CollectionInfo {
-  //   std::vector<unsigned int> id{};
-  //   std::vector<std::string> name{};
-  //   std::vector<std::string> type{};
-  //   std::vector<short> isSubsetCollection{};
-  //   std::vector<SchemaVersionT> schemaVersion{};
-  // };
-
+  /// Map each category to the collections that have been written and are available
   std::unordered_map<std::string, std::vector<podio::root_utils::CollectionWriteInfo>> m_collectionInfo{};
 
   std::vector<std::string> m_availableCategories{};

src/RNTupleReader.cc

@@ -50,31 +50,10 @@ bool RNTupleReader::initCategory(const std::string& category) {
   // Assume that the metadata is the same in all files
   auto filename = m_filenames[0];
 
-  // auto& collInfo = m_collectionInfo[category];
-
   auto collInfo = m_metadata_readers[filename]->GetView<std::vector<root_utils::CollectionWriteInfo>>(
       {root_utils::collInfoName(category)});
 
   m_collectionInfo[category] = collInfo(0);
-
-  // auto id = m_metadata_readers[filename]->GetView<std::vector<unsigned int>>(root_utils::idTableName(category));
-  // collInfo.collectionID = id(0);
-
-  // auto collectionName =
-  //     m_metadata_readers[filename]->GetView<std::vector<std::string>>(root_utils::collectionName(category));
-  // collInfo.name = collectionName(0);
-
-  // auto collectionType =
-  //     m_metadata_readers[filename]->GetView<std::vector<std::string>>(root_utils::collInfoName(category));
-  // collInfo.type = collectionType(0);
-
-  // auto subsetCollection =
-  //     m_metadata_readers[filename]->GetView<std::vector<short>>(root_utils::subsetCollection(category));
-  // collInfo.isSubset = subsetCollection(0);
-
-  // auto schemaVersion = m_metadata_readers[filename]->GetView<std::vector<SchemaVersionT>>("schemaVersion_" +
-  // category); collInfo.schemaVersion = schemaVersion(0);
-
   m_idTables[category] = root_utils::makeCollIdTable(collInfo(0));
 
   return true;
@@ -191,46 +170,46 @@ std::unique_ptr<ROOTFrameData> RNTupleReader::readEntry(const std::string& categ
   // we set all the fields there in any case.
   auto dentry = m_readers[category][readerIndex]->GetModel().CreateEntry();
 
-  for (size_t i = 0; i < collInfo.size(); ++i) {
-    if (!collsToRead.empty() && std::ranges::find(collsToRead, collInfo[i].name) == collsToRead.end()) {
+  for (const auto& coll : collInfo) {
+    if (!collsToRead.empty() && std::ranges::find(collsToRead, coll.name) == collsToRead.end()) {
       continue;
     }
-    const auto& collType = collInfo[i].dataType;
+    const auto& collType = coll.dataType;
     const auto& bufferFactory = podio::CollectionBufferFactory::instance();
-    auto maybeBuffers = bufferFactory.createBuffers(collType, collInfo[i].schemaVersion, collInfo[i].isSubset);
+    auto maybeBuffers = bufferFactory.createBuffers(collType, coll.schemaVersion, coll.isSubset);
     auto collBuffers = maybeBuffers.value_or(podio::CollectionReadBuffers{});
 
     if (!maybeBuffers) {
-      std::cout << "WARNING: Buffers couldn't be created for collection " << collInfo[i].name << " of type "
-                << collInfo[i].dataType << " and schema version " << collInfo[i].schemaVersion << std::endl;
+      std::cout << "WARNING: Buffers couldn't be created for collection " << coll.name << " of type " << coll.dataType
+                << " and schema version " << coll.schemaVersion << std::endl;
       return nullptr;
     }
 
-    if (collInfo[i].isSubset) {
-      auto brName = root_utils::subsetBranch(collInfo[i].name);
+    if (coll.isSubset) {
+      auto brName = root_utils::subsetBranch(coll.name);
       auto vec = new std::vector<podio::ObjectID>;
       dentry->BindRawPtr(brName, vec);
       collBuffers.references->at(0) = std::unique_ptr<std::vector<podio::ObjectID>>(vec);
     } else {
-      dentry->BindRawPtr(collInfo[i].name, collBuffers.data);
+      dentry->BindRawPtr(coll.name, collBuffers.data);
 
       const auto relVecNames = podio::DatamodelRegistry::instance().getRelationNames(collType);
       for (size_t j = 0; j < relVecNames.relations.size(); ++j) {
         const auto relName = relVecNames.relations[j];
         auto vec = new std::vector<podio::ObjectID>;
-        const auto brName = root_utils::refBranch(collInfo[i].name, relName);
+        const auto brName = root_utils::refBranch(coll.name, relName);
         dentry->BindRawPtr(brName, vec);
         collBuffers.references->at(j) = std::unique_ptr<std::vector<podio::ObjectID>>(vec);
       }
 
       for (size_t j = 0; j < relVecNames.vectorMembers.size(); ++j) {
         const auto vecName = relVecNames.vectorMembers[j];
-        const auto brName = root_utils::vecBranch(collInfo[i].name, vecName);
+        const auto brName = root_utils::vecBranch(coll.name, vecName);
         dentry->BindRawPtr(brName, collBuffers.vectorMembers->at(j).second);
       }
     }
 
-    buffers.emplace(collInfo[i].name, std::move(collBuffers));
+    buffers.emplace(coll.name, std::move(collBuffers));
   }
 
   m_readers[category][readerIndex]->LoadEntry(localEntry, *dentry);

src/rootUtils.h

@@ -370,6 +370,8 @@ inline std::string getInconsistentCollsMsg(const std::vector<std::string>& exist
   return sstr.str();
 }
 
+/// Create a collection id table from the information in the
+/// CollectionWriteInfos
 inline std::shared_ptr<podio::CollectionIDTable> makeCollIdTable(const std::vector<CollectionWriteInfo>& collInfo) {
   std::vector<uint32_t> ids{};
   ids.reserve(collInfo.size());