adding emcal eta phi on surface to tree

Author: fjonasALICE

PWGJE/Tasks/gammajettreeproducer.cxx

@@ -9,6 +9,12 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// C++ system headers first
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+// Framework and other headers after
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
@@ -44,9 +50,10 @@
 /// \since 02.08.2024
 ///
 using namespace o2;
+using namespace o2::aod;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
-using selectedClusters = o2::soa::Filtered<o2::soa::Join<o2::aod::JClusters,o2::aod::JClusterTracks>>;
+using selectedClusters = o2::soa::Filtered<o2::soa::Join<o2::aod::JClusters, o2::aod::JClusterTracks>>;
 
 #include "Framework/runDataProcessing.h"
 
@@ -220,8 +227,10 @@ struct GammaJetTreeProducer {
   // sadly passing of the string at runtime is not possible for technical region so cluster definition is
   // an integer instead
   Filter clusterDefinitionSelection = (o2::aod::jcluster::definition == mClusterDefinition);
+  PresliceUnsorted<aod::JEMCTracks> EMCTrackPerTrack = aod::jemctrack::trackId;
+
   // Process clusters
-  void processClusters(soa::Join<JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, selectedClusters const& clusters, JetTracks const& tracks)
+  void processClusters(soa::Join<JetCollisions, aod::BkgChargedRhos, aod::JCollisionBCs>::iterator const& collision, selectedClusters const& clusters, JetTracks const& tracks, aod::JEMCTracks const& emctracks)
   {
     if (!isEventAccepted(collision)) {
       return;
@@ -248,20 +257,20 @@ struct GammaJetTreeProducer {
       // double dRMin = 100;
       double p = -1;
 
-      // do track matching 
+      // do track matching
       auto tracksofcluster = cluster.matchedTracks_as<JetTracks>();
-      
       for (auto track : tracksofcluster) {
         if (!isTrackSelected(track)) {
           continue;
         }
+        auto emcTracksPerTrack = emctracks.sliceBy(EMCTrackPerTrack, track.globalIndex());
+        auto emcTrack = emcTracksPerTrack.iteratorAt(0);
         // find closest track that still has E/p < trackMatchingEoverP
         if (cluster.energy()/track.p() > trackMatchingEoverP) {
           continue;
         } else {
-          // TODO make it eta on emcal surface and phi on emcal surface
-          dEta = cluster.eta() - track.eta();
-          dPhi = RecoDecay::constrainAngle(RecoDecay::constrainAngle(track.phi(), -M_PI) - RecoDecay::constrainAngle(cluster.phi(), -M_PI), -M_PI);
+          dEta = cluster.eta() - emcTrack.etaEmcal();
+          dPhi = RecoDecay::constrainAngle(RecoDecay::constrainAngle(emcTrack.phiEmcal(), -M_PI) - RecoDecay::constrainAngle(cluster.phi(), -M_PI), -M_PI);
           p = track.p();
           break;
         }
@@ -308,7 +317,7 @@ struct GammaJetTreeProducer {
       // calculate perp cone rho
       double perpconerho = ch_perp_cone_rho(jet, tracks, perpConeJetR);
       mHistograms.fill(HIST("chjetPtEtaPhi"), jet.pt(), jet.eta(), jet.phi());
-      chargedJetsTable(storedColIndex, jet.pt(), jet.eta(), jet.phi(), jet.r(), jet.energy(), jet.mass(), jet.area(), leadingTrackPt, perpconerho,nconst);
+      chargedJetsTable(storedColIndex, jet.pt(), jet.eta(), jet.phi(), jet.r(), jet.energy(), jet.mass(), jet.area(), leadingTrackPt, perpconerho, nconst);
       // fill histograms
       mHistograms.fill(HIST("chjetPt"), jet.pt());
     }