Rename Label to Lbl since label in O2 is used in different scope. Add the MC information to dumpDataModel (#3603)

pzhristov · hristov · web-flow · commit 9c7da2e1c868 · 2020-05-18T10:37:51.000+02:00
Co-authored-by: hristov &lt;Peter.Hristov@cern.ch&gt;
diff --git a/Analysis/DataModel/src/dumpDataModel.cxx b/Analysis/DataModel/src/dumpDataModel.cxx
@@ -165,5 +165,8 @@ edge[dir=back, arrowtail=empty]
   dumpTable<Jets>(true, StyleType::BLUE);
   dumpTable<JetConstituents>(true, StyleType::BLUE);
   dumpTable<UnassignedTracks>();
+  dumpTable<McCollisions>();
+  dumpTable<McLabels>();
+  dumpTable<McParticles>();
   fmt::printf("%s\n", R"(})");
 }
diff --git a/Framework/Core/include/Framework/AnalysisDataModel.h b/Framework/Core/include/Framework/AnalysisDataModel.h
@@ -420,16 +420,16 @@ using McCollision = McCollisions::iterator;
 
 namespace mclabel
 {
-DECLARE_SOA_COLUMN(Label, label, int);
-DECLARE_SOA_COLUMN(LabelMask, labelMask, uint16_t);
+DECLARE_SOA_COLUMN(Lbl, lbl, int);
+DECLARE_SOA_COLUMN(LblMask, lblMask, uint16_t);
 /// Bit mask to indicate detector mismatches (bit ON means mismatch)
 /// Bit 0-6: mismatch at ITS layer
 /// Bit 7-9: # of TPC mismatches in the ranges 0, 1, 2-3, 4-7, 8-15, 16-31, 32-63, >64
 /// Bit 10: TRD, bit 11: TOF
 } // namespace mclabel
 
 DECLARE_SOA_TABLE(McLabels, "AOD", "MCLABEL", o2::soa::Index<>,
-                  mclabel::Label, mclabel::LabelMask);
+                  mclabel::Lbl, mclabel::LblMask);
 using McLabel = McLabels::iterator;
 
 namespace mcparticle

Original file line number	Diff line number	Diff line change
`@@ -165,5 +165,8 @@ edge[dir=back, arrowtail=empty]`
`165`	`165`	`dumpTable<Jets>(true, StyleType::BLUE);`
`166`	`166`	`dumpTable<JetConstituents>(true, StyleType::BLUE);`
`167`	`167`	`dumpTable<UnassignedTracks>();`
	`168`	`+ dumpTable<McCollisions>();`
	`169`	`+ dumpTable<McLabels>();`
	`170`	`+ dumpTable<McParticles>();`
`168`	`171`	`fmt::printf("%s\n", R"(})");`
`169`	`172`	`}`