fix for the new geometry (L. Gaudichet)

[u/mrichter/AliRoot.git] / ITS / AliITStrackV2.cxx

diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx
index 5950e9d682ea9e524738184daef61e840aa96549..3985365808d8b2bc2efd6efe98f440fa07048437 100644 (file)
--- a/ITS/AliITStrackV2.cxx
+++ b/ITS/AliITStrackV2.cxx
@@ -52,7 +52,7 @@ AliITStrackV2::AliITStrackV2(AliESDtrack& t,Bool_t c) throw (const Char_t *) :
   //------------------------------------------------------------------
   const AliExternalTrackParam *par=&t;
   if (c) {
-    par=t.GetConstrainedExternalParameters();
+    par=t.GetConstrainedParam();
     if (!par) throw "AliITStrackV2: conversion failed !\n";
   }
   Set(par->GetX(),par->GetAlpha(),par->GetParameter(),par->GetCovariance());
@@ -151,7 +151,7 @@ Bool_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
   if (!AliExternalTrackParam::PropagateTo(xk,bz)) return kFALSE;
  if (!AliExternalTrackParam::CorrectForMaterial(d,x0,GetMass())) return kFALSE;
 
-  Double_t x=GetX(), y=GetZ(), z=GetZ();
+  Double_t x=GetX(), y=GetY(), z=GetZ();
   if (IsStartedTimeIntegral() && x>oldX) {
     Double_t l2 = (x-oldX)*(x-oldX) + (y-oldY)*(y-oldY) + (z-oldZ)*(z-oldZ);
     AddTimeStep(TMath::Sqrt(l2));
@@ -268,7 +268,7 @@ Bool_t AliITStrackV2::Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]) {
     sigma2p += Cov(0)/r2*(1.- dy*dy/r2)*(1.- dy*dy/r2);
     sigma2p += ers[1]*ers[1]/r2;
     sigma2p += 0.25*Cov(14)*cnv*cnv*GetX()*GetX();
-    Double_t eps2p=sigma2p/(Cov(2) + sigma2p);
+    Double_t eps2p=sigma2p/(Cov(5) + sigma2p);
     Par(0) += Cov(3)/(Cov(5) + sigma2p)*(parp - GetSnp());
     Par(2)  = eps2p*GetSnp() + (1 - eps2p)*parp;
     Cov(5) *= eps2p;
@@ -284,7 +284,7 @@ Bool_t AliITStrackV2::Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]) {
     Par(4) += Cov(13)/(Cov(9) + sigma2l)*(parl - Par(3));
     Par(3)  = eps2l*Par(3) + (1-eps2l)*parl;
     Cov(9) *= eps2l; 
-    Cov(13)*= (eps2l/cnv/cnv); 
+    Cov(13)*= eps2l; 
     Cov(7) *= eps2l; 
   }
   if (!Invariant()) return kFALSE;