Using AliVVertex instead of AliESDVertex (Andrea)

diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx
index b6810b37e1cb682e318e412426aee20737302199..fcac295603ed0f43013dc15b5d5cd789ad47c52d 100644 (file)
--- a/ITS/AliITStrackV2.cxx
+++ b/ITS/AliITStrackV2.cxx
@@ -26,6 +26,7 @@
 #include "AliCluster.h"
 #include "AliTracker.h"
 #include "AliESDtrack.h"
+#include "AliESDVertex.h"
 #include "AliITSReconstructor.h"
 #include "AliITStrackV2.h"
 

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index 29cd96ee0420fd5081cdf6bc21a1a764d4ae40d7..94afebd923fce89fcade35ecbf538c635cfe64f2 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -17,6 +17,7 @@
 /* $Id$ */
 
 class AliESDtrack;
+class AliESDVertex;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {

diff --git a/PWG1/AliESDRecV0Info.h b/PWG1/AliESDRecV0Info.h
index 883f45569c41a4cfd5df56f3412b63beef64b51e..d97c106f290589e6c09e051d9f3c2e62bddb6afb 100644 (file)
--- a/PWG1/AliESDRecV0Info.h
+++ b/PWG1/AliESDRecV0Info.h
@@ -7,7 +7,7 @@
 
 #include "TObject.h"
 #include "AliESDRecInfo.h"
-class AliESDvertex;
+class AliESDVertex;
 class AliKFParticle;
 
 

diff --git a/STEER/AliExternalTrackParam.cxx b/STEER/AliExternalTrackParam.cxx
index fe492766d871386669bcbf8d47a88c163f973480..9e4c46cb70a4a593bbc6bc8c1134af69e66ce84c 100644 (file)
--- a/STEER/AliExternalTrackParam.cxx
+++ b/STEER/AliExternalTrackParam.cxx
@@ -27,7 +27,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include <TMatrixDSym.h>
 #include "AliExternalTrackParam.h"
-#include "AliESDVertex.h"
+#include "AliVVertex.h"
 #include "TPolyMarker3D.h"
 #include "TVector3.h"
 #include "AliLog.h"
@@ -1004,7 +1004,7 @@ PropagateToDCA(AliExternalTrackParam *p, Double_t b) {
 }
 
 
-Bool_t AliExternalTrackParam::PropagateToDCA(const AliESDVertex *vtx, 
+Bool_t AliExternalTrackParam::PropagateToDCA(const AliVVertex *vtx, 
 Double_t b, Double_t maxd, Double_t dz[2], Double_t covar[3]) {
   //
   // Propagate this track to the DCA to vertex "vtx", 
@@ -1020,8 +1020,8 @@ Double_t b, Double_t maxd, Double_t dz[2], Double_t covar[3]) {
   Double_t alpha=GetAlpha();
   Double_t sn=TMath::Sin(alpha), cs=TMath::Cos(alpha);
   Double_t x=GetX(), y=GetParameter()[0], snp=GetParameter()[2];
-  Double_t xv= vtx->GetXv()*cs + vtx->GetYv()*sn;
-  Double_t yv=-vtx->GetXv()*sn + vtx->GetYv()*cs, zv=vtx->GetZv();
+  Double_t xv= vtx->GetX()*cs + vtx->GetY()*sn;
+  Double_t yv=-vtx->GetX()*sn + vtx->GetY()*cs, zv=vtx->GetZ();
   x-=xv; y-=yv;
 
   //Estimate the impact parameter neglecting the track curvature
@@ -1047,7 +1047,7 @@ Double_t b, Double_t maxd, Double_t dz[2], Double_t covar[3]) {
   dz[1] = GetParameter()[1] - zv;
   
   if (covar==0) return kTRUE;
-  Double_t cov[6]; vtx->GetCovMatrix(cov);
+  Double_t cov[6]; vtx->GetCovarianceMatrix(cov);
 
   //***** Improvements by A.Dainese
   alpha=GetAlpha(); sn=TMath::Sin(alpha); cs=TMath::Cos(alpha);

diff --git a/STEER/AliExternalTrackParam.h b/STEER/AliExternalTrackParam.h
index 10d4c64713172f70876047f5cc6124ab479e00ce..118954c5cc1b95fbb30a0290163d70980dca28fa 100644 (file)
--- a/STEER/AliExternalTrackParam.h
+++ b/STEER/AliExternalTrackParam.h
@@ -27,7 +27,7 @@ const Double_t kMostProbablePt=0.35;
 
 Double_t ApproximateBetheBloch(Double_t);
 
-class AliESDVertex;
+class AliVVertex;
 class TPolyMarker3D; 
 
 class AliExternalTrackParam: public AliVParticle {
@@ -137,7 +137,7 @@ class AliExternalTrackParam: public AliVParticle {
   Double_t GetDCA(const AliExternalTrackParam *p, Double_t b,
     Double_t &xthis,Double_t &xp) const;
   Double_t PropagateToDCA(AliExternalTrackParam *p, Double_t b);
-  Bool_t PropagateToDCA(const AliESDVertex *vtx, Double_t b, Double_t maxd,
+  Bool_t PropagateToDCA(const AliVVertex *vtx, Double_t b, Double_t maxd,
                         Double_t dz[2]=0, Double_t cov[3]=0);
   
   void GetDirection(Double_t d[3]) const;

diff --git a/TPC/AliTPCtrack.cxx b/TPC/AliTPCtrack.cxx
index a3238802548f3e5271ab71749510de54b17dee5a..10741b91b3dd88fb0d8735c468364b2889427d58 100644 (file)
--- a/TPC/AliTPCtrack.cxx
+++ b/TPC/AliTPCtrack.cxx
@@ -27,6 +27,7 @@
 #include "AliCluster.h"
 #include "AliTracker.h"
 #include "AliESDtrack.h"
+#include "AliESDVertex.h"
 
 ClassImp(AliTPCtrack)