From f7fae2bcc08da946c0ea47df42555c9908a3a16f Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Thu, 30 Jan 2025 14:26:51 +0100 Subject: [PATCH] Remove no longer necessary special casing --- include/podio/RNTupleReader.h | 4 +--- include/podio/RNTupleWriter.h | 4 +--- src/RNTupleReader.cc | 20 -------------------- src/RNTupleWriter.cc | 29 ----------------------------- 4 files changed, 2 insertions(+), 55 deletions(-) diff --git a/include/podio/RNTupleReader.h b/include/podio/RNTupleReader.h index 672df4b58..4a056f4f6 100644 --- a/include/podio/RNTupleReader.h +++ b/include/podio/RNTupleReader.h @@ -12,10 +12,8 @@ #include #include +#include #include -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) - #include -#endif namespace podio { diff --git a/include/podio/RNTupleWriter.h b/include/podio/RNTupleWriter.h index b57eb09b3..49a1a128e 100644 --- a/include/podio/RNTupleWriter.h +++ b/include/podio/RNTupleWriter.h @@ -9,9 +9,7 @@ #include "TFile.h" #include #include -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) - #include -#endif +#include #include #include diff --git a/src/RNTupleReader.cc b/src/RNTupleReader.cc index 1d75fa0f9..5e935b053 100644 --- a/src/RNTupleReader.cc +++ b/src/RNTupleReader.cc @@ -178,15 +178,11 @@ std::unique_ptr RNTupleReader::readEntry(const std::string& categ auto readerIndex = upper - 1 - m_readerEntries[category].begin(); ROOTFrameData::BufferMap buffers; -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) // We need to create a non-bare entry here, because the entries for the // parameters are not explicitly (re)set and we need them default initialized. // In principle we would only need a bare entry for the collection data, since // we set all the fields there in any case. auto dentry = m_readers[category][readerIndex]->GetModel().CreateEntry(); -#else - auto dentry = m_readers[category][readerIndex]->GetModel()->GetDefaultEntry(); -#endif for (size_t i = 0; i < collInfo.id.size(); ++i) { if (!collsToRead.empty() && std::ranges::find(collsToRead, collInfo.name[i]) == collsToRead.end()) { @@ -207,40 +203,24 @@ std::unique_ptr RNTupleReader::readEntry(const std::string& categ if (collInfo.isSubsetCollection[i]) { auto brName = root_utils::subsetBranch(collInfo.name[i]); auto vec = new std::vector; -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) dentry->BindRawPtr(brName, vec); -#else - dentry->CaptureValueUnsafe(brName, vec); -#endif collBuffers.references->at(0) = std::unique_ptr>(vec); } else { -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) dentry->BindRawPtr(collInfo.name[i], collBuffers.data); -#else - dentry->CaptureValueUnsafe(collInfo.name[i], collBuffers.data); -#endif 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; const auto brName = root_utils::refBranch(collInfo.name[i], relName); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) dentry->BindRawPtr(brName, vec); -#else - dentry->CaptureValueUnsafe(brName, vec); -#endif collBuffers.references->at(j) = std::unique_ptr>(vec); } for (size_t j = 0; j < relVecNames.vectorMembers.size(); ++j) { const auto vecName = relVecNames.vectorMembers[j]; const auto brName = root_utils::vecBranch(collInfo.name[i], vecName); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) dentry->BindRawPtr(brName, collBuffers.vectorMembers->at(j).second); -#else - dentry->CaptureValueUnsafe(brName, collBuffers.vectorMembers->at(j).second); -#endif } } diff --git a/src/RNTupleWriter.cc b/src/RNTupleWriter.cc index 73c5db22d..4027079c2 100644 --- a/src/RNTupleWriter.cc +++ b/src/RNTupleWriter.cc @@ -41,13 +41,8 @@ void RNTupleWriter::fillParams(const GenericParameters& params, CategoryInfo& ca ROOT::Experimental::REntry* entry) { auto& paramStorage = getParamStorage(catInfo); paramStorage = params.getKeysAndValues(); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) entry->BindRawPtr(root_utils::getGPKeyName(), ¶mStorage.keys); entry->BindRawPtr(root_utils::getGPValueName(), ¶mStorage.values); -#else - entry->CaptureValueUnsafe(root_utils::getGPKeyName(), ¶mStorage.keys); - entry->CaptureValueUnsafe(root_utils::getGPValueName(), ¶mStorage.values); -#endif } void RNTupleWriter::writeFrame(const podio::Frame& frame, const std::string& category) { @@ -99,11 +94,7 @@ void RNTupleWriter::writeFrame(const podio::Frame& frame, const std::string& cat } } -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) auto entry = m_categories[category].writer->GetModel().CreateBareEntry(); -#else - auto entry = m_categories[category].writer->GetModel()->CreateBareEntry(); -#endif ROOT::Experimental::RNTupleWriteOptions options; options.SetCompression(ROOT::RCompressionSetting::EDefaults::kUseGeneralPurpose); @@ -111,21 +102,13 @@ void RNTupleWriter::writeFrame(const podio::Frame& frame, const std::string& cat for (const auto& [name, coll] : collections) { auto collBuffers = coll->getBuffers(); if (collBuffers.vecPtr) { -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) entry->BindRawPtr(name, static_cast(collBuffers.vecPtr)); -#else - entry->CaptureValueUnsafe(name, static_cast(collBuffers.vecPtr)); -#endif } if (coll->isSubsetCollection()) { auto& refColl = (*collBuffers.references)[0]; const auto brName = root_utils::subsetBranch(name); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) entry->BindRawPtr(brName, refColl.get()); -#else - entry->CaptureValueUnsafe(brName, refColl.get()); -#endif } else { @@ -134,11 +117,7 @@ void RNTupleWriter::writeFrame(const podio::Frame& frame, const std::string& cat int i = 0; for (auto& c : (*refColls)) { const auto brName = root_utils::refBranch(name, relVecNames.relations[i]); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) entry->BindRawPtr(brName, c.get()); -#else - entry->CaptureValueUnsafe(brName, c.get()); -#endif ++i; } } @@ -149,11 +128,7 @@ void RNTupleWriter::writeFrame(const podio::Frame& frame, const std::string& cat const auto typeName = "vector<" + type + ">"; const auto brName = root_utils::vecBranch(name, relVecNames.vectorMembers[i]); auto ptr = *static_cast**>(vec); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) entry->BindRawPtr(brName, ptr); -#else - entry->CaptureValueUnsafe(brName, ptr); -#endif ++i; } } @@ -177,11 +152,7 @@ std::unique_ptr RNTupleWriter::createModels(const std::vector& collections) { auto model = ROOT::Experimental::RNTupleModel::CreateBare(); -#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0) using ROOT::Experimental::RFieldBase; -#else - using ROOT::Experimental::Detail::RFieldBase; -#endif for (auto& [name, coll] : collections) { // For the first entry in each category we also record the datamodel