Fix neccessary for local merge

[u/mrichter/AliRoot.git] / STEER / AOD / AliAODVertex.cxx

diff --git a/STEER/AOD/AliAODVertex.cxx b/STEER/AOD/AliAODVertex.cxx
index 01c05088f0895ecec913ff250020224adc056b1f..29a8f37986b563541eb138cc54169ec0f74be32b 100644 (file)
--- a/STEER/AOD/AliAODVertex.cxx
+++ b/STEER/AOD/AliAODVertex.cxx
@@ -33,6 +33,7 @@ AliAODVertex::AliAODVertex() :
   AliVVertex(),
   fChi2perNDF(-999.),
   fID(-1),
+  fBCID(AliVTrack::kTOFBCNA),
   fType(kUndef),
   fNprong(0),
   fIprong(0),
@@ -58,6 +59,7 @@ AliAODVertex::AliAODVertex(const Double_t position[3],
   AliVVertex(),
   fChi2perNDF(chi2perNDF),
   fID(id),
+  fBCID(AliVTrack::kTOFBCNA),
   fType(vtype),
   fNprong(nprong),
   fIprong(0),
@@ -86,6 +88,7 @@ AliAODVertex::AliAODVertex(const Float_t position[3],
   AliVVertex(),
   fChi2perNDF(chi2perNDF),
   fID(id),
+  fBCID(AliVTrack::kTOFBCNA),
   fType(vtype),
   fNprong(nprong),
   fIprong(0),
@@ -110,6 +113,7 @@ AliAODVertex::AliAODVertex(const Double_t position[3],
   AliVVertex(),
   fChi2perNDF(chi2perNDF),
   fID(-1),
+  fBCID(AliVTrack::kTOFBCNA),
   fType(vtype),
   fNprong(nprong),
   fIprong(0),
@@ -132,6 +136,7 @@ AliAODVertex::AliAODVertex(const Float_t position[3],
   AliVVertex(),
   fChi2perNDF(chi2perNDF),
   fID(-1),
+  fBCID(AliVTrack::kTOFBCNA),
   fType(vtype),
   fNprong(nprong),
   fIprong(0),
@@ -161,6 +166,7 @@ AliAODVertex::AliAODVertex(const AliAODVertex& vtx) :
   AliVVertex(vtx),
   fChi2perNDF(vtx.fChi2perNDF),
   fID(vtx.fID),
+  fBCID(vtx.fBCID),
   fType(vtx.fType),
   fNprong(vtx.fNprong),
   fIprong(vtx.fIprong),
@@ -215,23 +221,25 @@ AliAODVertex& AliAODVertex::operator=(const AliAODVertex& vtx)
 
     //momentum
     for (int i = 0; i < 3; i++) 
-      fPosition[i] = vtx.fPosition[i];
+       fPosition[i] = vtx.fPosition[i];
     
     fChi2perNDF = vtx.fChi2perNDF;
-    fID = vtx.fID;
+    fID   = vtx.fID;
     fType = vtx.fType;
-
+    fBCID = vtx.fBCID;
+    
     //covariance matrix
     delete fCovMatrix;
     fCovMatrix = NULL;   
-    if (vtx.fCovMatrix) fCovMatrix=new AliAODRedCov<3>(*vtx.fCovMatrix);
+    if (vtx.fCovMatrix) fCovMatrix = new AliAODRedCov<3>(*vtx.fCovMatrix);
     
     //other stuff
-    fParent = vtx.fParent;
-    fDaughters = vtx.fDaughters;
-    fNprong    = vtx.fNprong;
-    fIprong    = vtx.fIprong;  
-
+    fNContributors = vtx.fNContributors;
+    fParent        = vtx.fParent;
+    fDaughters     = vtx.fDaughters;
+    fNprong        = vtx.fNprong;
+    fIprong        = vtx.fIprong;  
+    
     MakeProngs();
     for (int i = 0; i < fNprong; i++) {
        fProngs[i] = vtx.fProngs[i];