Drop need for Framework/RootTableBuilderHelpers.h

Author: ktf

Framework/AnalysisSupport/src/AODJAlienReaderHelpers.cxx

@@ -14,7 +14,6 @@
 #include "Framework/TableTreeHelpers.h"
 #include "Framework/AnalysisHelpers.h"
 #include "Framework/DataProcessingStats.h"
-#include "Framework/RootTableBuilderHelpers.h"
 #include "Framework/RootArrowFilesystem.h"
 #include "Framework/AlgorithmSpec.h"
 #include "Framework/ConfigParamRegistry.h"

Framework/Core/CMakeLists.txt

@@ -328,11 +328,6 @@ o2_add_executable(dpl-run
                   PUBLIC_LINK_LIBRARIES O2::Framework
                   )
 
-o2_add_executable(verify-aod-file
-                  SOURCES src/verifyAODFile.cxx
-                  PUBLIC_LINK_LIBRARIES O2::Framework ROOT::TreePlayer
-                  COMPONENT_NAME Framework)
-
 # benchmarks
 
 foreach(b

Framework/Core/src/AODReaderHelpers.cxx

@@ -15,7 +15,6 @@
 #include "Framework/AnalysisDataModelHelpers.h"
 #include "Framework/DataProcessingHelpers.h"
 #include "Framework/ExpressionHelpers.h"
-#include "Framework/RootTableBuilderHelpers.h"
 #include "Framework/AlgorithmSpec.h"
 #include "Framework/ConfigParamRegistry.h"
 #include "Framework/ControlService.h"

Framework/Core/src/verifyAODFile.cxx

@@ -12,7 +12,6 @@
 #include <catch_amalgamated.hpp>
 
 #include "Framework/TableBuilder.h"
-#include "Framework/RootTableBuilderHelpers.h"
 #include "Framework/ASoA.h"
 #include "Framework/PluginManager.h"
 #include "../src/ArrowDebugHelpers.h"
@@ -50,87 +49,6 @@
 
 using namespace o2::framework;
 
-TEST_CASE("RootTree2Table")
-{
-  using namespace o2::framework;
-  /// Create a simple TTree
-  TTree t1("t1", "a simple Tree with simple variables");
-  Float_t xyz[3];
-  Int_t ij[2];
-  Float_t px, py, pz;
-  Double_t random;
-  Int_t ev;
-  t1.Branch("px", &px, "px/F");
-  t1.Branch("py", &py, "py/F");
-  t1.Branch("pz", &pz, "pz/F");
-  t1.Branch("random", &random, "random/D");
-  t1.Branch("ev", &ev, "ev/I");
-  t1.Branch("xyz", xyz, "xyz[3]/F");
-  t1.Branch("ij", ij, "ij[2]/I");
-  // fill the tree
-  for (Int_t i = 0; i < 1000; i++) {
-    xyz[0] = 1;
-    xyz[1] = 2;
-    xyz[2] = 3;
-    gRandom->Rannor(px, py);
-    pz = px * px + py * py;
-    xyz[2] = i + 1;
-    ij[0] = i;
-    ij[1] = i + 1;
-    random = gRandom->Rndm();
-    ev = i + 1;
-    t1.Fill();
-  }
-
-  // Create an arrow table from this.
-  TableBuilder builder;
-  TTreeReader reader(&t1);
-  auto&& xyzReader = HolderMaker<float[3]>::make(reader, "xyz");
-  auto&& ijkReader = HolderMaker<int[2]>::make(reader, "ij");
-  auto&& pxReader = HolderMaker<float>::make(reader, "px");
-  auto&& pyReader = HolderMaker<float>::make(reader, "py");
-  auto&& pzReader = HolderMaker<float>::make(reader, "pz");
-  auto&& randomReader = HolderMaker<double>::make(reader, "random");
-  auto&& evReader = HolderMaker<int>::make(reader, "ev");
-
-  RootTableBuilderHelpers::convertTTree(builder, reader, std::move(xyzReader), std::move(ijkReader), std::move(pxReader), std::move(pyReader), std::move(pzReader), std::move(randomReader), std::move(evReader));
-  auto table = builder.finalize();
-  REQUIRE(table->num_rows() == 1000);
-  REQUIRE(table->num_columns() == 7);
-  REQUIRE(table->schema()->field(0)->type()->id() == arrow::fixed_size_list(arrow::float32(), 3)->id());
-  REQUIRE(table->schema()->field(1)->type()->id() == arrow::fixed_size_list(arrow::int32(), 2)->id());
-  REQUIRE(table->schema()->field(2)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->schema()->field(3)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->schema()->field(4)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->schema()->field(5)->type()->id() == arrow::float64()->id());
-  REQUIRE(table->schema()->field(6)->type()->id() == arrow::int32()->id());
-
-  {
-    auto chunkToUse = table->column(0)->chunk(0);
-    chunkToUse = std::dynamic_pointer_cast<arrow::FixedSizeListArray>(chunkToUse)->values();
-    auto array = std::static_pointer_cast<arrow::FloatArray>(chunkToUse);
-    // array of 3 floats, time 1000.
-    REQUIRE(array->length() == 3000);
-    const float* c = reinterpret_cast<float const*>(array->values()->data());
-
-    CHECK(c[0] == 1);
-    CHECK(c[1] == 2);
-    CHECK(c[2] == 1);
-  }
-  {
-    auto chunkToUse = table->column(1)->chunk(0);
-    chunkToUse = std::dynamic_pointer_cast<arrow::FixedSizeListArray>(chunkToUse)->values();
-    auto array = std::static_pointer_cast<arrow::Int32Array>(chunkToUse);
-    REQUIRE(array->length() == 2000);
-
-    const int* ptr = reinterpret_cast<int const*>(array->values()->data());
-    for (size_t i = 0; i < 1000; i++) {
-      CHECK(ptr[2 * i + 0] == i);
-      CHECK(ptr[2 * i + 1] == i + 1);
-    }
-  }
-}
-
 namespace o2::aod
 {
 namespace test
@@ -149,60 +67,6 @@ DECLARE_SOA_TABLE(Test, "AOD", "ETAPHI",
                   test::Random, test::Ev);
 } // namespace o2::aod
 
-TEST_CASE("RootTree2TableViaASoA")
-{
-  using namespace o2::framework;
-  /// Create a simple TTree
-  TTree t2("t2", "a simple Tree with simple variables");
-  Float_t xyz[3];
-  Int_t ij[2];
-  Float_t px, py, pz;
-  Double_t random;
-  Int_t ev;
-  t2.Branch("px", &px, "px/F");
-  t2.Branch("py", &py, "py/F");
-  t2.Branch("pz", &pz, "pz/F");
-  t2.Branch("random", &random, "random/D");
-  t2.Branch("ev", &ev, "ev/I");
-  t2.Branch("xyz", xyz, "xyz[3]/F");
-  t2.Branch("ij", ij, "ij[2]/I");
-  // fill the tree
-  for (Int_t i = 0; i < 1000; i++) {
-    gRandom->Rannor(xyz[0], xyz[1]);
-    gRandom->Rannor(px, py);
-    pz = px * px + py * py;
-    xyz[2] = i + 1;
-    ij[0] = i;
-    ij[1] = i + 1;
-    random = gRandom->Rndm();
-    ev = i + 1;
-    t2.Fill();
-  }
-
-  // Create an arrow table from this.
-  TableBuilder builder;
-  TTreeReader reader(&t2);
-  REQUIRE(t2.GetEntries() == 1000);
-
-  RootTableBuilderHelpers::convertASoA<o2::aod::Test>(builder, reader);
-  auto table = builder.finalize();
-  REQUIRE(table->num_rows() == 1000);
-  REQUIRE(table->num_columns() == 7);
-  REQUIRE(table->column(0)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->column(1)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->column(2)->type()->id() == arrow::float32()->id());
-  REQUIRE(table->column(3)->type()->id() == arrow::fixed_size_list(arrow::float32(), 3)->id());
-  REQUIRE(table->column(4)->type()->id() == arrow::fixed_size_list(arrow::int32(), 2)->id());
-  REQUIRE(table->column(5)->type()->id() == arrow::float64()->id());
-  REQUIRE(table->column(6)->type()->id() == arrow::int32()->id());
-
-  o2::aod::Test testTable{table};
-  for (auto& row : testTable) {
-    REQUIRE(row.ij()[0] == row.ij()[1] - 1);
-    REQUIRE(row.ij()[1] == row.ev());
-  }
-}
-
 TEST_CASE("RootTree2Fragment")
 {
   using namespace o2::framework;