From 9315bb42814fba15e455224caf24abf54115415b Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Wed, 5 Nov 2025 14:51:26 +0100
Subject: [PATCH] DPL: move TableToTree to AnalysisSupport, on its way to be
 deprecated

---
 Detectors/AOD/CMakeLists.txt                               | 2 ++
 Framework/AnalysisSupport/CMakeLists.txt                   | 7 +++++++
 .../include/Framework/TableTreeHelpers.h                   | 2 +-
 .../{Core => AnalysisSupport}/src/TableTreeHelpers.cxx     | 0
 .../test/benchmark_TableToTree.cxx                         | 0
 Framework/Core/CMakeLists.txt                              | 2 --
 6 files changed, 10 insertions(+), 3 deletions(-)
 rename Framework/{Core => AnalysisSupport}/include/Framework/TableTreeHelpers.h (98%)
 rename Framework/{Core => AnalysisSupport}/src/TableTreeHelpers.cxx (100%)
 rename Framework/{Core => AnalysisSupport}/test/benchmark_TableToTree.cxx (100%)

diff --git a/Detectors/AOD/CMakeLists.txt b/Detectors/AOD/CMakeLists.txt
index 7ab36d260e480..827b23b3e4cdd 100644
--- a/Detectors/AOD/CMakeLists.txt
+++ b/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
@@ -75,6 +76,7 @@ o2_add_executable(
         O2::DataFormatsFT0
         O2::Steer
         O2::ZDCBase
+        O2::FrameworkAnalysisSupport
         nlohmann_json::nlohmann_json
         )
 
diff --git a/Framework/AnalysisSupport/CMakeLists.txt b/Framework/AnalysisSupport/CMakeLists.txt
index dedbf8cb590b2..92fd55b86a33d 100644
--- a/Framework/AnalysisSupport/CMakeLists.txt
+++ b/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)
diff --git a/Framework/Core/include/Framework/TableTreeHelpers.h b/Framework/AnalysisSupport/include/Framework/TableTreeHelpers.h
similarity index 98%
rename from Framework/Core/include/Framework/TableTreeHelpers.h
rename to Framework/AnalysisSupport/include/Framework/TableTreeHelpers.h
index 0a163d59aecb0..c5e9d5fa14261 100644
--- a/Framework/Core/include/Framework/TableTreeHelpers.h
+++ b/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>
 
diff --git a/Framework/Core/src/TableTreeHelpers.cxx b/Framework/AnalysisSupport/src/TableTreeHelpers.cxx
similarity index 100%
rename from Framework/Core/src/TableTreeHelpers.cxx
rename to Framework/AnalysisSupport/src/TableTreeHelpers.cxx
diff --git a/Framework/Core/test/benchmark_TableToTree.cxx b/Framework/AnalysisSupport/test/benchmark_TableToTree.cxx
similarity index 100%
rename from Framework/Core/test/benchmark_TableToTree.cxx
rename to Framework/AnalysisSupport/test/benchmark_TableToTree.cxx
diff --git a/Framework/Core/CMakeLists.txt b/Framework/Core/CMakeLists.txt
index 43571526855cc..48183bc1e9526 100644
--- a/Framework/Core/CMakeLists.txt
+++ b/Framework/Core/CMakeLists.txt
@@ -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}