Keep thte ROOTReader functional for older versions

Author: tmadlener

src/ROOTReader.cc

@@ -170,19 +170,32 @@ void ROOTReader::initCategory(CategoryInfo& catInfo, const std::string& category
   auto* collInfoBranch = root_utils::getBranch(m_metaChain.get(), root_utils::collInfoName(category));
 
   auto collInfo = new std::vector<root_utils::CollectionWriteInfo>();
-  if (m_fileVersion < podio::version::Version{0, 16, 4}) {
-    auto oldCollInfo = new std::vector<root_utils::CollectionInfoWithoutSchemaT>();
-    collInfoBranch->SetAddress(&oldCollInfo);
-    collInfoBranch->GetEntry(0);
-    collInfo->reserve(oldCollInfo->size());
-    for (auto&& [collID, collType, isSubsetColl] : *oldCollInfo) {
-      // Manually set the schema version to 1
-      collInfo->emplace_back(collID, std::move(collType), isSubsetColl, 1u);
-    }
-    delete oldCollInfo;
-  } else {
+
+  if (m_fileVersion >= podio::version::Version{1, 1, 0}) {
     collInfoBranch->SetAddress(&collInfo);
     collInfoBranch->GetEntry(0);
+  } else {
+    auto collInfoOld = new std::vector<root_utils::CollectionWriteInfoT>();
+    if (m_fileVersion < podio::version::Version{0, 16, 4}) {
+      auto collInfoReallyOld = new std::vector<root_utils::CollectionInfoWithoutSchemaT>();
+      collInfoBranch->SetAddress(&collInfoReallyOld);
+      collInfoBranch->GetEntry(0);
+      collInfoOld->reserve(collInfoReallyOld->size());
+      for (auto& [collID, collType, isSubsetColl] : *collInfoReallyOld) {
+        // Manually set the schema version to 1
+        collInfo->emplace_back(collID, std::move(collType), isSubsetColl, 1u);
+      }
+      delete collInfoReallyOld;
+    } else {
+      collInfoBranch->SetAddress(&collInfoOld);
+      collInfoBranch->GetEntry(0);
+    }
+    // "Convert" to new style
+    collInfo->reserve(collInfoOld->size());
+    for (auto& [id, typeName, isSubsetColl, schemaVersion] : *collInfoOld) {
+      collInfo->emplace_back(id, std::move(typeName), isSubsetColl, schemaVersion);
+    }
+    delete collInfoOld;
   }
 
   // For backwards compatibility make it possible to read the index based files