* EveBase/AliEveTrack

---------------------
New class, sub-class of TEveTrack.
All macro-calling functions were removed from TEveTrack and moved into
this class (as they were ALICE specific anyway):
   void ImportHits();
   void ImportClusters();
   void ImportClustersFromIndex();
   void ImportKine();
   void ImportKineWithArgs(.....);
   void PrintKineStack();

This will allow to:
1. simplify initialization;
2. make it easier to extend the functionality.

All changes in other files are replacements of TEveTrack with
AliEveTrack.

* macros/anyscan_init.C
-----------------------
Add a deprecation warning.

diff --git a/EVE/EveBase/AliEveCascade.cxx b/EVE/EveBase/AliEveCascade.cxx
index fcaf37092332b1d472d5f23c1476f169f4e6253f..3b732f755d26ecfaf83f3be3b235c080ce580a08 100644 (file)
--- a/EVE/EveBase/AliEveCascade.cxx
+++ b/EVE/EveBase/AliEveCascade.cxx
@@ -9,12 +9,10 @@
 
 #include "AliEveCascade.h"
 
-#include <TEveTrack.h>
 #include <TEveTrackPropagator.h>
 #include <TEveManager.h>
 
 #include <TPolyLine3D.h>
-#include <TPolyMarker3D.h>
 #include <TColor.h>
 
 #include <vector>
@@ -59,7 +57,7 @@ AliEveCascade::AliEveCascade(TEveRecTrack* tBac, TEveRecV0* v0, TEveRecCascade*
   fRecDecayV(cascade->fCascadeVCa),
   fRecDecayP(cascade->fPBac + v0->fPNeg + v0->fPPos),
   fRecDecayV0(v0->fVCa),
-  fBacTrack(new TEveTrack(tBac, rs)),
+  fBacTrack(new AliEveTrack(tBac, rs)),
 
   fRnrStyle(rs),
   fPointingCurve(new TEveLine("Pointing Curve")),

diff --git a/EVE/EveBase/AliEveCascade.h b/EVE/EveBase/AliEveCascade.h
index 2c960aa8031c115dc9c3d8a851b62c536969fdd0..13f621930a61cc8319dfbaff47dcab410c5cb479 100644 (file)
--- a/EVE/EveBase/AliEveCascade.h
+++ b/EVE/EveBase/AliEveCascade.h
@@ -19,19 +19,14 @@
 * Boris Hippolyte, IPHC (hippolyt@in2p3.fr)
 ************************************************************************/
 
+#include "AliEveTrack.h"
 #include <TEveVSDStructs.h>
-#include <TEveElement.h>
-#include <TEveTrack.h>
 
-#include <TPolyMarker3D.h>
-#include <TPolyLine3D.h>
+class AliEveCascadeList;
 
 class TH1F;
 class TH2F;
 
-
-class AliEveCascadeList;
-
 class AliEveCascade : public TEvePointSet
 {
   friend class AliEveCascadeList;
@@ -66,7 +61,7 @@ public:
 
   TEveTrackPropagator* GetPropagator() const  { return fRnrStyle; }
 
-  TEveTrack* GetBacTrack() { return fBacTrack; }
+  AliEveTrack* GetBacTrack() { return fBacTrack; }
 
   TEveLine*  GetPointingCurve() { return fPointingCurve; }
   TEveLine*  GetV0Path() { return fV0Path; }
@@ -77,7 +72,7 @@ protected:
   TEveVector fRecDecayP;    // Reconstructed momentum at the decay
   TEveVector fRecDecayV0;   // Reconstructed birth point of neutral daughter
 
-  TEveTrack        *fBacTrack;
+  AliEveTrack        *fBacTrack;
 
   TEveTrackPropagator *fRnrStyle;
 

diff --git a/EVE/EveBase/AliEveCosmicRayFitter.cxx b/EVE/EveBase/AliEveCosmicRayFitter.cxx
index 4c34534cbe86e3c54f72bc9a42354e5ed1e8cbc4..78942fdf6eb2b19e72ba7549f1d582e4a03137c4 100644 (file)
--- a/EVE/EveBase/AliEveCosmicRayFitter.cxx
+++ b/EVE/EveBase/AliEveCosmicRayFitter.cxx
@@ -11,7 +11,7 @@
 
 #include "AliLog.h"
 
-#include "TEveTrack.h"
+#include "AliEveTrack.h"
 #include "TEveTrackPropagator.h"
 #include "TEveVSDStructs.h"
 #include "TEveManager.h"
@@ -235,7 +235,7 @@ void AliEveCosmicRayFitter::FitTrack()
   rc.fV.Set(x, y, z);
   rc.fP.Set(1, params1(1), params2(1));
 
-  TEveTrack* track = new TEveTrack(&rc, fTrackList->GetPropagator());
+  AliEveTrack* track = new AliEveTrack(&rc, fTrackList->GetPropagator());
   track->SetAttLineAttMarker(fTrackList);
 
   TEveTrackPropagator* tp = fTrackList->GetPropagator();

diff --git a/EVE/EveBase/AliEveJetPlaneEditor.cxx b/EVE/EveBase/AliEveJetPlaneEditor.cxx
index ebc807ad46c8548410984c75d6aec3fb63079c79..5c5991de52220bbff74b96b9d5d71cf56f81fb9e 100644 (file)
--- a/EVE/EveBase/AliEveJetPlaneEditor.cxx
+++ b/EVE/EveBase/AliEveJetPlaneEditor.cxx
@@ -72,14 +72,14 @@ AliEveJetPlaneEditor::AliEveJetPlaneEditor(const TGWindow *p, Int_t width, Int_t
   fEnergyColorScale->Connect("ValueSet(Double_t)", "AliEveJetPlaneEditor", this, "DoEnergyColorScale()");
   AddFrame(fEnergyColorScale, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1));
 
-  fOneSelection = new TGRadioButton(this, "&One TEveTrack/Jet");
-  fTwoSelection = new TGRadioButton(this, "&Two TEveTrack/Jet");
+  fOneSelection = new TGRadioButton(this, "&One AliEveTrack/Jet");
+  fTwoSelection = new TGRadioButton(this, "&Two AliEveTrack/Jet");
   AddFrame(fOneSelection, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1));
   AddFrame(fTwoSelection, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1));
   fOneSelection->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoOneSelection()");
   fTwoSelection->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoTwoSelection()");
 
