use pointers to original objects stored in AliEmcalParticle

[u/mrichter/AliRoot.git] / PWG / EMCAL / AliEmcalClusTrackMatcherTask.cxx

diff --git a/PWG/EMCAL/AliEmcalClusTrackMatcherTask.cxx b/PWG/EMCAL/AliEmcalClusTrackMatcherTask.cxx
index 6601d031868bab7ad66387d32ae09a49224dae8d..511dc52a577a25bd6034b6e11d78992db15d94a8 100644 (file)
--- a/PWG/EMCAL/AliEmcalClusTrackMatcherTask.cxx
+++ b/PWG/EMCAL/AliEmcalClusTrackMatcherTask.cxx
@@ -255,22 +255,22 @@ Bool_t AliEmcalClusTrackMatcherTask::Run()
     AliPicoTrack::GetEtaPhiDiff(track, clust, dphi, deta);
     clust->SetEmcCpvDistance(matchedId);
     clust->SetTrackDistance(deta, dphi);
-    if (!fOrigTracks) 
-      continue;
     if (ac) {
       for (Int_t i=0; i<N; ++i) {
        Int_t id = partC->GetMatchedObjId(i);
-       TObject *obj = fOrigTracks->At(id);
+       partT = static_cast<AliEmcalParticle*>(tracks->GetParticle(id));
+       TObject *obj = partT->GetTrack();
        ac->AddTrackMatched(obj);
-     }
-      continue;
-    }
-    TArrayI arr(N);
-    for (Int_t i=0; i<N; ++i) {
-      Int_t id = partC->GetMatchedObjId(i);
-      arr.AddAt(id,i);
+      }
+    } else {
+      TArrayI arr(N);
+      for (Int_t i=0; i<N; ++i) {
+       Int_t id = partC->GetMatchedObjId(i);
+       partT = static_cast<AliEmcalParticle*>(tracks->GetParticle(id));
+       arr.AddAt(partT->IdInCollection(),i);
+      }
+      ec->AddTracksMatched(arr);
     }
-    ec->AddTracksMatched(arr);
   }
   
   tracks->ResetCurrentID();
@@ -279,7 +279,8 @@ Bool_t AliEmcalClusTrackMatcherTask::Run()
     track->ResetStatus(AliVTrack::kEMCALmatch);
     if (partT->GetNumberOfMatchedObj() <= 0)
       continue;
-    track->SetEMCALcluster(partT->GetMatchedObjId());
+    partC = static_cast<AliEmcalParticle*>(clusters->GetParticle(partT->GetMatchedObjId()));
+    track->SetEMCALcluster(partC->IdInCollection());
     track->SetStatus(AliVTrack::kEMCALmatch);
   }