Fixed index column and syntax in momentum packing

Author: nicola-wilson

PWGJE/TableProducer/tableDiffWake.cxx

@@ -80,7 +80,7 @@ DECLARE_SOA_COLUMN(Psi2, psi2, int16_t);
 DECLARE_SOA_COLUMN(Psi3, psi3, int16_t);
 } // namespace testcol
 
-DECLARE_SOA_TABLE(TableCol, "AOD", "TABLECOL",
+DECLARE_SOA_TABLE(TableCols, "AOD", "TABLECOL",
                   o2::soa::Index<>,
                   testcol::Rn,
                   testcol::Cent,
@@ -92,13 +92,13 @@ DECLARE_SOA_TABLE(TableCol, "AOD", "TABLECOL",
                   testcol::VertexZ,
                   testcol::Psi2,
                   testcol::Psi3);
-using Collision = TableCol::iterator;
+using TableCol = TableCols::iterator;
 
 namespace testtrack
 {
 
 // Track properties
-DECLARE_SOA_INDEX_COLUMN(Collision, collision);
+DECLARE_SOA_INDEX_COLUMN(TableCol, tablecol);
 DECLARE_SOA_COLUMN(Charge, charge, int16_t);
 DECLARE_SOA_COLUMN(P, p, uint64_t);
 DECLARE_SOA_COLUMN(Dedx, dedx, uint16_t);
@@ -108,7 +108,7 @@ DECLARE_SOA_COLUMN(Dcaz, dcaz, int16_t);
 
 DECLARE_SOA_TABLE(TableTrack, "AOD", "TABLETRACK",
                   o2::soa::Index<>,
-                  testtrack::CollisionId,
+                  testtrack::TableColId,
                   testtrack::Charge,
                   testtrack::P,
                   testtrack::Dedx,
@@ -127,7 +127,9 @@ struct TableDiffWake {
   Configurable<float> centMax{"centMax", 10, "centrality"};
   Configurable<float> zVertCut{"zVertCut", 10.0, "z_vertex cut"};
 
-  Produces<o2::aod::TableCol> testcol;
+  int64_t collisionCounter = 0;
+
+  Produces<o2::aod::TableCols> testcol;
   Produces<o2::aod::TableTrack> testtrack;
 
   EventPlaneHelper helperEP;
@@ -188,8 +190,7 @@ struct TableDiffWake {
     int16_t substituteEp2 = static_cast<int16_t>(ep2 * 1000);
     int16_t substituteEp3 = static_cast<int16_t>(ep3 * 1000);
 
-    testcol(col.globalIndex(),
-            run,
+    testcol(run,
             col.centFT0C(),
             col.multTPC(),
             col.trackOccupancyInTimeRange(),
@@ -221,7 +222,7 @@ struct TableDiffWake {
 
       int64_t particlePx = (track.px() * 6000);
       if (particlePx < 0)
-        substituteP |= static_cast<uint64_t>1 << uppermostBit;
+        substituteP |= static_cast<uint64_t>(1) << uppermostBit;
       if (particlePx < 0)
         particlePx = (-1) * particlePx;
       substituteP |= (particlePx & bitmask20Bits) << lowermostBit;
@@ -230,7 +231,7 @@ struct TableDiffWake {
       lowermostBit = 21;
       int64_t particlePy = (track.py() * 6000);
       if (particlePy < 0)
-        substituteP |= static_cast<uint64_t>1 << uppermostBit;
+        substituteP |= static_cast<uint64_t>(1) << uppermostBit;
       if (particlePy < 0)
         particlePy = (-1) * particlePy;
       substituteP |= (particlePy & bitmask20Bits) << lowermostBit;
@@ -239,7 +240,7 @@ struct TableDiffWake {
       lowermostBit = 42;
       int64_t particlePz = (track.pz() * 6000);
       if (particlePz < 0)
-        substituteP |= static_cast<uint64_t>1 << uppermostBit;
+        substituteP |= static_cast<uint64_t>(1) << uppermostBit;
       if (particlePz < 0)
         particlePz = (-1) * particlePz;
       substituteP |= (particlePz & bitmask20Bits) << lowermostBit;
@@ -252,13 +253,14 @@ struct TableDiffWake {
       int16_t substituteDCAZ = static_cast<int16_t>(track.dcaZ() * 100);
 
       //--------------- Fill track table ------------------
-      testtrack(track.collisionId(),
+      testtrack(collisionCounter,
                 track.sign(),
                 substituteP,
                 substituteDEDX,
                 substituteDCAXY,
                 substituteDCAZ);
     }
+    collisionCounter++;
   }
 };