Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGPP / AliIntSpotEstimator.cxx

diff --git a/PWGPP/AliIntSpotEstimator.cxx b/PWGPP/AliIntSpotEstimator.cxx
index 4c94d084c08ee909b7756f3b19ac4d6f059265ea..39504595d36a9ed118b39303bc140346c98d891a 100644 (file)
--- a/PWGPP/AliIntSpotEstimator.cxx
+++ b/PWGPP/AliIntSpotEstimator.cxx
@@ -22,7 +22,11 @@ AliIntSpotEstimator::AliIntSpotEstimator(const char* name,Double_t outcut,Int_t
                                         Int_t ntrBins,Int_t ntMn,Int_t ntMx,
                                         Int_t nPBins,Double_t pmn,Double_t pmx,Bool_t ntuple) 
 : TNamed(name,""),
-  fEvProc(0),fIPCenterStat(0),fMinTracksForIP(ntrIP>2?ntrIP:2),fOutlierCut(outcut),fEstimIP(0),
+  fEvProc(0),fIPCenterStat(0),fMinTracksForIP(ntrIP>2?ntrIP:2),fOutlierCut(outcut),
+  fIPCenIni(),
+  fIPCenter(),
+  fIPCen2(),
+  fEstimIP(0),
   fEstimVtx(0),fEstimTrc(0),fHVtxXY(0),fNtuple(0),fVertexer(0),fTracks(0)
 {
   InitEstimators(nPhiBins,nestb,estmin,estmax,ntrBins,ntMn,ntMx,nPBins,pmn,pmx,ntuple);
@@ -32,6 +36,9 @@ AliIntSpotEstimator::AliIntSpotEstimator(const char* name,Double_t outcut,Int_t
 AliIntSpotEstimator::AliIntSpotEstimator(Bool_t initDef) 
   : TNamed("IPEstimator",""),
     fEvProc(0),fIPCenterStat(0),fMinTracksForIP(2),fOutlierCut(1e-4),
+    fIPCenIni(),
+    fIPCenter(),
+    fIPCen2(),    
     fEstimIP(0),fEstimVtx(0),fEstimTrc(0),fHVtxXY(0),fNtuple(0),fVertexer(0),fTracks(0)
 {
   if (initDef) InitEstimators();
@@ -158,15 +165,15 @@ Bool_t AliIntSpotEstimator::ProcessTracks()
       double cs = TMath::Cos(phiTrack);
       double sn = TMath::Sin(phiTrack);
       double trDCA = (xyzDCA[0]-fIPCenIni[0])         *sn - (xyzDCA[1]-fIPCenIni[1])         *cs;  // track signed DCA to origin
-      double vtDCA = (recNewVtx->GetXv()-fIPCenIni[0])*sn - (recNewVtx->GetYv()-fIPCenIni[1])*cs;  // vertex signed DCA to origin
+      double vtDCA = (recNewVtx->GetX()-fIPCenIni[0])*sn - (recNewVtx->GetY()-fIPCenIni[1])*cs;  // vertex signed DCA to origin
       UpdateEstimators(vtDCA,trDCA, nTracks1, pTrack, phiTrack);
       selTrack->PropagateTo(told,fieldVal);    // restore the track
       if (fNtuple) {
        static float ntf[8];
        ntf[0] = float(nTracks1);
-       ntf[1] = recNewVtx->GetXv();
-       ntf[2] = recNewVtx->GetYv();
-       ntf[3] = recNewVtx->GetZv();
+       ntf[1] = recNewVtx->GetX();
+       ntf[2] = recNewVtx->GetY();
+       ntf[3] = recNewVtx->GetZ();
        ntf[4] = xyzDCA[0];
        ntf[5] = xyzDCA[1];
        ntf[6] = phiTrack;