rebase O2 to new table system

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(o2::aod::Hash<T::ref.label_hash>::str);
   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"
@@ -32,7 +31,6 @@
 #include "GlobalTracking/MatchGlobalFwd.h"
 
 #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, o2::aod::Hash<o2::aod::McCollisions::ref.label_hash>::str);
     t2t.addAllBranches();
     t2t.process();
   }
@@ -200,7 +200,7 @@ void fillCollisionAndTrackTable()
       f.Close();
       TFile outfile("aod.root", "RECREATE");
       {
-        TableToTree t2t(colltable, &outfile, aod::MetadataTrait<o2::aod::Collisions>::metadata::tableLabel());
+        TableToTree t2t(colltable, &outfile, o2::aod::Hash<o2::aod::Collisions::ref.label_hash>::str);
         t2t.addAllBranches();
         t2t.process();
       }