DPL: adapt RCombinedDS to new ROOT API

Author: ktf

Framework/CMakeLists.txt

@@ -22,8 +22,9 @@ add_subdirectory(CCDBSupport)
 add_subdirectory(PhysicsSupport)
 add_subdirectory(DataTakingSupport)
 
-add_subdirectory(RootAnalysisHelpers)
-
+# FIXME: disable for now, since ROOT made a non backward compatible change
+# RCombinedDS. Will reenable once we move to ROOT 6.30.01
+#add_subdirectory(RootAnalysisHelpers)
 
 # Build the GUI support only if we have DebugGUI
 if (TARGET AliceO2::DebugGUI)

Framework/RootAnalysisHelpers/include/Framework/RCombinedDS.h

@@ -341,14 +341,14 @@ class RCombinedDS final : public ROOT::RDF::RDataSource
     dummy += colName.data();
     throw std::runtime_error(dummy);
   }
-  const std::vector<std::string>& GetColumnNames() const override;
+  [[nodiscard]] const std::vector<std::string>& GetColumnNames() const override;
   std::vector<std::pair<ULong64_t, ULong64_t>> GetEntryRanges() override;
-  std::string GetTypeName(std::string_view colName) const override;
-  bool HasColumn(std::string_view colName) const override;
+  [[nodiscard]] std::string GetTypeName(std::string_view colName) const override;
+  [[nodiscard]] bool HasColumn(std::string_view colName) const override;
   bool SetEntry(unsigned int slot, ULong64_t entry) override;
   void InitSlot(unsigned int slot, ULong64_t firstEntry) override;
   void SetNSlots(unsigned int nSlots) override;
-  void Initialise() override;
+  void Initialize() override;
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////

Framework/RootAnalysisHelpers/src/RCombinedDS.cxx

@@ -220,12 +220,12 @@ std::vector<void*> RCombinedDS::GetColumnReadersImpl(std::string_view colName, c
   O2_BUILTIN_UNREACHABLE();
 }
 
-void RCombinedDS::Initialise()
+void RCombinedDS::Initialize()
 {
   fEntryRanges = fIndex->BuildIndex(fLeftDF, fRightDF);
 
-  fLeft->Initialise();
-  fRight->Initialise();
+  fLeft->Initialize();
+  fRight->Initialize();
 }
 
 /// Creates a RDataFrame using an arrow::Table as input.

Framework/TestWorkflows/CMakeLists.txt

@@ -37,15 +37,16 @@ o2_add_dpl_workflow(sync-reconstruction-dummy
                   SOURCES src/o2SyncReconstructionDummy.cxx
                   COMPONENT_NAME TestWorkflows)
 
-o2_add_dpl_workflow(d0-analysis
-                  SOURCES src/o2D0Analysis.cxx
-                  PUBLIC_LINK_LIBRARIES O2::FrameworkRootAnalysisHelpers
-                  COMPONENT_NAME TestWorkflows)
-
-o2_add_dpl_workflow(simple-tracks-analysis
-                  SOURCES src/o2SimpleTracksAnalysis.cxx
-                  PUBLIC_LINK_LIBRARIES O2::FrameworkRootAnalysisHelpers
-                  COMPONENT_NAME TestWorkflows)
+# FIXME: renable when the new ROOT is used
+#o2_add_dpl_workflow(d0-analysis
+#                  SOURCES src/o2D0Analysis.cxx
+#                  PUBLIC_LINK_LIBRARIES O2::FrameworkRootAnalysisHelpers
+#                  COMPONENT_NAME TestWorkflows)
+#
+#o2_add_dpl_workflow(simple-tracks-analysis
+#                  SOURCES src/o2SimpleTracksAnalysis.cxx
+#                  PUBLIC_LINK_LIBRARIES O2::FrameworkRootAnalysisHelpers
+#                  COMPONENT_NAME TestWorkflows)
 
 o2_add_dpl_workflow(analysis-task-example
                   SOURCES src/o2AnalysisTaskExample.cxx