[PWGJE] Switch to JTable

Author: Arvindiiti

PWGJE/Tasks/nucleiInJets.cxx

@@ -179,8 +179,8 @@ struct nucleiInJets {
   static constexpr int PDGTriton = 1000010030;
   static constexpr int PDGHelium = 1000020030;
 
-  using EventTable = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0Cs>;
-  using EventTableMC = soa::Join<EventTable, aod::McCollisionLabels>;
+  using EventTable = soa::Join<aod::JetCollisions, aod::EvSels, aod::CentFT0Ms, aod::CentFV0As, aod::CentFT0Cs>;
+  using EventTableMC = soa::Join<EventTable, aod::JMcCollisionLbs>;
   using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTPCFullKa,
                                     aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullHe, aod::pidTPCFullTr, aod::pidTOFFullPi, aod::pidTOFFullKa,
                                     aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr, aod::pidTOFFullHe, aod::pidTOFbeta, aod::TOFSignal>;
@@ -192,7 +192,10 @@ struct nucleiInJets {
                                       aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr, aod::pidTOFFullHe,
                                       aod::TOFSignal /*, aod::McTrackLabels*/>;
 
-  using TrackCandidatesIncMC = soa::Join<TrackCandidatesMC, aod::McTrackLabels>;
+  using TrackCandidatesIncMC = soa::Join<aod::JTracks, aod::JTrackPIs, aod::JMcTrackLbs, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::pidTPCFullPi, aod::pidTPCFullKa,
+                                         aod::pidTPCFullPr, aod::pidTPCFullDe, aod::pidTPCFullHe, aod::pidTPCFullTr, aod::pidTOFFullPi,
+                                         aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFFullDe, aod::pidTOFFullTr, aod::pidTOFFullHe,
+                                         aod::TOFSignal>;
 
   Filter jetCuts = aod::jet::pt > cfgjetPtMin&& aod::jet::r == nround(cfgjetR.node() * 100.0f);
 
@@ -207,7 +210,6 @@ struct nucleiInJets {
   OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
   Service<o2::ccdb::BasicCCDBManager> ccdb;
   TRandom3 randUniform;
-
   void init(o2::framework::InitContext&)
   {
 
@@ -1341,11 +1343,13 @@ struct nucleiInJets {
     }
   }
 
-  void processDataInc(EventTable::iterator const& coll, TrackCandidates const& tracks)
+  void processDataInc(EventTable::iterator const& coll, soa::Join<aod::JetTracks, aod::JTrackPIs> const& tracks, TrackCandidates const&)
   {
     jetHist.fill(HIST("hNEventsInc"), 0.5);
-    if (!coll.sel8())
+
+    if (!jetderiveddatautilities::selectCollision(coll, jetderiveddatautilities::initialiseEventSelectionBits("sel8")))
       return;
+
     jetHist.fill(HIST("hNEventsInc"), 1.5);
     if (std::abs(coll.posZ()) > 10) // bad vertex
       return;
@@ -1365,7 +1369,8 @@ struct nucleiInJets {
         centrality = -999;
     }
 
-    for (const auto& trk : tracks) {
+    for (const auto& track : tracks) {
+      auto trk = track.track_as<TrackCandidates>();
       if (!isTrackSelected(trk)) {
         continue;
       }
@@ -1736,8 +1741,8 @@ struct nucleiInJets {
       bool isTpcPassed(true);
       bool isTof(completeTrack.hasTOF());
       bool isTOFAndTPCPreSel(completeTrack.hasTOF() &&
-                             (completeTrack.tpcNSigmaPr() < cfgnTPCPIDPrTOF || completeTrack.tpcNSigmaDe() < cfgnTPCPIDDeTOF ||
-                              completeTrack.tpcNSigmaHe() < cfgnTPCPIDHeTOF || completeTrack.tpcNSigmaTr() < cfgnTPCPIDTrTOF));
+                             (std::abs(completeTrack.tpcNSigmaPr()) < cfgnTPCPIDPrTOF || std::abs(completeTrack.tpcNSigmaDe()) < cfgnTPCPIDDeTOF ||
+                              std::abs(completeTrack.tpcNSigmaHe()) < cfgnTPCPIDHeTOF || std::abs(completeTrack.tpcNSigmaTr()) < cfgnTPCPIDTrTOF));
 
       bool jetFlag = false;
       bool jetFlagPerpCone = false;
@@ -1755,7 +1760,6 @@ struct nucleiInJets {
         if (RPerpCone1 < cfgjetR || RPerpCone2 < cfgjetR)
           jetFlagPerpCone = true;
       } else {
-
         for (std::size_t iDJet = 0; iDJet < mcdJetPt.size(); iDJet++) {
           double delPhi = TVector2::Phi_mpi_pi(mcdJetPhi[iDJet] - track.phi());
           double delEta = mcdJetEta[iDJet] - track.eta();
@@ -1958,16 +1962,15 @@ struct nucleiInJets {
     } // jet constituents
   } // process
 
-  void processRecInc(EventTableMC::iterator const& coll, TrackCandidatesIncMC const& tracks, aod::McParticles const& mcParticles)
+  void processRecInc(EventTableMC::iterator const& coll, TrackCandidatesIncMC const& tracks, aod::JetParticles const& particleTracks, aod::JMcCollisions const&)
   {
+
     jetHist.fill(HIST("recInc/eventStat"), 0.5);
-    if (!coll.sel8()) {
+    if (!jetderiveddatautilities::selectCollision(coll, jetderiveddatautilities::initialiseEventSelectionBits("sel8")))
       return;
-    }
     jetHist.fill(HIST("recInc/eventStat"), 1.5);
     if (std::abs(coll.posZ()) > 10) // bad vertex
       return;
-
     jetHist.fill(HIST("recInc/vertexZ"), coll.posZ());
     jetHist.fill(HIST("recInc/eventStat"), 2.5);
 
@@ -1994,13 +1997,11 @@ struct nucleiInJets {
         continue;
       if (std::fabs(track.eta()) > cfgtrkMaxEta)
         continue;
-
-      auto mcTrack = track.mcParticle_as<aod::McParticles>();
+      auto mcTrack = track.mcParticle_as<o2::aod::JMcParticles>();
       if (!mcTrack.isPhysicalPrimary())
         continue;
-
       bool isTOFAndTPCPreSel(track.hasTOF() &&
-                             (track.tpcNSigmaPr() < cfgnTPCPIDPrTOF || track.tpcNSigmaDe() < cfgnTPCPIDDeTOF));
+                             (std::abs(track.tpcNSigmaPr()) < cfgnTPCPIDPrTOF || std::abs(track.tpcNSigmaDe()) < cfgnTPCPIDDeTOF));
 
       if (mapPDGToValue(mcTrack.pdgCode()) != 0) {
         jetHist.fill(HIST("recInc/pt/PtParticleTypeTPC"), mcTrack.pt(), mapPDGToValue(mcTrack.pdgCode()), centrality);
@@ -2015,7 +2016,8 @@ struct nucleiInJets {
     } // track
 
     // loop over particles
-    for (const auto& mcParticle : mcParticles) {
+    auto mcParticles_per_coll = particleTracks.sliceBy(perMCCol, coll.mcCollision().globalIndex());
+    for (const auto& mcParticle : mcParticles_per_coll) {
       if (!mcParticle.isPhysicalPrimary())
         continue;
       if (std::fabs(mcParticle.eta()) > cfgtrkMaxEta)