adding transient collision id table for v0 and cascades (#4167)

jgrosseo · web-flow · commit 48404ce61350 · 2020-08-18T09:55:24.000+02:00
diff --git a/Analysis/DataModel/src/dumpDataModel.cxx b/Analysis/DataModel/src/dumpDataModel.cxx
@@ -154,8 +154,8 @@ edge[dir=back, arrowtail=empty]
   dumpTable<MuonClusters>();
   dumpTable<Zdcs>();
   dumpTable<Run2V0s>();
-  dumpTable<V0s>();
-  dumpTable<Cascades>();
+  dumpTable<StoredV0s>();
+  dumpTable<StoredCascades>();
   dumpTable<BCs>();
   dumpTable<FT0s>();
   dumpTable<FV0s>();
diff --git a/Analysis/Tutorials/CMakeLists.txt b/Analysis/Tutorials/CMakeLists.txt
@@ -112,3 +112,6 @@ o2_add_dpl_workflow(custom-index
                   PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisCore O2::AnalysisDataModel
                   COMPONENT_NAME AnalysisTutorial)
 
+o2_add_dpl_workflow(vzero-iteration
+                  SOURCES src/vzeroIteration.cxx
+                  COMPONENT_NAME AnalysisTutorial)
diff --git a/Analysis/Tutorials/src/vzeroIteration.cxx b/Analysis/Tutorials/src/vzeroIteration.cxx
@@ -0,0 +1,70 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+struct ATask {
+  Produces<aod::TransientV0s> transientV0s;
+  Produces<aod::TransientCascades> transientCascades;
+
+  void process(aod::StoredV0s const& v0s, aod::StoredCascades const& cascades, aod::Tracks const& tracks)
+  {
+    for (auto& v0 : v0s) {
+      transientV0s(v0.posTrack().collisionId());
+    }
+    for (auto& cascade : cascades) {
+      transientCascades(cascade.bachelor().collisionId());
+    }
+  }
+};
+
+struct BTask {
+  void process(aod::V0s const& v0s, aod::Tracks const& tracks)
+  {
+    for (auto& v0 : v0s) {
+      LOGF(DEBUG, "V0 (%d, %d, %d)", v0.posTrack().collisionId(), v0.negTrack().collisionId(), v0.collisionId());
+    }
+  }
+};
+
+struct CTask {
+  void process(aod::Cascades const& cascades, aod::Tracks const& tracks)
+  {
+    for (auto& cascade : cascades) {
+      LOGF(DEBUG, "Cascade (%d, %d)", cascade.bachelor().collisionId(), cascade.collisionId());
+    }
+  }
+};
+
+// Grouping
+struct DTask {
+  void process(aod::Collision const& collision, aod::V0s const& v0s, aod::Tracks const& tracks)
+  {
+    LOGF(INFO, "Collision %d has %d V0s", collision.globalIndex(), v0s.size());
+
+    for (auto& v0 : v0s) {
+      LOGF(DEBUG, "Collision %d V0 %d (%d, %d)", collision.globalIndex(), v0.globalIndex(), v0.posTrackId(), v0.negTrackId());
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const&)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<ATask>("produce-v0index"),
+    adaptAnalysisTask<BTask>("consume-v0"),
+    adaptAnalysisTask<CTask>("consume-cascades"),
+    adaptAnalysisTask<DTask>("consume-grouped-v0"),
+  };
+}
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -441,19 +441,27 @@ namespace v0
 {
 DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "fPosTrackID");
 DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "fNegTrackID");
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);
 } // namespace v0
 
-DECLARE_SOA_TABLE(V0s, "AOD", "V0", v0::PosTrackId, v0::NegTrackId);
+DECLARE_SOA_TABLE(StoredV0s, "AOD", "O2v0", o2::soa::Index<>, v0::PosTrackId, v0::NegTrackId);
+DECLARE_SOA_TABLE(TransientV0s, "AOD", "V0INDEX", v0::CollisionId);
+
+using V0s = soa::Join<TransientV0s, StoredV0s>;
 using V0 = V0s::iterator;
 
 namespace cascade
 {
 DECLARE_SOA_INDEX_COLUMN(V0, v0);
 DECLARE_SOA_INDEX_COLUMN_FULL(Bachelor, bachelor, int, Tracks, "fTracksID");
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);
 } // namespace cascade
 
-DECLARE_SOA_TABLE(Cascades, "AOD", "CASCADE", cascade::V0Id, cascade::BachelorId);
-using Casecade = Cascades::iterator;
+DECLARE_SOA_TABLE(StoredCascades, "AOD", "O2cascade", o2::soa::Index<>, cascade::V0Id, cascade::BachelorId);
+DECLARE_SOA_TABLE(TransientCascades, "AOD", "CASCADEINDEX", cascade::CollisionId);
+
+using Cascades = soa::Join<TransientCascades, StoredCascades>;
+using Cascade = Cascades::iterator;
 
 // ---- LEGACY tables ----
 
