PWGJE: Adding fixes to the track to collision associator and the deri…

PWGJE/Core/JetDerivedDataUtilities.h

@@ -35,8 +35,9 @@ enum JCollisionSel {
   selMCFull = 4,
   selMCFullPbPb = 5,
   selUnanchoredMC = 6,
-  sel7 = 7,
-  sel7KINT7 = 8
+  selTVX = 7,
+  sel7 = 8,
+  sel7KINT7 = 9
 };
 
 template <typename T>
@@ -71,6 +72,9 @@ int initialiseEventSelection(std::string eventSelection)
   if (eventSelection == "selUnanchoredMC") {
     return JCollisionSel::selUnanchoredMC;
   }
+  if (eventSelection == "selTVX") {
+    return JCollisionSel::selTVX;
+  }
   if (eventSelection == "sel7") {
     return JCollisionSel::sel7;
   }
@@ -100,6 +104,7 @@ uint16_t setEventSelectionBit(T const& collision)
     }
   }
   if (collision.selection_bit(o2::aod::evsel::kIsTriggerTVX)) {
+    SETBIT(bit, JCollisionSel::selTVX);
     SETBIT(bit, JCollisionSel::selUnanchoredMC);
     if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
       SETBIT(bit, JCollisionSel::selMC);

PWGJE/DataModel/JetReducedData.h

@@ -32,13 +32,20 @@ DECLARE_SOA_INDEX_COLUMN(BC, bc);
 DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
 DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t);
 DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t);
+DECLARE_SOA_BITMAP_COLUMN(Alias, alias, 32);
+DECLARE_SOA_BITMAP_COLUMN(Selection, selection, 64);
+DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
 } // namespace jbc
 
 DECLARE_SOA_TABLE(JBCs, "AOD", "JBC",
                   o2::soa::Index<>,
                   jbc::RunNumber,
                   jbc::GlobalBC,
-                  jbc::Timestamp);
+                  jbc::Timestamp,
+                  jbc::Alias,
+                  jbc::Selection);
 
 using JBC = JBCs::iterator;
 
@@ -47,6 +54,8 @@ DECLARE_SOA_TABLE(StoredJBCs, "AOD1", "JBC",
                   jbc::RunNumber,
                   jbc::GlobalBC,
                   jbc::Timestamp,
+                  jbc::Alias,
+                  jbc::Selection,
                   o2::soa::Marker<1>);
 
 using StoredJBC = StoredJBCs::iterator;
@@ -58,6 +67,17 @@ DECLARE_SOA_TABLE(StoredJBCPIs, "AOD1", "JBCPI",
                   jbc::BCId,
                   o2::soa::Marker<1>);
 