-  // fInformationSetup = new TGTextButton(this, "TEveTrack/Jet Print");
+  // fInformationSetup = new TGTextButton(this, "AliEveTrack/Jet Print");
   // AddFrame(fInformationSetup, new TGLayoutHints(kLHintsTop | kLHintsLeft, 2, 0, 2, 2));
   // fInformationSetup->Connect("Clicked()", "AliEveJetPlaneEditor", this, "DoStaticDataWindow()");
 }
@@ -227,7 +227,7 @@ AliEveJetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, cons
 
   fL3 = new TGLayoutHints(kLHintsTop | kLHintsLeft, 5, 5, 5, 5);
 
-  TGCompositeFrame *tf = fTab->AddTab("One TEveTrack/Jet");
+  TGCompositeFrame *tf = fTab->AddTab("One AliEveTrack/Jet");
 
   //    fF1 = new TGCompositeFrame(tf, 60, 20, kVerticalFrame);
   //    fF1->AddFrame(new TGTextButton(fF1, "&Test button", 0), fL3);
@@ -262,7 +262,7 @@ AliEveJetPlaneEditor::StaticDataWindow::StaticDataWindow(const TGWindow *p, cons
   MapSubwindows();
   Resize();
 
-  SetWindowName("TEveTrack/Jet Common Setup");
+  SetWindowName("AliEveTrack/Jet Common Setup");
 }
 
 AliEveJetPlaneEditor::StaticDataWindow::~StaticDataWindow()

diff --git a/EVE/EveBase/AliEveJetPlaneGL.cxx b/EVE/EveBase/AliEveJetPlaneGL.cxx
index fb1d2ec5feed93da7a7fb6f603f9ded6c1c3ce28..73d63618f518e09264cd30c73e8939d720782d56 100644 (file)
--- a/EVE/EveBase/AliEveJetPlaneGL.cxx
+++ b/EVE/EveBase/AliEveJetPlaneGL.cxx
@@ -277,7 +277,7 @@ void AliEveJetPlaneGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord
     if (rec.GetN() == 3)
     {
       AliAODTrack v = fM->fTracks[rec.GetItem(2)];
-      printf("TEveTrack 4-momentum: %f, %f, %f, %f \n", v.Px(),v.Py(),v.Pz(),v.Pt() );
+      printf("AliEveTrack 4-momentum: %f, %f, %f, %f \n", v.Px(),v.Py(),v.Pz(),v.Pt() );
       printf("Eta-Phi values: %f, %f\n", v.Eta(), v.Phi());
     }
   }
@@ -323,8 +323,8 @@ void AliEveJetPlaneGL::ProcessSelection(TGLRnrCtx & /*rnrCtx*/, TGLSelectRecord
        track2State = 1;
       }
 
