Fixed indexing

Author: nicola-wilson

PWGJE/TableProducer/diffWakeTreeProducer.cxx

@@ -65,7 +65,6 @@ namespace o2::aod
 namespace testcol
 {
 // Event properties
-DECLARE_SOA_COLUMN(Ci, ci, int64_t);         // Collision index - needed because is used as tree
 DECLARE_SOA_COLUMN(Rn, rn, int32_t);         // run number
 DECLARE_SOA_COLUMN(Cent, cent, float);       // FT0C centrality
 DECLARE_SOA_COLUMN(Mult, mult, int32_t);     // TPC multiplicity
@@ -80,7 +79,6 @@ DECLARE_SOA_COLUMN(Psi3, psi3, int16_t);
 
 DECLARE_SOA_TABLE(TableCols, "AOD", "TABLECOL",
                   o2::soa::Index<>,
-                  testcol::Ci,
                   testcol::Rn,
                   testcol::Cent,
                   testcol::Mult,
@@ -98,7 +96,6 @@ namespace testtrack
 
 // Track properties
 DECLARE_SOA_INDEX_COLUMN(TableCol, tableCol);
-DECLARE_SOA_COLUMN(Ci, ci, int64_t); // is needed to link to collision when used as tree
 DECLARE_SOA_COLUMN(Charge, charge, int16_t);
 DECLARE_SOA_COLUMN(P, p, uint64_t);
 DECLARE_SOA_COLUMN(Dedx, dedx, uint16_t);
@@ -107,9 +104,7 @@ DECLARE_SOA_COLUMN(Dcaz, dcaz, int16_t);
 } // namespace testtrack
 
 DECLARE_SOA_TABLE(TableTrack, "AOD", "TABLETRACK",
-                  o2::soa::Index<>,
                   testtrack::TableColId,
-                  testtrack::Ci,
                   testtrack::Charge,
                   testtrack::P,
                   testtrack::Dedx,
@@ -129,8 +124,6 @@ struct DiffWakeTreeProducer {
   Configurable<float> zVertCut{"zVertCut", 10.0, "z_vertex cut"};
   Configurable<float> etaCut{"etaCut", 0.9, "eta cut"};
 
-  int64_t collisionCounter = 0;
-
   Produces<o2::aod::TableCols> testcol;
   Produces<o2::aod::TableTrack> testtrack;
 
@@ -197,8 +190,7 @@ struct DiffWakeTreeProducer {
     int16_t substituteEp2 = static_cast<int16_t>(ep2 * 1000);
     int16_t substituteEp3 = static_cast<int16_t>(ep3 * 1000);
 
-    testcol(collisionCounter,
-            run,
+    testcol(run,
             col.centFT0C(),
             col.multTPC(),
             col.trackOccupancyInTimeRange(),
@@ -266,14 +258,12 @@ struct DiffWakeTreeProducer {
 
       //--------------- Fill track table ------------------
       testtrack(testcol.lastIndex(),
-                collisionCounter,
                 track.sign(),
                 substituteP,
                 substituteDEDX,
                 substituteDCAXY,
                 substituteDCAZ);
     }
-    collisionCounter++;
   }
 };