Merge branch 'displayDevel'

[u/mrichter/AliRoot.git] / HLT / EVE / AliHLTEveMuon.cxx

diff --git a/HLT/EVE/AliHLTEveMuon.cxx b/HLT/EVE/AliHLTEveMuon.cxx
index cc81f3993ea60b040c7e9833d8f62aeba3862072..05625e203f9bb6d2c0e6459298b5da8c5d168f09 100644 (file)
--- a/HLT/EVE/AliHLTEveMuon.cxx
+++ b/HLT/EVE/AliHLTEveMuon.cxx
@@ -24,7 +24,7 @@
 #include "TCanvas.h"\r
 #include "TEveStraightLineSet.h"\r
 #include "TEvePointSet.h"\r
-#include "AliEveHOMERManager.h"\r
+#include "AliEveHLTEventManager.h"\r
 #include "TEveManager.h"\r
 \r
 \r
@@ -47,7 +47,7 @@ class AliEveMuonTrack;
 ClassImp(AliHLTEveMuon);\r
 \r
 AliHLTEveMuon::AliHLTEveMuon() : \r
-  AliHLTEveBase(),\r
+  AliHLTEveBase("Muon"),\r
   fFullTrackList(NULL),\r
   fTracks(NULL),\r
   fClusters(NULL)\r
@@ -78,7 +78,7 @@ void AliHLTEveMuon::ProcessBlock(AliHLTHOMERBlockDesc * block) {
   if ( (block->GetDataType().CompareTo("RECHITS") == 0) || (block->GetDataType().CompareTo("TRIGRECS") == 0) ) {\r
     if(!fClusters) {\r
       fClusters = CreateClusters();\r
-      fEventManager->GetEveManager()->AddElement(fClusters);\r
+      AddElement(fClusters);\r
     }\r
     ProcessClusters( block, fClusters );\r
     \r
@@ -86,8 +86,7 @@ void AliHLTEveMuon::ProcessBlock(AliHLTHOMERBlockDesc * block) {
     \r
     if ( !fTracks ) {\r
       fTracks = CreateTrackSet(); \r
-      fEventManager->GetEveManager()->AddElement(fTracks);\r
-      gEve->AddElement(fTracks);\r
+      AddElement(fTracks);\r
     }\r
     \r
     ProcessTracks( block, fTracks );\r
@@ -96,8 +95,7 @@ void AliHLTEveMuon::ProcessBlock(AliHLTHOMERBlockDesc * block) {
     \r
     if ( !fFullTrackList ) {\r
       fFullTrackList = CreateFullTrackList(); \r
-      fEventManager->GetEveManager()->AddElement(fFullTrackList);      \r
-      gEve->AddElement(fFullTrackList);\r
+      AddElement(fFullTrackList);\r
     }\r
     \r
     ProcessFullTracks( block,  fFullTrackList );\r
@@ -118,17 +116,17 @@ TEvePointSet * AliHLTEveMuon::CreateClusters() {
 \r
 TEveStraightLineSet * AliHLTEveMuon::CreateTrackSet() {\r
   // See header file\r
-  TEveStraightLineSet * ls = new TEveStraightLineSet("MUON Tracks");\r
-  ls->SetMainColor(kRed);\r
-  ls->SetLineWidth(3);\r
-  return ls;\r
+  TEveStraightLineSet * lineset = new TEveStraightLineSet("MUON Tracks");\r
+  lineset->SetMainColor(kRed);\r
+  lineset->SetLineWidth(3);\r
+  return lineset;\r
 }\r
 \r
 TEveTrackList * AliHLTEveMuon::CreateFullTrackList(){\r
   // See header file\r
-  TEveTrackList * ls = new TEveTrackList("MUON Full Tracks");\r
-  ls->SetMainColor(kBlue);\r
-  return ls;\r
+  TEveTrackList * lineset = new TEveTrackList("MUON Full Tracks");\r
+  lineset->SetMainColor(kBlue);\r
+  return lineset;\r
 }\r
 \r
 void AliHLTEveMuon::ProcessHistogram(AliHLTHOMERBlockDesc * block ) {\r
@@ -347,7 +345,7 @@ Int_t AliHLTEveMuon::ProcessFullTracks(AliHLTHOMERBlockDesc * block, TEveTrackLi
     track->MakeESDTrack(muonESDTrack);\r
     //track->SetTitle(Form("HLT Track : %d, pt : %lf",ientry,TMath::Sqrt(((mtrack->fPx * mtrack->fPx) + (mtrack->fPy * mtrack->fPy)))));\r
     track->SetName(Form("HLT Track : %d, pt : %lf",ientry,TMath::Sqrt(((mtrack->fPx * mtrack->fPx) + (mtrack->fPy * mtrack->fPy)))));\r
-    gEve->AddElement(track, fullTracks);\r
+    fullTracks->AddElement(track);\r
     \r
     mtrack++;\r
   }//track loop\r