X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=ITS%2FAliITStrackV2.cxx;h=60834d30969a9ff5fecc2df77163e79ee2bfa672;hb=559d0c87ae779c3681ae7486db74297306ad8138;hp=9a974620100159c394b0bf94664bc03b6fd6f36c;hpb=649ab0de9bcc939fee935c0a97a729b4c9336260;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx
index 9a974620100..60834d30969 100644
--- a/ITS/AliITStrackV2.cxx
+++ b/ITS/AliITStrackV2.cxx
@@ -13,63 +13,107 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-//-------------------------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////
 //                Implementation of the ITS track class
 //
 //          Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
 //     dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
-//-------------------------------------------------------------------------
-
-#include <TMatrixD.h>
-
+///////////////////////////////////////////////////////////////////////////
 #include <TMath.h>
-#include <iostream.h>
 
 #include "AliCluster.h"
-#include "AliTPCtrack.h"
+#include "AliESDtrack.h"
 #include "AliITStrackV2.h"
+#include "AliStrLine.h"
 
 ClassImp(AliITStrackV2)
 
 const Int_t kWARN=5;
 
 //____________________________________________________________________________
-AliITStrackV2::AliITStrackV2(const AliTPCtrack& t) throw (const Char_t *) {
+AliITStrackV2::AliITStrackV2():AliKalmanTrack(),
+  fX(0),
+  fAlpha(0),
+  fdEdx(0),
+  fP0(0),
+  fP1(0),
+  fP2(0),
+  fP3(0),
+  fP4(0),
+  fC00(0),
+  fC10(0),
+  fC11(0),
+  fC20(0),
+  fC21(0),
+  fC22(0),
+  fC30(0),
+  fC31(0),
+  fC32(0),
+  fC33(0),
+  fC40(0),
+  fC41(0),
+  fC42(0),
+  fC43(0),
+  fC44(0),
+  fESDtrack(0)
+{
+    for(Int_t i=0; i<2*kMaxLayer; i++) fIndex[i]=-1;
+    for(Int_t i=0; i<4; i++) fdEdxSample[i]=0;
+}
+
+
+//____________________________________________________________________________
+AliITStrackV2::AliITStrackV2(AliESDtrack& t,Bool_t c) throw (const Char_t *) :
+AliKalmanTrack() {
   //------------------------------------------------------------------
-  //Conversion TPC track -> ITS track
+  // Conversion ESD track -> ITS track.
+  // If c==kTRUE, create the ITS track out of the constrained params.
   //------------------------------------------------------------------
+  SetNumberOfClusters(t.GetITSclusters(fIndex));
   SetLabel(t.GetLabel());
-  SetChi2(0.);
-  SetNumberOfClusters(0);
-  //SetConvConst(t.GetConvConst());
-
-  fdEdx  = t.GetdEdx();
   SetMass(t.GetMass());
+  //
+  //
 
+  fdEdx=t.GetITSsignal();
   fAlpha = t.GetAlpha();
   if      (fAlpha < -TMath::Pi()) fAlpha += 2*TMath::Pi();
   else if (fAlpha >= TMath::Pi()) fAlpha -= 2*TMath::Pi();
 
   //Conversion of the track parameters
-  Double_t x,p[5]; t.GetExternalParameters(x,p);
-  fX=x;    x=GetConvConst();
+  Double_t x,p[5]; 
+  if (c) t.GetConstrainedExternalParameters(fAlpha,x,p);
+  else t.GetExternalParameters(x,p);
+  fX=x;   
   fP0=p[0]; 
-  fP1=p[1]; 
+  fP1=p[1];   SaveLocalConvConst(); 
   fP2=p[2];
-  fP3=p[3];
+  fP3=p[3];   x=GetLocalConvConst();
   fP4=p[4]/x; 
 
   //Conversion of the covariance matrix
-  Double_t c[15]; t.GetExternalCovariance(c);
-
-  fC00=c[0 ];
-  fC10=c[1 ];   fC11=c[2 ];
-  fC20=c[3 ];   fC21=c[4 ];   fC22=c[5 ];
-  fC30=c[6 ];   fC31=c[7 ];   fC32=c[8 ];   fC33=c[9 ];
-  fC40=c[10]/x; fC41=c[11]/x; fC42=c[12]/x; fC43=c[13]/x; fC44=c[14]/x/x;
+  Double_t cv[15]; 
+  if (c) t.GetConstrainedExternalCovariance(cv);
+  else t.GetExternalCovariance(cv);
+  fC00=cv[0 ];
+  fC10=cv[1 ];   fC11=cv[2 ];
+  fC20=cv[3 ];   fC21=cv[4 ];   fC22=cv[5 ];
+  fC30=cv[6 ];   fC31=cv[7 ];   fC32=cv[8 ];   fC33=cv[9 ];
+  fC40=cv[10]/x; fC41=cv[11]/x; fC42=cv[12]/x; fC43=cv[13]/x; fC44=cv[14]/x/x;
+
+  if (t.GetStatus()&AliESDtrack::kTIME) {
+    StartTimeIntegral();
+    Double_t times[10]; t.GetIntegratedTimes(times); SetIntegratedTimes(times);
+    SetIntegratedLength(t.GetIntegratedLength());
+  }
+  fESDtrack=&t;
 
-  if (!Invariant()) throw "AliITStrackV2: conversion failed !\n";
+  //  if (!Invariant()) throw "AliITStrackV2: conversion failed !\n";
+  for(Int_t i=0; i<4; i++) fdEdxSample[i]=0;
+}
 
+void AliITStrackV2::UpdateESDtrack(ULong_t flags) const {
+  fESDtrack->UpdateTrackParams(this,flags);
 }
 
 //____________________________________________________________________________
@@ -89,11 +133,11 @@ AliITStrackV2::AliITStrackV2(const AliITStrackV2& t) : AliKalmanTrack(t) {
   fC30=t.fC30;  fC31=t.fC31;  fC32=t.fC32;  fC33=t.fC33;
   fC40=t.fC40;  fC41=t.fC41;  fC42=t.fC42;  fC43=t.fC43;  fC44=t.fC44;
 
-  Int_t n=GetNumberOfClusters();
-  for (Int_t i=0; i<n; i++) {
-      fIndex[i]=t.fIndex[i];
-      if (i<4) fdEdxSample[i]=t.fdEdxSample[i];
-  }
+  Int_t i;
+  for (i=0; i<2*kMaxLayer; i++) fIndex[i]=t.fIndex[i];
+  for (i=0; i<4; i++) fdEdxSample[i]=t.fdEdxSample[i];
+
+  fESDtrack=t.fESDtrack;
 }
 
 //_____________________________________________________________________________
@@ -117,7 +161,7 @@ void AliITStrackV2::GetExternalCovariance(Double_t cc[15]) const {
   // This function returns an external representation of the covriance matrix.
   //   (See comments in AliTPCtrack.h about external track representation)
   //-------------------------------------------------------------------------
-  Double_t a=GetConvConst();
+  Double_t a=GetLocalConvConst();
 
   cc[0 ]=fC00;
   cc[1 ]=fC10;   cc[2 ]=fC11;
@@ -131,9 +175,11 @@ Int_t AliITStrackV2::PropagateToVertex(Double_t d,Double_t x0) {
   //------------------------------------------------------------------
   //This function propagates a track to the minimal distance from the origin
   //------------------------------------------------------------------
-  Double_t xv=fP2*(fX*fP2 - fP0*TMath::Sqrt(1.- fP2*fP2)); //linear approxim.
-  PropagateTo(xv,d,x0);   
-  return 0;
+  //Double_t xv=fP2*(fX*fP2 - fP0*TMath::Sqrt(1.- fP2*fP2)); //linear approxim.
+  Double_t tgf=-(fP4*fX - fP2)/(fP4*fP0 + TMath::Sqrt(1 - fP2*fP2));
+  Double_t snf=tgf/TMath::Sqrt(1.+ tgf*tgf);
+  Double_t xv=(snf - fP2)/fP4 + fX;
+  return PropagateTo(xv,d,x0);
 }
 
 //____________________________________________________________________________
@@ -147,7 +193,7 @@ GetGlobalXYZat(Double_t xk, Double_t &x, Double_t &y, Double_t &z) const {
   if (TMath::Abs(f2) >= 0.9999) {
     Int_t n=GetNumberOfClusters();
     if (n>kWARN) 
-      cerr<<n<<" AliITStrackV2::GetGlobalXYZat: Propagation failed !\n";
+      Warning("GetGlobalXYZat","Propagation failed (%d) !\n",n);
     return 0;
   }
 
@@ -164,6 +210,24 @@ GetGlobalXYZat(Double_t xk, Double_t &x, Double_t &y, Double_t &z) const {
   return 1;
 }
 
+//_____________________________________________________________________________
+void AliITStrackV2::ApproximateHelixWithLine(Double_t xk, AliStrLine *line)
+{
+  //------------------------------------------------------------
+  // Approximate the track (helix) with a straight line tangent to the
+  // helix in the point defined by r (F. Prino, prino@to.infn.it)
+  //------------------------------------------------------------
+  Double_t mom[3];
+  Double_t azim = TMath::ASin(fP2)+fAlpha;
+  Double_t theta = TMath::Pi()/2. - TMath::ATan(fP3);
+  mom[0] = TMath::Sin(theta)*TMath::Cos(azim);
+  mom[1] = TMath::Sin(theta)*TMath::Sin(azim);
+  mom[2] = TMath::Cos(theta);
+  Double_t pos[3];
+  GetGlobalXYZat(xk,pos[0],pos[1],pos[2]);
+  line->SetP0(pos);
+  line->SetCd(mom);
+}
 //_____________________________________________________________________________
 Double_t AliITStrackV2::GetPredictedChi2(const AliCluster *c) const 
 {
@@ -172,92 +236,19 @@ Double_t AliITStrackV2::GetPredictedChi2(const AliCluster *c) const
   //-----------------------------------------------------------------
   Double_t r00=c->GetSigmaY2(), r01=0., r11=c->GetSigmaZ2();
   r00+=fC00; r01+=fC10; r11+=fC11;
-
+  //
   Double_t det=r00*r11 - r01*r01;
   if (TMath::Abs(det) < 1.e-30) {
     Int_t n=GetNumberOfClusters();
     if (n>kWARN) 
-       cerr<<n<<" AliKalmanTrack::GetPredictedChi2: Singular matrix !\n";
+      Warning("GetPredictedChi2","Singular matrix (%d) !\n",n);
     return 1e10;
   }
   Double_t tmp=r00; r00=r11; r11=tmp; r01=-r01;
-  
-  Double_t dy=c->GetY() - fP0, dz=c->GetZ() - fP1;
-  
-  return (dy*r00*dy + 2*r01*dy*dz + dz*r11*dz)/det;
-}
-
-//_____________________________________________________________________________
-Double_t AliITStrackV2::GetPredictedChi2(const AliCluster *c,Double_t *m,
-Double_t x0) const {
-  //-----------------------------------------------------------------
-  // This function calculates a chi2 increment with a vertex contraint 
-  //-----------------------------------------------------------------
-  TVectorD x(5); x(0)=fP0; x(1)=fP1; x(2)=fP2; x(3)=fP3; x(4)=fP4;
-  TMatrixD C(5,5);
-  C(0,0)=fC00; 
-  C(1,0)=fC10; C(1,1)=fC11; 
-  C(2,0)=fC20; C(2,1)=fC21; C(2,2)=fC22;
-  C(3,0)=fC30; C(3,1)=fC31; C(3,2)=fC32; C(3,3)=fC33;
-  C(4,0)=fC40; C(4,1)=fC41; C(4,2)=fC42; C(4,3)=fC43; C(4,4)=fC44;
-
-  C(0,1)=C(1,0);
-  C(0,2)=C(2,0); C(1,2)=C(2,1);
-  C(0,3)=C(3,0); C(1,3)=C(3,1); C(2,3)=C(3,2);
-  C(0,4)=C(4,0); C(1,4)=C(4,1); C(2,4)=C(4,2); C(3,4)=C(4,3);
-
-  TMatrixD H(4,5); H.UnitMatrix();
-  Double_t dy=(c->GetY() - m[0]), dz=(c->GetZ() - m[1]);
-
-  Double_t dr=TMath::Sqrt(fX*fX + dy*dy);
-  Double_t r =TMath::Sqrt(4/dr/dr - fP4*fP4);
-  Double_t sn=0.5*(fP4*fX + dy*r);
-  Double_t tg=0.5*fP4*dz/TMath::ASin(0.5*fP4*dr);
-  TVectorD mm(4); 
-  mm(0)=m[0]=c->GetY(); mm(1)=m[1]=c->GetZ(); mm(2)=m[2]=sn; mm(3)=m[3]=tg;
-
-  Double_t v22=0.,v33=0.;
-  //x0=0.;
-  if (x0!=0.) {
-     Double_t pp2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
-     Double_t beta2=pp2/(pp2 + GetMass()*GetMass());
-     x0*=TMath::Sqrt((1.+ GetTgl()*GetTgl())/(1.- GetSnp()*GetSnp()));
-     Double_t theta2=14.1*14.1/(beta2*pp2*1e6)*x0;
-     v22 = theta2*(1.- GetSnp()*GetSnp())*(1. + GetTgl()*GetTgl());
-     v33 = theta2*(1.+ GetTgl()*GetTgl())*(1. + GetTgl()*GetTgl());
-  }
-  Double_t sy2=c->GetSigmaY2(), sz2=c->GetSigmaZ2();
-  v22+=kSigmaYV*kSigmaYV/dr/dr;
-  v22+=sy2/dr/dr;
-  Double_t v20=sy2/dr;
-
-  v33+=kSigmaZV*kSigmaZV/dr/dr;
-  v33+=sz2/dr/dr;
-  Double_t v31=sz2/dr;
-
-  TMatrixD V(4,4); 
-  V(0,0)=m[4 ]=sy2; V(0,1)=m[5 ]=0.;  V(0,2)=m[6 ]=v20; V(0,3)=m[7 ]=0.;
-  V(1,0)=m[8 ]=0.;  V(1,1)=m[9 ]=sz2; V(1,2)=m[10]=0.;  V(1,3)=m[11]=v31;
-  V(2,0)=m[12]=v20; V(2,1)=m[13]=0.;  V(2,2)=m[14]=v22; V(2,3)=m[15]=0.;
-  V(3,0)=m[16]=0.;  V(3,1)=m[17]=v31; V(3,2)=m[18]=0.;  V(3,3)=m[19]=v33;
-
-  TVectorD res=x;  res*=H; res-=mm; //res*=-1; 
-  TMatrixD tmp(H,TMatrixD::kMult,C);
-  TMatrixD R(tmp,TMatrixD::kMult,TMatrixD(TMatrixD::kTransposed,H)); R+=V;
-  
-  Double_t det=R.Determinant();
-  if (TMath::Abs(det) < 1.e-30) {
-    Int_t n=GetNumberOfClusters();
-    if (n>kWARN) 
-       cerr<<n<<" AliITStrackV2::GetPredictedChi2: Singular matrix !\n";
-    return 1e10;
-  }
 
-  R.Invert();
+  Double_t dy=c->GetY() - fP0, dz=c->GetZ() - fP1;
 
-  TVectorD rs=res;
-  res*=R;
-  return rs*res;
+  return (dy*r00*dy + 2*r01*dy*dz + dz*r11*dz)/det;
 }
 
 //____________________________________________________________________________
@@ -265,14 +256,14 @@ Int_t AliITStrackV2::CorrectForMaterial(Double_t d, Double_t x0) {
   //------------------------------------------------------------------
   //This function corrects the track parameters for crossed material
   //------------------------------------------------------------------
-  Double_t p2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
+  Double_t p2=(1.+ fP3*fP3)/(Get1Pt()*Get1Pt());
   Double_t beta2=p2/(p2 + GetMass()*GetMass());
   d*=TMath::Sqrt((1.+ fP3*fP3)/(1.- fP2*fP2));
 
   //Multiple scattering******************
   if (d!=0) {
-    //Double_t theta2=14.1*14.1/(beta2*p2*1e6)*TMath::Abs(d);
-     Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*TMath::Abs(d)*9.36*2.33;
+     Double_t theta2=14.1*14.1/(beta2*p2*1e6)*TMath::Abs(d);
+     //Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*TMath::Abs(d)*9.36*2.33;
      fC22 += theta2*(1.- fP2*fP2)*(1. + fP3*fP3);
      fC33 += theta2*(1. + fP3*fP3)*(1. + fP3*fP3);
      fC43 += theta2*fP3*fP4*(1. + fP3*fP3);
@@ -283,7 +274,10 @@ Int_t AliITStrackV2::CorrectForMaterial(Double_t d, Double_t x0) {
   if (x0!=0.) {
      d*=x0;
      Double_t dE=0.153e-3/beta2*(log(5940*beta2/(1-beta2)) - beta2)*d;
-     fP4*=(1.- sqrt(p2+GetMass()*GetMass())/p2*dE);
+     if (beta2/(1-beta2)>3.5*3.5)
+       dE=0.153e-3/beta2*(log(3.5*5940)+0.5*log(beta2/(1-beta2)) - beta2)*d;
+
+     fP4*=(1.- TMath::Sqrt(p2+GetMass()*GetMass())/p2*dE);
   }
 
   if (!Invariant()) return 0;
@@ -298,12 +292,18 @@ Int_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
   //------------------------------------------------------------------
   Double_t x1=fX, x2=xk, dx=x2-x1;
   Double_t f1=fP2, f2=f1 + fP4*dx;
-  if (TMath::Abs(f2) >= 0.9999) {
-    Int_t n=GetNumberOfClusters();
-    if (n>kWARN) 
-       cerr<<n<<" AliITStrackV2::PropagateTo: Propagation failed !\n";
+  if (TMath::Abs(f2) >= 0.98) {
+    // MI change  - don't propagate highly inclined tracks
+    //              covariance matrix distorted
+    //Int_t n=GetNumberOfClusters();
+    //if (n>kWARN) 
+    //   Warning("PropagateTo","Propagation failed !\n",n);
     return 0;
   }
+  Double_t lcc=GetLocalConvConst();  
+
+  // old position [SR, GSI, 17.02.2003]
+  Double_t oldX = fX, oldY = fP0, oldZ = fP1;
 
   Double_t r1=sqrt(1.- f1*f1), r2=sqrt(1.- f2*f2);
   
@@ -353,8 +353,20 @@ Int_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
 
   fX=x2;
 
+  //Change of the magnetic field *************
+  SaveLocalConvConst();
+  fP4*=lcc/GetLocalConvConst();
+
   if (!CorrectForMaterial(d,x0)) return 0;
 
+  // Integrated Time [SR, GSI, 17.02.2003]
+  if (IsStartedTimeIntegral() && fX>oldX) {
+    Double_t l2 = (fX-oldX)*(fX-oldX)+(fP0-oldY)*(fP0-oldY)+
+                  (fP1-oldZ)*(fP1-oldZ);
+    AddTimeStep(TMath::Sqrt(l2));
+  }
+  //
+
   return 1;
 }
 
@@ -376,6 +388,7 @@ Int_t AliITStrackV2::Update(const AliCluster* c, Double_t chi2, UInt_t index) {
   Double_t det=r00*r11 - r01*r01;
   Double_t tmp=r00; r00=r11/det; r11=tmp/det; r01=-r01/det;
 
+ 
   Double_t k00=fC00*r00+fC10*r01, k01=fC00*r01+fC10*r11;
   Double_t k10=fC10*r00+fC11*r01, k11=fC10*r01+fC11*r11;
   Double_t k20=fC20*r00+fC21*r01, k21=fC20*r01+fC21*r11;
@@ -420,6 +433,8 @@ Int_t AliITStrackV2::Update(const AliCluster* c, Double_t chi2, UInt_t index) {
      return 0;
   }
 
+  if (chi2<0) return 1;
+
   Int_t n=GetNumberOfClusters();
   fIndex[n]=index;
   SetNumberOfClusters(n+1);
@@ -435,27 +450,27 @@ Int_t AliITStrackV2::Invariant() const {
   Int_t n=GetNumberOfClusters();
   
   if (TMath::Abs(fP2)>=0.9999){
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fP2="<<fP2<<endl;
+     if (n>kWARN) Warning("Invariant","fP2=%f\n",fP2);
      return 0;
   }
   if (fC00<=0 || fC00>9.) {
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fC00="<<fC00<<endl; 
+     if (n>kWARN) Warning("Invariant","fC00=%f\n",fC00); 
      return 0;
   }
   if (fC11<=0 || fC11>9.) {
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fC11="<<fC11<<endl; 
+     if (n>kWARN) Warning("Invariant","fC11=%f\n",fC11); 
      return 0;
   }
   if (fC22<=0 || fC22>1.) {
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fC22="<<fC22<<endl; 
+     if (n>kWARN) Warning("Invariant","fC22=%f\n",fC22); 
      return 0;
   }
   if (fC33<=0 || fC33>1.) {
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fC33="<<fC33<<endl; 
+     if (n>kWARN) Warning("Invariant","fC33=%f\n",fC33); 
      return 0;
   }
   if (fC44<=0 || fC44>6e-5) {
-     if (n>kWARN) cout<<"AliITStrackV2::Invariant : fC44="<<fC44<<endl;
+     if (n>kWARN) Warning("Invariant","fC44=%f\n",fC44);
      return 0;
   }
   return 1;
@@ -466,6 +481,7 @@ Int_t AliITStrackV2::Propagate(Double_t alp,Double_t xk) {
   //------------------------------------------------------------------
   //This function propagates a track
   //------------------------------------------------------------------
+  Double_t alpha=fAlpha, x=fX;
   Double_t p0=fP0,p1=fP1,p2=fP2,p3=fP3,p4=fP4;
   Double_t c00=fC00;
   Double_t c10=fC10, c11=fC11;
@@ -473,73 +489,89 @@ Int_t AliITStrackV2::Propagate(Double_t alp,Double_t xk) {
   Double_t c30=fC30, c31=fC31, c32=fC32, c33=fC33;
   Double_t c40=fC40, c41=fC41, c42=fC42, c43=fC43, c44=fC44;
 
+  if      (alp < -TMath::Pi()) alp += 2*TMath::Pi();
+  else if (alp >= TMath::Pi()) alp -= 2*TMath::Pi();
+  Double_t ca=TMath::Cos(alp-fAlpha), sa=TMath::Sin(alp-fAlpha);
+  Double_t sf=fP2, cf=TMath::Sqrt(1.- fP2*fP2);
 
-  Double_t dalp=alp-fAlpha;
-
-  Double_t ca=TMath::Cos(dalp), sa=TMath::Sin(dalp);
-  Double_t sf=fP2, cf=TMath::Sqrt(1.- fP2*fP2);  
-
-  Double_t pp2=fP2*ca - cf*sa;
-  if (TMath::Abs(pp2) >= 0.9999) {
-     Int_t n=GetNumberOfClusters();
-     if (n>kWARN) 
-        cerr<<n<<" AliITStrackV2::Propagate: Rotation failed !\n";
-     return 0;
-  }
-
+  // **** rotation **********************
+  {
   fAlpha = alp;
-  if      (fAlpha < -TMath::Pi()) fAlpha += 2*TMath::Pi();
-  else if (fAlpha >= TMath::Pi()) fAlpha -= 2*TMath::Pi();
-  
-  Double_t x1=fX, y1=fP0;
-
-  fX = x1*ca + y1*sa;
-  fP0=-x1*sa + y1*ca;
-  fP2 = pp2;
-
-  cf=ca + sf*sa/cf;
-
-  if (!Invariant()) return 0;
+  fX =  x*ca + p0*sa;
+  fP0= -x*sa + p0*ca;
+  fP2=  sf*ca - cf*sa;
+
+  Double_t rr=(ca+sf/cf*sa);  
+
+  fC00 *= (ca*ca);
+  fC10 *= ca; 
+  fC20 *= ca*rr;
+  fC30 *= ca;
+  fC40 *= ca;
+  //fC11 = fC11;
+  fC21 *= rr;
+  //fC31 = fC31; 
+  //fC41 = fC41;
+  fC22 *= rr*rr;
+  fC32 *= rr;
+  fC42 *= rr;
+  //fC33=fC33;
+  //fC43=fC43;
+  //fC44=fC44;
+ 
+  }
 
-  x1=fX; Double_t x2=xk, dx=x2-x1;
+  // **** translation ******************
+  {
+  Double_t dx=xk-fX;
   Double_t f1=fP2, f2=f1 + fP4*dx;
-  if (TMath::Abs(f2) >= 0.9999) {
-    Int_t n=GetNumberOfClusters();
-    if (n>kWARN) 
-       cerr<<n<<" AliITStrackV2::Propagate: Propagation failed !\n";
+  if (TMath::Abs(f2) >= 0.98) {
+    // don't propagate highly inclined tracks MI
     return 0;
   }
+  //    Int_t n=GetNumberOfClusters();
+  //  if (n>kWARN) 
+  //     Warning("Propagate","Propagation failed (%d) !\n",n);
+  //  return 0;
+  //}
+  Double_t lcc=GetLocalConvConst();  
 
-  Double_t r1=sqrt(1.- f1*f1), r2=sqrt(1.- f2*f2);
-  
+  Double_t r1=TMath::Sqrt(1.- f1*f1), r2=TMath::Sqrt(1.- f2*f2);
+
+  fX=xk;
   fP0 += dx*(f1+f2)/(r1+r2);
   fP1 += dx*(f1+f2)/(f1*r2 + f2*r1)*fP3;
   fP2 += dx*fP4;
 
+  //Change of the magnetic field *************
+  SaveLocalConvConst();
+  fP4*=lcc/GetLocalConvConst();
+
   //f = F - 1
+  
   Double_t f02=    dx/(r1*r1*r1);
   Double_t f04=0.5*dx*dx/(r1*r1*r1);
   Double_t f12=    dx*fP3*f1/(r1*r1*r1);
   Double_t f14=0.5*dx*dx*fP3*f1/(r1*r1*r1);
   Double_t f13=    dx/r1;
   Double_t f24=    dx; 
-  /*
+  
   //b = C*ft
-  Double_t b00=f02*fC20 + f03*fC30, b01=f12*fC20 + f13*fC30 + f14*fC40;
-  Double_t b02=f23*fC30;
-  Double_t b10=f02*fC21 + f03*fC31, b11=f12*fC21 + f13*fC31 + f14*fC41;
-  Double_t b12=f23*fC31;
-  Double_t b20=f02*fC22 + f03*fC32, b21=f12*fC22 + f13*fC32 + f14*fC42;
-  Double_t b22=f23*fC32;
-  Double_t b30=f02*fC32 + f03*fC33, b31=f12*fC32 + f13*fC33 + f14*fC43;
-  Double_t b32=f23*fC33;
-  Double_t b40=f02*fC42 + f03*fC43, b41=f12*fC42 + f13*fC43 + f14*fC44;
-  Double_t b42=f23*fC43;
+  Double_t b00=f02*fC20 + f04*fC40, b01=f12*fC20 + f14*fC40 + f13*fC30;
+  Double_t b02=f24*fC40;
+  Double_t b10=f02*fC21 + f04*fC41, b11=f12*fC21 + f14*fC41 + f13*fC31;
+  Double_t b12=f24*fC41;
+  Double_t b20=f02*fC22 + f04*fC42, b21=f12*fC22 + f14*fC42 + f13*fC32;
+  Double_t b22=f24*fC42;
+  Double_t b40=f02*fC42 + f04*fC44, b41=f12*fC42 + f14*fC44 + f13*fC43;
+  Double_t b42=f24*fC44;
+  Double_t b30=f02*fC32 + f04*fC43, b31=f12*fC32 + f14*fC43 + f13*fC33;
+  Double_t b32=f24*fC43;
   
   //a = f*b = f*C*ft
-  Double_t a00=f02*b20+f03*b30,a01=f02*b21+f03*b31,a02=f02*b22+f03*b32;
-  Double_t a11=f12*b21+f13*b31+f14*b41,a12=f12*b22+f13*b32+f14*b42;
-  Double_t a22=f23*b32;
+  Double_t a00=f02*b20+f04*b40,a01=f02*b21+f04*b41,a02=f02*b22+f04*b42;
+  Double_t a11=f12*b21+f14*b41+f13*b31,a12=f12*b22+f14*b42+f13*b32;
+  Double_t a22=f24*b42;
 
   //F*C*Ft = C + (b + bt + a)
   fC00 += b00 + b00 + a00;
@@ -554,35 +586,10 @@ Int_t AliITStrackV2::Propagate(Double_t alp,Double_t xk) {
   fC22 += b22 + b22 + a22;
   fC32 += b32;
   fC42 += b42;
-*/
-
- TMatrixD F(5,5); F.UnitMatrix();
- F(0,0)=-(f1+f2)/(r1+r2)*sa + ca; F(0,2)=f02*cf; F(0,4)=f04;
- F(1,0)=-(f1+f2)/(f1*r2 + f2*r1)*fP3*sa; F(1,2)=f12*cf; F(1,4)=f14; F(1,3)=f13;
- F(2,0)=-fP4*sa; F(2,2)=cf; F(2,4)=f24;
-
-  TMatrixD C(5,5);
-  C(0,0)=fC00; 
-  C(1,0)=fC10; C(1,1)=fC11; 
-  C(2,0)=fC20; C(2,1)=fC21; C(2,2)=fC22;
-  C(3,0)=fC30; C(3,1)=fC31; C(3,2)=fC32; C(3,3)=fC33;
-  C(4,0)=fC40; C(4,1)=fC41; C(4,2)=fC42; C(4,3)=fC43; C(4,4)=fC44;
-
-  C(0,1)=C(1,0);
-  C(0,2)=C(2,0); C(1,2)=C(2,1);
-  C(0,3)=C(3,0); C(1,3)=C(3,1); C(2,3)=C(3,2);
-  C(0,4)=C(4,0); C(1,4)=C(4,1); C(2,4)=C(4,2); C(3,4)=C(4,3);
-
-  TMatrixD tmp(C,TMatrixD::kMult,TMatrixD(TMatrixD::kTransposed, F));
-  C.Mult(F,tmp);
-
-  fC00=C(0,0); 
-  fC10=C(1,0); fC11=C(1,1); 
-  fC20=C(2,0); fC21=C(2,1); fC22=C(2,2);
-  fC30=C(3,0); fC31=C(3,1); fC32=C(3,2); fC33=C(3,3);
-  fC40=C(4,0); fC41=C(4,1); fC42=C(4,2); fC43=C(4,3); fC44=C(4,4);
 
   if (!Invariant()) {
+     fAlpha=alpha; 
+     fX=x; 
      fP0=p0; fP1=p1; fP2=p2; fP3=p3; fP4=p4;
      fC00=c00;
      fC10=c10; fC11=c11;
@@ -591,38 +598,70 @@ Int_t AliITStrackV2::Propagate(Double_t alp,Double_t xk) {
      fC40=c40; fC41=c41; fC42=c42; fC43=c43; fC44=c44;
      return 0;
   }
-
-  fX=x2;
+  }
 
   return 1;
 }
 
-Double_t AliITStrackV2::GetD() const {
+
+Double_t AliITStrackV2::GetD(Double_t x, Double_t y) const {
   //------------------------------------------------------------------
-  //This function calculates the transverse impact parameter
+  // This function calculates the transverse impact parameter
+  // with respect to a point with global coordinates (x,y)
   //------------------------------------------------------------------
-  Double_t sn=fP4*fX - fP2, cs=fP4*fP0 + TMath::Sqrt(1.- fP2*fP2);
-  Double_t a=2*(fX*fP2 - fP0*TMath::Sqrt(1.- fP2*fP2))-fP4*(fX*fX + fP0*fP0);
+  Double_t xt=fX, yt=fP0;
+
+  Double_t sn=TMath::Sin(fAlpha), cs=TMath::Cos(fAlpha);
+  Double_t a = x*cs + y*sn;
+  y = -x*sn + y*cs; x=a;
+  xt-=x; yt-=y;
+
+  sn=fP4*xt - fP2; cs=fP4*yt + TMath::Sqrt(1.- fP2*fP2);
+  a=2*(xt*fP2 - yt*TMath::Sqrt(1.- fP2*fP2))-fP4*(xt*xt + yt*yt);
   if (fP4<0) a=-a;
   return a/(1 + TMath::Sqrt(sn*sn + cs*cs));
 }
 
-Int_t AliITStrackV2::Improve(Double_t x0,Double_t yv,Double_t zv) {
+Double_t AliITStrackV2::GetZat(Double_t x) const {
+  //------------------------------------------------------------------
+  // This function calculates the z at given x point - in current coordinate system
+  //------------------------------------------------------------------
+  Double_t x1=fX, x2=x, dx=x2-x1;
+  //
+  Double_t f1=fP2, f2=f1 + fP4*dx;
+  if (TMath::Abs(f2) >= 0.9999) {
+    return 10000000;
+  }
+  Double_t r1=sqrt(1.- f1*f1), r2=sqrt(1.- f2*f2);
+  Double_t z =  fP1 + dx*(f1+f2)/(f1*r2 + f2*r1)*fP3;
+  return z;
+}
+
+
+
+
+Int_t AliITStrackV2::Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]) {
   //------------------------------------------------------------------
   //This function improves angular track parameters  
   //------------------------------------------------------------------
+  Double_t cs=TMath::Cos(fAlpha), sn=TMath::Sin(fAlpha);
+  //Double_t xv = xyz[0]*cs + xyz[1]*sn; // vertex
+    Double_t yv =-xyz[0]*sn + xyz[1]*cs; // in the
+    Double_t zv = xyz[2];                // local frame
   Double_t dy=fP0-yv, dz=fP1-zv;
   Double_t r2=fX*fX+dy*dy;
   Double_t p2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
   Double_t beta2=p2/(p2 + GetMass()*GetMass());
   x0*=TMath::Sqrt((1.+ GetTgl()*GetTgl())/(1.- GetSnp()*GetSnp()));
-  //Double_t theta2=14.1*14.1/(beta2*p2*1e6)*x0;
-  Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*x0*9.36*2.33;
+  Double_t theta2=14.1*14.1/(beta2*p2*1e6)*x0;
+  //Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*x0*9.36*2.33;
   {
-  Double_t parp=0.5*(fP4*fX + dy*TMath::Sqrt(4/r2-fP4*fP4));
+  Double_t dummy=4/r2-fP4*fP4;
+  if (dummy < 0) return 0;
+  Double_t parp=0.5*(fP4*fX + dy*TMath::Sqrt(dummy));
   Double_t sigma2p = theta2*(1.- GetSnp()*GetSnp())*(1. + GetTgl()*GetTgl());
   sigma2p += fC00/r2*(1.- dy*dy/r2)*(1.- dy*dy/r2);
-  sigma2p += kSigmaYV*kSigmaYV/r2;
+  sigma2p += ers[1]*ers[1]/r2;
   sigma2p += 0.25*fC44*fX*fX;
   Double_t eps2p=sigma2p/(fC22+sigma2p);
   fP0 += fC20/(fC22+sigma2p)*(parp-fP2);
@@ -634,7 +673,7 @@ Int_t AliITStrackV2::Improve(Double_t x0,Double_t yv,Double_t zv) {
   Double_t parl=0.5*fP4*dz/TMath::ASin(0.5*fP4*TMath::Sqrt(r2));
   Double_t sigma2l=theta2;
   sigma2l += fC11/r2+fC00*dy*dy*dz*dz/(r2*r2*r2);
-  sigma2l += kSigmaZV*kSigmaZV/r2;
+  sigma2l += ers[2]*ers[2]/r2;
   Double_t eps2l=sigma2l/(fC33+sigma2l);
   fP1 += fC31/(fC33+sigma2l)*(parl-fP3);
   fP4 += fC43/(fC33+sigma2l)*(parl-fP3);
@@ -646,47 +685,6 @@ Int_t AliITStrackV2::Improve(Double_t x0,Double_t yv,Double_t zv) {
   return 1;
 } 
 
-/*
-Int_t AliITStrackV2::Improve(Double_t x0,Double_t yv,Double_t zv) {
-  //------------------------------------------------------------------
-  //This function improves angular track parameters  
-  //------------------------------------------------------------------
-  Double_t dy=fP0-yv, dz=fP1-zv;
-  Double_t r2=fX*fX+dy*dy;
-  Double_t p2=(1.+ GetTgl()*GetTgl())/(Get1Pt()*Get1Pt());
-  Double_t beta2=p2/(p2 + GetMass()*GetMass());
-  x0*=TMath::Sqrt((1.+ GetTgl()*GetTgl())/(1.- GetSnp()*GetSnp()));
-  //Double_t theta2=14.1*14.1/(beta2*p2*1e6)*x0;
-  Double_t theta2=1.0259e-6*14*14/28/(beta2*p2)*x0*9.36*2.33;
-
-  Double_t par=0.5*(fP4*fX + dy*TMath::Sqrt(4/r2-fP4*fP4));
-  Double_t sigma2 = theta2*(1.- GetSnp()*GetSnp())*(1. + GetTgl()*GetTgl());
-  sigma2 += fC00/r2*(1.- dy*dy/r2)*(1.- dy*dy/r2);
-  sigma2 += kSigmaYV*kSigmaYV/r2;
-  sigma2 += 0.25*fC44*fX*fX;
-  Double_t eps2=sigma2/(fC22+sigma2), eps=TMath::Sqrt(eps2);
-  if (10*r2*fC44<fC22) {
-     fP2 = eps2*fP2 + (1-eps2)*par;
-     fC22*=eps2; fC21*=eps; fC20*=eps; fC32*=eps; fC42*=eps;
-  }
-
-  par=0.5*fP4*dz/TMath::ASin(0.5*fP4*TMath::Sqrt(r2));
-  sigma2=theta2;
-  sigma2 += fC11/r2+fC00*dy*dy*dz*dz/(r2*r2*r2);
-  sigma2 += kSigmaZV*kSigmaZV/r2;
-  eps2=sigma2/(fC33+sigma2); eps=TMath::Sqrt(eps2);
-  Double_t tgl=fP3;
-  fP3 = eps2*fP3 + (1-eps2)*par;
-  fC33*=eps2; fC32*=eps; fC31*=eps; fC30*=eps; fC43*=eps;
-
-  eps=TMath::Sqrt((1+fP3*fP3)/(1+tgl*tgl));
-  fP4*=eps;
-  fC44*=eps*eps; fC43*=eps;fC42*=eps; fC41*=eps; fC40*=eps;
-
-  if (!Invariant()) return 0;
-  return 1;
-} 
-*/
 void AliITStrackV2::ResetCovariance() {
   //------------------------------------------------------------------
   //This function makes a track forget its history :)  
@@ -705,10 +703,15 @@ void AliITStrackV2::CookdEdx(Double_t low, Double_t up) {
   // This function calculates dE/dX within the "low" and "up" cuts.
   // Origin: Boris Batyunya, JINR, Boris.Batiounia@cern.ch 
   //-----------------------------------------------------------------
-  Int_t i;
-  Int_t nc=4;
   // The clusters order is: SSD-2, SSD-1, SDD-2, SDD-1, SPD-2, SPD-1
-  // Take only SSD and SDD
+
+  Int_t i;
+  Int_t nc=0;
+  for (i=0; i<GetNumberOfClusters(); i++) {
+    Int_t idx=GetClusterIndex(i);
+    idx=(idx&0xf0000000)>>28;
+    if (idx>1) nc++; // Take only SSD and SDD
+  }
 
   Int_t swap;//stupid sorting
   do {
@@ -726,7 +729,44 @@ void AliITStrackV2::CookdEdx(Double_t low, Double_t up) {
                                            // nu=2
   Float_t dedx=0;
   for (i=nl; i<nu; i++) dedx += fdEdxSample[i];
-  dedx /= (nu-nl);
+  if (nu-nl>0) dedx /= (nu-nl);
 
   SetdEdx(dedx);
 }
+
+Double_t AliITStrackV2::
+PropagateToDCA(AliKalmanTrack *p, Double_t d, Double_t x0) {
+  //--------------------------------------------------------------
+  // Propagates this track and the argument track to the position of the
+  // distance of closest approach. 
+  // Returns the (weighed !) distance of closest approach.
+  //--------------------------------------------------------------
+  Double_t xthis, xp, dca;
+  {
+  //Temporary solution
+  Double_t b=1./GetLocalConvConst()/kB2C;
+  AliExternalTrackParam dummy1(*this), dummy2(*p); 
+  dca=dummy1.GetDCA(&dummy2,b,xthis,xp);
+  }
+  if (!PropagateTo(xthis,d,x0)) {
+    //AliWarning(" propagation failed !");
+    return 1e+33;
+  }  
+
+  if (!p->PropagateTo(xp,d,x0)) {
+    //AliWarning(" propagation failed !";
+    return 1e+33;
+  }  
+
+  return dca;
+} 
+
+Double_t AliITStrackV2::Get1Pt() const {
+  //--------------------------------------------------------------
+  // Returns the inverse Pt (1/GeV/c)
+  // (or 1/"most probable pt", if the field is too weak)
+  //--------------------------------------------------------------
+  if (TMath::Abs(GetLocalConvConst()) > kVeryBigConvConst)
+      return 1./kMostProbableMomentum/TMath::Sqrt(1.+ GetTgl()*GetTgl());
+  return (TMath::Sign(1e-9,fP4) + fP4)*GetLocalConvConst();
+}