Merge 932fee4 into sapling-pr-archive-ktf

Author: ktf

DataFormats/common/include/CommonDataFormat/BunchFilling.h

@@ -107,7 +107,6 @@ class BunchFilling
 
   ClassDefNV(BunchFilling, 2);
 };
-} // namespace o2
 
 namespace framework
 {
@@ -118,5 +117,6 @@ struct is_messageable<o2::BunchFilling> : std::true_type {
 };
 
 } // namespace framework
+} // namespace o2
 
 #endif

Detectors/AOD/CMakeLists.txt

@@ -19,6 +19,7 @@ target_link_libraries(
           O2::FDDWorkflow
           O2::FV0Workflow
           O2::Framework
+          O2::FrameworkAnalysisSupport
           O2::GlobalTracking
           O2::GlobalTrackingWorkflow
           O2::ITSMFTWorkflow

Framework/AnalysisSupport/CMakeLists.txt

@@ -19,6 +19,7 @@ endif()
 o2_add_library(FrameworkAnalysisSupport
                SOURCES src/Plugin.cxx
                        src/DataInputDirector.cxx
+                       src/TableTreeHelpers.cxx
                        src/AODJAlienReaderHelpers.cxx
                        src/AODWriterHelpers.cxx
                PRIVATE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/src
@@ -39,3 +40,9 @@ o2_add_test(DataInputDirector NAME test_Framework_test_DataInputDirector
                COMPONENT_NAME Framework
                LABELS framework
                PUBLIC_LINK_LIBRARIES O2::FrameworkAnalysisSupport)
+
+o2_add_test(TableToTree NAME benchmark_TableToTree
+               SOURCES test/benchmark_TableToTree.cxx
+               COMPONENT_NAME Framework
+               LABELS framework
+               PUBLIC_LINK_LIBRARIES O2::FrameworkAnalysisSupport benchmark::benchmark)

…ore/include/Framework/TableTreeHelpers.h …ort/include/Framework/TableTreeHelpers.hFramework/Core/include/Framework/TableTreeHelpers.h renamed to Framework/AnalysisSupport/include/Framework/TableTreeHelpers.h Framework/Core/include/Framework/TableTreeHelpers.h renamed to Framework/AnalysisSupport/include/Framework/TableTreeHelpers.h

@@ -18,7 +18,7 @@
 #include "TTreeReader.h"
 #include "TTreeReaderValue.h"
 #include "TTreeReaderArray.h"
-#include "TableBuilder.h"
+#include "Framework/TableBuilder.h"
 #include <arrow/dataset/file_base.h>
 #include <memory>
 

Framework/Core/src/TableTreeHelpers.cxx …AnalysisSupport/src/TableTreeHelpers.cxxFramework/Core/src/TableTreeHelpers.cxx renamed to Framework/AnalysisSupport/src/TableTreeHelpers.cxx Framework/Core/src/TableTreeHelpers.cxx renamed to Framework/AnalysisSupport/src/TableTreeHelpers.cxx

@@ -132,7 +132,6 @@ o2_add_library(Framework
                        src/TMessageSerializer.cxx
                        src/TableBuilder.cxx
                        src/TableConsumer.cxx
-                       src/TableTreeHelpers.cxx
                        src/TopologyPolicy.cxx
                        src/TopologyPolicyHelpers.cxx
                        src/TextDriverClient.cxx
@@ -349,7 +348,6 @@ foreach(b
         ASoAHelpers
         EventMixing
         HistogramRegistry
-        TableToTree
         ExternalFairMQDeviceProxies
         )
   o2_add_executable(benchmark-${b}