+DECLARE_SOA_TABLE(BCCounts, "AOD", "BCCOUNT",
+                  jbc::ReadCounts,
+                  jbc::ReadCountsWithTVX,
+                  jbc::ReadCountsWithTVXAndITSROFBAndNoTFB);
+
+DECLARE_SOA_TABLE(StoredBCCounts, "AOD1", "BCCOUNT",
+                  jbc::ReadCounts,
+                  jbc::ReadCountsWithTVX,
+                  jbc::ReadCountsWithTVXAndITSROFBAndNoTFB,
+                  o2::soa::Marker<1>);
+
 namespace jcollision
 {
 DECLARE_SOA_INDEX_COLUMN(Collision, collision);
@@ -75,7 +95,9 @@ DECLARE_SOA_COLUMN(ChargedTriggerSel, chargedTriggerSel, uint8_t);
 DECLARE_SOA_COLUMN(FullTriggerSel, fullTriggerSel, uint32_t);
 DECLARE_SOA_COLUMN(ChargedHFTriggerSel, chargedHFTriggerSel, uint8_t);
 DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
-DECLARE_SOA_COLUMN(ReadSelectedCounts, readSelectedCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
 DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
 DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool);
 DECLARE_SOA_COLUMN(IsEMCALReadout, isEmcalReadout, bool);
@@ -138,32 +160,24 @@ DECLARE_SOA_TABLE(StoredJCollisionBCs, "AOD1", "JCOLLISIONBC",
 DECLARE_SOA_TABLE(JChTrigSels, "AOD", "JCHTRIGSEL",
                   jcollision::ChargedTriggerSel);
 
-DECLARE_SOA_TABLE(StoredJChTrigSels, "AOD1", "JCHTRIGSEL",
-                  jcollision::ChargedTriggerSel,
-                  o2::soa::Marker<1>);
-
 DECLARE_SOA_TABLE(JFullTrigSels, "AOD", "JFULLTRIGSEL",
                   jcollision::FullTriggerSel);
 
-DECLARE_SOA_TABLE(StoredJFullTrigSels, "AOD1", "JFULLTRIGSEL",
-                  jcollision::FullTriggerSel,
-                  o2::soa::Marker<1>);
-
 DECLARE_SOA_TABLE(JChHFTrigSels, "AOD", "JCHHFTRIGSEL",
                   jcollision::ChargedHFTriggerSel);
 
-DECLARE_SOA_TABLE(StoredJChHFTrigSels, "AOD1", "JCHHFTRIGSEL",
-                  jcollision::ChargedHFTriggerSel,
-                  o2::soa::Marker<1>);
-
 DECLARE_SOA_TABLE(CollisionCounts, "AOD", "COLLCOUNT",
                   jcollision::ReadCounts,
-                  jcollision::ReadSelectedCounts,
+                  jcollision::ReadCountsWithTVX,
+                  jcollision::ReadCountsWithTVXAndSelection,
+                  jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
                   jcollision::WrittenCounts);
 
 DECLARE_SOA_TABLE(StoredCollisionCounts, "AOD1", "COLLCOUNT",
                   jcollision::ReadCounts,
-                  jcollision::ReadSelectedCounts,
+                  jcollision::ReadCountsWithTVX,
+                  jcollision::ReadCountsWithTVXAndSelection,
+                  jcollision::ReadCountsWithTVXAndSelectionAndZVertex,
                   jcollision::WrittenCounts,
                   o2::soa::Marker<1>);
 
@@ -220,8 +234,14 @@ DECLARE_SOA_INDEX_COLUMN(Track, track);
 DECLARE_SOA_COLUMN(Pt, pt, float);
 DECLARE_SOA_COLUMN(Eta, eta, float);
 DECLARE_SOA_COLUMN(Phi, phi, float);
-DECLARE_SOA_COLUMN(DCAXY, dcaXY, float);
+DECLARE_SOA_COLUMN(DCAX, dcaX, float);
+DECLARE_SOA_COLUMN(DCAY, dcaY, float);
 DECLARE_SOA_COLUMN(DCAZ, dcaZ, float);
+DECLARE_SOA_COLUMN(DCAXY, dcaXY, float);
+DECLARE_SOA_COLUMN(DCAXYZ, dcaXYZ, float);
+DECLARE_SOA_COLUMN(SigmaDCAZ, sigmadcaZ, float);
+DECLARE_SOA_COLUMN(SigmaDCAXY, sigmadcaXY, float);
+DECLARE_SOA_COLUMN(SigmaDCAXYZ, sigmadcaXYZ, float);
 DECLARE_SOA_COLUMN(Sigma1Pt, sigma1Pt, float);
 DECLARE_SOA_COLUMN(TrackSel, trackSel, uint8_t);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px,
@@ -272,13 +292,25 @@ DECLARE_SOA_TABLE(StoredJTracks, "AOD1", "JTRACK",
 using StoredJTrack = StoredJTracks::iterator;
 
 DECLARE_SOA_TABLE(JTrackExtras, "AOD", "JTRACKEXTRA",
-                  jtrack::DCAXY,
+                  jtrack::DCAX,
+                  jtrack::DCAY,
                   jtrack::DCAZ,
+                  jtrack::DCAXY,
+                  jtrack::DCAXYZ,
+                  jtrack::SigmaDCAZ,
+                  jtrack::SigmaDCAXY,
+                  jtrack::SigmaDCAXYZ,
                   jtrack::Sigma1Pt);
 
 DECLARE_SOA_TABLE(StoredJTrackExtras, "AOD1", "JTRACKEXTRA",
-                  jtrack::DCAXY,
+                  jtrack::DCAX,
+                  jtrack::DCAY,
                   jtrack::DCAZ,
+                  jtrack::DCAXY,
+                  jtrack::DCAXYZ,
+                  jtrack::SigmaDCAZ,
+                  jtrack::SigmaDCAXY,
+                  jtrack::SigmaDCAXYZ,
                   jtrack::Sigma1Pt,
                   o2::soa::Marker<1>);
 

PWGJE/DataModel/JetReducedDataDQ.h

@@ -52,10 +52,19 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
 } // namespace jdielectronindices
 
+namespace dielectronbccounter
+{
+DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
+} // namespace dielectronbccounter
+
 namespace dielectroncollisioncounter
 {
 DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
-DECLARE_SOA_COLUMN(ReadSelectedCounts, readSelectedCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
 DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
 } // namespace dielectroncollisioncounter
 
@@ -84,9 +93,16 @@ DECLARE_SOA_TABLE(StoredJDielectronIds, "AOD1", "JDIELID",
                   jdielectronindices::Prong1Id,
                   o2::soa::Marker<1>);
 
+DECLARE_SOA_TABLE(DielectronBCCounts, "AOD", "DIELBCCOUNT",
+                  dielectronbccounter::ReadCounts,
+                  dielectronbccounter::ReadCountsWithTVX,
+                  dielectronbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
+
 DECLARE_SOA_TABLE(DielectronCollisionCounts, "AOD", "DIELCOLLCOUNT",
                   dielectroncollisioncounter::ReadCounts,
-                  dielectroncollisioncounter::ReadSelectedCounts,
+                  dielectroncollisioncounter::ReadCountsWithTVX,
+                  dielectroncollisioncounter::ReadCountsWithTVXAndSelection,
+                  dielectroncollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
                   dielectroncollisioncounter::WrittenCounts);
 
 namespace jdielectronmc

PWGJE/DataModel/JetReducedDataHF.h

@@ -35,10 +35,19 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
 } // namespace jd0indices
 
+namespace d0bccounter
+{
+DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
+} // namespace d0bccounter
+
 namespace d0collisioncounter
 {
 DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
-DECLARE_SOA_COLUMN(ReadSelectedCounts, readSelectedCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
 DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
 } // namespace d0collisioncounter
 
@@ -76,9 +85,16 @@ DECLARE_SOA_TABLE(StoredJD0PIds, "AOD1", "JD0PID",
                   jd0indices::JMcParticleId,
                   o2::soa::Marker<1>);
 
+DECLARE_SOA_TABLE(D0BCCounts, "AOD", "D0BCCOUNT",
+                  d0bccounter::ReadCounts,
+                  d0bccounter::ReadCountsWithTVX,
+                  d0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
+
 DECLARE_SOA_TABLE(D0CollisionCounts, "AOD", "D0COLLCOUNT",
                   d0collisioncounter::ReadCounts,
-                  d0collisioncounter::ReadSelectedCounts,
+                  d0collisioncounter::ReadCountsWithTVX,
+                  d0collisioncounter::ReadCountsWithTVXAndSelection,
+                  d0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
                   d0collisioncounter::WrittenCounts);
 
 namespace jlcindices
@@ -91,10 +107,19 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
 } // namespace jlcindices
 
+namespace lcbccounter
+{
+DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
+} // namespace lcbccounter
+
 namespace lccollisioncounter
 {
 DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
-DECLARE_SOA_COLUMN(ReadSelectedCounts, readSelectedCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
 DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
 } // namespace lccollisioncounter
 
@@ -134,9 +159,16 @@ DECLARE_SOA_TABLE(StoredJLcPIds, "AOD1", "JLCPID",
                   jlcindices::JMcParticleId,
                   o2::soa::Marker<1>);
 
-DECLARE_SOA_TABLE(LcCollisionCounts, "AOD", "LcCOLLCOUNT",
+DECLARE_SOA_TABLE(LcBCCounts, "AOD", "LCBCCOUNT",
+                  lcbccounter::ReadCounts,
+                  lcbccounter::ReadCountsWithTVX,
+                  lcbccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
+
+DECLARE_SOA_TABLE(LcCollisionCounts, "AOD", "LCCOLLCOUNT",
                   lccollisioncounter::ReadCounts,
-                  lccollisioncounter::ReadSelectedCounts,
+                  lccollisioncounter::ReadCountsWithTVX,
+                  lccollisioncounter::ReadCountsWithTVXAndSelection,
+                  lccollisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
                   lccollisioncounter::WrittenCounts);
 
 } // namespace o2::aod

PWGJE/DataModel/JetReducedDataV0.h

@@ -52,10 +52,19 @@ DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 DECLARE_SOA_INDEX_COLUMN(JMcParticle, mcParticle);
 } // namespace jv0indices
 
+namespace v0bccounter
+{
+DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndITSROFBAndNoTFB, readCountsWithTVXAndITSROFBAndNoTFB, std::vector<int>);
+} // namespace v0bccounter
+
 namespace v0collisioncounter
 {
 DECLARE_SOA_COLUMN(ReadCounts, readCounts, std::vector<int>);
-DECLARE_SOA_COLUMN(ReadSelectedCounts, readSelectedCounts, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVX, readCountsWithTVX, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelection, readCountsWithTVXAndSelection, std::vector<int>);
+DECLARE_SOA_COLUMN(ReadCountsWithTVXAndSelectionAndZVertex, readCountsWithTVXAndSelectionAndZVertex, std::vector<int>);
 DECLARE_SOA_COLUMN(WrittenCounts, writtenCounts, std::vector<int>);
 } // namespace v0collisioncounter
 
@@ -78,15 +87,16 @@ DECLARE_SOA_TABLE(JV0Ids, "AOD", "JV0ID",
                   jv0indices::PosTrackId,
                   jv0indices::NegTrackId);
 
-DECLARE_SOA_TABLE(StoredJV0Ids, "AOD1", "JV0ID",
-                  jv0indices::JCollisionId,
-                  jv0indices::PosTrackId,
-                  jv0indices::NegTrackId,
-                  o2::soa::Marker<1>);
+DECLARE_SOA_TABLE(V0BCCounts, "AOD", "V0BCCOUNT",
+                  v0bccounter::ReadCounts,
+                  v0bccounter::ReadCountsWithTVX,
+                  v0bccounter::ReadCountsWithTVXAndITSROFBAndNoTFB);
 
 DECLARE_SOA_TABLE(V0CollisionCounts, "AOD", "V0COLLCOUNT",
                   v0collisioncounter::ReadCounts,
-                  v0collisioncounter::ReadSelectedCounts,
+                  v0collisioncounter::ReadCountsWithTVX,
+                  v0collisioncounter::ReadCountsWithTVXAndSelection,
+                  v0collisioncounter::ReadCountsWithTVXAndSelectionAndZVertex,
                   v0collisioncounter::WrittenCounts);
 
 namespace jv0mc