Misalignment according survey data

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

diff --git a/STEER/AliAODVertex.cxx b/STEER/AliAODVertex.cxx
index 0268410dc1d15753c455e51cba4370e80a2d4ca4..44030031538b5f0427188030759dea549e83cff7 100644 (file)
--- a/STEER/AliAODVertex.cxx
+++ b/STEER/AliAODVertex.cxx
@@ -32,9 +32,10 @@ ClassImp(AliAODVertex)
 AliAODVertex::AliAODVertex() : 
   TObject(),
   fChi2perNDF(-999.),
+  fID(-1),
   fType(kUndef),
   fCovMatrix(NULL),
-  fParent(0x0),
+  fParent(),
   fDaughters()
   {
   // default constructor
@@ -47,9 +48,11 @@ AliAODVertex::AliAODVertex(const Double_t position[3],
                           const Double_t covMatrix[6],
                           Double_t  chi2perNDF,
                           TObject  *parent,
+                          Short_t id,
                           Char_t vtype) :
   TObject(),
   fChi2perNDF(chi2perNDF),
+  fID(id),
   fType(vtype),
   fCovMatrix(NULL),
   fParent(parent),
@@ -66,10 +69,12 @@ AliAODVertex::AliAODVertex(const Float_t position[3],
                           const Float_t  covMatrix[6],
                           Double_t  chi2perNDF,
                           TObject  *parent,
+                          Short_t id,
                           Char_t vtype) :
 
   TObject(),
   fChi2perNDF(chi2perNDF),
+  fID(id),
   fType(vtype),
   fCovMatrix(NULL),
   fParent(parent),
@@ -87,9 +92,10 @@ AliAODVertex::AliAODVertex(const Double_t position[3],
                           Char_t vtype) :
   TObject(),
   fChi2perNDF(chi2perNDF),
+  fID(-1),
   fType(vtype),
   fCovMatrix(NULL),
-  fParent(0x0),
+  fParent(),
   fDaughters()
 {
   // constructor without covariance matrix
@@ -103,9 +109,10 @@ AliAODVertex::AliAODVertex(const Float_t position[3],
                           Char_t vtype) :
   TObject(),
   fChi2perNDF(chi2perNDF),
+  fID(-1),
   fType(vtype),
   fCovMatrix(NULL),
-  fParent(0x0),
+  fParent(),
   fDaughters()
 {
   // constructor without covariance matrix
@@ -125,6 +132,7 @@ AliAODVertex::~AliAODVertex()
 AliAODVertex::AliAODVertex(const AliAODVertex& vtx) :
   TObject(vtx),
   fChi2perNDF(vtx.fChi2perNDF),
+  fID(vtx.fID),
   fType(vtx.fType),
   fCovMatrix(NULL),
   fParent(vtx.fParent),
@@ -152,6 +160,7 @@ AliAODVertex& AliAODVertex::operator=(const AliAODVertex& vtx)
       fPosition[i] = vtx.fPosition[i];
     
     fChi2perNDF = vtx.fChi2perNDF;
+    fID = vtx.fID;
     fType = vtx.fType;
 
     //covariance matrix
@@ -434,7 +443,7 @@ void AliAODVertex::PhiAndThetaToVertex(AliAODVertex *vtx, P &phi, T &theta) cons
   // rotation angles around z-axis (phi) and around new y-axis (theta)
   // with which vtx is seen (used by RotatedCovMatrix... methods)
 
-  phi = TMath::ATan2(vtx->GetY()-GetY(),vtx->GetX()-GetX());
+  phi = TMath::Pi()+TMath::ATan2(-vtx->GetY()+GetY(),-vtx->GetX()+GetX());
   Double_t vtxxphi = vtx->GetX()*TMath::Cos(phi)+vtx->GetY()*TMath::Sin(phi);
   Double_t xphi = GetX()*TMath::Cos(phi)+GetY()*TMath::Sin(phi);
   theta = TMath::ATan2(vtx->GetZ()-GetZ(),vtxxphi-xphi);