PHOS - Fixing circular dependecies + initial DA files

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

diff --git a/EVE/EveBase/AliEveCosmicRayFitter.cxx b/EVE/EveBase/AliEveCosmicRayFitter.cxx
index 96cd9e17229d74d06869e81559118bc1e8a60009..bc328df1fba81b5c111a91c8291d758932bb468e 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"
@@ -67,9 +67,8 @@ AliEveCosmicRayFitter::AliEveCosmicRayFitter(const Text_t* name, Int_t n_points)
 
   fTrackList = new TEveTrackList("Cosmic ray");
   fTrackList->SetTitle("muons");
-  fTrackList->SetMainColor((Color_t)8);
+  fTrackList->SetMainColor(8);
   gEve->AddElement(fTrackList);
-  UpdateItems();
 
   fGraphPicked1 = new TGraph();
   fGraphPicked1->SetName("Selected points");
@@ -151,6 +150,7 @@ void AliEveCosmicRayFitter::AddFitPoint(Int_t n)
 
   Float_t x, y, z;
   TEvePointSet* ps = dynamic_cast<TEvePointSet*>((TQObject*) gTQSender);
+  if(!ps) AliFatal("ps == 0, dynamic cast failed\n");
 
   std::map<Point_t, Int_t>::iterator g = fSPMap.find(Point_t(ps, n));
   if(g != fSPMap.end())
@@ -236,16 +236,16 @@ 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();
 
-  tp->InitTrack(rc.fV, rc.fP, 1, 0);
+  tp->InitTrack(rc.fV, 0);
   tp->GoToBounds(rc.fP);
 
   rc.fP.Set(-1, -params1(1), -params2(1));
-  tp->InitTrack(rc.fV, rc.fP, 1, 0);
+  tp->InitTrack(rc.fV, 0);
   tp->GoToBounds(rc.fP);
   tp->FillPointSet(track);
   tp->ResetTrack();
@@ -262,7 +262,6 @@ void AliEveCosmicRayFitter::DestroyElements()
   TEveElement::DestroyElements();
   gEve->AddElement(fTrackList, this);
   fTrackList->DestroyElements();
-  UpdateItems();
 }
 
 /**************************************************************************/
@@ -365,8 +364,11 @@ void AliEveCosmicRayFitter::DrawDebugGraph()
   // draw graphs
 
   TCanvas * canvas = 0;
-  if (gPad) gPad->Clear();
-  else if (gPad==0 || gPad->GetCanvas()->IsEditable() == kFALSE) {
+  if (gPad) {
+         gPad->Clear();
+         canvas=gPad->GetCanvas();
+  }
+  if (gPad==0 || gPad->GetCanvas()->IsEditable() == kFALSE) {
     canvas = new TCanvas("canvas", "CosmicRayFitter", 800, 400);
     canvas->Clear();
   }