-      printf("Jet: %i, TEveTrack: %i \n", jet1State, track1State);
-      printf("Jet: %i, TEveTrack: %i \n\n", jet2State, track2State);
+      printf("Jet: %i, AliEveTrack: %i \n", jet1State, track1State);
+      printf("Jet: %i, AliEveTrack: %i \n\n", jet2State, track2State);
 
       if(jet1State && jet2State)
       {

diff --git a/EVE/EveBase/AliEveKineTools.cxx b/EVE/EveBase/AliEveKineTools.cxx
index 9d22447464a569394294a9a3b0c06948e9175d60..6f7a799d067dc19ad6171903be646ba405b0b056 100644 (file)
--- a/EVE/EveBase/AliEveKineTools.cxx
+++ b/EVE/EveBase/AliEveKineTools.cxx
@@ -8,17 +8,14 @@
  **************************************************************************/
 
 #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 <map>
 
@@ -38,14 +35,14 @@ namespace {
   // 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, TEveTrack*>                 TrackMap_t;
-  typedef std::multimap<Int_t, TEveTrack*>::const_iterator TrackMap_ci;
+  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);
+      AliEveTrack* track = dynamic_cast<AliEveTrack*>(*i);
       map.insert(std::make_pair(track->GetLabel(), track));
       if (recurse)
         MapTracks(map, track, recurse);
@@ -63,7 +60,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())
     {
@@ -162,7 +159,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();
 

diff --git a/EVE/EveBase/AliEveTrack.cxx b/EVE/EveBase/AliEveTrack.cxx
new file mode 100644 (file)
index 0000000..fcb027b
--- /dev/null
+++ b/EVE/EveBase/AliEveTrack.cxx
@@ -0,0 +1,179 @@
+// $Id$
+// Author: Matevz Tadel 2009
+
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
+#include "AliEveTrack.h"
+
+#include <TROOT.h>
+
+//______________________________________________________________________________
+// Full description of AliEveTrack
+//
+
+ClassImp(AliEveTrack)
+
+//______________________________________________________________________________
+AliEveTrack::AliEveTrack() :
+  TEveTrack()
+{
+  // Constructor.
+}
+
+//______________________________________________________________________________
+AliEveTrack::AliEveTrack(TParticle* t, Int_t label, TEveTrackPropagator* rs) :
+  TEveTrack(t, label, rs)
+{
+  // Constructor.
+}
+
+//______________________________________________________________________________
+AliEveTrack::AliEveTrack(TEveMCTrack*  t, TEveTrackPropagator* rs) :
+  TEveTrack(t, rs)
+{
+  // Constructor.
+}
+
+//______________________________________________________________________________
+AliEveTrack::AliEveTrack(TEveRecTrack* t, TEveTrackPropagator* rs) :
+  TEveTrack(t, rs)
+{
+  // Constructor.
+}
+
+//______________________________________________________________________________
+AliEveTrack::AliEveTrack(const AliEveTrack& t) :
+  TEveTrack(t)
+{
+  // Copy constructor.
+}
+
+//______________________________________________________________________________
+AliEveTrack::~AliEveTrack()
+{
+  // Destructor.
+}
+
+/******************************************************************************/
+
+//______________________________________________________________________________
+void AliEveTrack::ImportHits()
+{
+  // Import hits with same label as the track.
+  // Uses macro "hits_from_label.C".
+
+  TEveUtil::LoadMacro("hits_from_label.C");
+  gROOT->ProcessLine(Form("hits_from_label(%d, (TEveElement*)%p);",
+                          fLabel, this));
+}
+
+//______________________________________________________________________________
+void AliEveTrack::ImportClusters()
+{
+  // Import clusters with same label as the track.
+  // Uses macro "clusters_from_label.C".
+
+  TEveUtil::LoadMacro("clusters_from_label.C");
+  gROOT->ProcessLine(Form("clusters_from_label(%d, (TEveElement*)%p);",
+                          fLabel, this));
+}
+
+//______________________________________________________________________________
+void AliEveTrack::ImportClustersFromIndex()
+{
+  // Import clusters marked with same reconstructed track index as the track.
+  // Uses macro "clusters_from_index.C".
+
+  static const TEveException kEH("AliEveTrack::ImportClustersFromIndex ");
+
+  if (fIndex == kMinInt)
+    throw(kEH + "index not set.");
+
+  TEveUtil::LoadMacro("clusters_from_index.C");
+  gROOT->ProcessLine(Form("clusters_from_index(%d, (TEveElement*)%p);",
+                          fIndex, this));
+}
+
+/******************************************************************************/
+
+//______________________________________________________________________________
+void AliEveTrack::ImportKine()
+{
+   // Import kinematics of the track's label recursively.
+   // Uses macro "kine_tracks.C".
+
+   static const TEveException kEH("AliEveTrack::ImportKine ");
+
+   if (fLabel == kMinInt)
+      throw(kEH + "label not set.");
+
+   Int_t label;
+   if (fLabel < 0) {
+      Warning(kEH, "label negative, taking absolute value.");
+      label = -fLabel;
+   } else {
+      label = fLabel;
+   }
+
+   TEveUtil::LoadMacro("kine_tracks.C");
+   gROOT->ProcessLine(Form("kine_track(%d, kTRUE, kTRUE, kTRUE, kTRUE, (TEveElement*)%p);",
+                           label, this));
+
+}
+
+//______________________________________________________________________________
+void AliEveTrack::ImportKineWithArgs(Bool_t importMother, Bool_t importDaugters,
+                                     Bool_t colorPdg,     Bool_t recurse)
+{
+  // Import kinematics of the track's label. Arguments steer the
+  // import process:
+  //   importMother     import particle with track's label
+  //   importDaugters   import direct daughters of label
+  //   colorPdg         color kinematics by PDG code
+  //   recurse          recursive import of daughters' daughters
+  // Uses macro "kine_tracks.C".
+
+  static const TEveException kEH("AliEveTrack::ImportKineWithArgs ");
+
+  if (fLabel == kMinInt)
+    throw(kEH + "label not set.");
+
+  Int_t label;
+  if (fLabel < 0) {
+    Warning(kEH, "label negative, taking absolute value.");
+    label = -fLabel;
+  } else {
+    label = fLabel;
+  }
+
+  TEveUtil::LoadMacro("kine_tracks.C");
+  gROOT->ProcessLine(Form("kine_track(%d, %d, %d, %d, %d, (TEveElement*)%p);",
+                          label, importMother, importDaugters, colorPdg, recurse, this));
+}
+
+//______________________________________________________________________________
+void AliEveTrack::PrintKineStack()
+{
+  // Print kinematics pertaining to track's label.
+  // Uses macro "print_kine_from_label.C".
+
+  static const TEveException kEH("AliEveTrack::PrintKineStack ");
+
+  if (fLabel == kMinInt)
+    throw(kEH + "label not set.");
+
+  Int_t label;
+  if (fLabel < 0) {
+    Warning(kEH, "label negative, taking absolute value.");
+    label = -fLabel;
+  } else {
+    label = fLabel;
+  }
+
+  TEveUtil::LoadMacro("print_kine_from_label.C");
+  gROOT->ProcessLine(Form("print_kine_from_label(%d);", label));
+}

diff --git a/EVE/EveBase/AliEveTrack.h b/EVE/EveBase/AliEveTrack.h
new file mode 100644 (file)
index 0000000..d597621
--- /dev/null
+++ b/EVE/EveBase/AliEveTrack.h
@@ -0,0 +1,46 @@
+// $Id$
+// Author: Matevz Tadel 2009
+
+/**************************************************************************
+ * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. *
+ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for          *
+ * full copyright notice.                                                 *
+ **************************************************************************/
+
+#ifndef AliEveTrack_H
+#define AliEveTrack_H
+
+#include <TEveTrack.h>
+
+//______________________________________________________________________________
+// Short description of AliEveTrack
+//
+
+class AliEveTrack : public TEveTrack
+{
+public:
+  AliEveTrack();
+  AliEveTrack(TParticle* t, Int_t label, TEveTrackPropagator* rs);
+  AliEveTrack(TEveMCTrack*  t, TEveTrackPropagator* rs);
+  AliEveTrack(TEveRecTrack* t, TEveTrackPropagator* rs);
+  AliEveTrack(const AliEveTrack& t);
+  virtual ~AliEveTrack();
+
+  virtual void ImportHits();      // *MENU*
+  virtual void ImportClusters();  // *MENU*
+
+  void ImportClustersFromIndex(); // *MENU*
+  void ImportKine();              // *MENU*
+  void ImportKineWithArgs(Bool_t importMother=kTRUE, Bool_t impDaugters=kTRUE,
+                         Bool_t colorPdg    =kTRUE, Bool_t recurse    =kTRUE); // *MENU*
+  void PrintKineStack();          // *MENU*
+
+protected:
+
+private:
+  AliEveTrack& operator=(const AliEveTrack&); // Not implemented
+
+  ClassDef(AliEveTrack, 0); // Short description.
+};
+
+#endif

diff --git a/EVE/EveBase/AliEveTrackCounter.cxx b/EVE/EveBase/AliEveTrackCounter.cxx
index 8c1ab028a4f2f70cf4882398e491b7133cbb5e38..6c250359aa915f76ded6ba6cb07c382731c43d01 100644 (file)
--- a/EVE/EveBase/AliEveTrackCounter.cxx
+++ b/EVE/EveBase/AliEveTrackCounter.cxx
@@ -10,7 +10,7 @@
 #include "AliEveTrackCounter.h"
 
 #include "TEveManager.h"
-#include "TEveTrack.h"
+#include "AliEveTrack.h"
 #include "TEveGedEditor.h"
 
 //==============================================================================
@@ -22,7 +22,7 @@
 // Provides event-based method for tagging of good / bad (or primary /
 // secondary) tracks. A report can be written into a text file.
 //
-// TEveTrack status is toggled by using secondary-selection / ctrl-click
+// AliEveTrack status is toggled by using secondary-selection / ctrl-click
 // functionality of the GL viewer.
 //
 // Some of the functionality is implemented in AliEveTrackCounterEditor
@@ -46,11 +46,11 @@ AliEveTrackCounter::AliEveTrackCounter(const Text_t* name, const Text_t* title)
    fTrackLists   ()
 {
    // Constructor.
-   // Connects to global signal "TEveTrack", "SecSelected(TEveTrack*)".
+   // Connects to global signal "AliEveTrack", "SecSelected(AliEveTrack*)".
 
    if (fgInstance == 0) fgInstance = this;
-   TQObject::Connect("TEveTrack", "SecSelected(TEveTrack*)",
-                     "AliEveTrackCounter", this, "DoTrackAction(TEveTrack*)");
+   TQObject::Connect("AliEveTrack", "SecSelected(AliEveTrack*)",
+                     "AliEveTrackCounter", this, "DoTrackAction(AliEveTrack*)");
 }
 
 //______________________________________________________________________________
@@ -59,7 +59,7 @@ AliEveTrackCounter::~AliEveTrackCounter()
    // Destructor.
    // Disconnect from the global track signals.
 
-   TQObject::Disconnect("TEveTrack", "DoTrackAction(TEveTrack*)");
+   TQObject::Disconnect("AliEveTrack", "DoTrackAction(AliEveTrack*)");
    if (fgInstance == this) fgInstance = 0;
 }
 
