Merge pull request cms-sw#44328 from iarspider/redo-44256

[ROOTMaster] Fix include for RNTuple* (redo of cms-sw#44256)
artlbv · Mar 13, 2024 · 980274e · 980274e
2 parents 9df6fad + dc416f2
commit 980274e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/Alignment/OfflineValidation/bin/DiMuonVmerge.cc b/Alignment/OfflineValidation/bin/DiMuonVmerge.cc
@@ -15,6 +15,7 @@
 
 #include "TString.h"
 #include "TASImage.h"
+#include "TGraph.h"
 
 #include "Alignment/OfflineValidation/macros/loopAndPlot.C"
 #include "Alignment/OfflineValidation/interface/TkAlStyle.h"

diff --git a/Alignment/OfflineValidation/macros/loopAndPlot.C b/Alignment/OfflineValidation/macros/loopAndPlot.C
@@ -4,6 +4,7 @@
 #include "TDirectory.h"
 #include "TFile.h"
 #include "TGaxis.h"
+#include "TGraph.h"
 #include "TH1.h"
 #include "TH2.h"
 #include "TKey.h"

diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTupleOutputModule.cc
@@ -15,17 +15,19 @@
 
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
-#include <ROOT/RNTupleOptions.hxx>
 #include <ROOT/RPageStorageFile.hxx>
 using ROOT::Experimental::RNTupleModel;
-using ROOT::Experimental::RNTupleWriteOptions;
-using ROOT::Experimental::Detail::RPageSinkFile;
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RNTupleWriter;
+using ROOT::Experimental::Detail::RPageSinkFile;
 #define MakeRNTupleWriter std::make_unique<RNTupleWriter>
+#include <ROOT/RNTupleOptions.hxx>
 #else
+using ROOT::Experimental::Internal::RPageSinkFile;
 #define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
+#include <ROOT/RNTupleWriteOptions.hxx>
 #endif
+using ROOT::Experimental::RNTupleWriteOptions;
 
 #include "TObjString.h"
 

diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.cc b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.cc
@@ -5,17 +5,19 @@
 
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
-#include <ROOT/RNTupleOptions.hxx>
 #include <ROOT/RPageStorageFile.hxx>
 using ROOT::Experimental::RNTupleModel;
-using ROOT::Experimental::RNTupleWriteOptions;
-using ROOT::Experimental::Detail::RPageSinkFile;
 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RNTupleWriter;
+using ROOT::Experimental::Detail::RPageSinkFile;
 #define MakeRNTupleWriter std::make_unique<RNTupleWriter>
+#include <ROOT/RNTupleOptions.hxx>
 #else
+using ROOT::Experimental::Internal::RPageSinkFile;
 #define MakeRNTupleWriter ROOT::Experimental::Internal::CreateRNTupleWriter
+#include <ROOT/RNTupleWriteOptions.hxx>
 #endif
+using ROOT::Experimental::RNTupleWriteOptions;
 
 #include "RNTupleFieldPtr.h"
 #include "SummaryTableOutputFields.h"

diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.h b/PhysicsTools/NanoAOD/plugins/rntuple/NanoAODRNTuples.h
@@ -12,7 +12,13 @@
 
 #include "TFile.h"
 #include <ROOT/RNTuple.hxx>
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RCollectionNTupleWriter;
+#else
+#include <ROOT/RNTupleWriter.hxx>
+#include <ROOT/RNTupleCollectionWriter.hxx>
+using ROOT::Experimental::RNTupleCollectionWriter;
+#endif
 using ROOT::Experimental::RNTupleWriter;
 
 #include "EventStringOutputFields.h"
@@ -64,7 +70,11 @@ class PSetNTuple {
   // https://github.com/root-project/root/issues/7861
   // RNTupleFieldPtr<edm::ParameterSetID> m_psetId;
   // RNTupleFieldPtr<edm::ParameterSetBlob> m_psetBlob;
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
   std::shared_ptr<RCollectionNTupleWriter> m_collection;
+#else
+  std::shared_ptr<RNTupleCollectionWriter> m_collection;
+#endif
   RNTupleFieldPtr<std::string> m_psetId;
   RNTupleFieldPtr<std::string> m_psetBlob;
   std::unique_ptr<RNTupleWriter> m_ntuple;
@@ -78,7 +88,11 @@ class MetadataNTuple {
 
 private:
   void createFields(TFile& file);
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
   std::shared_ptr<RCollectionNTupleWriter> m_procHist;
+#else
+  std::shared_ptr<RNTupleCollectionWriter> m_procHist;
+#endif
 
   RNTupleFieldPtr<std::string> m_phId;
   std::unique_ptr<RNTupleWriter> m_ntuple;

diff --git a/PhysicsTools/NanoAOD/plugins/rntuple/TableOutputFields.h b/PhysicsTools/NanoAOD/plugins/rntuple/TableOutputFields.h
@@ -11,7 +11,12 @@
 
 #include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
 using ROOT::Experimental::RCollectionNTupleWriter;
+#else
+#include <ROOT/RNTupleCollectionWriter.hxx>
+using ROOT::Experimental::RNTupleCollectionWriter;
+#endif
 using ROOT::Experimental::RNTupleModel;
 using ROOT::Experimental::RNTupleWriter;
 
@@ -110,7 +115,11 @@ class TableCollection {
 
 private:
   std::string m_collectionName;
+#if ROOT_VERSION_CODE < ROOT_VERSION(6, 31, 0)
   std::shared_ptr<RCollectionNTupleWriter> m_collection;
+#else
+  std::shared_ptr<RNTupleCollectionWriter> m_collection;
+#endif
   TableOutputFields m_main;
   std::vector<TableOutputFields> m_extensions;
 };