DPL Analysis: Table definition rewrite (AliceO2Group#13664)

Author: aalkin

Detectors/AOD/include/AODProducerWorkflow/AODProducerHelpers.h

@@ -18,8 +18,6 @@
 #include <boost/functional/hash.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/unordered_map.hpp>
-#include <string>
-#include <vector>
 #include <Framework/AnalysisHelpers.h>
 
 namespace o2::aodhelpers
@@ -55,7 +53,7 @@ auto createTableCursor(framework::ProcessingContext& pc)
   framework::Produces<T> c;
   c.resetCursor(pc.outputs()
                   .make<framework::TableBuilder>(framework::OutputForTable<T>::ref()));
-  c.setLabel(o2::aod::MetadataTrait<T>::metadata::tableLabel());
+  c.setLabel(aod::label<T::ref>());
   return c;
 }
 } // namespace o2::aodhelpers

Detectors/AOD/include/AODProducerWorkflow/AODProducerWorkflowSpec.h

@@ -21,7 +21,6 @@
 #include "DataFormatsTRD/TrackTRD.h"
 #include "DetectorsBase/GRPGeomHelper.h"
 #include "DetectorsBase/Propagator.h"
-#include "Framework/AnalysisHelpers.h"
 #include "Framework/DataProcessorSpec.h"
 #include "Framework/Task.h"
 #include "ReconstructionDataFormats/GlobalTrackID.h"
@@ -36,7 +35,6 @@
 #include <cstdint>
 #include <limits>
 #include <set>
-#include <string>
 #include <vector>
 #include <random>
 using namespace o2::framework;

Detectors/AOD/src/StandaloneAODProducer.cxx

@@ -94,7 +94,7 @@ void fillMCollisionTable(o2::steer::MCKinematicsReader const& mcreader)
 
   TFile outfile("aod.root", "UPDATE");
   {
-    TableToTree t2t(mccoltable, &outfile, aod::MetadataTrait<o2::aod::McCollisions>::metadata::tableLabel());
+    TableToTree t2t(mccoltable, &outfile, aod::description_str(aod::signature<o2::aod::McCollisions::ref>()).data());
     t2t.addAllBranches();
     t2t.process();
   }
@@ -200,12 +200,12 @@ void fillCollisionAndTrackTable()
       f.Close();
       TFile outfile("aod.root", "RECREATE");
       {
-        TableToTree t2t(colltable, &outfile, aod::MetadataTrait<o2::aod::Collisions>::metadata::tableLabel());
+        TableToTree t2t(colltable, &outfile, aod::description_str(aod::signature<o2::aod::Collisions::ref>()).data());
         t2t.addAllBranches();
         t2t.process();
       }
       {
-        TableToTree t2t(tracktable, &outfile, "Tracks" /* aod::MetadataTrait<o2::aod::Tracks>::metadata::tableLabel() */);
+        TableToTree t2t(tracktable, &outfile, aod::description_str(aod::signature<o2::aod::StoredTracks::ref>()).data());
         t2t.addAllBranches();
         t2t.process();
       }

Framework/Core/CMakeLists.txt

@@ -236,6 +236,7 @@ add_executable(o2-test-framework-core
               test/test_Services.cxx
               test/test_StringHelpers.cxx
               test/test_StaticFor.cxx
+              test/test_TableSpawner.cxx
               test/test_TMessageSerializer.cxx
               test/test_TableBuilder.cxx
               test/test_TimeParallelPipelining.cxx