@@ -92,7 +92,7 @@ void AliEveTrackCounter::RegisterTracks(TEveTrackList* tlist, Bool_t goodTracks)
    List_i i = tlist->BeginChildren();
    while (i != tlist->EndChildren())
    {
-      TEveTrack* t = dynamic_cast<TEveTrack*>(*i);
+      AliEveTrack* t = dynamic_cast<AliEveTrack*>(*i);
       if (t != 0)
       {
          if (goodTracks)
@@ -108,7 +108,7 @@ void AliEveTrackCounter::RegisterTracks(TEveTrackList* tlist, Bool_t goodTracks)
 }
 
 //______________________________________________________________________________
-void AliEveTrackCounter::DoTrackAction(TEveTrack* track)
+void AliEveTrackCounter::DoTrackAction(AliEveTrack* track)
 {
    // Slot called when track is ctrl-clicked.
    //
@@ -126,7 +126,7 @@ void AliEveTrackCounter::DoTrackAction(TEveTrack* track)
 
       case kCA_PrintTrackInfo:
       {
-         printf("TEveTrack '%s'\n", track->GetObject(eh)->GetName());
+         printf("AliEveTrack '%s'\n", track->GetObject(eh)->GetName());
          const TEveVector &v = track->GetVertex();
          const TEveVector &p = track->GetMomentum();;
          printf("  Vx=%f, Vy=%f, Vz=%f; Pt=%f, Pz=%f, phi=%f)\n",
@@ -186,7 +186,7 @@ void AliEveTrackCounter::OutputEventTracks(FILE* out)
       List_i i = tlist->BeginChildren();
       while (i != tlist->EndChildren())
       {
-         TEveTrack* t = dynamic_cast<TEveTrack*>(*i);
+         AliEveTrack* t = dynamic_cast<AliEveTrack*>(*i);
          if (t != 0 && t->GetLineStyle() == 1)
          {
             ++cnt;

diff --git a/EVE/EveBase/AliEveTrackCounter.h b/EVE/EveBase/AliEveTrackCounter.h
index 32afbc1d17aaa75a16aeba16d9783b326c3d5e5f..a54c735043b3ac3b102decdbb5a195ac15632223 100644 (file)
--- a/EVE/EveBase/AliEveTrackCounter.h
+++ b/EVE/EveBase/AliEveTrackCounter.h
@@ -13,7 +13,7 @@
 #include "TEveElement.h"
 #include "TList.h"
 
-class TEveTrack;
+class AliEveTrack;
 class TEveTrackList;
 
 //______________________________________________________________________________
@@ -37,7 +37,7 @@ public:
 
   void RegisterTracks(TEveTrackList* tlist, Bool_t goodTracks);
 
-  void DoTrackAction(TEveTrack* track);
+  void DoTrackAction(AliEveTrack* track);
 
   Int_t GetClickAction() const  { return fClickAction; }
   void  SetClickAction(Int_t a) { fClickAction = a; }

diff --git a/EVE/EveBase/AliEveTrackFitter.cxx b/EVE/EveBase/AliEveTrackFitter.cxx
index 450f7b88483f02e4d6f89b6c301c7eacd94ecebf..6eb19846b28885373fbed3feb761f7766390e94f 100644 (file)
--- a/EVE/EveBase/AliEveTrackFitter.cxx
+++ b/EVE/EveBase/AliEveTrackFitter.cxx
@@ -8,6 +8,7 @@
  **************************************************************************/
 
 #include "AliEveTrackFitter.h"
+#include "AliEveTrack.h"
 
 #include "TCanvas.h"
 #include "TGraph.h"
@@ -17,7 +18,6 @@
 #include "AliRieman.h"
 #include "AliExternalTrackParam.h"
 
-#include <TEveTrack.h>
 #include <TEveTrackPropagator.h>
 #include <TEveVSDStructs.h>
 #include <TEveManager.h>
@@ -34,7 +34,7 @@
 // It builds a list of points by listening to selection signal of any
 // object of type TEvePointSet. After selection the list is feeded to
 // AliRieman fitter, which returns helix parameters visualized with
-// TEveTrack.
+// AliEveTrack.
 //
 
 ClassImp(AliEveTrackFitter)
@@ -224,7 +224,7 @@ void AliEveTrackFitter::FitTrack()
   rc.fP.Set(p0);
   rc.fSign = trackParam.Charge();
 
-  TEveTrack* track = new TEveTrack(&rc, fTrackList->GetPropagator());
+  AliEveTrack* track = new AliEveTrack(&rc, fTrackList->GetPropagator());
   track->SetName(Form("track %f", fAlpha));
 
   track->MakeTrack();

diff --git a/EVE/EveBase/AliEveV0.cxx b/EVE/EveBase/AliEveV0.cxx
index 8886b95260e53ecff3e47ccd9747cc5dde858de4..409f89105af6e333ede8618b70e9aed900efbe6e 100644 (file)
--- a/EVE/EveBase/AliEveV0.cxx
+++ b/EVE/EveBase/AliEveV0.cxx
@@ -9,12 +9,10 @@
 
 #include "AliEveV0.h"
 
-#include <TEveTrack.h>
 #include <TEveTrackPropagator.h>
 #include <TEveManager.h>
 
 #include <TPolyLine3D.h>
-#include <TPolyMarker3D.h>
 #include <TColor.h>
 
 #include <TDatabasePDG.h>
@@ -67,8 +65,8 @@ AliEveV0::AliEveV0(TEveRecTrack* tNeg, TEveRecTrack* tPos,
   fRecDecayV(v0->fVCa),
   fRecDecayP(v0->fPNeg + v0->fPPos),
 
-  fNegTrack(new TEveTrack(tNeg, rs)),
-  fPosTrack(new TEveTrack(tPos, rs)),
+  fNegTrack(new AliEveTrack(tNeg, rs)),
+  fPosTrack(new AliEveTrack(tPos, rs)),
 
   fRnrStyle(rs),
   fPointingLine(new TEveLine("Pointing line")),
@@ -121,7 +119,7 @@ AliEveV0::~AliEveV0()
 void AliEveV0::SetMaxProbPdgPid(Int_t iDaughter, Int_t rPdg, Float_t rPid)
 {
   // Sets the maximum probability Pdg value and Pid for one daughter
-  // Should be moved to TEveTrack property eventually (or AliEveTrack creation)
+  // Should be moved to AliEveTrack property eventually (or AliEveTrack creation)
 
   if(iDaughter==0){
     fNegMaxProbPdg = rPdg;

diff --git a/EVE/EveBase/AliEveV0.h b/EVE/EveBase/AliEveV0.h
index 72bde42cffddf1edb0632982264a6696523f5204..73b52a0e1875d44475e8125eed89d82cdbb431fc 100644 (file)
--- a/EVE/EveBase/AliEveV0.h
+++ b/EVE/EveBase/AliEveV0.h
@@ -19,11 +19,9 @@
 * Ludovic Gaudichet (gaudichet@to.infn.it)
 ************************************************************************/
 
+#include "AliEveTrack.h"
 #include <TEveVSDStructs.h>
-#include <TEveElement.h>
-#include <TEveTrack.h>
 
-#include <TPolyMarker3D.h>
 #include <TPolyLine3D.h>
 
 #include <TPDGCode.h>
@@ -85,8 +83,8 @@ public:
 
   TEveTrackPropagator* GetPropagator() const  { return fRnrStyle; }
 
-  TEveTrack* GetNegTrack() { return fNegTrack; }
-  TEveTrack* GetPosTrack() { return fPosTrack; }
+  AliEveTrack* GetNegTrack() { return fNegTrack; }
+  AliEveTrack* GetPosTrack() { return fPosTrack; }
 
   TEveLine*  GetPointingLine() { return fPointingLine; }
 
@@ -95,8 +93,8 @@ protected:
   TEveVector fRecDecayV;    // Point of closest approach
   TEveVector fRecDecayP;
 
-  TEveTrack        *fNegTrack;
-  TEveTrack        *fPosTrack;
+  AliEveTrack        *fNegTrack;
+  AliEveTrack        *fPosTrack;
 
   TEveTrackPropagator *fRnrStyle;
 

diff --git a/EVE/EveBase/AliEveV0Editor.cxx b/EVE/EveBase/AliEveV0Editor.cxx
index 2d6b297a9dacc30283c2f3e7c33c1fa15e857ec6..69bffb94a3a5b82787641a033b8cde4eaaf02ecb 100644 (file)
--- a/EVE/EveBase/AliEveV0Editor.cxx
+++ b/EVE/EveBase/AliEveV0Editor.cxx
@@ -150,8 +150,8 @@ void AliEveV0Editor::DisplayDetailed()
 
   TEveUtil::LoadMacro("clusters_from_index.C");
 
-  TEveTrack *negTrack = fM->GetNegTrack();
-  TEveTrack *posTrack = fM->GetPosTrack();
+  AliEveTrack *negTrack = fM->GetNegTrack();
+  AliEveTrack *posTrack = fM->GetPosTrack();
 
 
   char macroWithIndex[100] = {0};

diff --git a/EVE/EveBase/EveBaseLinkDef.h b/EVE/EveBase/EveBaseLinkDef.h
index a384d421bcedaa42bb6c4051ab893e345484d0ac..53aa0b898724686aabad8ebf7d20e8b4a15fcc91 100644 (file)
--- a/EVE/EveBase/EveBaseLinkDef.h
+++ b/EVE/EveBase/EveBaseLinkDef.h
@@ -26,6 +26,9 @@
 
 #pragma link C++ class AliEveVSDCreator+;
 
+// AliEveTrack
+#pragma link C++ class AliEveTrack+;
+
 // AliEveTrackcounter
 #pragma link C++ class AliEveTrackCounter+;
 #pragma link C++ class AliEveTrackCounterEditor+;

diff --git a/EVE/alice-macros/esd_tracks.C b/EVE/alice-macros/esd_tracks.C
index 1df934997e18a48436ce1e26714b388a67b82b9a..95fadd70dc08e192a0fc0c0e31d5a8e6f7de07bb 100644 (file)
--- a/EVE/alice-macros/esd_tracks.C
+++ b/EVE/alice-macros/esd_tracks.C
@@ -51,7 +51,7 @@ TString esd_track_title(AliESDtrack* t)
   return s;
 }
 
-void esd_track_add_param(TEveTrack* track, AliExternalTrackParam* tp)
+void esd_track_add_param(AliEveTrack* track, AliExternalTrackParam* tp)
 {
   // Add additional track parameters as a path-mark to track.
 
@@ -98,9 +98,9 @@ TEveTrack* esd_make_track(AliESDtrack *at, TEveTrackList* cont)
   Double_t ep = at->GetP(), mc = at->GetMass();
   rt.fBeta = ep/TMath::Sqrt(ep*ep + mc*mc);
 
-  TEveTrack* track = new TEveTrack(&rt, cont->GetPropagator());
+  AliEveTrack* track = new AliEveTrack(&rt, cont->GetPropagator());
   track->SetAttLineAttMarker(cont);
-  track->SetName(Form("TEveTrack %d", at->GetID()));
+  track->SetName(Form("AliEveTrack %d", at->GetID()));
   track->SetElementTitle(esd_track_title(at));
 
   // Add inner/outer track parameters as path-marks.
@@ -132,7 +132,7 @@ TEveTrackList* esd_tracks()
   for (Int_t n = 0; n < esd->GetNumberOfTracks(); ++n)
   {
     ++count;
-    TEveTrack* track = esd_make_track(esd->GetTrack(n), cont);
+    AliEveTrack* track = esd_make_track(esd->GetTrack(n), cont);
 
     cont->AddElement(track);
   }
@@ -205,7 +205,7 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0)
     ++count;
     AliESDtrack* at = (AliESDtrack*) obj;
 
-    TEveTrack* track = esd_make_track(at, cont);
+    AliEveTrack* track = esd_make_track(at, cont);
     cont->AddElement(track);
   }
   cont->SetTitle(Form("N=%d", count));
@@ -372,8 +372,8 @@ TEveElementList* esd_tracks_by_category()
     ++tc[ti];
     ++count;
 
-    TEveTrack* track = esd_make_track(at, tlist);
-    track->SetName(Form("TEveTrack idx=%d, sigma=%5.3f", at->GetID(), s));
+    AliEveTrack* track = esd_make_track(at, tlist);
+    track->SetName(Form("AliEveTrack idx=%d, sigma=%5.3f", at->GetID(), s));
     tlist->AddElement(track);
   }
 

diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C
index 1d925b764b66843ff42c17b66d0af99bba35473a..a0adf67cc93dcde5fbcfae67080df606c421eb23 100644 (file)
--- a/EVE/alice-macros/kine_tracks.C
+++ b/EVE/alice-macros/kine_tracks.C
@@ -48,7 +48,7 @@ kine_tracks(Double_t min_pt  = 0,     Double_t min_p   = 0,
       if (p->Pt() < min_pt && p->P() < min_p) continue;
 
       ++count;
-      TEveTrack* track = new TEveTrack(p, i, trkProp);
+      AliEveTrack* track = new AliEveTrack(p, i, trkProp);
 
       //PH The line below is replaced waiting for a fix in Root
       //PH which permits to use variable siza arguments in CINT
@@ -96,7 +96,7 @@ kine_tracks(Double_t min_pt  = 0,     Double_t min_p   = 0,
   return cont;
 }
 
-void kine_daughters(TEveTrack* parent,  AliStack* stack,
+void kine_daughters(AliEveTrack* parent,  AliStack* stack,
                    Double_t     min_pt,  Double_t  min_p,
                    Bool_t       pdg_col, Bool_t    recurse)
 {
@@ -109,7 +109,7 @@ void kine_daughters(TEveTrack* parent,  AliStack* stack,
       TParticle* dp = stack->Particle(d);
       if (dp->Pt() < min_pt && dp->P() < min_p) continue;
 
-      TEveTrack* dtrack = new TEveTrack(dp, d, rs);
+      AliEveTrack* dtrack = new AliEveTrack(dp, d, rs);
       char form[1000];
       sprintf(form,"%s [%d]", dp->GetName(), d);
       dtrack->SetName(form);
@@ -124,7 +124,7 @@ void kine_daughters(TEveTrack* parent,  AliStack* stack,
   }
 }
 
-Color_t set_track_color(TEveTrack* t, Bool_t pdg_col)
+Color_t set_track_color(AliEveTrack* t, Bool_t pdg_col)
 {
   if (pdg_col)
     t->SetMainColor(get_pdg_color(t->GetPdg()));
@@ -211,7 +211,7 @@ kine_track(Int_t  label,
 
   if (import_mother || (import_daughters && p->GetNDaughters()))
   {
-    TEveTrack* toptrack = 0;
+    AliEveTrack* toptrack = 0;
     TEveTrackList* tracklist = 0;
     TEveTrackPropagator* rs = 0;
 
@@ -237,8 +237,8 @@ kine_track(Int_t  label,
     }
     else
     {
-      // check if container is TEveTrackList or TEveTrack (has rnr-style)
-      TEveTrack* t = dynamic_cast<TEveTrack*>(cont);
+      // check if container is TEveTrackList or AliEveTrack (has rnr-style)
+      AliEveTrack* t = dynamic_cast<AliEveTrack*>(cont);
       if (t) {
        rs = t->GetPropagator();
       } else {
@@ -252,7 +252,7 @@ kine_track(Int_t  label,
 
     if (import_mother)
     {
-      TEveTrack* track = new TEveTrack(p, label, rs);
+      AliEveTrack* track = new AliEveTrack(p, label, rs);
       char form[1000];
       sprintf(form,"%s [%d]", p->GetName(), label);
       track->SetName(form);
@@ -269,7 +269,7 @@ kine_track(Int_t  label,
       for (int d=p->GetFirstDaughter(); d>0 && d<=p->GetLastDaughter(); ++d)
       {
        TParticle* dp = stack->Particle(d);
-       TEveTrack* track = new TEveTrack(dp, d, rs);
+       AliEveTrack* track = new AliEveTrack(dp, d, rs);
        char form[1000];
        sprintf(form,"%s [%d]", dp->GetName(), d);
        track->SetName(form);

diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C
index 760a64e6ff6fd5515252a26ec0db29c4073bca60..48a61dc3cf3d9c85ddab5238c26206079d9d079d 100644 (file)
--- a/EVE/alice-macros/primary_vertex_tracks.C
+++ b/EVE/alice-macros/primary_vertex_tracks.C
@@ -24,7 +24,7 @@ TEveTrackList* primary_vertex_tracks()
   for (Int_t n=0; n<pv->GetNIndices(); n++)
   {
     AliESDtrack* at = esd->GetTrack(pv->GetIndices()[n]);
-    TEveTrack* track = esd_make_track(rnrStyle, n, at, at);
+    AliEveTrack* track = esd_make_track(rnrStyle, n, at, at);
     track->SetLineWidth(4);
     track->SetLineColor(cont->GetMainColor());
     track->SetLineStyle(7);

diff --git a/EVE/hlt-macros/homer_display.C b/EVE/hlt-macros/homer_display.C
index a36f2b07d8fbc2fed87e927851b735ba8b742e53..4e6bed18437b1be724283e96a66baa32afca4b40 100644 (file)
--- a/EVE/hlt-macros/homer_display.C
+++ b/EVE/hlt-macros/homer_display.C
@@ -23,7 +23,7 @@ class AliHLTHOMERBlockDesc;
 
 class TEvePointSet;
 class TEveTrackList;
-class TEveTrack;
+class AliEveTrack;
 
 class AliEveTPCLoader;
 class AliEveTPCData;
@@ -44,7 +44,7 @@ class AliEveITSDigitsInfo;
 //***********************************************************
 #include "TEveManager.h"
 #include "TEvePointSet.h"
-#include "TEveTrack.h"
+#include "AliEveTrack.h"
 #include "TEveVSDStructs.h"
 #include "TEveTrackPropagator.h"
 #include "TEvePointSet.h"
@@ -459,7 +459,7 @@ TEveTrack* makeESDTrack( TEveTrackPropagator*   rnrStyle,
   Double_t ep = esdTrack->GetP(), mc = esdTrack->GetMass();
   rt.fBeta = ep/TMath::Sqrt(ep*ep + mc*mc);
 
-  TEveTrack* track = new TEveTrack(&rt, rnrStyle);
+  AliEveTrack* track = new AliEveTrack(&rt, rnrStyle);
 
   cout<<"startPoint = "<<vbuf[0]<<" "<<vbuf[1]<<" "<<vbuf[2]<<" "<<pbuf[0]<<" "<<pbuf[1]<<" "<<pbuf[2]<<endl;
 
@@ -582,7 +582,7 @@ TEveTrack* makeESDTrack( TEveTrackPropagator*   rnrStyle,
   //PH                rt.sign*TMath::Hypot(rt.P.x, rt.P.y), rt.P.z,
   //PH                rt.V.x, rt.V.y, rt.V.z));
   char form[1000];
-  sprintf(form,"TEveTrack %d", rt.fIndex);
+  sprintf(form,"AliEveTrack %d", rt.fIndex);
   track->SetName(form);
   track->SetStdTitle();
   return track;
@@ -626,7 +626,7 @@ Int_t processTPCTracks(AliHLTHOMERBlockDesc* block) {
     cout<<"\nESD track N"<<ii<<":"<<endl;
     trackParam->Print();
 
-    TEveTrack* track = makeESDTrack( rnrStyle, ii, esdTrack, trackParam );
+    AliEveTrack* track = makeESDTrack( rnrStyle, ii, esdTrack, trackParam );
     esdTrack->GetPxPyPz(pin);
 
     //cout<<"pt : "<<sqrt(pin[0]*pin[0] + pin[1]*pin[1])<<endl;

diff --git a/EVE/macros/anyscan_init.C b/EVE/macros/anyscan_init.C
index daab6d84ec8f591838111c0fba9a21f0c9016650..e74124140ebce1ee82ffcf2a0e194a82224c844e 100644 (file)
--- a/EVE/macros/anyscan_init.C
+++ b/EVE/macros/anyscan_init.C
@@ -43,6 +43,8 @@ Bool_t gCenterProjectionsAtPrimaryVertex = kFALSE;
 
 void anyscan_init()
 {
+  Warning("anyscan_init", "This macro is deprecated - use visscan_init instead.");
+
   TEveUtil::LoadMacro("alieve_init.C");
   alieve_init(".", -1);