Fixes for bug #52499: Field polarities inconsistiency

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

diff --git a/STEER/AliMixedEvent.cxx b/STEER/AliMixedEvent.cxx
index 01dd541b7917eb2cf5477160ab59309ecf68b6c8..d3800cb3887801d285487f0244b586b8201f41cd 100644 (file)
--- a/STEER/AliMixedEvent.cxx
+++ b/STEER/AliMixedEvent.cxx
@@ -25,11 +25,9 @@
 
 
 #include "AliMixedEvent.h"
-#include "AliESDVertex.h"
 #include "AliExternalTrackParam.h"
-#include "AliESDtrack.h"
 #include "TVector3.h"
-#include "AliAODVertex.h"
+#include "AliVVertex.h"
 #include <TMath.h>
 #include <TMatrix.h>
 #include <TMatrixD.h>
@@ -42,7 +40,8 @@ AliMixedEvent::AliMixedEvent() :
     fEventList(),
     fNEvents(0),       
     fNumberOfTracks(0),
-    fNTracksCumul(0)
+    fNTracksCumul(0),
+    fMeanVertex(0)
 {
     // Default constructor
 }
@@ -52,7 +51,8 @@ AliMixedEvent::AliMixedEvent(const AliMixedEvent& Evnt) :
     fEventList(),
     fNEvents(0),
     fNumberOfTracks(0),
-    fNTracksCumul(0)
+    fNTracksCumul(0),
+    fMeanVertex(0)
 { } // Copy constructor
 
 AliMixedEvent& AliMixedEvent::operator=(const AliMixedEvent& vEvnt)
@@ -135,11 +135,10 @@ void AliMixedEvent::ComputeVtx(TObjArray *vertices, Double_t *pos,Double_t *sig)
     Double_t sumsigma[6]={0.,0.,0.,0.,0.,0.};
     
     for(Int_t ivtx = 0; ivtx < nentries; ivtx++){
-       AliAODVertex *vtx=(AliAODVertex*)vertices->UncheckedAt(ivtx);
+       AliVVertex *vtx=(AliVVertex*)vertices->UncheckedAt(ivtx);
        if(!vtx) return;
        Double_t covariance[6];
-       vtx->GetCovMatrix(covariance);
-
+       vtx->GetCovarianceMatrix(covariance);
        Double_t vtxPos[3];
        vtx->GetXYZ(vtxPos);
        if(covariance[0]==0) continue;