adressing Nimas comments

Author: louisemillot

PWGJE/TableProducer/slimTablesProducer.cxx

@@ -66,13 +66,15 @@ DECLARE_SOA_INDEX_COLUMN(SlMcCollision, slMcCollision);
 DECLARE_SOA_COLUMN(Px, px, float);
 DECLARE_SOA_COLUMN(Py, py, float);
 DECLARE_SOA_COLUMN(Pz, pz, float);
+DECLARE_SOA_COLUMN(E, e, float);
 } // namespace slimparticles
 DECLARE_SOA_TABLE(SlimParticles, "AOD", "SlimParticles",
                   o2::soa::Index<>,
                   slimparticles::SlMcCollisionId,
                   slimparticles::Px,
                   slimparticles::Py,
-                  slimparticles::Pz);
+                  slimparticles::Pz,
+                  slimparticles::E);
 using SlimParticle = SlimParticles::iterator;
 } // namespace o2::aod
 
@@ -145,9 +147,8 @@ struct SlimTablesProducer {
   Filter mcCollisionFilter = (nabs(aod::jmccollision::posZ) < vertexZCut && aod::jmccollision::centFT0M >= centralityMin && aod::jmccollision::centFT0M < centralityMax); // no centFT0C for mccollisions, using centFT0M for both
   Filter particleCuts = (aod::jmcparticle::pt >= minPt && aod::jmcparticle::pt < maxPt && aod::jmcparticle::eta > minEta && aod::jmcparticle::eta < maxEta);
 
-  void processData(soa::Filtered<o2::aod::JetCollisions>::iterator const& collision,
-                   soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& tracks,
-                   soa::Join<aod::Tracks, aod::TracksExtra, o2::aod::TracksDCA> const&)
+  void processData(soa::Filtered<aod::JetCollisions>::iterator const& collision,
+                   soa::Filtered<aod::JetTracks> const& tracks)
   {
     histos.fill(HIST("h_collisions"), 0.5);
     float centrality = -1.0;
@@ -161,13 +162,9 @@ struct SlimTablesProducer {
     slimCollisions(collision.posZ());
     auto slimCollIndex = slimCollisions.lastIndex();
     for (const auto& track : tracks) {
-      if (!jetderiveddatautilities::selectTrack(track, trackSelection) && jetderiveddatautilities::selectTrackDcaZ(track, trackDcaZmax)) {
+      if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
         continue;
       }
-      const auto& aodTrack = track.track_as<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>>();
-      if (aodTrack.tpcNClsCrossedRows() < minTPCNClsCrossedRows) {
-        continue; // remove badly tracked
-      }
       float mass = jetderiveddatautilities::mPion;
       float p = track.pt() * std::cosh(track.eta());
       float energy = std::sqrt(p * p + mass * mass);
@@ -178,8 +175,7 @@ struct SlimTablesProducer {
 
   void processMCD(soa::Filtered<aod::JetCollisionsMCD>::iterator const& collision,
                   aod::JetMcCollisions const&, // join the weight
-                  soa::Filtered<soa::Join<aod::JetTracksMCD, aod::JTrackExtras, aod::JTrackPIs>> const& tracks,
-                  soa::Join<aod::Tracks, aod::TracksExtra, o2::aod::TracksDCA> const&)
+                  soa::Filtered<aod::JetTracksMCD> const& tracks)
   {
     float eventWeight = collision.mcCollision_as<aod::JetMcCollisions>().weight();
     histos.fill(HIST("h_mcCollMCD_counts_weight"), 0.5, eventWeight);
@@ -196,13 +192,9 @@ struct SlimTablesProducer {
     slimCollisions(collision.posZ());
     auto slimCollIndex = slimCollisions.lastIndex();
     for (const auto& track : tracks) {
-      if (!jetderiveddatautilities::selectTrack(track, trackSelection) && jetderiveddatautilities::selectTrackDcaZ(track, trackDcaZmax)) {
+      if (!jetderiveddatautilities::selectTrack(track, trackSelection)) {
         continue;
       }
-      const auto& aodTrack = track.track_as<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>>();
-      if (aodTrack.tpcNClsCrossedRows() < minTPCNClsCrossedRows) {
-        continue; // remove badly tracked
-      }
       float mass = jetderiveddatautilities::mPion;
       float p = track.pt() * std::cosh(track.eta());
       float energy = std::sqrt(p * p + mass * mass);
@@ -244,7 +236,7 @@ struct SlimTablesProducer {
     slimMcCollisions(mcCollision.posZ());
     auto slimMcCollIndex = slimMcCollisions.lastIndex();
     for (const auto& particle : particles) {
-      slimParticles(slimMcCollIndex, particle.px(), particle.py(), particle.pz());
+      slimParticles(slimMcCollIndex, particle.px(), particle.py(), particle.pz(), particle.energy());
     }
   }
   PROCESS_SWITCH(SlimTablesProducer, processMCP, "process mccollisions and mcparticles for MCD", false);