Changes needed on Sun with Root v4-03-04

[u/mrichter/AliRoot.git] / TPC / AliTPCtrack.cxx

diff --git a/TPC/AliTPCtrack.cxx b/TPC/AliTPCtrack.cxx
index b8f6bd08139d19fe3b214b2995fad4b784f18b7a..f514d185c27a9f0ca733b7dcce44bbb82224403a 100644 (file)
--- a/TPC/AliTPCtrack.cxx
+++ b/TPC/AliTPCtrack.cxx
@@ -25,7 +25,6 @@
 
 #include "AliTPCtrack.h"
 #include "AliCluster.h"
-#include "AliBarrelTrack.h"
 #include "AliESDtrack.h"
 
 ClassImp(AliTPCtrack)
@@ -38,7 +37,7 @@ AliTPCtrack::AliTPCtrack(): AliKalmanTrack()
   //-------------------------------------------------
   fX = fP0 = fP1 = fP2 = fP3 = fP3 = fP4 = 0.0;
   fAlpha = fdEdx = 0.0;
-  fNWrong = fNRotation = fNumber = 0;  // [SR, 01.04.2003]
+  fNumber = 0;  // [SR, 01.04.2003]
   for (Int_t i=0; i<3;i++) fKinkIndexes[i]=0;
 }
 
@@ -80,55 +79,6 @@ const Double_t cc[15], Double_t xref, Double_t alpha) : AliKalmanTrack() {
   for (Int_t i=0; i<3;i++) fKinkIndexes[i]=0;
 }
 
-//_____________________________________________________________________________
-AliTPCtrack::AliTPCtrack(const AliKalmanTrack& t,Double_t alpha) :
-AliKalmanTrack(t) {
-  //-----------------------------------------------------------------
-  // Conversion AliKalmanTrack -> AliTPCtrack.
-  //-----------------------------------------------------------------
-  SetChi2(0.);
-  SetNumberOfClusters(0);
-
-  fdEdx  = 0.;
-  fAlpha = alpha;
-  if      (fAlpha < -TMath::Pi()) fAlpha += 2*TMath::Pi();
-  else if (fAlpha >= TMath::Pi()) fAlpha -= 2*TMath::Pi();
-
-  //Conversion of the track parameters
-  Double_t x,p[5]; t.GetExternalParameters(x,p);
-  fX=x;    x=GetConvConst();
-  fP0=p[0]; 
-  fP1=p[1]; 
-  fP3=p[3];
-  fP4=p[4]/x; 
-  fP2=fP4*fX - p[2];
-
-  //Conversion of the covariance matrix
-  Double_t c[15]; t.GetExternalCovariance(c);
-  c[10]/=x; c[11]/=x; c[12]/=x; c[13]/=x; c[14]/=x*x;
-
-  Double_t c22=fX*fX*c[14] - 2*fX*c[12] + c[5];
-  Double_t c32=fX*c[13] - c[8];
-  Double_t c20=fX*c[10] - c[3], c21=fX*c[11] - c[4], c42=fX*c[14] - c[12];
-  
-  fC00=c[0 ];
-  fC10=c[1 ];   fC11=c[2 ];
-  fC20=c20;     fC21=c21;     fC22=c22;
-  fC30=c[6 ];   fC31=c[7 ];   fC32=c32;   fC33=c[9 ];
-  fC40=c[10];   fC41=c[11];   fC42=c42;   fC43=c[13]; fC44=c[14];
-  //
-  //MI
-  fSdEdx      = 0;
-  fNFoundable = 0;
-  fBConstrain = 0;
-  fLastPoint  = 0;
-  fFirstPoint = 0;
-  fRemoval    = 0;
-  fTrackType  = 0;
-  fLab2       = 0;
-  for (Int_t i=0; i<3;i++) fKinkIndexes[i]=0;
-}
-
 //_____________________________________________________________________________
 AliTPCtrack::AliTPCtrack(const AliESDtrack& t) : AliKalmanTrack() {
   //-----------------------------------------------------------------
@@ -216,39 +166,7 @@ AliTPCtrack::AliTPCtrack(const AliTPCtrack& t) : AliKalmanTrack(t) {
   fLab2       = t.fLab2;
   for (Int_t i=0; i<3;i++) fKinkIndexes[i]=t.fKinkIndexes[i];
 }
-//_____________________________________________________________________________
 
-void  AliTPCtrack::GetBarrelTrack(AliBarrelTrack *track) const{
-  //
-  // Create a Barrel Track out of this track
-  // Current track is propagated to the reference plane
-  // by the tracker
-  //
-  // [SR, 01.04.2003]
-  
-  if (!track) return;
-  Double_t xr, vec[5], cov[15];
-
-  track->SetLabel(GetLabel());
-  track->SetX(fX, fAlpha);
-  track->SetNClusters(GetNumberOfClusters(), GetChi2());
-  Double_t times[10];
-  GetIntegratedTimes(times);
-  track->SetTime(times, GetIntegratedLength());
-
-  track->SetMass(GetMass());
-  track->SetdEdX(GetdEdx());
-
-  track->SetNWrongClusters(fNWrong);
-  track->SetNRotate(fNRotation);
-
-  GetExternalParameters(xr, vec);
-  track->SetStateVector(vec);
-  
-  GetExternalCovariance(cov);
-  track->SetCovarianceMatrix(cov);
-
-}
 //_____________________________________________________________________________
 Int_t AliTPCtrack::Compare(const TObject *o) const {
   //-----------------------------------------------------------------
@@ -451,14 +369,6 @@ Int_t AliTPCtrack::Update(const AliCluster *c, Double_t chisq, UInt_t index) {
   //-----------------------------------------------------------------
   // This function associates a cluster with this track.
   //-----------------------------------------------------------------
-
-  // update the number of wrong SR[20.03.2003]
-  Int_t absLabel = TMath::Abs(GetLabel());
-  if ( (c->GetLabel(0) != absLabel) && 
-       (c->GetLabel(0) != absLabel) &&
-       (c->GetLabel(0) != absLabel)) fNWrong++;
-  //
-
   Double_t r00=c->GetSigmaY2(), r01=0., r11=c->GetSigmaZ2();
   r00+=fC00; r01+=fC10; r11+=fC11;
   Double_t det=r00*r11 - r01*r01;
@@ -517,9 +427,6 @@ Int_t AliTPCtrack::Rotate(Double_t alpha)
   //-----------------------------------------------------------------
   // This function rotates this track.
   //-----------------------------------------------------------------
-
-  if (alpha != 0) fNRotation++;  // [SR, 01.04.2003]
-
   fAlpha += alpha;
   if (fAlpha<-TMath::Pi()) fAlpha += 2*TMath::Pi();
   if (fAlpha>=TMath::Pi()) fAlpha -= 2*TMath::Pi();