X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliESDVertex.h;h=5ed40a92f5cbef075214e428d951ddff9db560d9;hb=383a295ac7dc9752055fe92388ad6e102a41dc69;hp=5ea8e4a95e65053d583849a65d97380ed7375ebb;hpb=bf25155cbf11acd3d16fbd331a0925be341f6e97;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliESDVertex.h b/STEER/AliESDVertex.h
index 5ea8e4a95e6..5ed40a92f5c 100644
--- a/STEER/AliESDVertex.h
+++ b/STEER/AliESDVertex.h
@@ -26,10 +26,11 @@
  *                                                                           *
  *****************************************************************************/
 
-//---- Root headers -----
-#include <TNamed.h>
+#include <TMath.h>
 
-class AliESDVertex : public TNamed {
+#include "AliVertex.h"
+
+class AliESDVertex : public AliVertex {
  
  public:
  
@@ -43,21 +44,21 @@ class AliESDVertex : public TNamed {
 	       const Char_t *vtxName="Vertex");
   AliESDVertex(Double_t position[3],Double_t sigma[3],Double_t snr[3],
 	       const Char_t *vtxName="Vertex");
+  AliESDVertex(const AliESDVertex &source);
+  AliESDVertex &operator=(const AliESDVertex &source);
+  virtual void Copy(TObject &obj) const;
 
-  virtual ~AliESDVertex();
-
+  virtual ~AliESDVertex() {}
 
-  void     GetXYZ(Double_t position[3]) const;
   void     GetSigmaXYZ(Double_t sigma[3]) const;
   void     GetCovMatrix(Double_t covmatrix[6]) const;
+  void     GetCovarianceMatrix(Double_t covmatrix[6]) const 
+                    {GetCovMatrix(covmatrix);}
   void     GetSNR(Double_t snr[3]) const;
 
-  Double_t GetXv() const;
-  Double_t GetYv() const;
-  Double_t GetZv() const;
-  Double_t GetXRes() const;
-  Double_t GetYRes() const;
-  Double_t GetZRes() const;
+  Double_t GetXRes() const {return TMath::Sqrt(fCovXX);}
+  Double_t GetYRes() const {return TMath::Sqrt(fCovYY);}
+  Double_t GetZRes() const {return TMath::Sqrt(fCovZZ);}
   Double_t GetXSNR() const { return fSNR[0]; }
   Double_t GetYSNR() const { return fSNR[1]; }
   Double_t GetZSNR() const { return fSNR[2]; }
@@ -65,30 +66,30 @@ class AliESDVertex : public TNamed {
   Double_t GetChi2() const { return fChi2; }
   Double_t GetChi2toNDF() const 
     { return fChi2/(2.*(Double_t)fNContributors-3.); }
-  Int_t    GetNContributors() const { return fNContributors; }
+  Double_t GetChi2perNDF() const { return GetChi2toNDF();}
+  Int_t    GetNDF() const {return (2*fNContributors-3);}
 
   void     Print(Option_t* option = "") const;
   void     PrintStatus() const {Print();}
-  void SetTruePos(Double_t *tp){for(Int_t i=0;i<3;i++)fTruePos[i]=tp[i];}
-  void GetTruePos(Double_t &x,Double_t &y,Double_t &z) const 
-       {x=fTruePos[0]; y=fTruePos[1]; z=fTruePos[2];}
 
-  void Reset() { SetToZero(); SetName("Vertex"); }
+  void     Reset() { SetToZero(); SetName("Vertex"); }
+
+  void     SetID(Char_t id) {fID=id;}
+  Char_t   GetID() const {return fID;}
 
  protected:
 
-  Double_t fPosition[3];  // vertex position
-  Double_t fCovXX,fCovXY,fCovYY,fCovXZ,fCovYZ,fCovZZ;  // vertex covariance matrix
-  Double_t fSNR[3];  // S/N ratio
-  Double_t fChi2;  // chi2 of vertex fit
-  Int_t    fNContributors;  // # of tracklets/tracks used for the estimate 
-  Double_t fTruePos[3];   //true vertex position (for comparison purposes)
+  Double32_t fCovXX,fCovXY,fCovYY,fCovXZ,fCovYZ,fCovZZ;  // vertex covariance matrix
+  Double32_t fSNR[3];  // S/N ratio
+  Double32_t fChi2;  // chi2 of vertex fit
+
+  Char_t fID;       // ID of this vertex within an ESD event
 
  private:
 
   void SetToZero();
 
-  ClassDef(AliESDVertex,4)  // Class for Primary Vertex
+  ClassDef(AliESDVertex,7)  // Class for Primary Vertex
 };
 
 #endif