Fix fixed-string length bug

[u/mrichter/AliRoot.git] / STEER / AliAODVertex.h

diff --git a/STEER/AliAODVertex.h b/STEER/AliAODVertex.h
index 325f4168ee18be5bc0c9eef3997c069c88fd4cc4..e53cc9fb338ca5f1fa12fedaff21c30c4070d089 100644 (file)
--- a/STEER/AliAODVertex.h
+++ b/STEER/AliAODVertex.h
@@ -10,7 +10,6 @@
 //     Author: Markus Oldenburg, CERN
 //-------------------------------------------------------------------------
 
-#include <TNamed.h>
 #include <TRef.h>
 #include <TRefArray.h>
 #include <TMath.h>
@@ -28,12 +27,14 @@ class AliAODVertex : public TObject {
               const Double_t *covMatrix=0x0,
               Double_t chi2perNDF = -999.,
               TObject *parent = 0x0,
+              Short_t id=-1,
+              Char_t vtype=kUndef);
+  AliAODVertex(const Float_t *position, 
+              const Float_t *covMatrix=0x0,
+              Double_t chi2perNDF = -999.,
+              TObject *parent = 0x0,
+              Short_t id=-1,
               Char_t vtype=kUndef);
-    AliAODVertex(const Float_t *position, 
-                const Float_t *covMatrix=0x0,
-                Double_t chi2perNDF = -999.,
-                TObject *parent = 0x0,
-                Char_t vtype=kUndef);
     AliAODVertex(const Double_t *position, 
                 Double_t chi2perNDF,
                 Char_t vtype=kUndef);
@@ -56,9 +57,9 @@ class AliAODVertex : public TObject {
 
   void     SetParent(TObject *parent) { fParent = parent; }
 
-  Double_t  GetX() const { return fPosition[0]; }
-  Double_t  GetY() const { return fPosition[1]; }
-  Double_t  GetZ() const { return fPosition[2]; }
+  Double_t GetX() const { return fPosition[0]; }
+  Double_t GetY() const { return fPosition[1]; }
+  Double_t GetZ() const { return fPosition[2]; }
   template <class T> void GetPosition(T *pos) const
     {pos[0]=fPosition[0]; pos[1]=fPosition[1]; pos[2]=fPosition[2];}
 
@@ -74,18 +75,22 @@ class AliAODVertex : public TObject {
 
   template <class T> void     GetSigmaXYZ(T *sigma) const;
 
-  Double_t  GetChi2perNDF() const { return fChi2perNDF; }
-  Double_t  GetChi2() const { return fChi2perNDF*(Double_t)GetNDF(); }
-  Int_t     GetNDF() const { return 2*GetNContributors()-3; }
+  Double_t GetChi2perNDF() const { return fChi2perNDF; }
+  Double_t GetChi2() const { return fChi2perNDF*(Double_t)GetNDF(); }
+  Int_t    GetNDF() const { return 2*GetNContributors()-3; }
+
+  Short_t  GetID() const { return fID; }
+  void     SetID(Short_t id) { fID=id; }
 
-  Char_t    GetType() const { return fType; }
-  void      SetType(AODVtx_t vtype) { fType=vtype; }
+  Char_t   GetType() const { return fType; }
+  void     SetType(AODVtx_t vtype) { fType=vtype; }
 
   TObject* GetParent() const   { return fParent.GetObject(); }
   Bool_t   HasParent(TObject *parent) const { return (fParent.GetObject() == parent) ? kTRUE : kFALSE; }
 
   void     AddDaughter(TObject *daughter) { fDaughters.Add(daughter);}
   void     RemoveDaughter(TObject *daughter) { fDaughters.Remove(daughter); }
+  void     RemoveDaughters() { fDaughters.Clear(); }
   TObject* GetDaughter(Int_t i) { return fDaughters.At(i); }
   Bool_t   HasDaughter(TObject *daughter) const;
   Int_t    GetNDaughters() const { return fDaughters.GetEntriesFast(); }
@@ -111,14 +116,16 @@ class AliAODVertex : public TObject {
 
  private :
 
-  Double32_t    fPosition[3]; // vertex position
-  Double32_t    fChi2perNDF;  // chi2/NDF of vertex fit
-  AliAODRedCov<3> *fCovMatrix;   // vertex covariance matrix; values of and below the diagonal
-  TRef          fParent;      // reference to the parent particle
-  TRefArray     fDaughters;   // references to the daughter particles
-  Char_t        fType;        // Vertex type
+  Double32_t      fPosition[3]; // vertex position
+  Double32_t      fChi2perNDF;  // chi2/NDF of vertex fit
+  Short_t         fID;          // vertex ID; corresponds to the array index of the appropriate ESD container
+  Char_t          fType;        // vertex type
+
+  AliAODRedCov<3> *fCovMatrix;  // vertex covariance matrix; values of and below the diagonal
+  TRef            fParent;      // reference to the parent particle
+  TRefArray       fDaughters;   // references to the daughter particles
 
-  ClassDef(AliAODVertex,2);
+  ClassDef(AliAODVertex,3);
 };
 
 #endif