Fix also the RNTupleReader

include/podio/RNTupleReader.h

@@ -1,10 +1,5 @@
-<<<<<<<< HEAD:include/podio/RNTupleReader.h
 #ifndef PODIO_RNTUPLEREADER_H
 #define PODIO_RNTUPLEREADER_H
-========
-#ifndef PODIO_ROOTRNTUPLEREADER_H
-#define PODIO_ROOTRNTUPLEREADER_H
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):include/podio/ROOTRNTupleReader.h
 
 #include "podio/CollectionBranches.h"
 #include "podio/ICollectionProvider.h"
@@ -27,7 +22,6 @@ namespace podio {
 This class has the function to read available data from disk
 and to prepare collections and buffers.
 **/
-<<<<<<<< HEAD:include/podio/RNTupleReader.h
 class RNTupleReader {
 
 public:
@@ -36,16 +30,6 @@ class RNTupleReader {
 
   RNTupleReader(const RNTupleReader&) = delete;
   RNTupleReader& operator=(const RNTupleReader&) = delete;
-========
-class ROOTRNTupleReader {
-
-public:
-  ROOTRNTupleReader() = default;
-  ~ROOTRNTupleReader() = default;
-
-  ROOTRNTupleReader(const ROOTRNTupleReader&) = delete;
-  ROOTRNTupleReader& operator=(const ROOTRNTupleReader&) = delete;
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):include/podio/ROOTRNTupleReader.h
 
   void openFile(const std::string& filename);
   void openFiles(const std::vector<std::string>& filename);

src/RNTupleReader.cc

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:src/RNTupleReader.cc
 #include "podio/RNTupleReader.h"
-========
-#include "podio/ROOTRNTupleReader.h"
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
 #include "podio/CollectionBase.h"
 #include "podio/CollectionBufferFactory.h"
 #include "podio/CollectionBuffers.h"
@@ -18,11 +14,7 @@
 namespace podio {
 
 template <typename T>
-<<<<<<<< HEAD:src/RNTupleReader.cc
 void RNTupleReader::readParams(const std::string& name, unsigned entNum, GenericParameters& params) {
-========
-void ROOTRNTupleReader::readParams(const std::string& name, unsigned entNum, GenericParameters& params) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   auto keyView = m_readers[name][0]->GetView<std::vector<std::string>>(root_utils::getGPKeyName<T>());
   auto valueView = m_readers[name][0]->GetView<std::vector<std::vector<T>>>(root_utils::getGPValueName<T>());
 
@@ -31,11 +23,7 @@ void ROOTRNTupleReader::readParams(const std::string& name, unsigned entNum, Gen
   }
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 GenericParameters RNTupleReader::readEventMetaData(const std::string& name, unsigned entNum) {
-========
-GenericParameters ROOTRNTupleReader::readEventMetaData(const std::string& name, unsigned entNum) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   GenericParameters params;
 
   readParams<int>(name, entNum, params);
@@ -46,11 +34,7 @@ GenericParameters ROOTRNTupleReader::readEventMetaData(const std::string& name,
   return params;
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 bool RNTupleReader::initCategory(const std::string& category) {
-========
-bool ROOTRNTupleReader::initCategory(const std::string& category) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   if (std::find(m_availableCategories.begin(), m_availableCategories.end(), category) == m_availableCategories.end()) {
     return false;
   }
@@ -81,19 +65,11 @@ bool ROOTRNTupleReader::initCategory(const std::string& category) {
   return true;
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 void RNTupleReader::openFile(const std::string& filename) {
   openFiles({filename});
 }
 
 void RNTupleReader::openFiles(const std::vector<std::string>& filenames) {
-========
-void ROOTRNTupleReader::openFile(const std::string& filename) {
-  openFiles({filename});
-}
-
-void ROOTRNTupleReader::openFiles(const std::vector<std::string>& filenames) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
 
   m_filenames.insert(m_filenames.end(), filenames.begin(), filenames.end());
   for (auto& filename : filenames) {
@@ -117,11 +93,7 @@ void ROOTRNTupleReader::openFiles(const std::vector<std::string>& filenames) {
   m_availableCategories = availableCategoriesField(0);
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 unsigned RNTupleReader::getEntries(const std::string& name) {
-========
-unsigned ROOTRNTupleReader::getEntries(const std::string& name) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   if (m_readers.find(name) == m_readers.end()) {
     for (auto& filename : m_filenames) {
       try {
@@ -136,11 +108,7 @@ unsigned ROOTRNTupleReader::getEntries(const std::string& name) {
   return m_totalEntries[name];
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 std::vector<std::string_view> RNTupleReader::getAvailableCategories() const {
-========
-std::vector<std::string_view> ROOTRNTupleReader::getAvailableCategories() const {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   std::vector<std::string_view> cats;
   cats.reserve(m_availableCategories.size());
   for (const auto& cat : m_availableCategories) {
@@ -149,19 +117,11 @@ std::vector<std::string_view> ROOTRNTupleReader::getAvailableCategories() const
   return cats;
 }
 
-<<<<<<<< HEAD:src/RNTupleReader.cc
 std::unique_ptr<ROOTFrameData> RNTupleReader::readNextEntry(const std::string& name) {
   return readEntry(name, m_entries[name]);
 }
 
 std::unique_ptr<ROOTFrameData> RNTupleReader::readEntry(const std::string& category, const unsigned entNum) {
-========
-std::unique_ptr<ROOTFrameData> ROOTRNTupleReader::readNextEntry(const std::string& name) {
-  return readEntry(name, m_entries[name]);
-}
-
-std::unique_ptr<ROOTFrameData> ROOTRNTupleReader::readEntry(const std::string& category, const unsigned entNum) {
->>>>>>>> da92408 (Change ROOTNTuple{Reader,Writer} to ROOTRNTuple{Reader,Writer}):src/ROOTRNTupleReader.cc
   if (m_totalEntries.find(category) == m_totalEntries.end()) {
     getEntries(category);
   }