Adding new calibration flavours for trigger

[u/mrichter/AliRoot.git] / STEER / AliPoints.cxx

diff --git a/STEER/AliPoints.cxx b/STEER/AliPoints.cxx
index 51c61a6ff046cc5cbf05bc7c520270293e3d32c8..8e7e9ffc7cb57a199041d34be1393d3446684395 100644 (file)
--- a/STEER/AliPoints.cxx
+++ b/STEER/AliPoints.cxx
@@ -13,21 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.7  2001/01/26 19:58:48  hristov
-Major upgrade of AliRoot code
-
-Revision 1.6  2000/10/02 21:28:14  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.5  2000/07/11 18:24:59  fca
-Coding convention corrections + few minor bug fixes
-
-Revision 1.4  1999/09/29 09:24:29  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -47,6 +33,7 @@ Introduction of the Copyright and cvs Log
 #include "TView.h"
 
 #include "AliDetector.h"
+#include "AliMC.h"
 #include "AliPoints.h"
 #include "AliRun.h"
  
@@ -95,17 +82,17 @@ AliPoints::~AliPoints()
 }
 
 //_______________________________________________________________________
-void AliPoints::Copy(AliPoints &pts) const
+void AliPoints::Copy(TObject &pts) const
 {
   //
   // Copy *this onto pts
   //
-  if(this != &pts) {
+  if((TObject*)this != &pts) {
     ((TPolyMarker3D*)this)->Copy(dynamic_cast<TPolyMarker3D&>(pts));
-    pts.fGLList = fGLList;
-    pts.fLastPoint = fLastPoint;
-    pts.fDetector = fDetector;
-    pts.fIndex = fIndex;
+    (dynamic_cast<AliPoints&>(pts)).fGLList = fGLList;
+    (dynamic_cast<AliPoints&>(pts)).fLastPoint = fLastPoint;
+    (dynamic_cast<AliPoints&>(pts)).fDetector = fDetector;
+    (dynamic_cast<AliPoints&>(pts)).fIndex = fIndex;
   }
 }
 
@@ -130,7 +117,7 @@ Int_t AliPoints::DistancetoPrimitive(Int_t px, Int_t py)
 }
 
 //_______________________________________________________________________
-void AliPoints::DumpParticle()
+void AliPoints::DumpParticle() const
 {
   //
   //   Dump particle corresponding to this point
@@ -188,12 +175,12 @@ TParticle *AliPoints::GetParticle() const
   //
   //   Returns pointer to particle index in AliRun::fParticles
   //
-  if (fIndex < 0 || fIndex >= gAlice->GetNtrack()) return 0;
-  else return gAlice->Particle(fIndex);
+  if (fIndex < 0 || fIndex >= gAlice->GetMCApp()->GetNtrack()) return 0;
+  else return gAlice->GetMCApp()->Particle(fIndex);
 }
 
 //_______________________________________________________________________
-void AliPoints::InspectParticle()
+void AliPoints::InspectParticle() const
 {
   //
   //   Inspect particle corresponding to this point
@@ -214,7 +201,7 @@ void AliPoints::Propagate()
   //  
   TIter next(gAlice->Detectors());
   AliDetector *detector;
-  while((detector = dynamic_cast<AliDetector*>(next()))) {
+  while((detector = (AliDetector*)(next()))) {
     if (!detector->IsActive()) continue;
     points = detector->Points();
     if (!points) continue;