fix

Author: aimeric-landou

PWGJE/Tasks/trackEfficiency.cxx

@@ -107,14 +107,14 @@ struct TrackEfficiency {
     SplitOkCheckFirstAssocCollOnly // 2
   };
 
-  template <typename TJetTrack, typename TAodTracks>
-  bool isAcceptedTrack(TJetTrack const& jetTrack, TAodTracks const&) {
+  template <typename TJetTrack>
+  bool isAcceptedTrack(TJetTrack const& jetTrack) {
     if (!useCustomTrackSelection) {
       if (jetderiveddatautilities::selectTrack(jetTrack, trackSelection) && jetderiveddatautilities::selectTrackDcaZ(jetTrack, trackDcaZmax)) { // if track selection is uniformTrack, dcaZ cuts need to be added as they aren't in the selection so that they can be studied here
         return true;
       }
     } else {
-      auto aodTrack = jetTrack.template track_as<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>>(); // might need the aodTracks to have the TracksExtra table as well; should check; check what is needed for the track selection
+      const auto& aodTrack = jetTrack.template track_as<soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA>>(); // might need the aodTracks to have the TracksExtra table as well; should check; check what is needed for the track selection
       if (customTrackSelection.IsSelected(aodTrack)) {
         return true;
       } 
@@ -133,11 +133,11 @@ struct TrackEfficiency {
     return std::abs(charge) >= chargeUnit;
   }
 
-  template <typename TCollision, typename TJetTracks, typename TAodTracks>
-  void fillTrackHistograms(TCollision const& collision, TJetTracks const& jetTracks, TAodTracks const& aodTracks, float weight = 1.0)
+  template <typename TCollision, typename TJetTracks>
+  void fillTrackHistograms(TCollision const& collision, TJetTracks const& jetTracks, float weight = 1.0)
   {
     for (auto const& track : jetTracks) {
-      if (!isAcceptedTrack(track, aodTracks)) {
+      if (!isAcceptedTrack(track)) {
         continue;
       }
 
@@ -363,7 +363,7 @@ struct TrackEfficiency {
                                soa::Join<aod::McCollisions, aod::HepMCXSections> const&,
                                soa::SmallGroups<aod::JetCollisionsMCD> const& collisions, // smallgroups gives only the collisions associated to the current mccollision, thanks to the mccollisionlabel pre-integrated in jetcollisionsmcd
                                soa::Join<aod::JetTracksMCD, aod::JTrackExtras, aod::JTrackPIs> const& jetTracks,
-                               soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const& aodTracks,
+                               soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const&,
                                JetParticlesWithOriginal const& jMcParticles)
   {
     // missing:
@@ -479,7 +479,7 @@ struct TrackEfficiency {
       for (auto const& track : collTracks) {
         registry.fill(HIST("hTrackCutsCounts"), 0.5);
 
-        if (!isAcceptedTrack(track, aodTracks)) {
+        if (!isAcceptedTrack(track)) {
           continue;
         }
         registry.fill(HIST("hTrackCutsCounts"), 1.5);
@@ -545,7 +545,7 @@ struct TrackEfficiency {
                                        soa::Join<aod::McCollisions, aod::HepMCXSections> const&,
                                        soa::SmallGroups<aod::JetCollisionsMCD> const& collisions, // smallgroups gives only the collisions associated to the current mccollision, thanks to the mccollisionlabel pre-integrated in jetcollisionsmcd
                                        soa::Join<aod::JetTracksMCD, aod::JTrackExtras, aod::JTrackPIs> const& jetTracks,
-                                       soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const& aodTracks,
+                                       soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const&,
                                        JetParticlesWithOriginal const& jMcParticles)
   {
     // missing:
@@ -649,7 +649,7 @@ struct TrackEfficiency {
       for (auto const& track : collTracks) {
         registry.fill(HIST("hTrackCutsCounts"), 0.5, mcCollision.weight());
 
-        if (!isAcceptedTrack(track, aodTracks)) {
+        if (!isAcceptedTrack(track)) {
           continue;
         }
         registry.fill(HIST("hTrackCutsCounts"), 1.5, mcCollision.weight());
@@ -721,8 +721,8 @@ struct TrackEfficiency {
   PROCESS_SWITCH(TrackEfficiency, processEFficiencyPurityWeighted, "Histograms for efficiency and purity quantities for weighted simulations", false);
 
   void processTracksFromData(soa::Filtered<aod::JetCollisions>::iterator const& collision,
-                             soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& jetTracks,
-                             soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const& aodTracks)
+                             soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& jetTracks,
+                             soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const&)
   {
     if (!jetderiveddatautilities::selectCollision(collision, eventSelectionBits, skipMBGapEvents)) {
       return;
@@ -731,15 +731,15 @@ struct TrackEfficiency {
       return;
     }
 
-    fillTrackHistograms(collision, jetTracks, aodTracks);
+    fillTrackHistograms(collision, jetTracks);
   }
   PROCESS_SWITCH(TrackEfficiency, processTracksFromData, "QA for charged tracks in data", false);
 
   void processTracksFromMc(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
                            soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs> const&,
                            soa::Join<aod::McCollisions, aod::HepMCXSections> const&,
-                           soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& jetTracks,
-                           soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const& aodTracks)
+                           soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& jetTracks,
+                           soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const&)
   {
     if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
       return;
@@ -756,15 +756,15 @@ struct TrackEfficiency {
       return;
     }
 
-    fillTrackHistograms(collision, jetTracks, aodTracks);
+    fillTrackHistograms(collision, jetTracks);
   }
   PROCESS_SWITCH(TrackEfficiency, processTracksFromMc, "QA for charged tracks in MC without weights", false);
 
   void processTracksFromMcWeighted(soa::Join<aod::JetCollisions, aod::JMcCollisionLbs>::iterator const& collision,
                                    soa::Join<aod::JetMcCollisions, aod::JMcCollisionPIs> const&,
                                    soa::Join<aod::McCollisions, aod::HepMCXSections> const&,
-                                   soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras>> const& jetTracks,
-                                   soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const& aodTracks)
+                                   soa::Filtered<soa::Join<aod::JetTracks, aod::JTrackExtras, aod::JTrackPIs>> const& jetTracks,
+                                   soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA> const&)
   {
     if (!collision.has_mcCollision()) { // the collision is fake and has no associated mc coll; skip as .mccollision() cannot be called
       return;
@@ -782,7 +782,7 @@ struct TrackEfficiency {
       return;
     }
 
-    fillTrackHistograms(collision, jetTracks, aodTracks, eventWeight);
+    fillTrackHistograms(collision, jetTracks, eventWeight);
   }
   PROCESS_SWITCH(TrackEfficiency, processTracksFromMcWeighted, "QA for charged tracks in weighted MC", false);