Add includes missing after cleanup in root.

[u/mrichter/AliRoot.git] / EVE / EveBase / AliEveKineTools.cxx

diff --git a/EVE/EveBase/AliEveKineTools.cxx b/EVE/EveBase/AliEveKineTools.cxx
index 86b957c82cc4ee094e0da5ea3eef3b0fb8d1cb93..d76390587b2ccedde1ad28e2d843bedcc8ee1ac0 100644 (file)
--- a/EVE/EveBase/AliEveKineTools.cxx
+++ b/EVE/EveBase/AliEveKineTools.cxx
@@ -8,17 +8,15 @@
  **************************************************************************/
 
 #include "AliEveKineTools.h"
-
-#include <TObject.h>
-#include <TTree.h>
-#include <TBranchElement.h>
-#include <TClonesArray.h>
+#include "AliEveTrack.h"
 
 #include <AliStack.h>
 #include <AliTrackReference.h>
 
-#include <TEveTrack.h>
-#include <TEveElement.h>
+#include <TTree.h>
+#include <TBranchElement.h>
+#include <TClonesArray.h>
+#include <TParticle.h>
 
 #include <map>
 
@@ -32,14 +30,21 @@ ClassImp(AliEveKineTools)
 
 namespace {
 
-  typedef std::map<Int_t, TEveTrack*> TrackMap_t;
+  // Map to store label-to-track association.
+  //
+  // multimap is used as there are cases when initial particles (in
+  // particular resonances) are not assigned proper status-codes
+  // and can thus be found several times in the eve-track-list.
+
+  typedef std::multimap<Int_t, AliEveTrack*>                 TrackMap_t;
+  typedef std::multimap<Int_t, AliEveTrack*>::const_iterator TrackMap_ci;
 
   void MapTracks(TrackMap_t& map, TEveElement* cont, Bool_t recurse)
   {
     TEveElement::List_i i = cont->BeginChildren();
     while (i != cont->EndChildren()) {
-      TEveTrack* track = dynamic_cast<TEveTrack*>(*i);
-      map[track->GetLabel()] = track;
+      AliEveTrack* track = dynamic_cast<AliEveTrack*>(*i);
+      map.insert(std::make_pair(track->GetLabel(), track));
       if (recurse)
         MapTracks(map, track, recurse);
       ++i;
@@ -56,7 +61,7 @@ void AliEveKineTools::SetDaughterPathMarks(TEveElement* cont, AliStack* stack, B
   TEveElement::List_i  iter = cont->BeginChildren();
   while(iter != cont->EndChildren())
   {
-    TEveTrack* track = dynamic_cast<TEveTrack*>(*iter);
+    AliEveTrack* track = dynamic_cast<AliEveTrack*>(*iter);
     TParticle* p = stack->Particle(track->GetLabel());
     if (p->GetNDaughters())
     {
@@ -110,7 +115,7 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_
     treeTR->GetEntry(te);
 
     Int_t last_label = -1;
-    TrackMap_t::iterator iter = map.end();
+    std::pair<TrackMap_ci, TrackMap_ci> range;
     Int_t nArrEntries = arr->GetEntriesFast();
 
     // printf("tree-entry %d, n-arr-entries %d\n", te, nArrEntries);
@@ -131,13 +136,13 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_
 
       if (label != last_label)
       {
-        iter       = map.find(label);
+        range      = map.equal_range(label);
         last_label = label;
       }
 
-      if (iter != map.end())
+      for (TrackMap_ci i = range.first; i != range.second; ++i)
       {
-        iter->second->AddPathMark
+       i->second->AddPathMark
           (TEvePathMark(isRef ? TEvePathMark::kReference : TEvePathMark::kDecay,
                         TEveVector(atr->X(),  atr->Y(),  atr->Z()),
                         TEveVector(atr->Px(), atr->Py(), atr->Pz()),
@@ -155,7 +160,7 @@ void AliEveKineTools::SortPathMarks(TEveElement* el, Bool_t recurse)
   // Sort path-marks for track by time.
   // If recurse is true, descends down all track children.
 
-  TEveTrack* track = dynamic_cast<TEveTrack*>(el);
+  AliEveTrack* track = dynamic_cast<AliEveTrack*>(el);
   if (track)
     track->SortPathMarksByTime();