]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
1) removed global variables from AliITSRecoParam.h
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 25 Oct 2007 07:59:30 +0000 (07:59 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 25 Oct 2007 07:59:30 +0000 (07:59 +0000)
2) possibility to exclude use of amplitude info in AliITStrackerMI
3) reorganization of material correction in AliITStrackerMI
4) possibility to choose cluster error parametrization in AliITStrackerMI

A. Dainese

14 files changed:
ITS/AliITSClusterParam.cxx
ITS/AliITSClusterParam.h
ITS/AliITSRecoParam.cxx
ITS/AliITSRecoParam.h
ITS/AliITStrackMI.cxx
ITS/AliITStrackSA.cxx
ITS/AliITStrackSA.h
ITS/AliITStrackV2.cxx
ITS/AliITStrackV2.h
ITS/AliITStrackerMI.cxx
ITS/AliITStrackerMI.h
ITS/AliITStrackerSA.cxx
ITS/AliITStrackerV2.cxx
ITS/AliITStrackerV2.h

index 4db9e0b444aa1fa96839f83ffc127dc10d999961..6a4cda84bcc583af0e0515dd36d0afe1cb6b78f1 100644 (file)
 //#include <TLinearFitter.h>
 //#include <TH1F.h>
 //#include <TProfile2D.h>
+#include <TVector3.h>
 #include "TMath.h"
+#include "AliGeomManager.h"
 #include "AliITSRecPoint.h"
 #include "AliITSClusterParam.h"
+#include "AliITSReconstructor.h"
+#include "AliExternalTrackParam.h"
 
 ClassImp(AliITSClusterParam)
 
@@ -73,40 +77,86 @@ AliITSClusterParam* AliITSClusterParam::Instance()
 }
 //-------------------------------------------------------------------------
 void AliITSClusterParam::GetNTeor(Int_t layer,const AliITSRecPoint* /*cl*/, 
-                                 Float_t theta,Float_t phi,
+                                 Float_t tgl,Float_t tgphitr,
                                  Float_t &ny,Float_t &nz)
 {
   //
-  //get "mean shape"
+  // Get "mean shape" (original parametrization from AliITStrackerMI)
   //
-  if (layer==0){
-    ny = 1.+TMath::Abs(phi)*3.2;
-    nz = 1.+TMath::Abs(theta)*0.34;
+  tgl = TMath::Abs(tgl);
+  tgphitr = TMath::Abs(tgphitr);
+
+  // SPD
+  if (layer==0) {
+    ny = 1.+tgphitr*3.2;
+    nz = 1.+tgl*0.34;
     return;
   }
-  if (layer==1){
-    ny = 1.+TMath::Abs(phi)*3.2;
-    nz = 1.+TMath::Abs(theta)*0.28;
+  if (layer==1) {
+    ny = 1.+tgphitr*3.2;
+    nz = 1.+tgl*0.28;
     return;
   }
-  
-  if (layer>3){
-    ny = 2.02+TMath::Abs(phi)*1.95;
-    nz = 2.02+TMath::Abs(phi)*2.35;
+  // SSD
+  if (layer==4 || layer==5) {
+    ny = 2.02+tgphitr*1.95;
+    nz = 2.02+tgphitr*2.35;
     return;
   }
-  ny  = 6.6-2.7*TMath::Abs(phi);
-  nz  = 2.8-3.11*TMath::Abs(phi)+0.45*TMath::Abs(theta);
+  // SDD
+  ny  = 6.6-2.7*tgphitr;
+  nz  = 2.8-3.11*tgphitr+0.45*tgl;
+  return;
+}
+//--------------------------------------------------------------------------
+Int_t AliITSClusterParam::GetError(Int_t layer,
+                                  const AliITSRecPoint *cl,
+                                  Float_t tgl,Float_t tgphitr,Float_t expQ,
+                                  Float_t &erry,Float_t &errz)
+{
+  //
+  // Calculate cluster position error
+  //
+  switch(AliITSReconstructor::GetRecoParam()->GetClusterErrorsParam()) {
+  case 0: 
+    return GetErrorOrigRecPoint(cl,erry,errz);
+    break;
+  case 1: 
+    return GetErrorParamMI(layer,cl,tgl,tgphitr,expQ,erry,errz);
+    break;
+  case 2: 
+    return GetErrorParamAngle(layer,cl,tgl,tgphitr,erry,errz);
+    break;
+  default: 
+    return GetErrorParamMI(layer,cl,tgl,tgphitr,expQ,erry,errz);
+    break;
+  }
+
 }
 //--------------------------------------------------------------------------
-Int_t AliITSClusterParam::GetError(Int_t layer,const AliITSRecPoint*cl,
-                                  Float_t theta,Float_t phi,Float_t expQ,
+Int_t AliITSClusterParam::GetErrorOrigRecPoint(const AliITSRecPoint*cl,
                                   Float_t &erry,Float_t &errz)
 {
-  //calculate cluster position error
+  //
+  // Calculate cluster position error (just take error from AliITSRecPoint)
+  //
+  erry   = TMath::Sqrt(cl->GetSigmaY2()); 
+  errz   = TMath::Sqrt(cl->GetSigmaZ2()); 
+
+  return 1;
+}
+//--------------------------------------------------------------------------
+Int_t AliITSClusterParam::GetErrorParamMI(Int_t layer,const AliITSRecPoint*cl,
+                                         Float_t tgl,Float_t tgphitr,
+                                         Float_t expQ,
+                                         Float_t &erry,Float_t &errz)
+{
+  //
+  // Calculate cluster position error (original parametrization from 
+  // AliITStrackerMI)
   //
   Float_t nz,ny;
-  GetNTeor(layer, cl,theta,phi,ny,nz);  
+  GetNTeor(layer, cl,tgl,tgphitr,ny,nz);  
   erry   = TMath::Sqrt(cl->GetSigmaY2()); 
   errz   = TMath::Sqrt(cl->GetSigmaZ2()); 
   //
@@ -147,7 +197,7 @@ Int_t AliITSClusterParam::GetError(Int_t layer,const AliITSRecPoint*cl,
       errz = 0.57*scale;
       return 100;
     }
-    Float_t normq = cl->GetQ()/(TMath::Sqrt(1+theta*theta+phi*phi));
+    Float_t normq = cl->GetQ()/(TMath::Sqrt(1+tgl*tgl+tgphitr*tgphitr));
     Float_t chargematch = TMath::Max(double(normq/expQ),2.);
     //
     if (cl->GetType()==1 || cl->GetType()==10 ){                                                              
@@ -201,7 +251,7 @@ Int_t AliITSClusterParam::GetError(Int_t layer,const AliITSRecPoint*cl,
     return 109;
   }
   //DRIFTS
-  Float_t normq = cl->GetQ()/(TMath::Sqrt(1+theta*theta+phi*phi));
+  Float_t normq = cl->GetQ()/(TMath::Sqrt(1+tgl*tgl+tgphitr*tgphitr));
   Float_t chargematch = normq/expQ;
   chargematch/=2.4; // F. Prino Sept. 2007: SDD charge conversion keV->ADC
   Float_t factorz=1;
@@ -255,6 +305,80 @@ Int_t AliITSClusterParam::GetError(Int_t layer,const AliITSRecPoint*cl,
   return 200;
 }
 //--------------------------------------------------------------------------
+Int_t AliITSClusterParam::GetErrorParamAngle(Int_t layer,
+                                            const AliITSRecPoint *cl,
+                                            Float_t tgl,Float_t tgphitr,
+                                            Float_t &erry,Float_t &errz)
+{
+  //
+  // Calculate cluster position error (parametrization extracted from rp-hit
+  // residuals, as a function of angle between track and det module plane.
+  // Origin: M.Lunardon, S.Moretto)
+  //
+
+  Double_t maxSigmaSPDx=100.;
+  Double_t maxSigmaSPDz=400.;
+  Double_t maxSigmaSDDx=100.;
+  Double_t maxSigmaSDDz=400.;
+  Double_t maxSigmaSSDx=100.;
+  Double_t maxSigmaSSDz=1000.;
+  
+  Double_t paramSPDx[3]={-6.417,0.18,11.14};
+  Double_t paramSPDz[2]={118.,-0.155};
+  Double_t paramSDDx[2]={30.93,0.059};
+  Double_t paramSDDz[2]={33.09,0.011};
+  Double_t paramSSDx[2]={18.64,-0.0046};
+  Double_t paramSSDz[2]={784.4,-0.828};
+  Double_t sigmax=1000.0,sigmaz=1000.0;
+  
+  Int_t volId = (Int_t)cl->GetVolumeId();
+  Double_t tra[3]; AliGeomManager::GetOrigTranslation(volId,tra);
+  Double_t rot[9]; AliGeomManager::GetOrigRotation(volId,rot);
+
+
+  Double_t phitr = TMath::ATan(tgphitr);
+  Double_t alpha = TMath::ATan2(tra[1],tra[0]);
+  Double_t phiglob = alpha+phitr;
+  Double_t p[3]; 
+  p[0] = TMath::Cos(phiglob);
+  p[1] = TMath::Sin(phiglob);
+  p[2] = tgl;
+  TVector3 pvec(p[0],p[1],p[2]);
+  TVector3 normvec(rot[1],-rot[0],0.);
+  Double_t angle = pvec.Angle(normvec);
+  if(angle>0.5*TMath::Pi()) angle = TMath::Pi()-angle;
+  Double_t angleDeg = angle*TMath::Pi()/180.;
+  
+  if(layer==0 || layer==1) { // SPD
+
+    sigmax = TMath::Exp(angleDeg*paramSPDx[1]+paramSPDx[0])+paramSPDx[2];
+    sigmaz = paramSPDz[0]+paramSPDz[1]*angleDeg;
+    if(sigmax > maxSigmaSPDx) sigmax = maxSigmaSPDx;
+    if(sigmaz > maxSigmaSPDz) sigmax = maxSigmaSPDz;
+
+  } else if(layer==2 || layer==3) { // SDD
+
+    sigmax = angleDeg*paramSDDx[1]+paramSDDx[0];
+    sigmaz = paramSDDz[0]+paramSDDz[1]*angleDeg;
+    if(sigmax > maxSigmaSDDx) sigmax = maxSigmaSDDx;
+    if(sigmaz > maxSigmaSDDz) sigmax = maxSigmaSDDz;
+    
+  } else if(layer==4 || layer==5) { // SSD
+
+    sigmax = angleDeg*paramSSDx[1]+paramSSDx[0];
+    sigmaz = paramSSDz[0]+paramSSDz[1]*angleDeg;
+    if(sigmax > maxSigmaSSDx) sigmax = maxSigmaSSDx;
+    if(sigmaz > maxSigmaSSDz) sigmax = maxSigmaSSDz;
+    
+  }
+
+  // convert from micron to cm
+  erry = 1.e-4*sigmax; 
+  errz = 1.e-4*sigmaz;
+  
+  return 1;
+}
+//--------------------------------------------------------------------------
 void AliITSClusterParam::Print(Option_t* /*option*/) const {
   //
   // Print param Information
index 2c489c797b12ad8a0082e8289437ae636e81b90f..0832cd4cf551dfa8a1b5fe37cc57664e4a82c216 100644 (file)
@@ -26,16 +26,25 @@ class AliITSClusterParam : public TObject {
   virtual void Print(Option_t* option = "") const;
   void SetInstance(AliITSClusterParam *param){fgInstance = param;}
   static void GetNTeor(Int_t layer,const AliITSRecPoint* cl,
-               Float_t theta,Float_t phi,
-               Float_t &ny,Float_t &nz);
+                      Float_t tgl,Float_t tgphitr,
+                      Float_t &ny,Float_t &nz);
   static Int_t GetError(Int_t layer,const AliITSRecPoint*cl,
-                Float_t theta,Float_t phi,Float_t expQ,
-                Float_t &erry,Float_t &errz);
+                       Float_t tgl,Float_t tgphitr,Float_t expQ,
+                       Float_t &erry,Float_t &errz);
 
   //void FitData(TTree * tree);
   //
  protected:
   static AliITSClusterParam*   fgInstance; //! Instance of this class (singleton implementation)
+  static Int_t GetErrorOrigRecPoint(const AliITSRecPoint*cl,
+                                   Float_t &erry,Float_t &errz);
+  static Int_t GetErrorParamMI(Int_t layer,const AliITSRecPoint*cl,
+                              Float_t tgl,Float_t tgphitr,Float_t expQ,
+                              Float_t &erry,Float_t &errz);
+  static Int_t GetErrorParamAngle(Int_t layer,const AliITSRecPoint*cl,
+                                 Float_t tgl,Float_t tgphitr,
+                                 Float_t &erry,Float_t &errz);
+
   ClassDef(AliITSClusterParam,1)    //  ITS cluster parametrization class
 };
 
index 1fc817e300862db923810103c84c8d8dce301a59..23e70df6d84b7068a4c7cd937e7b7aa44e1bf948 100644 (file)
 
 ClassImp(AliITSRecoParam)
 
+const Int_t AliITSRecoParam::fgkLayersNotToSkip[AliITSgeomTGeo::kNLayers]={0,0,0,0,0,0};
+const Int_t AliITSRecoParam::fgkLastLayerToTrackTo=0;
+const Int_t AliITSRecoParam::fgkMaxDetectorPerLayer=1000;
+const Double_t AliITSRecoParam::fgkriw=80.0;
+const Double_t AliITSRecoParam::fgkdiw=0.0053;
+const Double_t AliITSRecoParam::fgkX0iw=30.0;
+const Double_t AliITSRecoParam::fgkrcd=61.0;
+const Double_t AliITSRecoParam::fgkdcd=0.0053;
+const Double_t AliITSRecoParam::fgkX0cd=30.0;
+const Double_t AliITSRecoParam::fgkyr=12.8;
+const Double_t AliITSRecoParam::fgkdr=0.03;
+const Double_t AliITSRecoParam::fgkzm=0.2;
+const Double_t AliITSRecoParam::fgkdm=0.40;
+const Double_t AliITSRecoParam::fgkrs=50.0;
+const Double_t AliITSRecoParam::fgkds=0.001;
+const Double_t AliITSRecoParam::fgkrInsideITSscreen=49.0;
+const Double_t AliITSRecoParam::fgkrInsideSPD1=3.7;
+const Double_t AliITSRecoParam::fgkrPipe=3.;
+const Double_t AliITSRecoParam::fgkrInsidePipe=2.7;
+const Double_t AliITSRecoParam::fgkrOutsidePipe=3.3;
+const Double_t AliITSRecoParam::fgkdPipe=0.0028;
+const Double_t AliITSRecoParam::fgkrInsideShield[2]={7.5,25.0};
+const Double_t AliITSRecoParam::fgkrOutsideShield[2]={10.5,30.0};
+const Double_t AliITSRecoParam::fgkdshield[2]={0.0097,0.0034};
+const Double_t AliITSRecoParam::fgkX0shield[2]={38.6,42.0};
+const Double_t AliITSRecoParam::fgkX0Air=21.82;
+const Double_t AliITSRecoParam::fgkX0Be=65.19;
+const Double_t AliITSRecoParam::fgkBoundaryWidth=0.2;
+const Double_t AliITSRecoParam::fgkDeltaXNeighbDets=0.5;
+const Double_t AliITSRecoParam::fgkSPDdetzlength=6.960; // 7.072-2*0.056
+const Double_t AliITSRecoParam::fgkSPDdetxlength=1.298; // 1.410-2*0.056
 
 //_____________________________________________________________________________
 AliITSRecoParam::AliITSRecoParam() : TObject(),
+fMaxSnp(1.),
 fNSigmaYLayerForRoadY(0),
 fNSigmaRoadY(0),
 fNSigmaZLayerForRoadZ(0),
@@ -62,20 +94,21 @@ fZWindowDeadZone(0),
 fSigmaXDeadZoneHit2(0),
 fSigmaZDeadZoneHit2(0),
 fXPassDeadZoneHits(0),
-fUseTGeoInTracker(kFALSE),
+fUseTGeoInTracker(0),
 fAllowSharedClusters(kTRUE),
-fUseNominalClusterErrors(kFALSE),
+fClusterErrorsParam(1),
 fFindV0s(kTRUE)
 {
   //
   // constructor
   //
   SetLayersParameters();
-  SetUseTGeoInTracker(kFALSE);
+  SetUseTGeoInTracker(0);
   SetAllowSharedClusters(kTRUE);
   SetFindV0s(kTRUE);
   SetAddVirtualClustersInDeadZone(kTRUE);
   SetUseAmplitudeInfo(kTRUE);
+  SetClusterErrorsParam(1);
 }
 //_____________________________________________________________________________
 AliITSRecoParam::~AliITSRecoParam() 
index ee8c06ef8a669e1f6888765fb1f90133088960d4..fb527082f650eedc5a30438ae4f1039eadbc2082 100644 (file)
 
 
 #include "TObject.h"
-
-//--------------- move from AliITSrecoV2.h ---------------------------    
-const Int_t kMaxLayer = 6;
-
-const Int_t kLayersNotToSkip[6]={0,0,0,0,0,0};
-const Int_t kLastLayerToTrackTo=0;
-
-const Int_t kMaxClusterPerLayer=7000*10;
-const Int_t kMaxClusterPerLayer5=7000*10*2/5;
-const Int_t kMaxClusterPerLayer10=7000*10*2/10;
-const Int_t kMaxClusterPerLayer20=7000*10*2/20;
-const Int_t kMaxDetectorPerLayer=1000;
-//------------- end of move from AliITSrecoV2.h --------------------
-
-const Double_t kriw=80.0,kdiw=0.0053,kX0iw=30.0; // TPC inner wall
-const Double_t krcd=61.0,kdcd=0.0053,kX0cd=30.0; // TPC "central drum"
-const Double_t kyr=12.8,kdr=0.03; // rods
-const Double_t kzm=0.2,kdm=0.40;  // membrane
-const Double_t krs=50.0,kds=0.001; // ITS screen
-const Double_t krInsideITSscreen=49.0; // inside ITS screen
-
-const Double_t krInsideSPD1=3.7; // inside SPD
-const Double_t krPipe=3.; // beam pipe radius
-const Double_t krInsidePipe=2.7; // inside beam pipe
-const Double_t krOutsidePipe=3.3; // outside beam pipe
-const Double_t kdPipe=0.0023; // beam pipe thickness
-
-const Double_t kX0Air=21.82;
-const Double_t kX0Be=65.19;
-const Double_t kX0shieldSDD=38.6;
-const Double_t kX0shieldSPD=42.0;
-
-const Double_t kdshieldSDD=0.0034;
-const Double_t krshieldSPD=7.5,kdshieldSPD=0.0097;
-
-
-const Double_t kBoundaryWidth=0.2; // to define track at detector boundary 
-const Double_t kDeltaXNeighbDets=0.5; // max difference in radius between 
-                                      // neighbouring detectors
-
-// Size of the SPD sensitive volumes (ladders), for dead zones treatment
-const Double_t kSPDdetzlength=6.960; // 7.072-2*0.056
-const Double_t kSPDdetxlength=1.298; // 1.410-2*0.056
+#include "AliITSgeomTGeo.h"
 
 class AliITSRecoParam : public TObject
 {
@@ -68,7 +26,42 @@ class AliITSRecoParam : public TObject
   static AliITSRecoParam *GetHighFluxParam();// make reco parameters for high flux env. 
   static AliITSRecoParam *GetCosmicTestParam();// special setting for cosmic  
 
-  
+  static Int_t GetLayersNotToSkip(Int_t i) { return fgkLayersNotToSkip[i]; }
+  static Int_t GetLastLayerToTrackTo() { return fgkLastLayerToTrackTo; }
+  static Int_t GetMaxClusterPerLayer() { return fgkMaxClusterPerLayer; }
+  static Int_t GetMaxClusterPerLayer5() { return fgkMaxClusterPerLayer5; }
+  static Int_t GetMaxClusterPerLayer10() { return fgkMaxClusterPerLayer10; }
+  static Int_t GetMaxClusterPerLayer20() { return fgkMaxClusterPerLayer20; }
+  static Int_t GetMaxDetectorPerLayer() { return fgkMaxDetectorPerLayer; }
+  static Double_t Getriw() { return fgkriw; }
+  static Double_t Getdiw() { return fgkdiw; }
+  static Double_t GetX0iw() { return fgkX0iw; }
+  static Double_t Getrcd() { return fgkrcd; }
+  static Double_t Getdcd() { return fgkdcd; }
+  static Double_t GetX0cd() { return fgkX0cd; }
+  static Double_t Getyr() { return fgkyr; }
+  static Double_t Getdr() { return fgkdr; }
+  static Double_t Getzm() { return fgkzm; }
+  static Double_t Getdm() { return fgkdm; }
+  static Double_t Getrs() { return fgkrs; }
+  static Double_t Getds() { return fgkds; }
+  static Double_t GetrInsideITSscreen() { return fgkrInsideITSscreen; }
+  static Double_t GetrInsideSPD1() { return fgkrInsideSPD1; }
+  static Double_t GetrPipe() { return fgkrPipe; }
+  static Double_t GetrInsidePipe() { return fgkrInsidePipe; }
+  static Double_t GetrOutsidePipe() { return fgkrOutsidePipe; }
+  static Double_t GetdPipe() { return fgkdPipe; }
+  static Double_t GetrInsideShield(Int_t i) { return fgkrInsideShield[i]; }
+  static Double_t GetrOutsideShield(Int_t i) { return fgkrOutsideShield[i]; }
+  static Double_t Getdshield(Int_t i) { return fgkdshield[i]; }
+  static Double_t GetX0shield(Int_t i) { return fgkX0shield[i]; }
+  static Double_t GetX0Air() { return fgkX0Air; }
+  static Double_t GetX0Be() { return fgkX0Be; }
+  static Double_t GetBoundaryWidth() { return fgkBoundaryWidth; }
+  static Double_t GetDeltaXNeighbDets() { return fgkDeltaXNeighbDets; }
+  static Double_t GetSPDdetzlength() { return fgkSPDdetzlength; }
+  static Double_t GetSPDdetxlength() { return fgkSPDdetxlength; }
+
   Double_t GetSigmaY2(Int_t i) const { return fSigmaY2[i]; }
   Double_t GetSigmaZ2(Int_t i) const { return fSigmaZ2[i]; }
 
@@ -119,15 +112,15 @@ class AliITSRecoParam : public TObject
 
 
 
-  void   SetUseTGeoInTracker(Bool_t use=kTRUE) { fUseTGeoInTracker=use; return; }
-  Bool_t GetUseTGeoInTracker() const { return fUseTGeoInTracker; }
+  void   SetUseTGeoInTracker(Int_t use=1) { fUseTGeoInTracker=use; return; }
+  Int_t  GetUseTGeoInTracker() const { return fUseTGeoInTracker; }
   
   void   SetAllowSharedClusters(Bool_t allow=kTRUE) { fAllowSharedClusters=allow; return; }
   Bool_t GetAllowSharedClusters() const { return fAllowSharedClusters; }
 
-  void   SetUseNominalClusterErrors(Bool_t nominal=kTRUE) { fUseNominalClusterErrors=nominal; return; }
-  Bool_t GetUseNominalClusterErrors() const { return fUseNominalClusterErrors; }
-  void   SetUseAmplitudeInfo(Bool_t use=kTRUE) { for(Int_t i=0;i<6;i++) fUseAmplitudeInfo[i]=use; return; }
+  void   SetClusterErrorsParam(Int_t param=1) { fClusterErrorsParam=param; return; }
+  Int_t  GetClusterErrorsParam() const { return fClusterErrorsParam; }
+  void   SetUseAmplitudeInfo(Bool_t use=kTRUE) { for(Int_t i=0;i<AliITSgeomTGeo::kNLayers;i++) fUseAmplitudeInfo[i]=use; return; }
   void   SetUseAmplitudeInfo(Int_t ilay,Bool_t use) { fUseAmplitudeInfo[ilay]=use; return; }
   Bool_t GetUseAmplitudeInfo(Int_t ilay) const { return fUseAmplitudeInfo[ilay]; }
 
@@ -137,11 +130,49 @@ class AliITSRecoParam : public TObject
 
   void SetLayersParameters();
   //
+
+  enum {fgkMaxClusterPerLayer=70000}; //7000*10;   // max clusters per layer
+  enum {fgkMaxClusterPerLayer5=28000};//7000*10*2/5;  // max clusters per layer
+  enum {fgkMaxClusterPerLayer10=14000};//7000*10*2/10; // max clusters per layer
+  enum {fgkMaxClusterPerLayer20=7000};//7000*10*2/20; // max clusters per layer
+
  protected:
   //
+  static const Int_t fgkLayersNotToSkip[AliITSgeomTGeo::kNLayers]; // array with layers not to skip
+  static const Int_t fgkLastLayerToTrackTo;  // innermost layer
+  static const Int_t fgkMaxDetectorPerLayer; // max clusters per layer
+  static const Double_t fgkriw;              // TPC inner wall radius
+  static const Double_t fgkdiw;              // TPC inner wall x/X0
+  static const Double_t fgkX0iw;             // TPC inner wall X0 
+  static const Double_t fgkrcd;              // TPC central drum radius
+  static const Double_t fgkdcd;              // TPC central drum x/X0
+  static const Double_t fgkX0cd;             // TPC central drum X0
+  static const Double_t fgkyr;               // TPC rods y (tracking c.s.)
+  static const Double_t fgkdr;               // TPC rods x/X0
+  static const Double_t fgkzm;               // TPC membrane z
+  static const Double_t fgkdm;               // TPC membrane x/X0
+  static const Double_t fgkrs;               // ITS screen radius
+  static const Double_t fgkds;               // ITS screed x/X0
+  static const Double_t fgkrInsideITSscreen; // inside ITS screen radius
+  static const Double_t fgkrInsideSPD1;      // inside SPD1 radius
+  static const Double_t fgkrPipe;            // pipe radius
+  static const Double_t fgkrInsidePipe;      // inside pipe radius
+  static const Double_t fgkrOutsidePipe;     // outside pipe radius
+  static const Double_t fgkdPipe;            // pipe x/X0
+  static const Double_t fgkrInsideShield[2]; // inside SPD (0) SDD (1) shield radius
+  static const Double_t fgkrOutsideShield[2]; // outside SPD (0) SDD (1) shield radius
+  static const Double_t fgkdshield[2];        // SPD (0) SDD (1) shield x/X0
+  static const Double_t fgkX0shield[2];       // SPD (0) SDD (1) shield X0
+  static const Double_t fgkX0Air;             // air X0
+  static const Double_t fgkX0Be;              // Berillium X0
+  static const Double_t fgkBoundaryWidth;     // to define track at detector boundary
+  static const Double_t fgkDeltaXNeighbDets;  // max difference in radius between neighbouring detectors 
+  static const Double_t fgkSPDdetzlength;     // SPD ladder length in z
+  static const Double_t fgkSPDdetxlength;     // SPD ladder length in x
+
   // spatial resolutions of the detectors
-  Double_t fSigmaY2[kMaxLayer]; // y
-  Double_t fSigmaZ2[kMaxLayer]; // z
+  Double_t fSigmaY2[AliITSgeomTGeo::kNLayers]; // y
+  Double_t fSigmaZ2[AliITSgeomTGeo::kNLayers]; // z
   //
   Double_t fMaxSnp; // maximum of sin(phi)  (MI)
   //
@@ -156,17 +187,17 @@ class AliITSRecoParam : public TObject
   Double_t fNSigma2RoadYNonC; // y
   //
   // chi2 cuts
-  Double_t fMaxChi2PerCluster[kMaxLayer-1]; // max chi2 for MIP (MI)
-  Double_t fMaxNormChi2NonC[kMaxLayer]; //max norm chi2 for non constrained tracks (MI)
-  Double_t fMaxNormChi2C[kMaxLayer];  //max norm chi2 for constrained tracks (MI)
+  Double_t fMaxChi2PerCluster[AliITSgeomTGeo::kNLayers-1]; // max chi2 for MIP (MI)
+  Double_t fMaxNormChi2NonC[AliITSgeomTGeo::kNLayers]; //max norm chi2 for non constrained tracks (MI)
+  Double_t fMaxNormChi2C[AliITSgeomTGeo::kNLayers];  //max norm chi2 for constrained tracks (MI)
   Double_t fMaxNormChi2NonCForHypothesis; //max norm chi2 (on layers 0,1,2) for hypotheis to be kept (MI)
   Double_t fMaxChi2; // used to initialize variables needed to find minimum chi2 (MI,V2)
-  Double_t fMaxChi2s[kMaxLayer];   // max predicted chi2 (cluster & track prol.) (MI)
+  Double_t fMaxChi2s[AliITSgeomTGeo::kNLayers];   // max predicted chi2 (cluster & track prol.) (MI)
   //
   Double_t fMaxRoad;   // (V2)
   //
   Double_t fMaxChi2In; // (NOT USED)
-  Double_t fMaxChi2sR[kMaxLayer];  // (NOT USED) 
+  Double_t fMaxChi2sR[AliITSgeomTGeo::kNLayers];  // (NOT USED) 
   Double_t fChi2PerCluster; // (NOT USED)
   //
   // default primary vertex (MI,V2)
@@ -196,10 +227,10 @@ class AliITSRecoParam : public TObject
   Double_t fXPassDeadZoneHits;  // x distance between clusters
 
 
-  Bool_t fUseTGeoInTracker; // use TGeo to get material budget in tracker MI
+  Int_t fUseTGeoInTracker; // use TGeo to get material budget in tracker MI
   Bool_t fAllowSharedClusters; // if kFALSE don't set to kITSin tracks with shared clusters (MI)
-  Bool_t fUseNominalClusterErrors; // if kFALSE don't modify errors using AliITSClusterParam (MI)
-  Bool_t fUseAmplitudeInfo[6]; // use cluster charge in cluster-track matching (SDD,SSD) (MI)
+  Int_t fClusterErrorsParam; // parametrization for cluster errors (MI), see AliITSRecoParam::GetError()
+  Bool_t fUseAmplitudeInfo[AliITSgeomTGeo::kNLayers]; // use cluster charge in cluster-track matching (SDD,SSD) (MI)
 
   Bool_t fFindV0s;  // flag to enable V0 finder (MI)
 
index 15f1a789bf29766106a1ce94215f4099f8f16396..968dac1e45afffd74002dc5a88dff4acb4b6ade9 100644 (file)
@@ -26,6 +26,7 @@
 
 #include "AliCluster.h"
 #include "AliESDtrack.h"
+#include "AliITSgeomTGeo.h"
 #include "AliITStrackMI.h"
 
 ClassImp(AliITStrackMI)
@@ -46,7 +47,7 @@ fConstrain(kFALSE),
 fGoldV0(kFALSE)
 {
   //constructor
-    for(Int_t i=0; i<kMaxLayer; i++) fClIndex[i]=-1;
+    for(Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fClIndex[i]=-1;
     for(Int_t i=0; i<6; i++) { fNy[i]=0; fNz[i]=0; fNormQ[i]=0; fNormChi2[i]=1000;}
     for(Int_t i=0; i<12; i++) {fDy[i]=0; fDz[i]=0; fSigmaY[i]=0; fSigmaZ[i]=0; fChi2MIP[i]=0;}
     fD[0]=0; fD[1]=0;
index c51ca46260451599d269807ae1d1c95992a97748..999978f4c13433e6107392dbd778cd84559d3c21 100755 (executable)
@@ -37,7 +37,7 @@ fNSA(0)
   SetNumberOfClusters(0);
   SetNumberOfClustersSA(0);
   ResetIndexSA();
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++){ 
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){ 
     SetNumberOfMarked(nlay,0);
   }
   ResetMarked();
@@ -51,7 +51,7 @@ fNSA(0){
 // Copy a V2 track into a SA track
   SetNumberOfClustersSA(0);
   ResetIndexSA();
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++){ 
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){ 
     SetNumberOfMarked(nlay,0);
   }
   ResetMarked();
@@ -68,13 +68,13 @@ fNSA(t.fNSA){
   ResetMarked();
   Int_t number = t.GetNumberOfClustersSA();
   SetNumberOfClustersSA(number);
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++){
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     SetNumberOfMarked(nlay,t.GetNumberOfMarked(nlay));
   }
   for(Int_t i=0;i<number;i++){
     fSain[i]=t.fSain[i];
   }
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++){
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     for(Int_t i=0;i<t.GetNumberOfMarked(nlay);i++){
       fCluMark[nlay][i]=t.fCluMark[nlay][i];
     }
@@ -146,13 +146,13 @@ fNSA(0)
                                                                               
   Set(sX,sAlpha,sP,sC);
 
-  for(Int_t i=0; i<kMaxLayer; i++) fIndex[i] = 0;  // to be set explicitely
+  for(Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fIndex[i] = 0;  // to be set explicitely
 
   for(Int_t i=0; i<4; i++) fdEdxSample[i] = 0; 
 
   SetNumberOfClusters(0);
   SetNumberOfClustersSA(0);
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++) SetNumberOfMarked(nlay,0);
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++) SetNumberOfMarked(nlay,0);
   ResetIndexSA();
   ResetMarked();
   SetChi2(0);
@@ -194,7 +194,7 @@ void AliITStrackSA::AddClusterMark(Int_t layer, Int_t clnumb) {
 void AliITStrackSA::AddClusterV2(Int_t layer,Int_t clnumb) {
   // add one clusters to the list (maximum number=6)
   Int_t presnum = GetNumberOfClusters();
-  if(presnum>=kMaxLayer){
+  if(presnum>=AliITSgeomTGeo::GetNLayers()){
     Warning("AddClusterV2","Maximum number of clusters already reached. Nothing is done\n");
     return;
    }    
@@ -208,7 +208,7 @@ void AliITStrackSA::AddClusterV2(Int_t layer,Int_t clnumb) {
 void AliITStrackSA::ResetMarked(){
 
   //Reset array of marked clusters
-  for(Int_t nlay=0;nlay<fgkLayers;nlay++){
+  for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
     for(Int_t k=0; k<fgkMaxNumberOfClustersL; k++) fCluMark[nlay][k]=0;
   }
 }
index 4efa3580ef6002cbf67d18434cc81afaa2a55bf5..c96e6ce30a51f32a767ad3fdbbdd64b39a071459 100755 (executable)
@@ -41,13 +41,12 @@ class AliITStrackSA : public AliITStrackMI {
 
   static const Int_t fgkMaxNumberOfClustersL = 4;// Max. n. of clusters/layer 
   static const Int_t fgkMaxNumberOfClusters = 15;// Max. number of clusters 
-  static const Int_t fgkLayers = 6; //Number of lyers
-                                            // per trackSA
+
   UInt_t  fSain[fgkMaxNumberOfClusters];   // cluster index (SA)
   Int_t fNSA;          // number of clusters SA 
 
-  Int_t fCluMark[fgkLayers][fgkMaxNumberOfClustersL]; //indices for cluster used
-  Int_t fNM[fgkLayers]; //number of marked clusters
+  Int_t fCluMark[AliITSgeomTGeo::kNLayers][fgkMaxNumberOfClustersL]; //indices for cluster used
+  Int_t fNM[AliITSgeomTGeo::kNLayers]; //number of marked clusters
 
   ClassDef(AliITStrackSA,3)
 };
index 657841884355d75c6949088c2b1aaace3c2dcd84..469832ba137ca59d97940c74f8dd2079e3b1aac1 100644 (file)
@@ -36,7 +36,7 @@ AliITStrackV2::AliITStrackV2() : AliKalmanTrack(),
   fdEdx(0),
   fESDtrack(0)
 {
-    for(Int_t i=0; i<2*kMaxLayer; i++) fIndex[i]=-1;
+    for(Int_t i=0; i<2*AliITSgeomTGeo::kNLayers; i++) fIndex[i]=-1;
     for(Int_t i=0; i<4; i++) fdEdxSample[i]=0;
 }
 
@@ -88,7 +88,7 @@ AliITStrackV2::AliITStrackV2(const AliITStrackV2& t) :
   //------------------------------------------------------------------
   Int_t i;
   for (i=0; i<4; i++) fdEdxSample[i]=t.fdEdxSample[i];
-  for (i=0; i<2*kMaxLayer; i++) fIndex[i]=t.fIndex[i];
+  for (i=0; i<2*AliITSgeomTGeo::GetNLayers(); i++) fIndex[i]=t.fIndex[i];
 }
 
 //_____________________________________________________________________________
@@ -114,19 +114,22 @@ AliITStrackV2::PropagateToVertex(const AliESDVertex *v,Double_t d,Double_t x0)
   //This function propagates a track to the minimal distance from the origin
   //------------------------------------------------------------------  
   Double_t bz=GetBz();
-  if (PropagateToDCA(v,bz,kVeryBig))
-   if (AliExternalTrackParam::CorrectForMaterial(d,x0,GetMass())) return kTRUE;
+  if (PropagateToDCA(v,bz,kVeryBig)) {
+    Double_t xOverX0,xTimesRho; 
+    xOverX0 = d; xTimesRho = d*x0;
+    if (CorrectForMeanMaterial(xOverX0,xTimesRho,kTRUE)) return kTRUE;
+  }
   return kFALSE;
 }
 
 //____________________________________________________________________________
 Bool_t AliITStrackV2::
-GetGlobalXYZat(Double_t xk, Double_t &x, Double_t &y, Double_t &z) const {
+GetGlobalXYZat(Double_t xloc, Double_t &x, Double_t &y, Double_t &z) const {
   //------------------------------------------------------------------
   //This function returns a track position in the global system
   //------------------------------------------------------------------
   Double_t r[3];
-  Bool_t rc=GetXYZAt(xk, AliTracker::GetBz(), r);
+  Bool_t rc=GetXYZAt(xloc, AliTracker::GetBz(), r);
   x=r[0]; y=r[1]; z=r[2]; 
   return rc;
 }
@@ -151,7 +154,9 @@ Bool_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
   
   Double_t bz=GetBz();
   if (!AliExternalTrackParam::PropagateTo(xk,bz)) return kFALSE;
-  if (!AliExternalTrackParam::CorrectForMaterial(d,x0,GetMass())) return kFALSE;
+  Double_t xOverX0,xTimesRho; 
+  xOverX0 = d; xTimesRho = d*x0;
+  if (!CorrectForMeanMaterial(xOverX0,xTimesRho,kTRUE)) return kFALSE;
 
   Double_t x=GetX(), y=GetY(), z=GetZ();
   if (IsStartedTimeIntegral() && x>oldX) {
@@ -163,7 +168,7 @@ Bool_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
 }
 
 //____________________________________________________________________________
-Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep) {
+Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho) {
   //-------------------------------------------------------------------
   //  Propagates the track to a reference plane x=xToGo in n steps.
   //  These n steps are only used to take into account the curvature.
@@ -184,13 +189,11 @@ Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep) {
     if (!GetXYZAt(x, bz, end)) return kFALSE;
     if (!AliExternalTrackParam::PropagateTo(x, bz)) return kFALSE;
     AliTracker::MeanMaterialBudget(start, end, mparam);
-    //printf("mparam: %f %f %f %f %f %f %f\n",mparam[0],mparam[1],mparam[2],mparam[3],mparam[4],mparam[5],mparam[6]);
     if (mparam[1]<900000) {
-      Double_t lengthTimesMeanDensity = sign*mparam[4]*mparam[0];
-      Double_t xOverX0 = mparam[1];
-      //printf("%f %f %f CorrectForMeanMaterial(%f,%f)\n",startx,xToGo,sign,xOverX0,lengthTimesMeanDensity);
+      xTimesRho = sign*mparam[4]*mparam[0];
+      xOverX0   = mparam[1];
       if (!AliExternalTrackParam::CorrectForMeanMaterial(xOverX0,
-                                     lengthTimesMeanDensity,GetMass())) return kFALSE;
+                                     xTimesRho,GetMass())) return kFALSE;
     }
   }
 
@@ -419,20 +422,41 @@ Double_t AliITStrackV2::GetBz() const {
 
 //____________________________________________________________________________
 Bool_t AliITStrackV2::
-GetPhiZat(Double_t rk, Double_t &phik, Double_t &zk) const {
+GetPhiZat(Double_t r, Double_t &phi, Double_t &z) const {
+  //------------------------------------------------------------------
+  // This function returns the global cylindrical (phi,z) of the track 
+  // position estimated at the radius r. 
+  // The track curvature is neglected.
+  //------------------------------------------------------------------
+  Double_t d=GetD(0.,0.);
+  if (TMath::Abs(d) > r) return kFALSE; 
+
+  Double_t rcurr=TMath::Sqrt(GetX()*GetX() + GetY()*GetY());
+  if (TMath::Abs(d) > rcurr) return kFALSE; 
+  Double_t phicurr=GetAlpha()+TMath::ASin(GetSnp());
+
+  phi=phicurr+TMath::ASin(d/r)-TMath::ASin(d/rcurr);
+  z=GetZ()+GetTgl()*(TMath::Sqrt(r*r-d*d) - TMath::Sqrt(rcurr*rcurr-d*d));
+
+  return kTRUE;
+}
+//____________________________________________________________________________
+Bool_t AliITStrackV2::
+GetLocalXat(Double_t r,Double_t &xloc) const {
   //------------------------------------------------------------------
-  // This function returns the global cylindrical (phik,zk) of the track 
-  // position estimated at the radius rk
+  // This function returns the local x of the track 
+  // position estimated at the radius r. 
   // The track curvature is neglected.
   //------------------------------------------------------------------
   Double_t d=GetD(0.,0.);
-  if (TMath::Abs(d) > rk) return kFALSE; 
+  if (TMath::Abs(d) > r) return kFALSE; 
 
-  Double_t r=TMath::Sqrt(GetX()*GetX() + GetY()*GetY());
-  Double_t phi=GetAlpha()+TMath::ASin(GetSnp());
+  Double_t rcurr=TMath::Sqrt(GetX()*GetX() + GetY()*GetY());
+  Double_t phicurr=GetAlpha()+TMath::ASin(GetSnp());
+  Double_t phi=phicurr+TMath::ASin(d/r)-TMath::ASin(d/rcurr);
 
-  phik=phi+TMath::ASin(d/rk)-TMath::ASin(d/r);
-  zk=GetZ()+GetTgl()*(TMath::Sqrt(rk*rk-d*d) - TMath::Sqrt(r*r-d*d));
+  xloc=r*(TMath::Cos(phi)*TMath::Cos(GetAlpha())
+         +TMath::Sin(phi)*TMath::Sin(GetAlpha())); 
 
   return kTRUE;
 }
index acddcf7ebbbb4c2b783f6166be0f70e2cfc68467..3efc2ccf2d5f36ab4ef40ef18cf7bf4e24b381a8 100644 (file)
@@ -12,6 +12,7 @@
 
 #include <AliKalmanTrack.h>
 #include "AliITSRecoParam.h"
+#include "AliITSgeomTGeo.h"
 
 class AliESDtrack;
 
@@ -22,19 +23,23 @@ public:
   AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE) throw (const Char_t *);
   AliITStrackV2(const AliITStrackV2& t);
 
-  Bool_t CorrectForMaterial(Double_t d, Double_t x0=kX0Air) {
+  Bool_t CorrectForMeanMaterial(Double_t xOverX0, Double_t xTimesRho,
+                               Bool_t anglecorr=kFALSE) {
+    return AliExternalTrackParam::CorrectForMeanMaterial(xOverX0,xTimesRho,GetMass(),anglecorr);
+  }
+  Bool_t CorrectForMaterial(Double_t d, Double_t x0=AliITSRecoParam::GetX0Air()) {
+    // deprecated: use CorrectForMeanMaterial instead
     return AliExternalTrackParam::CorrectForMaterial(d,x0,GetMass());
   }
-  Bool_t CorrectForMeanMaterial(Double_t xOverX0, Double_t xTimesRho) {
-    return AliExternalTrackParam::CorrectForMeanMaterial(xOverX0,xTimesRho,GetMass());
+  Bool_t PropagateTo(Double_t xr, Double_t d, Double_t x0=AliITSRecoParam::GetX0Air());
+  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho);
+  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep=1) {
+    Double_t dummy1,dummy2; return PropagateToTGeo(xToGo,nstep,dummy1,dummy2);
   }
-  Bool_t PropagateTo(Double_t xr, Double_t d, Double_t x0=kX0Air);
-  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep=1);
   Double_t GetPredictedChi2(const AliCluster *cluster) const;
   Bool_t Update(const AliCluster *cl, Double_t chi2, Int_t i);
 
-  Bool_t 
-     PropagateToVertex(const AliESDVertex *v,Double_t d=0.,Double_t x0=0.);
+  Bool_t PropagateToVertex(const AliESDVertex *v,Double_t d=0.,Double_t x0=0.);
   Bool_t Propagate(Double_t alpha, Double_t xr);
   Bool_t MeanBudgetToPrimVertex(Double_t xyz[3], Double_t step, Double_t &d) const;
   Bool_t Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]);
@@ -60,15 +65,16 @@ public:
     return AliExternalTrackParam::GetDZ(xv,yv,zv,GetBz(),dz);
   }
 
-  Bool_t GetGlobalXYZat(Double_t r,Double_t &x,Double_t &y,Double_t &z) const;
+  Bool_t GetGlobalXYZat(Double_t xloc,Double_t &x,Double_t &y,Double_t &z) const;
   Bool_t GetPhiZat(Double_t r,Double_t &phi,Double_t &z) const;
+  Bool_t GetLocalXat(Double_t r,Double_t &xloc) const;
 
   Int_t Compare(const TObject *o) const;
   Int_t GetClusterIndex(Int_t i) const {return fIndex[i];}
   Bool_t Invariant() const;
 
-  void  SetExtraCluster(Int_t i, Int_t idx) {fIndex[kMaxLayer+i]=idx;}
-  Int_t GetExtraCluster(Int_t i) const {return fIndex[kMaxLayer+i];}
+  void  SetExtraCluster(Int_t i, Int_t idx) {fIndex[AliITSgeomTGeo::kNLayers+i]=idx;}
+  Int_t GetExtraCluster(Int_t i) const {return fIndex[AliITSgeomTGeo::kNLayers+i];}
 
 protected:
   Double_t GetBz() const ;
@@ -77,7 +83,7 @@ protected:
   static const Int_t fgkWARN; //! used for debugging purposes
   Float_t fdEdxSample[4];    // array of dE/dx samples b.b.
 
-  Int_t fIndex[2*kMaxLayer]; // indices of associated clusters 
+  Int_t fIndex[2*AliITSgeomTGeo::kNLayers]; // indices of associated clusters 
 
   AliESDtrack *fESDtrack;    //! pointer to the connected ESD track
 
index 2e6ab6ccff6161385c93de25af5abf7afcb4497a..b4a9abb9c8ad8e14466382d7a75ffdbfd49588e1 100644 (file)
@@ -27,9 +27,9 @@
 #include <TMatrixD.h>
 #include <TTree.h>
 #include <TTreeStream.h>
-#include <TTree.h>
 #include <TDatabasePDG.h>
 #include <TString.h>
+#include <TRandom.h>
 
 
 #include "AliESDEvent.h"
@@ -47,9 +47,7 @@
 
 ClassImp(AliITStrackerMI)
 
-
-
-AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[kMaxLayer]; // ITS layers
+AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[AliITSgeomTGeo::kNLayers]; // ITS layers
 
 AliITStrackerMI::AliITStrackerMI():AliTracker(),
 fI(0),
@@ -64,14 +62,27 @@ fAfterV0(kFALSE),
 fLastLayerToTrackTo(0),
 fCoefficients(0),
 fEsd(0),
-fUseTGeo(kFALSE),
+fTrackingPhase("Default"),
+fUseTGeo(0),
+fNtracks(0),
+fxOverX0Pipe(-1.),
+fxTimesRhoPipe(-1.),
+fxOverX0PipeTrks(0),
+fxTimesRhoPipeTrks(0),
+fxOverX0ShieldTrks(0),
+fxTimesRhoShieldTrks(0),
+fxOverX0LayerTrks(0),
+fxTimesRhoLayerTrks(0),
 fDebugStreamer(0){
   //Default constructor
-  for(Int_t i=0;i<4;i++) fSPDdetzcentre[i]=0.;
+  Int_t i;
+  for(i=0;i<4;i++) fSPDdetzcentre[i]=0.;
+  for(i=0;i<2;i++) {fxOverX0Shield[i]=-1.;fxTimesRhoShield[i]=-1.;}
+  for(i=0;i<6;i++) {fxOverX0Layer[i]=-1.;fxTimesRhoLayer[i]=-1.;}
 }
 //------------------------------------------------------------------------
 AliITStrackerMI::AliITStrackerMI(const Char_t *geom) : AliTracker(),
-fI(kMaxLayer),
+fI(AliITSgeomTGeo::GetNLayers()),
 fBestTrack(),
 fTrackToFollow(),
 fTrackHypothesys(),
@@ -80,10 +91,20 @@ fOriginal(),
 fCurrentEsdTrack(),
 fPass(0),
 fAfterV0(kFALSE),
-fLastLayerToTrackTo(kLastLayerToTrackTo),
+fLastLayerToTrackTo(AliITSRecoParam::GetLastLayerToTrackTo()),
 fCoefficients(0),
 fEsd(0),
-fUseTGeo(kFALSE),
+fTrackingPhase("Default"),
+fUseTGeo(0),
+fNtracks(0),
+fxOverX0Pipe(-1.),
+fxTimesRhoPipe(-1.),
+fxOverX0PipeTrks(0),
+fxTimesRhoPipeTrks(0),
+fxOverX0ShieldTrks(0),
+fxTimesRhoShieldTrks(0),
+fxOverX0LayerTrks(0),
+fxTimesRhoLayerTrks(0),
 fDebugStreamer(0){
   //--------------------------------------------------------------------
   //This is the AliITStrackerMI constructor
@@ -95,7 +116,7 @@ fDebugStreamer(0){
   fCoefficients = 0;
   fAfterV0     = kFALSE;
 
-  for (Int_t i=1; i<kMaxLayer+1; i++) {
+  for (Int_t i=1; i<AliITSgeomTGeo::GetNLayers()+1; i++) {
     Int_t nlad=AliITSgeomTGeo::GetNLadders(i);
     Int_t ndet=AliITSgeomTGeo::GetNDetectors(i);
 
@@ -135,7 +156,7 @@ fDebugStreamer(0){
 
   }
 
-  fI=kMaxLayer;
+  fI=AliITSgeomTGeo::GetNLayers();
 
   fPass=0;
   fConstraint[0]=1; fConstraint[1]=0;
@@ -148,8 +169,8 @@ fDebugStreamer(0){
                     AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
   SetVertex(xyzVtx,ersVtx);
 
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=kLayersNotToSkip[i];
-  fLastLayerToTrackTo=kLastLayerToTrackTo;
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=AliITSRecoParam::GetLayersNotToSkip(i);
+  fLastLayerToTrackTo=AliITSRecoParam::GetLastLayerToTrackTo();
   for (Int_t i=0;i<100000;i++){
     fBestTrackIndex[i]=0;
   }
@@ -165,9 +186,11 @@ fDebugStreamer(0){
   AliITSgeomTGeo::GetTranslation(1,1,4,tr);
   fSPDdetzcentre[3] = tr[2];
 
-
   fUseTGeo = AliITSReconstructor::GetRecoParam()->GetUseTGeoInTracker();
-  //
+
+  for(Int_t i=0;i<2;i++) {fxOverX0Shield[i]=-1.;fxTimesRhoShield[i]=-1.;}
+  for(Int_t i=0;i<6;i++) {fxOverX0Layer[i]=-1.;fxTimesRhoLayer[i]=-1.;}
+  
   fDebugStreamer = new TTreeSRedirector("ITSdebug.root");
 
 }
@@ -185,9 +208,31 @@ fAfterV0(tracker.fAfterV0),
 fLastLayerToTrackTo(tracker.fLastLayerToTrackTo),
 fCoefficients(tracker.fCoefficients),
 fEsd(tracker.fEsd),
+fTrackingPhase(tracker.fTrackingPhase),
 fUseTGeo(tracker.fUseTGeo),
+fNtracks(tracker.fNtracks),
+fxOverX0Pipe(tracker.fxOverX0Pipe),
+fxTimesRhoPipe(tracker.fxTimesRhoPipe),
+fxOverX0PipeTrks(0),
+fxTimesRhoPipeTrks(0),
+fxOverX0ShieldTrks(0),
+fxTimesRhoShieldTrks(0),
+fxOverX0LayerTrks(0),
+fxTimesRhoLayerTrks(0),
 fDebugStreamer(tracker.fDebugStreamer){
   //Copy constructor
+  Int_t i;
+  for(i=0;i<4;i++) {
+    fSPDdetzcentre[i]=tracker.fSPDdetzcentre[i];
+  }
+  for(i=0;i<6;i++) {
+    fxOverX0Layer[i]=tracker.fxOverX0Layer[i];
+    fxTimesRhoLayer[i]=tracker.fxTimesRhoLayer[i];
+  }
+  for(i=0;i<2;i++) {
+    fxOverX0Shield[i]=tracker.fxOverX0Shield[i];
+    fxTimesRhoShield[i]=tracker.fxTimesRhoShield[i];
+  }
 }
 //------------------------------------------------------------------------
 AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){
@@ -202,7 +247,8 @@ AliITStrackerMI::~AliITStrackerMI()
   //
   //destructor
   //
-  if (fCoefficients) delete []fCoefficients;
+  if (fCoefficients) delete [] fCoefficients;
+  DeleteTrksMaterialLUT();
   if (fDebugStreamer) {
     //fDebugStreamer->Close();
     delete fDebugStreamer;
@@ -213,7 +259,7 @@ void AliITStrackerMI::SetLayersNotToSkip(Int_t *l) {
   //--------------------------------------------------------------------
   //This function set masks of the layers which must be not skipped
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=l[i];
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=l[i];
 }
 //------------------------------------------------------------------------
 Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
@@ -231,7 +277,7 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
 
   Int_t j=0;
   Int_t detector=0;
-  for (Int_t i=0; i<kMaxLayer; i++) {
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) {
     Int_t ndet=fgLayers[i].GetNdetectors();
     Int_t jmax = j + fgLayers[i].GetNladders()*ndet;
     for (; j<jmax; j++) {           
@@ -251,7 +297,7 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
       // add dead zone "virtual" cluster in SPD, if there is a cluster within 
       // zwindow cm from the dead zone      
       if (i<2 && AliITSReconstructor::GetRecoParam()->GetAddVirtualClustersInDeadZone()) {
-       for (Float_t xdead = 0; xdead < kSPDdetxlength; xdead += (i+1.)*AliITSReconstructor::GetRecoParam()->GetXPassDeadZoneHits()) {
+       for (Float_t xdead = 0; xdead < AliITSRecoParam::GetSPDdetxlength(); xdead += (i+1.)*AliITSReconstructor::GetRecoParam()->GetXPassDeadZoneHits()) {
          Int_t lab[4]   = {0,0,0,detector};
          Int_t info[3]  = {0,0,i};
          Float_t q      = 0.;
@@ -262,22 +308,22 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
                            q};
          Bool_t local   = kTRUE;
          Double_t zwindow = AliITSReconstructor::GetRecoParam()->GetZWindowDeadZone();
-         hit[1] = fSPDdetzcentre[0]+0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[0]+0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
-         hit[1] = fSPDdetzcentre[1]-0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[1]-0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
-         hit[1] = fSPDdetzcentre[1]+0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[1]+0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
-         hit[1] = fSPDdetzcentre[2]-0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[2]-0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
-         hit[1] = fSPDdetzcentre[2]+0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[2]+0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
-         hit[1] = fSPDdetzcentre[3]-0.5*kSPDdetzlength;
+         hit[1] = fSPDdetzcentre[3]-0.5*AliITSRecoParam::GetSPDdetzlength();
          if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
            fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
        }
@@ -296,41 +342,27 @@ void AliITStrackerMI::UnloadClusters() {
   //--------------------------------------------------------------------
   //This function unloads ITS clusters
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxLayer; i++) fgLayers[i].ResetClusters();
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fgLayers[i].ResetClusters();
 }
 //------------------------------------------------------------------------
 static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) {
   //--------------------------------------------------------------------
   // Correction for the material between the TPC and the ITS
   //--------------------------------------------------------------------
-  if (t->GetX() > kriw) {                 // inward direction 
-      if (!t->PropagateToTGeo(kriw,1)) return 1;// TPC inner wall
-      if (!t->PropagateToTGeo(krcd,1)) return 1;// TPC central drum
-      if (!t->PropagateToTGeo(krs,1))  return 1;// ITS screen
-      /* without TGeo:
-        if (!t->PropagateTo(kriw,kdiw,kX0iw)) return 1;// TPC inner wall
-        if (TMath::Abs(t->GetY())>kyr) t->CorrectForMaterial(kdr);//rods 
-        if (TMath::Abs(t->GetZ())<kzm) t->CorrectForMaterial(kdm);//membrane 
-        if (!t->PropagateTo(krcd,kdcd,kX0cd)) return 1;// TPC central drum
-        //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
-        //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,dr,x0r); 
-        if (!t->PropagateTo(krs,kds,kX0Air)) return 1;// ITS screen */
-  } else if (t->GetX() < krs) {          // outward direction
-      if (!t->PropagateToTGeo(krs,1))        return 1;// ITS screen
-      if (!t->PropagateToTGeo(krcd,1))       return 1;// TPC central drum
-      if (!t->PropagateToTGeo(kriw+0.001,1)) return 1;// TPC inner wall
-      /* without TGeo
-      if (!t->PropagateTo(krs,-kds,kX0Air)) return 1;
-      //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
-      //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,-dr,x0r); 
-      if (!t->PropagateTo(krcd,-kdcd,kX0cd)) return 1;// TPC central drum
-      if (!t->PropagateTo(kriw+0.001,-kdiw,kX0iw)) return 1; */
+  if (t->GetX() > AliITSRecoParam::Getriw()) {   // inward direction 
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getriw(),1)) return 0;// TPC inner wall
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getrcd(),1)) return 0;// TPC central drum
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getrs(),1))  return 0;// ITS screen
+  } else if (t->GetX() < AliITSRecoParam::Getrs()) {  // outward direction
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getrs(),1))        return 0;// ITS screen
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getrcd(),1))       return 0;// TPC central drum
+      if (!t->PropagateToTGeo(AliITSRecoParam::Getriw()+0.001,1)) return 0;// TPC inner wall
   } else {
     Error("CorrectForTPCtoITSDeadZoneMaterial","Track is already in the dead zone !");
-    return 1;
+    return 0;
   }
   
-  return 0;
+  return 1;
 }
 //------------------------------------------------------------------------
 Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
@@ -338,6 +370,8 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   // This functions reconstructs ITS tracks
   // The clusters must be already loaded !
   //--------------------------------------------------------------------
+  fTrackingPhase="Clusters2Tracks";
+
   TObjArray itsTracks(15000);
   fOriginal.Clear();
   fEsd = event;         // store pointer to the esd 
@@ -385,8 +419,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
        if (TMath::Abs(t->GetD(0))>AliITSReconstructor::GetRecoParam()->GetMaxDForProlongation()) {
          delete t;
          continue;
-       }
-       
+       }       
        if (TMath::Abs(vdist)>AliITSReconstructor::GetRecoParam()->GetMaxDZForProlongation()) {
          delete t;
          continue;
@@ -395,10 +428,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
          delete t;
          continue;
        }
-       
-       if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
-         //Warning("Clusters2Tracks",
-         //        "failed to correct for the material in the dead zone !\n");
+       if (!CorrectForTPCtoITSDeadZoneMaterial(t)) {
          delete t;
          continue;
        }
@@ -415,14 +445,14 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   fTrackHypothesys.Expand(nentr);
   fBestHypothesys.Expand(nentr);
   MakeCoefficients(nentr);
+  if(fUseTGeo==3 || fUseTGeo==4) MakeTrksMaterialLUT(nentr);
   Int_t ntrk=0;
   // THE TWO TRACKING PASSES
   for (fPass=0; fPass<2; fPass++) {
      Int_t &constraint=fConstraint[fPass]; if (constraint<0) continue;
-     for (Int_t i=0; i<nentr; i++) {
-       //cerr<<fPass<<"    "<<i<<'\r';
-       fCurrentEsdTrack = i;
-       AliITStrackMI *t=(AliITStrackMI*)itsTracks.UncheckedAt(i);
+     for (fCurrentEsdTrack=0; fCurrentEsdTrack<nentr; fCurrentEsdTrack++) {
+       //cerr<<fPass<<"    "<<fCurrentEsdTrack<<'\r';
+       AliITStrackMI *t=(AliITStrackMI*)itsTracks.UncheckedAt(fCurrentEsdTrack);
        if (t==0) continue;              //this track has been already tracked
        if (t->GetReconstructed()&&(t->GetNUsed()<1.5)) continue;  //this track was  already  "succesfully" reconstructed
        Float_t dz[2]; t->GetDZ(GetX(),GetY(),GetZ(),dz);              //I.B.
@@ -435,7 +465,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
        fI = 6;
        ResetTrackToFollow(*t);
        ResetBestTrack();
-       FollowProlongationTree(t,i,fConstraint[fPass]);
+       FollowProlongationTree(t,fCurrentEsdTrack,fConstraint[fPass]);
 
        SortTrackHypothesys(fCurrentEsdTrack,20,0);  //MI change
        //
@@ -465,7 +495,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   itsTracks.Delete();
   //
   Int_t entries = fTrackHypothesys.GetEntriesFast();
-  for (Int_t ientry=0;ientry<entries;ientry++){
+  for (Int_t ientry=0; ientry<entries; ientry++) {
     TObjArray * array =(TObjArray*)fTrackHypothesys.UncheckedAt(ientry);
     if (array) array->Delete();
     delete fTrackHypothesys.RemoveAt(ientry); 
@@ -476,7 +506,11 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   fOriginal.Clear();
   delete [] fCoefficients;
   fCoefficients=0;
+  DeleteTrksMaterialLUT();
+
   Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk);
+
+  fTrackingPhase="Default";
   
   return 0;
 }
@@ -486,6 +520,7 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
   // This functions propagates reconstructed ITS tracks back
   // The clusters must be loaded !
   //--------------------------------------------------------------------
+  fTrackingPhase="PropagateBack";
   Int_t nentr=event->GetNumberOfTracks();
   Info("PropagateBack", "Number of ESD tracks: %d\n", nentr);
 
@@ -510,27 +545,16 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
 
      // propagate to vertex [SR, GSI 17.02.2003]
      // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov
-     if(fUseTGeo) {
-       if (fTrackToFollow.PropagateToTGeo(krInsidePipe,1)) {
-        if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
-          fTrackToFollow.StartTimeIntegral();
-        }
-        fTrackToFollow.PropagateToTGeo(krOutsidePipe,1);
-       }
-     } else {
-       if (fTrackToFollow.PropagateTo(krInsidePipe,kdPipe,kX0Be)) {
-        if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
-          fTrackToFollow.StartTimeIntegral();
-        }
-        fTrackToFollow.PropagateTo(krOutsidePipe,-kdPipe,kX0Be);
-       }
+     if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) {
+       if (fTrackToFollow.PropagateToVertex(event->GetVertex()))
+        fTrackToFollow.StartTimeIntegral();
+       // from vertex to outside pipe
+       CorrectForPipeMaterial(&fTrackToFollow,"outward");
      }
 
      fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters();
-     if (RefitAt(krInsideITSscreen,&fTrackToFollow,t)) {
-        if (CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)!=0) {
-          //Warning("PropagateBack",
-          //        "failed to correct for the material in the dead zone !\n");
+     if (RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&fTrackToFollow,t)) {
+        if (!CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)) {
           delete t;
           continue;
         }
@@ -546,6 +570,8 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
 
   Info("PropagateBack","Number of back propagated ITS tracks: %d\n",ntrk);
 
+  fTrackingPhase="Default";
+
   return 0;
 }
 //------------------------------------------------------------------------
@@ -555,6 +581,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
   // "inward propagated" TPC tracks
   // The clusters must be loaded !
   //--------------------------------------------------------------------
+  fTrackingPhase="RefitInward";
   if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event);
   Int_t nentr=event->GetNumberOfTracks();
   Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
@@ -577,9 +604,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
         continue;
     }
     t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
-    if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
-      //Warning("RefitInward",
-      //         "failed to correct for the material in the dead zone !\n");
+    if (!CorrectForTPCtoITSDeadZoneMaterial(t)) {
        delete t;
        continue;
     }
@@ -591,7 +616,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
       fTrackToFollow.ResetCovariance(10.);
 
     //Refitting...
-    if (RefitAt(krInsideSPD1, &fTrackToFollow, t,kTRUE)) {
+    if (RefitAt(AliITSRecoParam::GetrInsideSPD1(), &fTrackToFollow, t,kTRUE)) {
        fTrackToFollow.SetLabel(t->GetLabel());
        //       fTrackToFollow.CookdEdx();
        CookdEdx(&fTrackToFollow);
@@ -599,13 +624,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
        CookLabel(&fTrackToFollow,0.0); //For comparison only
 
        //The beam pipe
-       Bool_t okToPipe;
-       if(fUseTGeo) { 
-        okToPipe = fTrackToFollow.PropagateToTGeo(krInsidePipe,1); 
-       } else {
-        okToPipe = fTrackToFollow.PropagateTo(krInsidePipe,kdPipe,kX0Be);
-       }
-       if(okToPipe) {
+       if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) {
         AliESDtrack  *esdTrack =fTrackToFollow.GetESDtrack();
         esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit);
         Float_t r[3]={0.,0.,0.};
@@ -613,13 +632,14 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
         esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD);
         ntrk++;
        }
-
     }
     delete t;
   }
 
   Info("RefitInward","Number of refitted tracks: %d\n",ntrk);
 
+  fTrackingPhase="Default";
+
   return 0;
 }
 //------------------------------------------------------------------------
@@ -704,8 +724,7 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index,
   Float_t expQ = TMath::Max(0.8*t->GetTPCsignal(),30.);
 
   Float_t errlocalx,errlocalz;
-  if(!AliITSReconstructor::GetRecoParam()->GetUseNominalClusterErrors())
-    AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz);
+  AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz);
 
   Float_t xyz[3];
   Float_t cov[6];
@@ -799,16 +818,17 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
   // 
   //
   // follow prolongations
-  for (Int_t ilayer=5;ilayer>=0;ilayer--){
+  for (Int_t ilayer=5; ilayer>=0; ilayer--) {
     //
     AliITSlayer &layer=fgLayers[ilayer]; 
-    Double_t r=layer.GetR();
+    Double_t r=layer.GetR();    
+    Double_t deltar=(ilayer<2 ? 0.10*r : 0.05*r);
     ntracks[ilayer]=0;
     //
     //
    Int_t nskipped=0;
     Float_t nused =0;
-    for (Int_t itrack =0;itrack<ntracks[ilayer+1];itrack++){
+    for (Int_t itrack =0; itrack<ntracks[ilayer+1]; itrack++) {
       //set current track
       if (ntracks[ilayer]>=100) break;  
       if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0) nskipped++;
@@ -821,23 +841,10 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
       new(&currenttrack1)  AliITStrackMI(tracks[ilayer+1][nindexes[ilayer+1][itrack]]);
   
       // material between SSD and SDD, SDD and SPD
-      if (ilayer==3 || ilayer==1) {
-       Double_t rshield,dshield,x0shield;
-       if (ilayer==3) { // SDDouter
-         rshield=0.5*(fgLayers[ilayer+1].GetR() + r);
-         dshield=kdshieldSDD;
-         x0shield=kX0shieldSDD;
-       } else {        // SPDouter
-         rshield=krshieldSPD; 
-         dshield=kdshieldSPD; 
-         x0shield=kX0shieldSPD;
-       }
-       if (fUseTGeo) {
-         if (!currenttrack1.PropagateToTGeo(rshield,1)) continue;
-       } else {
-         if (!currenttrack1.PropagateTo(rshield,dshield,x0shield)) continue;
-       }
-      }
+      if (ilayer==3) 
+       if(!CorrectForShieldMaterial(&currenttrack1,"SDD","inward")) continue;
+      if (ilayer==1) 
+       if(!CorrectForShieldMaterial(&currenttrack1,"SPD","inward")) continue;
 
       Double_t phi,z;
       if (!currenttrack1.GetPhiZat(r,phi,z)) continue;
@@ -845,34 +852,23 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
       Int_t idet=layer.FindDetectorIndex(phi,z);
       if (idet<0) continue;
       
-      Double_t trackGlobXYZ1[3],trackGlobXYZ2[3];
-      currenttrack1.GetXYZ(trackGlobXYZ1);
-
       //propagate to the intersection
       const AliITSdetector &det=layer.GetDetector(idet);
       new(&currenttrack2)  AliITStrackMI(currenttrack1);
+
+      Double_t trackGlobXYZ1[3];
+      currenttrack1.GetXYZ(trackGlobXYZ1);
+
       if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue;
       currenttrack2.Propagate(det.GetPhi(),det.GetR());
       currenttrack1.SetDetectorIndex(idet);
       currenttrack2.SetDetectorIndex(idet);
       
+      fI = ilayer;
       // Get the budget to the primary vertex and between the two layers
       // for the current track being prolonged (before searching for clusters
       // on this layer)
-      fI = ilayer;
-      Double_t budgetToPrimVertex = 0.;
-      if (fUseTGeo) {
-       if (!currenttrack2.MeanBudgetToPrimVertex(xyzVtx,2,budgetToPrimVertex))
-         budgetToPrimVertex = GetEffectiveThickness(0,0);
-      } else {
-         budgetToPrimVertex = GetEffectiveThickness(0,0);
-      }
-      Double_t mparam[7];
-      currenttrack2.GetXYZ(trackGlobXYZ2);
-      if(fUseTGeo) {
-       AliTracker::MeanMaterialBudget(trackGlobXYZ1,trackGlobXYZ2,mparam);
-      }
-
+      Double_t budgetToPrimVertex = GetEffectiveThickness();
 
       //***************
       // DEFINITION OF SEARCH ROAD FOR CLUSTERS SELECTION
@@ -889,16 +885,18 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
                    AliITSReconstructor::GetRecoParam()->GetSigmaY2(ilayer));
       
       // track at boundary between detectors, enlarge road
-      if ( (currenttrack1.GetY()-dy < det.GetYmin()+kBoundaryWidth) || 
-          (currenttrack1.GetY()+dy > det.GetYmax()-kBoundaryWidth) || 
-          (currenttrack1.GetZ()-dz < det.GetZmin()+kBoundaryWidth) ||
-          (currenttrack1.GetZ()+dz > det.GetZmax()-kBoundaryWidth) ) {
+      Double_t boundaryWidth=AliITSRecoParam::GetBoundaryWidth();
+      if ( (currenttrack1.GetY()-dy < det.GetYmin()+boundaryWidth) || 
+          (currenttrack1.GetY()+dy > det.GetYmax()-boundaryWidth) || 
+          (currenttrack1.GetZ()-dz < det.GetZmin()+boundaryWidth) ||
+          (currenttrack1.GetZ()+dz > det.GetZmax()-boundaryWidth) ) {
        Float_t tgl = TMath::Abs(currenttrack1.GetTgl());
        if (tgl > 1.) tgl=1.;
-       dz = TMath::Sqrt(dz*dz+kDeltaXNeighbDets*kDeltaXNeighbDets*tgl*tgl);
+       Double_t deltaXNeighbDets=AliITSRecoParam::GetDeltaXNeighbDets();
+       dz = TMath::Sqrt(dz*dz+deltaXNeighbDets*deltaXNeighbDets*tgl*tgl);
        Float_t snp = TMath::Abs(currenttrack1.GetSnp());
        if (snp > AliITSReconstructor::GetRecoParam()->GetMaxSnp()) continue;
-       dy = TMath::Sqrt(dy*dy+kDeltaXNeighbDets*kDeltaXNeighbDets*snp*snp);
+       dy = TMath::Sqrt(dy*dy+deltaXNeighbDets*deltaXNeighbDets*snp*snp);
       } // boundary
       
       // road in global (rphi,z)
@@ -967,16 +965,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
            continue;
          }
          currenttrack->SetDetectorIndex(idet);
-         // Get again the budget to the primary vertex and between the two 
-         // layers for the current track being prolonged, if had to change detector 
-         if (fUseTGeo) {
-           if (!currenttrack->MeanBudgetToPrimVertex(xyzVtx,2,budgetToPrimVertex))
-             budgetToPrimVertex = GetEffectiveThickness(0,0);
-           currenttrack->GetXYZ(trackGlobXYZ2);
-           AliTracker::MeanMaterialBudget(trackGlobXYZ1,trackGlobXYZ2,mparam);
-         } else {
-           budgetToPrimVertex = GetEffectiveThickness(0,0);
-         }
+         // Get again the budget to the primary vertex 
+         // for the current track being prolonged, if had to change detector 
+         //budgetToPrimVertex = GetEffectiveThickness();// not needed at the moment because anyway we take a mean material for this correction
        }
 
        // calculate track-clusters chi2
@@ -999,16 +990,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
          if (cl->IsUsed()) updatetrack->IncrementNUsed();
 
          // apply correction for material of the current layer
-         if(fUseTGeo) { 
-           Double_t d,lengthTimesMeanDensity;
-           d=mparam[1]; 
-           lengthTimesMeanDensity=mparam[0]*mparam[4]; 
-           updatetrack->CorrectForMeanMaterial(d,lengthTimesMeanDensity);        
-         } else {
-           Double_t d,x0;
-           d=layer.GetThickness(updatetrack->GetY(),updatetrack->GetZ(),x0);
-           updatetrack->CorrectForMaterial(d,x0);        
-         }
+         CorrectForLayerMaterial(updatetrack,ilayer,trackGlobXYZ1,"inward");
+
          if (constrain) { // apply vertex constrain
            updatetrack->SetConstrain(constrain);
            Bool_t isPrim = kTRUE;
@@ -1025,6 +1008,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
        }  // create new hypothesis
       } // loop over possible cluster prolongation      
       if (constrain&&itrack<2&&currenttrack1.GetNSkipped()==0 && deadzone==0&&ntracks[ilayer]<100) {   
+       // Bring the track beyond the material
+       currenttrack1.AliExternalTrackParam::PropagateTo(currenttrack1.GetX()-deltar,GetBz());
        AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
        vtrack->SetClIndex(ilayer,0);
        vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
@@ -1033,6 +1018,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
       }
 
       if (constrain&&itrack<1&&TMath::Abs(currenttrack1.GetTgl())>1.1) {  //big theta - for low flux
+       // Bring the track beyond the material
+       currenttrack1.AliExternalTrackParam::PropagateTo(currenttrack1.GetX()-deltar,GetBz());
        AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
        vtrack->SetClIndex(ilayer,0);
        vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
@@ -1041,7 +1028,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
       }
      
       
-    }
+    } // loop over tracks in layer ilayer+1
 
     //loop over track candidates for the current layer
     //
@@ -1224,7 +1211,7 @@ fRoad(0){
   //--------------------------------------------------------------------
   //default AliITSlayer constructor
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxClusterPerLayer;i++) {
+  for (Int_t i=0; i<AliITSRecoParam::GetMaxClusterPerLayer(); i++) {
     fClusterWeight[i]=0;
     fClusterTracks[0][i]=-1;
     fClusterTracks[1][i]=-1;
@@ -1300,7 +1287,7 @@ AliITStrackerMI::AliITSlayer::~AliITSlayer() {
   //--------------------------------------------------------------------
   delete[] fDetectors;
   for (Int_t i=0; i<fN; i++) delete fClusters[i];
-  for (Int_t i=0; i<kMaxClusterPerLayer;i++) {
+  for (Int_t i=0; i<AliITSRecoParam::GetMaxClusterPerLayer(); i++) {
     fClusterWeight[i]=0;
     fClusterTracks[0][i]=-1;
     fClusterTracks[1][i]=-1;
@@ -1314,7 +1301,7 @@ void AliITStrackerMI::AliITSlayer::ResetClusters() {
   // This function removes loaded clusters
   //--------------------------------------------------------------------
   for (Int_t i=0; i<fN; i++) delete fClusters[i];
-  for (Int_t i=0; i<kMaxClusterPerLayer;i++){
+  for (Int_t i=0; i<AliITSRecoParam::GetMaxClusterPerLayer(); i++){
     fClusterWeight[i]=0;
     fClusterTracks[0][i]=-1;
     fClusterTracks[1][i]=-1;
@@ -1330,7 +1317,7 @@ void AliITStrackerMI::AliITSlayer::ResetWeights() {
   //--------------------------------------------------------------------
   // This function reset weights of the clusters
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxClusterPerLayer;i++) {
+  for (Int_t i=0; i<AliITSRecoParam::GetMaxClusterPerLayer(); i++) {
     fClusterWeight[i]=0;
     fClusterTracks[0][i]=-1;
     fClusterTracks[1][i]=-1;
@@ -1359,7 +1346,7 @@ Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *cl) {
   //--------------------------------------------------------------------
   //This function adds a cluster to this layer
   //--------------------------------------------------------------------
-  if (fN==kMaxClusterPerLayer) {
+  if (fN==AliITSRecoParam::GetMaxClusterPerLayer()) {
     ::Error("InsertCluster","Too many clusters !\n");
     return 1;
   }
@@ -1431,7 +1418,7 @@ void  AliITStrackerMI::AliITSlayer::SortClusters()
       Float_t curY = fY[i]+irot*TMath::TwoPi()*fR; 
       // slice 5
       for (Int_t slice=0; slice<6;slice++){
-       if (fBy5[slice][0]<curY && curY<fBy5[slice][1]&&fN5[slice]<kMaxClusterPerLayer5){
+       if (fBy5[slice][0]<curY && curY<fBy5[slice][1]&&fN5[slice]<AliITSRecoParam::GetMaxClusterPerLayer5()){
          fClusters5[slice][fN5[slice]] = fClusters[i];
          fY5[slice][fN5[slice]] = curY;
          fZ5[slice][fN5[slice]] = fZ[i];
@@ -1441,7 +1428,7 @@ void  AliITStrackerMI::AliITSlayer::SortClusters()
       }
       // slice 10
       for (Int_t slice=0; slice<11;slice++){
-       if (fBy10[slice][0]<curY && curY<fBy10[slice][1]&&fN10[slice]<kMaxClusterPerLayer10){
+       if (fBy10[slice][0]<curY && curY<fBy10[slice][1]&&fN10[slice]<AliITSRecoParam::GetMaxClusterPerLayer10()){
          fClusters10[slice][fN10[slice]] = fClusters[i];
          fY10[slice][fN10[slice]] = curY;
          fZ10[slice][fN10[slice]] = fZ[i];
@@ -1451,7 +1438,7 @@ void  AliITStrackerMI::AliITSlayer::SortClusters()
       }
       // slice 20
       for (Int_t slice=0; slice<21;slice++){
-       if (fBy20[slice][0]<curY && curY<fBy20[slice][1]&&fN20[slice]<kMaxClusterPerLayer20){
+       if (fBy20[slice][0]<curY && curY<fBy20[slice][1]&&fN20[slice]<AliITSRecoParam::GetMaxClusterPerLayer20()){
          fClusters20[slice][fN20[slice]] = fClusters[i];
          fY20[slice][fN20[slice]] = curY;
          fZ20[slice][fN20[slice]] = fZ[i];
@@ -1644,7 +1631,7 @@ const {
   // This function returns the layer thickness at this point (units X0)
   //--------------------------------------------------------------------
   Double_t d=0.0085;
-  x0=kX0Air;
+  x0=AliITSRecoParam::GetX0Air();
   if (43<fR&&fR<45) { //SSD2
      Double_t dd=0.0034;
      d=dd;
@@ -1736,32 +1723,40 @@ const {
   return d;
 }
 //------------------------------------------------------------------------
-Double_t AliITStrackerMI::GetEffectiveThickness(Double_t y,Double_t z) const
+Double_t AliITStrackerMI::GetEffectiveThickness()
 {
   //--------------------------------------------------------------------
   // Returns the thickness between the current layer and the vertex (units X0)
   //--------------------------------------------------------------------
 
+  if(fUseTGeo!=0) {
+    if(fxOverX0Layer[0]<0) BuildMaterialLUT("Layers");
+    if(fxOverX0Shield[0]<0) BuildMaterialLUT("Shields");
+    if(fxOverX0Pipe<0) BuildMaterialLUT("Pipe");
+  }
+
   // beam pipe
-  Double_t d=kdPipe*krPipe*krPipe;
+  Double_t dPipe = (fUseTGeo==0 ? AliITSRecoParam::GetdPipe() : fxOverX0Pipe);
+  Double_t d=dPipe*AliITSRecoParam::GetrPipe()*AliITSRecoParam::GetrPipe();
 
   // layers
   Double_t x0=0;
   Double_t xn=fgLayers[fI].GetR();
   for (Int_t i=0; i<fI; i++) {
     Double_t xi=fgLayers[i].GetR();
-    d+=fgLayers[i].GetThickness(y,z,x0)*xi*xi;
+    Double_t dLayer = (fUseTGeo==0 ? fgLayers[i].GetThickness(0,0,x0) : fxOverX0Layer[i]);
+    d+=dLayer*xi*xi;
   }
 
   // shields
   if (fI>1) {
-    d+=kdshieldSPD*krshieldSPD*krshieldSPD;
+    Double_t dshieldSPD = (fUseTGeo==0 ? AliITSRecoParam::Getdshield(0) : fxOverX0Shield[0]);
+    d+=dshieldSPD*AliITSRecoParam::GetrInsideShield(0)*AliITSRecoParam::GetrInsideShield(0);
   }
   if (fI>3) {
-    Double_t xi=0.5*(fgLayers[3].GetR()+fgLayers[4].GetR());
-    d+=kdshieldSDD*xi*xi;
+    Double_t dshieldSDD = (fUseTGeo==0 ? AliITSRecoParam::Getdshield(1) : fxOverX0Shield[1]);
+    d+=dshieldSDD*AliITSRecoParam::GetrInsideShield(1)*AliITSRecoParam::GetrInsideShield(1);
   }
-
   return d/(xn*xn);
 }
 //------------------------------------------------------------------------
@@ -1795,9 +1790,9 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
   // If "extra"==kTRUE, 
   //    the clusters from overlapped modules get attached to "t" 
   //--------------------------------------------------------------------
-  Int_t index[kMaxLayer];
+  Int_t index[AliITSgeomTGeo::kNLayers];
   Int_t k;
-  for (k=0; k<kMaxLayer; k++) index[k]=-1;
+  for (k=0; k<AliITSgeomTGeo::GetNLayers(); k++) index[k]=-1;
   Int_t nc=c->GetNumberOfClusters();
   for (k=0; k<nc; k++) { 
     Int_t idx=c->GetClusterIndex(k),nl=(idx&0xf0000000)>>28;
@@ -1808,18 +1803,19 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
   // by the track
   Int_t innermostlayer=5;
   Double_t d = TMath::Abs(t->GetD(0.,0.));
-  for(innermostlayer=0; innermostlayer<kMaxLayer; innermostlayer++)
+  for(innermostlayer=0; innermostlayer<AliITSgeomTGeo::GetNLayers(); innermostlayer++)
     if(d<fgLayers[innermostlayer].GetR()) break;
   //printf(" d  %f  innermost %d\n",d,innermostlayer);
 
   Int_t from, to, step;
   if (xx > t->GetX()) {
-      from=innermostlayer; to=kMaxLayer;
+      from=innermostlayer; to=AliITSgeomTGeo::GetNLayers();
       step=+1;
   } else {
-      from=kMaxLayer-1; to=innermostlayer-1;
+      from=AliITSgeomTGeo::GetNLayers()-1; to=innermostlayer-1;
       step=-1;
   }
+  TString dir=(step>0 ? "outward" : "inward");
 
   // loop on the layers
   for (Int_t i=from; i != to; i += step) {
@@ -1828,23 +1824,10 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
  
      // material between SSD and SDD, SDD and SPD
      Double_t hI=i-0.5*step; 
-     if (TMath::Abs(hI-1.5)<0.01 || TMath::Abs(hI-3.5)<0.01) {             
-       Double_t rshield,dshield,x0shield;
-       if (TMath::Abs(hI-3.5)<0.01) { // SDDouter
-         rshield=0.5*(fgLayers[i-step].GetR() + r);
-         dshield=kdshieldSDD;
-         x0shield=kX0shieldSDD;
-       } else {        // SPDouter
-         rshield=krshieldSPD; 
-         dshield=kdshieldSPD; 
-         x0shield=kX0shieldSPD;
-       }
-       if (fUseTGeo) {
-         if (!t->PropagateToTGeo(rshield,1)) return kFALSE;
-       } else {
-         if (!t->PropagateTo(rshield,-step*dshield,x0shield)) return kFALSE;
-       }
-     }
+     if (TMath::Abs(hI-3.5)<0.01) // SDDouter
+       if(!CorrectForShieldMaterial(t,"SDD",dir)) return kFALSE;
+     if (TMath::Abs(hI-1.5)<0.01) // SPDouter
+       if(!CorrectForShieldMaterial(t,"SPD",dir)) return kFALSE;
      
      // remember old position [SR, GSI 18.02.2003]
      Double_t oldX=0., oldY=0., oldZ=0.;
@@ -1860,15 +1843,11 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      if (!t->GetPhiZat(r,phi,z)) return kFALSE;
 
      Int_t idet=layer.FindDetectorIndex(phi,z);
-     if (idet<0) { 
-       return kFALSE;
-     }
+     if (idet<0) return kFALSE;
 
      const AliITSdetector &det=layer.GetDetector(idet);
      phi=det.GetPhi();
-     if (!t->Propagate(phi,det.GetR())) {
-       return kFALSE;
-     }
+     if (!t->Propagate(phi,det.GetR())) return kFALSE;
      t->SetDetectorIndex(idet);
 
      const AliITSRecPoint *cl=0;
@@ -1903,27 +1882,6 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
        t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
      }
 
-     // Correct for material of the current layer
-     Double_t d,x0;
-     if(fUseTGeo) {
-       Double_t globXYZ[3];
-       t->GetXYZ(globXYZ);
-       Double_t mparam[7];
-       AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
-       if (mparam[1]<900000) {
-        d=mparam[1]; 
-        Double_t lengthTimesMeanDensity=mparam[0]*mparam[4]; 
-        t->CorrectForMeanMaterial(d,lengthTimesMeanDensity);
-       } else {
-        d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-        t->CorrectForMaterial(-step*d,x0);
-       }
-     } else {
-       d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-       t->CorrectForMaterial(-step*d,x0);
-     }
-     
-                 
      if (extra) { //search for extra clusters
         AliITStrackV2 tmp(*t);
         Double_t dz=4*TMath::Sqrt(tmp.GetSigmaZ2()+AliITSReconstructor::GetRecoParam()->GetSigmaZ2(i));
@@ -1964,6 +1922,9 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      }
      //
 
+     // Correct for material of the current layer
+     if(!CorrectForLayerMaterial(t,i,oldGlobXYZ,dir)) return kFALSE;
+
   } // end loop on the layers
 
   if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
@@ -1976,11 +1937,11 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
   // This function refits the track "t" at the position "x" using
   // the clusters from array
   //--------------------------------------------------------------------
-  Int_t index[kMaxLayer];
+  Int_t index[AliITSgeomTGeo::kNLayers];
   Int_t k;
-  for (k=0; k<kMaxLayer; k++) index[k]=-1;
+  for (k=0; k<AliITSgeomTGeo::GetNLayers(); k++) index[k]=-1;
   //
-  for (k=0; k<kMaxLayer; k++) { 
+  for (k=0; k<AliITSgeomTGeo::GetNLayers(); k++) { 
     index[k]=clindex[k]; 
   }
 
@@ -1988,18 +1949,19 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
   // by the track
   Int_t innermostlayer=5;
   Double_t d = TMath::Abs(t->GetD(0.,0.));
-  for(innermostlayer=0; innermostlayer<kMaxLayer; innermostlayer++)
+  for(innermostlayer=0; innermostlayer<AliITSgeomTGeo::GetNLayers(); innermostlayer++)
     if(d<fgLayers[innermostlayer].GetR()) break;
   //printf(" d  %f  innermost %d\n",d,innermostlayer);
 
   Int_t from, to, step;
   if (xx > t->GetX()) {
-      from=innermostlayer; to=kMaxLayer;
+      from=innermostlayer; to=AliITSgeomTGeo::GetNLayers();
       step=+1;
   } else {
-      from=kMaxLayer-1; to=innermostlayer-1;
+      from=AliITSgeomTGeo::GetNLayers()-1; to=innermostlayer-1;
       step=-1;
   }
+  TString dir=(step>0 ? "outward" : "inward");
 
   for (Int_t i=from; i != to; i += step) {
      AliITSlayer &layer=fgLayers[i];
@@ -2008,23 +1970,10 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
 
      // material between SSD and SDD, SDD and SPD
      Double_t hI=i-0.5*step; 
-     if (TMath::Abs(hI-1.5)<0.01 || TMath::Abs(hI-3.5)<0.01) {             
-       Double_t rshield,dshield,x0shield;
-       if (TMath::Abs(hI-3.5)<0.01) { // SDDouter
-         rshield=0.5*(fgLayers[i-step].GetR() + r);
-         dshield=kdshieldSDD;
-         x0shield=kX0shieldSDD;
-       } else {        // SPDouter
-         rshield=krshieldSPD; 
-         dshield=kdshieldSPD; 
-         x0shield=kX0shieldSPD;
-       }
-       if (fUseTGeo) {
-         if (!t->PropagateToTGeo(rshield,1)) return kFALSE;
-       } else {
-         if (!t->PropagateTo(rshield,-step*dshield,x0shield)) return kFALSE;
-       }
-     }
+     if (TMath::Abs(hI-3.5)<0.01) // SDDouter
+       if(!CorrectForShieldMaterial(t,"SDD",dir)) return kFALSE;
+     if (TMath::Abs(hI-1.5)<0.01) // SPDouter
+       if(!CorrectForShieldMaterial(t,"SPD",dir)) return kFALSE;
 
      // remember old position [SR, GSI 18.02.2003]
      Double_t oldX=0., oldY=0., oldZ=0.;
@@ -2039,14 +1988,10 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
      if (!t->GetPhiZat(r,phi,z)) return kFALSE;
 
      Int_t idet=layer.FindDetectorIndex(phi,z);
-     if (idet<0) { 
-       return kFALSE;
-     }
+     if (idet<0) return kFALSE;
      const AliITSdetector &det=layer.GetDetector(idet);
      phi=det.GetPhi();
-     if (!t->Propagate(phi,det.GetR())) {
-       return kFALSE;
-     }
+     if (!t->Propagate(phi,det.GetR())) return kFALSE;
      t->SetDetectorIndex(idet);
 
      const AliITSRecPoint *cl=0;
@@ -2082,24 +2027,7 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
      }
 
      // Correct for material of the current layer
-     Double_t d,x0;
-     if(fUseTGeo) {
-       Double_t globXYZ[3];
-       t->GetXYZ(globXYZ);
-       Double_t mparam[7];
-       AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
-       if (mparam[1]<900000) {
-        d=mparam[1]; 
-        Double_t lengthTimesMeanDensity=mparam[0]*mparam[4]; 
-        t->CorrectForMeanMaterial(d,lengthTimesMeanDensity);
-       } else {
-        d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-        t->CorrectForMaterial(-step*d,x0);
-       }
-     } else {
-       d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-       t->CorrectForMaterial(-step*d,x0);
-     }
+     if(!CorrectForLayerMaterial(t,i,oldGlobXYZ,dir)) return kFALSE;
                  
      // track time update [SR, GSI 17.02.2003]
      if (t->IsStartedTimeIntegral() && step==1) {
@@ -2266,14 +2194,14 @@ Double_t  AliITStrackerMI::GetDeadZoneProbability(Double_t zpos, Double_t zerr)
   if (TMath::Abs(absz-nearestz)>0.25+3.*zerr) return probability;
   Double_t zmin, zmax;   
   if (zpos<-6.) { // dead zone at z = -7
-    zmin = fSPDdetzcentre[0] + 0.5*kSPDdetzlength;
-    zmax = fSPDdetzcentre[1] - 0.5*kSPDdetzlength;
+    zmin = fSPDdetzcentre[0] + 0.5*AliITSRecoParam::GetSPDdetzlength();
+    zmax = fSPDdetzcentre[1] - 0.5*AliITSRecoParam::GetSPDdetzlength();
   } else if (zpos>6.) { // dead zone at z = +7
-    zmin = fSPDdetzcentre[2] + 0.5*kSPDdetzlength;
-    zmax = fSPDdetzcentre[3] - 0.5*kSPDdetzlength;
+    zmin = fSPDdetzcentre[2] + 0.5*AliITSRecoParam::GetSPDdetzlength();
+    zmax = fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength();
   } else if (absz<2.) { // dead zone at z = 0
-    zmin = fSPDdetzcentre[1] + 0.5*kSPDdetzlength;
-    zmax = fSPDdetzcentre[2] - 0.5*kSPDdetzlength;
+    zmin = fSPDdetzcentre[1] + 0.5*AliITSRecoParam::GetSPDdetzlength();
+    zmax = fSPDdetzcentre[2] - 0.5*AliITSRecoParam::GetSPDdetzlength();
   } else {
     zmin = 0.;
     zmax = 0.;
@@ -3031,11 +2959,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     // backtrack
     backtrack = new(backtrack) AliITStrackMI(*track); 
     if (track->GetConstrain()) {
-      if(fUseTGeo) {
-       if (!backtrack->PropagateToTGeo(krInsidePipe,1)) continue;
-      } else {
-       if (!backtrack->PropagateTo(krInsidePipe,kdPipe,kX0Be)) continue;
-      }
+      if (!CorrectForPipeMaterial(backtrack,"inward")) continue;
       if (!backtrack->Improve(0,xyzVtx,ersVtx))         continue;     
       backtrack->ResetCovariance(10.);      
     }else{
@@ -3372,7 +3296,7 @@ void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
   track->SetdEdx(sumamp/sumweight);
 }
 //------------------------------------------------------------------------
-void  AliITStrackerMI::MakeCoefficients(Int_t ntracks){
+void AliITStrackerMI::MakeCoefficients(Int_t ntracks){
   //
   //
   if (fCoefficients) delete []fCoefficients;
@@ -3389,11 +3313,10 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR
   Float_t theta = track->GetTgl();
   Float_t phi   = track->GetSnp();
   phi = TMath::Sqrt(phi*phi/(1.-phi*phi));
-  if(!AliITSReconstructor::GetRecoParam()->GetUseNominalClusterErrors())
-    AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
+  AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
   Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz);
   Float_t ny,nz;
-  AliITSClusterParam::GetNTeor(layer,cluster, theta,phi,ny,nz);  
+  AliITSClusterParam::GetNTeor(layer,cluster,theta,phi,ny,nz);  
   Double_t delta = cluster->GetNy()+cluster->GetNz()-nz-ny;
   if (delta>1){
     chi2+=0.5*TMath::Min(delta/2,2.);
@@ -3409,8 +3332,8 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR
   return chi2;
 
 }
-
-Int_t    AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,Double_t chi2,Int_t index) const 
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,Double_t chi2,Int_t index) const 
 {
   //
   //
@@ -3436,7 +3359,7 @@ Int_t    AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* c
   return track->UpdateMI(cl->GetY(),cl->GetZ(),track->GetSigmaY(layer),track->GetSigmaZ(layer),chi2,index);
 }
 //------------------------------------------------------------------------
-void   AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
+void AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
 {
   //
   //DCA sigmas parameterization
@@ -3446,8 +3369,7 @@ void   AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Fl
   sigmarfi = 0.0040+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC();
   sigmaz   = 0.0110+4.37*TMath::Abs(track->GetC());
 }
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz)
 {
   //
@@ -3658,7 +3580,7 @@ void AliITStrackerMI::UpdateTPCV0(AliESDEvent *event){
   //
 }
 //------------------------------------------------------------------------
-void  AliITStrackerMI::FindV02(AliESDEvent *event)
+void AliITStrackerMI::FindV02(AliESDEvent *event)
 {
   //
   // V0 finder
@@ -4366,6 +4288,410 @@ void AliITStrackerMI::RefitV02(AliESDEvent *event)
   }
 }
 //------------------------------------------------------------------------
+void AliITStrackerMI::BuildMaterialLUT(TString material) {
+  //--------------------------------------------------------------------
+  // Fill a look-up table with mean material
+  //--------------------------------------------------------------------
+
+  Int_t n=1000;
+  Double_t mparam[7];
+  Double_t point1[3],point2[3];
+  Double_t phi,cosphi,sinphi,z;
+  // 0-5 layers, 6 pipe, 7-8 shields 
+  Double_t rmin[9]={ 3.5, 5.5,13.0,22.0,35.0,41.0, 2.0, 7.5,25.0};
+  Double_t rmax[9]={ 5.5, 7.3,17.0,26.0,41.0,47.0, 3.0,10.5,30.0};
+
+  Int_t ifirst=0,ilast=0;  
+  if(material.Contains("Pipe")) {
+    ifirst=6; ilast=6;
+  } else if(material.Contains("Shields")) {
+    ifirst=7; ilast=8;
+  } else if(material.Contains("Layers")) {
+    ifirst=0; ilast=5;
+  } else {
+    Error("BuildMaterialLUT","Wrong layer name\n");
+  }
+
+  for(Int_t imat=ifirst; imat<=ilast; imat++) {
+    Double_t param[5]={0.,0.,0.,0.,0.};
+    for (Int_t i=0; i<n; i++) {
+      phi = 2.*TMath::Pi()*gRandom->Rndm();
+      cosphi = TMath::Cos(phi); sinphi = TMath::Sin(phi); 
+      z = 14.*(-1.+2.*gRandom->Rndm()); // SPD barrel
+      point1[0] = rmin[imat]*cosphi;
+      point1[1] = rmin[imat]*sinphi;
+      point1[2] = z;
+      point2[0] = rmax[imat]*cosphi;
+      point2[1] = rmax[imat]*sinphi;
+      point2[2] = z;
+      AliTracker::MeanMaterialBudget(point1,point2,mparam);
+      for(Int_t j=0;j<5;j++) param[j]+=mparam[j];
+    }
+    for(Int_t j=0;j<5;j++) param[j]/=(Float_t)n;
+    if(imat<=5) {
+      fxOverX0Layer[imat] = param[1];
+      fxTimesRhoLayer[imat] = param[0]*param[4];
+    } else if(imat==6) {
+      fxOverX0Pipe = param[1];
+      fxTimesRhoPipe = param[0]*param[4];
+    } else if(imat==7) {
+      fxOverX0Shield[0] = param[1];
+      fxTimesRhoShield[0] = param[0]*param[4];
+    } else if(imat==8) {
+      fxOverX0Shield[1] = param[1];
+      fxTimesRhoShield[1] = param[0]*param[4];
+    }
+  }
+  /*
+  printf("%s\n",material.Data());
+  printf("%f  %f\n",fxOverX0Pipe,fxTimesRhoPipe);
+  printf("%f  %f\n",fxOverX0Shield[0],fxTimesRhoShield[0]);
+  printf("%f  %f\n",fxOverX0Shield[1],fxTimesRhoShield[1]);
+  printf("%f  %f\n",fxOverX0Layer[0],fxTimesRhoLayer[0]);
+  printf("%f  %f\n",fxOverX0Layer[1],fxTimesRhoLayer[1]);
+  printf("%f  %f\n",fxOverX0Layer[2],fxTimesRhoLayer[2]);
+  printf("%f  %f\n",fxOverX0Layer[3],fxTimesRhoLayer[3]);
+  printf("%f  %f\n",fxOverX0Layer[4],fxTimesRhoLayer[4]);
+  printf("%f  %f\n",fxOverX0Layer[5],fxTimesRhoLayer[5]);
+  */
+  return;
+}
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::CorrectForPipeMaterial(AliITStrackMI *t,
+                                             TString direction) {
+  //-------------------------------------------------------------------
+  // Propagate beyond beam pipe and correct for material
+  // (material budget in different ways according to fUseTGeo value)
+  //-------------------------------------------------------------------
+
+  // Define budget mode:
+  // 0: material from AliITSRecoParam (hard coded)
+  // 1: material from TGeo (on the fly)
+  // 2: material from lut
+  // 3: material from TGeo (same for all hypotheses)
+  Int_t mode;
+  switch(fUseTGeo) {
+  case 0:
+    mode=0; 
+    break;    
+  case 1:
+    mode=1;
+    break;    
+  case 2:
+    mode=2;
+    break;
+  case 3:
+    if(fTrackingPhase.Contains("Clusters2Tracks")) 
+      { mode=3; } else { mode=1; }
+    break;
+  case 4:
+    if(fTrackingPhase.Contains("Clusters2Tracks")) 
+      { mode=3; } else { mode=2; }
+    break;
+  default:
+    mode=0;
+    break;
+  }
+  if(fTrackingPhase.Contains("Default")) mode=0;
+
+  Int_t index=fCurrentEsdTrack;
+
+  Float_t  dir = (direction.Contains("inward") ? 1. : -1.);
+  Double_t rToGo=(dir>0 ? AliITSRecoParam::GetrInsidePipe() : AliITSRecoParam::GetrOutsidePipe());
+  Double_t xToGo; t->GetLocalXat(rToGo,xToGo);
+
+  Double_t xOverX0,x0,lengthTimesMeanDensity;
+  Bool_t anglecorr=kTRUE;
+
+  switch(mode) {
+  case 0:
+    xOverX0 = AliITSRecoParam::GetdPipe();
+    x0 = AliITSRecoParam::GetX0Be();
+    lengthTimesMeanDensity = xOverX0*x0;
+    break;
+  case 1:
+    if (!t->PropagateToTGeo(xToGo,1)) return 0;
+    return 1;
+    break;
+  case 2:
+    if(fxOverX0Pipe<0) BuildMaterialLUT("Pipe");  
+    xOverX0 = fxOverX0Pipe;
+    lengthTimesMeanDensity = fxTimesRhoPipe;
+    break;
+  case 3:
+    if(!fxOverX0PipeTrks || index<0 || index>=fNtracks) Error("CorrectForPipeMaterial","Incorrect usage of UseTGeo option!\n");
+    if(fxOverX0PipeTrks[index]<0) {
+      if (!t->PropagateToTGeo(xToGo,1,xOverX0,lengthTimesMeanDensity)) return 0;
+      Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
+                                (1.-t->GetSnp()*t->GetSnp()));
+      fxOverX0PipeTrks[index] = TMath::Abs(xOverX0)/angle;
+      fxTimesRhoPipeTrks[index] = TMath::Abs(lengthTimesMeanDensity)/angle;
+      return 1;
+    }
+    xOverX0 = fxOverX0PipeTrks[index];
+    lengthTimesMeanDensity = fxTimesRhoPipeTrks[index];
+    break;
+  }
+
+  lengthTimesMeanDensity *= dir;
+
+  if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
+  if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;  
+
+  return 1;
+}
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::CorrectForShieldMaterial(AliITStrackMI *t,
+                                               TString shield,
+                                               TString direction) {
+  //-------------------------------------------------------------------
+  // Propagate beyond SPD or SDD shield and correct for material
+  // (material budget in different ways according to fUseTGeo value)
+  //-------------------------------------------------------------------
+
+  // Define budget mode:
+  // 0: material from AliITSRecoParam (hard coded)
+  // 1: material from TGeo (on the fly)
+  // 2: material from lut
+  // 3: material from TGeo (same for all hypotheses)
+  Int_t mode;
+  switch(fUseTGeo) {
+  case 0:
+    mode=0; 
+    break;    
+  case 1:
+    mode=1;
+    break;    
+  case 2:
+    mode=2;
+    break;
+  case 3:
+    if(fTrackingPhase.Contains("Clusters2Tracks")) 
+      { mode=3; } else { mode=1; }
+    break;
+  case 4:
+    if(fTrackingPhase.Contains("Clusters2Tracks")) 
+      { mode=3; } else { mode=2; }
+    break;
+  default:
+    mode=0;
+    break;
+  }
+  if(fTrackingPhase.Contains("Default")) mode=0;
+
+  Float_t  dir = (direction.Contains("inward") ? 1. : -1.);
+  Double_t rToGo;
+  Int_t    shieldindex=0;
+  if (shield.Contains("SDD")) { // SDDouter
+    rToGo=(dir>0 ? AliITSRecoParam::GetrInsideShield(1) : AliITSRecoParam::GetrOutsideShield(1));
+    shieldindex=1;
+  } else if (shield.Contains("SPD")) {        // SPDouter
+    rToGo=(dir>0 ? AliITSRecoParam::GetrInsideShield(0) : AliITSRecoParam::GetrOutsideShield(0)); 
+    shieldindex=0;
+  } else {
+    Error("CorrectForShieldMaterial"," Wrong shield name\n");
+    //    printf("%s\n",shield.Data());
+    return 0;
+  }
+  Double_t xToGo; t->GetLocalXat(rToGo,xToGo);
+
+  Int_t index=2*fCurrentEsdTrack+shieldindex;
+
+  Double_t xOverX0,x0,lengthTimesMeanDensity;
+  Bool_t anglecorr=kTRUE;
+
+  switch(mode) {
+  case 0:
+    xOverX0 = AliITSRecoParam::Getdshield(shieldindex);
+    x0 = AliITSRecoParam::GetX0shield(shieldindex);
+    lengthTimesMeanDensity = xOverX0*x0;
+    break;
+  case 1:
+    if (!t->PropagateToTGeo(xToGo,1)) return 0;
+    return 1;
+    break;
+  case 2:
+    if(fxOverX0Shield[shieldindex]<0) BuildMaterialLUT("Shields");  
+    xOverX0 = fxOverX0Shield[shieldindex];
+    lengthTimesMeanDensity = fxTimesRhoShield[shieldindex];
+    break;
+  case 3:
+    if(!fxOverX0ShieldTrks || index<0 || index>=2*fNtracks) Error("CorrectForShieldMaterial","Incorrect usage of UseTGeo option!\n");
+    if(fxOverX0ShieldTrks[index]<0) {
+      if (!t->PropagateToTGeo(xToGo,1,xOverX0,lengthTimesMeanDensity)) return 0;
+      Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
+                                (1.-t->GetSnp()*t->GetSnp()));
+      fxOverX0ShieldTrks[index] = TMath::Abs(xOverX0)/angle;
+      fxTimesRhoShieldTrks[index] = TMath::Abs(lengthTimesMeanDensity)/angle;
+      return 1;
+    }
+    xOverX0 = fxOverX0ShieldTrks[index];
+    lengthTimesMeanDensity = fxTimesRhoShieldTrks[index];
+    break;
+  }
+
+  lengthTimesMeanDensity *= dir;
+
+  if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
+  if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;  
+
+  return 1;
+}
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::CorrectForLayerMaterial(AliITStrackMI *t,
+                                              Int_t layerindex,
+                                              Double_t oldGlobXYZ[3],
+                                              TString direction) {
+  //-------------------------------------------------------------------
+  // Propagate beyond layer and correct for material
+  // (material budget in different ways according to fUseTGeo value)
+  //-------------------------------------------------------------------
+
+  // Define budget mode:
+  // 0: material from AliITSRecoParam (hard coded)
+  // 1: material from TGeo (on the fly)
+  // 2: material from lut
+  // 3: material from TGeo (same for all hypotheses)
+  Int_t mode;
+  switch(fUseTGeo) {
+  case 0:
+    mode=0; 
+    break;    
+  case 1:
+    mode=1;
+    break;    
+  case 2:
+    mode=2;
+    break;
+  case 3:
+    if(fTrackingPhase.Contains("Clusters2Tracks"))
+      { mode=3; } else { mode=1; }
+    break;
+  case 4:
+    if(fTrackingPhase.Contains("Clusters2Tracks")) 
+      { mode=3; } else { mode=2; }
+    break;
+  default:
+    mode=0;
+    break;
+  }
+  if(fTrackingPhase.Contains("Default")) mode=0;
+
+  Float_t  dir = (direction.Contains("inward") ? 1. : -1.);
+
+  Double_t r=fgLayers[layerindex].GetR();
+  Double_t deltar=(layerindex<2 ? 0.10*r : 0.05*r);
+
+  Double_t rToGo=TMath::Sqrt(t->GetX()*t->GetX()+t->GetY()*t->GetY())-deltar*dir;
+  Double_t xToGo; t->GetLocalXat(rToGo,xToGo);
+
+  Int_t index=6*fCurrentEsdTrack+layerindex;
+
+  // Bring the track beyond the material
+  if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
+  Double_t globXYZ[3];
+  t->GetXYZ(globXYZ);
+
+  Double_t xOverX0=0.0,x0=0.0,lengthTimesMeanDensity=0.0;
+  Double_t mparam[7];
+  Bool_t anglecorr=kTRUE;
+
+  switch(mode) {
+  case 0:
+    xOverX0 = fgLayers[layerindex].GetThickness(t->GetY(),t->GetZ(),x0);
+    lengthTimesMeanDensity = xOverX0*x0;
+    break;
+  case 1:
+    AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
+    if(mparam[1]>900000) return 0;
+    xOverX0=mparam[1];
+    lengthTimesMeanDensity=mparam[0]*mparam[4];
+    anglecorr=kFALSE;
+    break;
+  case 2:
+    if(fxOverX0Layer[layerindex]<0) BuildMaterialLUT("Layers");  
+    xOverX0 = fxOverX0Layer[layerindex];
+    lengthTimesMeanDensity = fxTimesRhoLayer[layerindex];
+    break;
+  case 3:
+    if(!fxOverX0LayerTrks || index<0 || index>=6*fNtracks) Error("CorrectForLayerMaterial","Incorrect usage of UseTGeo option!\n");
+    if(fxOverX0LayerTrks[index]<0) {
+      AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
+      if(mparam[1]>900000) return 0;
+      Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
+                                (1.-t->GetSnp()*t->GetSnp()));
+      xOverX0=mparam[1]/angle;
+      lengthTimesMeanDensity=mparam[0]*mparam[4]/angle;
+      fxOverX0LayerTrks[index] = TMath::Abs(xOverX0);
+      fxTimesRhoLayerTrks[index] = TMath::Abs(lengthTimesMeanDensity);
+    }
+    xOverX0 = fxOverX0LayerTrks[index];
+    lengthTimesMeanDensity = fxTimesRhoLayerTrks[index];
+    break;
+  }
+
+  lengthTimesMeanDensity *= dir;
+
+  if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;  
+
+  return 1;
+}
+//------------------------------------------------------------------------
+void AliITStrackerMI::MakeTrksMaterialLUT(Int_t ntracks) {
+  //-----------------------------------------------------------------
+  // Initialize LUT for storing material for each prolonged track
+  //-----------------------------------------------------------------
+  fxOverX0PipeTrks = new Float_t[ntracks]; 
+  fxTimesRhoPipeTrks = new Float_t[ntracks]; 
+  fxOverX0ShieldTrks = new Float_t[ntracks*2]; 
+  fxTimesRhoShieldTrks = new Float_t[ntracks*2]; 
+  fxOverX0LayerTrks = new Float_t[ntracks*6]; 
+  fxTimesRhoLayerTrks = new Float_t[ntracks*6]; 
+
+  for(Int_t i=0; i<ntracks; i++) {
+    fxOverX0PipeTrks[i] = -1.;
+    fxTimesRhoPipeTrks[i] = -1.;
+  }
+  for(Int_t j=0; j<ntracks*2; j++) {
+    fxOverX0ShieldTrks[j] = -1.;
+    fxTimesRhoShieldTrks[j] = -1.;
+  }
+  for(Int_t k=0; k<ntracks*6; k++) {
+    fxOverX0LayerTrks[k] = -1.;
+    fxTimesRhoLayerTrks[k] = -1.;
+  }
+
+  fNtracks = ntracks;  
+
+  return;
+}
+//------------------------------------------------------------------------
+void AliITStrackerMI::DeleteTrksMaterialLUT() {
+  //-----------------------------------------------------------------
+  // Delete LUT for storing material for each prolonged track
+  //-----------------------------------------------------------------
+  if(fxOverX0PipeTrks) { 
+    delete [] fxOverX0PipeTrks; fxOverX0PipeTrks = 0; 
+  } 
+  if(fxOverX0ShieldTrks) { 
+    delete [] fxOverX0ShieldTrks; fxOverX0ShieldTrks = 0; 
+  } 
+  
+  if(fxOverX0LayerTrks) { 
+    delete [] fxOverX0LayerTrks;  fxOverX0LayerTrks = 0; 
+  } 
+  if(fxTimesRhoPipeTrks) { 
+    delete [] fxTimesRhoPipeTrks;  fxTimesRhoPipeTrks = 0; 
+  } 
+  if(fxTimesRhoShieldTrks) { 
+    delete [] fxTimesRhoShieldTrks; fxTimesRhoShieldTrks = 0; 
+  } 
+  if(fxTimesRhoLayerTrks) { 
+    delete [] fxTimesRhoLayerTrks; fxTimesRhoLayerTrks = 0; 
+  } 
+  return;
+}
+//------------------------------------------------------------------------
 
 
 
index 06aec47a1b7f1c0f1029b08d4377b226acfe649f..990457af255b8ee036990f7f3bb6447852820483 100644 (file)
@@ -120,32 +120,32 @@ public:
     Int_t fNdetectors;          // detectors/ladder
     AliITSdetector *fDetectors; // array of detectors
     Int_t fN;                   // number of clusters
-    AliITSRecPoint *fClusters[kMaxClusterPerLayer]; // pointers to clusters
-    Int_t        fClusterIndex[kMaxClusterPerLayer]; // pointers to clusters
-    Float_t fY[kMaxClusterPerLayer];                // y position of the clusters      
-    Float_t fZ[kMaxClusterPerLayer];                // z position of the clusters      
+    AliITSRecPoint *fClusters[AliITSRecoParam::fgkMaxClusterPerLayer]; // pointers to clusters
+    Int_t        fClusterIndex[AliITSRecoParam::fgkMaxClusterPerLayer]; // pointers to clusters
+    Float_t fY[AliITSRecoParam::fgkMaxClusterPerLayer];                // y position of the clusters      
+    Float_t fZ[AliITSRecoParam::fgkMaxClusterPerLayer];                // z position of the clusters      
     Float_t fYB[2];                                       // ymin and ymax
     //
-    AliITSRecPoint *fClusters5[6][kMaxClusterPerLayer5]; // pointers to clusters -     slice in y
-    Int_t        fClusterIndex5[6][kMaxClusterPerLayer5]; // pointers to clusters -     slice in y    
-    Float_t fY5[6][kMaxClusterPerLayer5];                // y position of the clusters  slice in y    
-    Float_t fZ5[6][kMaxClusterPerLayer5];                // z position of the clusters  slice in y 
+    AliITSRecPoint *fClusters5[6][AliITSRecoParam::fgkMaxClusterPerLayer5]; // pointers to clusters -     slice in y
+    Int_t        fClusterIndex5[6][AliITSRecoParam::fgkMaxClusterPerLayer5]; // pointers to clusters -     slice in y    
+    Float_t fY5[6][AliITSRecoParam::fgkMaxClusterPerLayer5];                // y position of the clusters  slice in y    
+    Float_t fZ5[6][AliITSRecoParam::fgkMaxClusterPerLayer5];                // z position of the clusters  slice in y 
     Int_t fN5[6];                                       // number of cluster in slice
     Float_t fDy5;                                       //delta y
     Float_t fBy5[6][2];                                    //slice borders
     //
-    AliITSRecPoint *fClusters10[11][kMaxClusterPerLayer10]; // pointers to clusters -     slice in y
-    Int_t        fClusterIndex10[11][kMaxClusterPerLayer10]; // pointers to clusters -     slice in y    
-    Float_t fY10[11][kMaxClusterPerLayer10];                // y position of the clusters  slice in y    
-    Float_t fZ10[11][kMaxClusterPerLayer10];                // z position of the clusters  slice in y 
+    AliITSRecPoint *fClusters10[11][AliITSRecoParam::fgkMaxClusterPerLayer10]; // pointers to clusters -     slice in y
+    Int_t        fClusterIndex10[11][AliITSRecoParam::fgkMaxClusterPerLayer10]; // pointers to clusters -     slice in y    
+    Float_t fY10[11][AliITSRecoParam::fgkMaxClusterPerLayer10];                // y position of the clusters  slice in y    
+    Float_t fZ10[11][AliITSRecoParam::fgkMaxClusterPerLayer10];                // z position of the clusters  slice in y 
     Int_t fN10[11];                                       // number of cluster in slice
     Float_t fDy10;                                        // delta y
     Float_t fBy10[11][2];                                 // slice borders
     //
-    AliITSRecPoint *fClusters20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y
-    Int_t        fClusterIndex20[21][kMaxClusterPerLayer20]; // pointers to clusters -     slice in y    
-    Float_t fY20[21][kMaxClusterPerLayer20];                // y position of the clusters  slice in y    
-    Float_t fZ20[21][kMaxClusterPerLayer20];                // z position of the clusters  slice in y 
+    AliITSRecPoint *fClusters20[21][AliITSRecoParam::fgkMaxClusterPerLayer20]; // pointers to clusters -     slice in y
+    Int_t        fClusterIndex20[21][AliITSRecoParam::fgkMaxClusterPerLayer20]; // pointers to clusters -     slice in y    
+    Float_t fY20[21][AliITSRecoParam::fgkMaxClusterPerLayer20];                // y position of the clusters  slice in y    
+    Float_t fZ20[21][AliITSRecoParam::fgkMaxClusterPerLayer20];                // z position of the clusters  slice in y 
     Int_t fN20[21];                                       // number of cluster in slice
     Float_t fDy20;                                        //delta y 
     Float_t fBy20[21][2];                                 //slice borders
@@ -157,8 +157,8 @@ public:
     Int_t    fNcs;                                        //number of clusters in current slice    
     Int_t fCurrentSlice;                                  //current slice
     //
-    Float_t  fClusterWeight[kMaxClusterPerLayer]; // probabilistic weight of the cluster
-    Int_t    fClusterTracks[4][kMaxClusterPerLayer]; //tracks registered to given cluster
+    Float_t  fClusterWeight[AliITSRecoParam::fgkMaxClusterPerLayer]; // probabilistic weight of the cluster
+    Int_t    fClusterTracks[4][AliITSRecoParam::fgkMaxClusterPerLayer]; //tracks registered to given cluster
     Float_t fZmax;      //    edges
     Float_t fYmin;      //   of  the
     Float_t fYmax;      //   "window"
@@ -178,7 +178,7 @@ protected:
   void UpdateTPCV0(AliESDEvent *event);  //try to update, or reject TPC  V0s
   void CookLabel(AliKalmanTrack *t,Float_t wrong) const;
   void CookLabel(AliITStrackMI *t,Float_t wrong) const;
-  Double_t GetEffectiveThickness(Double_t y, Double_t z) const;
+  Double_t GetEffectiveThickness();
   void FollowProlongationTree(AliITStrackMI * otrack, Int_t esdindex, Bool_t constrain);
   void ResetBestTrack() {
      fBestTrack.~AliITStrackMI();
@@ -212,10 +212,16 @@ protected:
   Float_t  * GetNz(Int_t trackindex) const {return &fCoefficients[trackindex*48+36];}
   void       SignDeltas( TObjArray *ClusterArray, Float_t zv);
   void MakeCoefficients(Int_t ntracks);
+  void BuildMaterialLUT(TString material);
+  void MakeTrksMaterialLUT(Int_t ntracks);
+  void DeleteTrksMaterialLUT();
+  Int_t CorrectForPipeMaterial(AliITStrackMI *t, TString direction="inward");
+  Int_t CorrectForShieldMaterial(AliITStrackMI *t, TString shield, TString direction="inward");
+  Int_t CorrectForLayerMaterial(AliITStrackMI *t, Int_t layerindex, Double_t oldGlobXYZ[3], TString direction="inward");
   void UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const;
   Int_t fI;                              // index of the current layer
-  static AliITSlayer fgLayers[kMaxLayer];// ITS layers
-  AliITStrackMI fTracks[kMaxLayer];      // track estimations at the ITS layers
+  static AliITSlayer fgLayers[AliITSgeomTGeo::kNLayers];// ITS layers
+  AliITStrackMI fTracks[AliITSgeomTGeo::kNLayers];      // track estimations at the ITS layers
   AliITStrackMI fBestTrack;              // "best" track 
   AliITStrackMI fTrackToFollow;          // followed track
   TObjArray     fTrackHypothesys;        // ! array with track hypothesys- ARRAY is the owner of tracks- MI
@@ -226,17 +232,31 @@ protected:
   Int_t fPass;                           // current pass through the data 
   Int_t fConstraint[2];                  // constraint flags
   Bool_t fAfterV0;                       //indicates V0 founded
-  Int_t fLayersNotToSkip[kMaxLayer];     // layer masks
+  Int_t fLayersNotToSkip[AliITSgeomTGeo::kNLayers];     // layer masks
   Int_t fLastLayerToTrackTo;             // the innermost layer to track to
-  Float_t * fCoefficients;                //! working array with errors and mean cluster shape
+  Float_t * fCoefficients;               //! working array with errors and mean cluster shape
   AliESDEvent  * fEsd;                   //! pointer to the ESD event
   Double_t fSPDdetzcentre[4];            // centres of SPD modules in z
-  Bool_t fUseTGeo;                       // use TGeo to get material budget
-  TTreeSRedirector *fDebugStreamer;     //!debug streamer
+  TString fTrackingPhase;                // current tracking phase
+  Int_t fUseTGeo;                        // use TGeo to get material budget
+  Int_t   fNtracks;                      // number of tracks to prolong
+  Float_t fxOverX0Pipe;                  // material budget
+  Float_t fxTimesRhoPipe;                // material budget
+  Float_t fxOverX0Shield[2];             // material budget
+  Float_t fxTimesRhoShield[2];           // material budget
+  Float_t fxOverX0Layer[6];              // material budget
+  Float_t fxTimesRhoLayer[6];            // material budget
+  Float_t *fxOverX0PipeTrks;             //! material budget
+  Float_t *fxTimesRhoPipeTrks;           //! material budget
+  Float_t *fxOverX0ShieldTrks;           //! material budget
+  Float_t *fxTimesRhoShieldTrks;         //! material budget
+  Float_t *fxOverX0LayerTrks;            //! material budget
+  Float_t *fxTimesRhoLayerTrks;          //! material budget
+  TTreeSRedirector *fDebugStreamer;      //!debug streamer
 private:
   AliITStrackerMI(const AliITStrackerMI &tracker);
   AliITStrackerMI & operator=(const AliITStrackerMI &tracker);
-  ClassDef(AliITStrackerMI,3)   //ITS tracker MI
+  ClassDef(AliITStrackerMI,4)   //ITS tracker MI
 };
 
 
index 4305191a7570eb82b970adf7f7265ea9ae0864c3..a7adcb4f58dfddd07370e9cb84f78424308814dd 100644 (file)
@@ -813,12 +813,12 @@ AliITStrackV2* AliITStrackerSA::FitTrack(AliITStrackSA* tr,Double_t *primaryVert
               ot->ResetCovariance(10.);
               ot->ResetClusters();
               
-              if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6
+              if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),ot,trac)){ //fit from layer 1 to layer 6
                 AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
                 otrack2->ResetCovariance(10.); 
                 otrack2->ResetClusters();
                 //fit from layer 6 to layer 1
-                if(RefitAt(krInsideSPD1,otrack2,ot)) {
+                if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),otrack2,ot)) {
                  fListOfTracks->AddLast(otrack2);
                  new (tri[nlist]) AliITStrackSA(*trac);
                  nlist++;
@@ -1073,39 +1073,31 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar
              Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);        
              Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
              Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1));
-             //printf("phi2: %f   tgl2: %f\n",phi2,tgl2);
               AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
                               
-             //Float_t clxyz[3]; 
               if(cl5!=0) {
                trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
                trac->AddClusterMark(5,mark5[l6]);
-               //cl5->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
               if(cl4!=0){
                trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0);
                trac->AddClusterMark(4,mark4[l5]);
-               //cl4->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
               if(cl3!=0){
                trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0);
                trac->AddClusterMark(3,mark3[l4]);
-               //cl3->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
               if(cl2!=0){
                trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0);
                trac->AddClusterMark(2,mark2[l3]);
-               //cl2->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
               if(cl1!=0){
                trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0);
                trac->AddClusterMark(1,mark1[l2]);
-               //cl1->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
               if(cl0!=0){
                trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0);
                trac->AddClusterMark(0,mark0[l1]);
-               //cl0->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);       
              }
 
 
@@ -1115,13 +1107,12 @@ AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primar
               ot->ResetCovariance(10.);
               ot->ResetClusters();
               
-             //printf("%d  \n",trac->GetNumberOfClusters());for(Int_t ijk=0;ijk<trac->GetNumberOfClusters();ijk++) printf("    %d",trac->GetClusterIndex(ijk)); printf("\n");
-              if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6
+              if(RefitAt(AliITSRecoParam::GetrInsideITSscreen(),ot,trac)){ //fit from layer 1 to layer 6
                 AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
                 otrack2->ResetCovariance(10.); 
                 otrack2->ResetClusters();
                 //fit from layer 6 to layer 1
-                if(RefitAt(krInsideSPD1,otrack2,ot)) {
+                if(RefitAt(AliITSRecoParam::GetrInsideSPD1(),otrack2,ot)) {
                  fListOfTracks->AddLast(otrack2);
                  new (tri[nlist]) AliITStrackSA(*trac);
                  nlist++;
index 8a4173435207ef2b49445287899b4018af0c1a22..53048c6542153ffc038019a1e14e1b00c4937cb3 100644 (file)
 
 ClassImp(AliITStrackerV2)
 
-AliITStrackerV2::AliITSlayer AliITStrackerV2::fgLayers[kMaxLayer]; //ITS layers
+AliITStrackerV2::AliITSlayer AliITStrackerV2::fgLayers[AliITSgeomTGeo::kNLayers]; //ITS layers
 
 AliITStrackerV2::AliITStrackerV2(): 
   AliTracker(), 
-  fI(kMaxLayer),
+  fI(AliITSgeomTGeo::GetNLayers()),
   fBestTrack(),
   fTrackToFollow(),
   fPass(0),
-  fLastLayerToTrackTo(kLastLayerToTrackTo)
+  fLastLayerToTrackTo(AliITSRecoParam::GetLastLayerToTrackTo())
 {
   //--------------------------------------------------------------------
   //This is the AliITStrackerV2 default constructor
   //--------------------------------------------------------------------
 
-  for (Int_t i=1; i<kMaxLayer+1; i++) new(fgLayers+i-1) AliITSlayer();
+  for (Int_t i=1; i<AliITSgeomTGeo::GetNLayers()+1; i++) new(fgLayers+i-1) AliITSlayer();
 
   fConstraint[0]=1; fConstraint[1]=0;
 
@@ -66,7 +66,7 @@ AliITStrackerV2::AliITStrackerV2():
                  AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
   SetVertex(xyz,ers);
 
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=kLayersNotToSkip[i];
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=AliITSRecoParam::GetLayersNotToSkip(i);
 
 }
 
@@ -82,7 +82,7 @@ AliITStrackerV2::AliITStrackerV2(const AliITStrackerV2 &t):
   //This is the AliITStrackerV2 copy constructor
   //--------------------------------------------------------------------
 
-  //for (Int_t i=1; i<kMaxLayer+1; i++) new(fgLayers+i-1) AliITSlayer();
+  //for (Int_t i=1; i<AliITSgeomTGeo::GetNLayers()+1; i++) new(fgLayers+i-1) AliITSlayer();
 
   fConstraint[0]=t.fConstraint[0]; fConstraint[1]=t.fConstraint[1];
 
@@ -96,17 +96,17 @@ AliITStrackerV2::AliITStrackerV2(const AliITStrackerV2 &t):
   ers[0]=t.GetSigmaX(); ers[1]=t.GetSigmaY(); ers[2]=t.GetSigmaZ(); 
   SetVertex(xyz,ers);
 
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=t.fLayersNotToSkip[i];
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=t.fLayersNotToSkip[i];
 
 }
 
 AliITStrackerV2::AliITStrackerV2(const Char_t *geom) : 
   AliTracker(), 
-  fI(kMaxLayer),
+  fI(AliITSgeomTGeo::GetNLayers()),
   fBestTrack(),
   fTrackToFollow(),
   fPass(0),
-  fLastLayerToTrackTo(kLastLayerToTrackTo)
+  fLastLayerToTrackTo(AliITSRecoParam::GetLastLayerToTrackTo())
 {
   //--------------------------------------------------------------------
   //This is the AliITStrackerV2 constructor
@@ -115,7 +115,7 @@ AliITStrackerV2::AliITStrackerV2(const Char_t *geom) :
     AliWarning("\"geom\" is actually a dummy argument !");
   }
 
-  for (Int_t i=1; i<kMaxLayer+1; i++) {
+  for (Int_t i=1; i<AliITSgeomTGeo::GetNLayers()+1; i++) {
     Int_t nlad=AliITSgeomTGeo::GetNLadders(i);
     Int_t ndet=AliITSgeomTGeo::GetNDetectors(i);
 
@@ -165,7 +165,7 @@ AliITStrackerV2::AliITStrackerV2(const Char_t *geom) :
                  AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()}; 
   SetVertex(xyz,ers);
 
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=kLayersNotToSkip[i];
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=AliITSRecoParam::GetLayersNotToSkip(i);
 
 }
 
@@ -173,7 +173,7 @@ void AliITStrackerV2::SetLayersNotToSkip(Int_t *l) {
   //--------------------------------------------------------------------
   //This function set masks of the layers which must be not skipped
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=l[i];
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fLayersNotToSkip[i]=l[i];
 }
 
 Int_t AliITStrackerV2::LoadClusters(TTree *cTree) {
@@ -190,7 +190,7 @@ Int_t AliITStrackerV2::LoadClusters(TTree *cTree) {
   branch->SetAddress(&clusters);
 
   Int_t j=0;
-  for (Int_t i=0; i<kMaxLayer; i++) {
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) {
     Int_t ndet=fgLayers[i].GetNdetectors();
     Int_t jmax = j + fgLayers[i].GetNladders()*ndet;
 
@@ -227,7 +227,7 @@ void AliITStrackerV2::UnloadClusters() {
   //--------------------------------------------------------------------
   //This function unloads ITS clusters
   //--------------------------------------------------------------------
-  for (Int_t i=0; i<kMaxLayer; i++) fgLayers[i].ResetClusters();
+  for (Int_t i=0; i<AliITSgeomTGeo::GetNLayers(); i++) fgLayers[i].ResetClusters();
 }
 
 static Int_t CorrectForDeadZoneMaterial(AliITStrackV2 *t) {
@@ -318,7 +318,7 @@ Int_t AliITStrackerV2::Clusters2Tracks(AliESDEvent *event) {
        ResetTrackToFollow(*t);
        ResetBestTrack();
 
-       for (FollowProlongation(); fI<kMaxLayer; fI++) {
+       for (FollowProlongation(); fI<AliITSgeomTGeo::GetNLayers(); fI++) {
           while (TakeNextProlongation()) FollowProlongation();
        }
 
@@ -687,7 +687,7 @@ AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd):
 
   for (Int_t i=0; i<kNsector; i++) fN[i]=0;
 
-  for (Int_t i=0; i<kMaxClusterPerLayer; i++) fClusters[i]=0;
+  for (Int_t i=0; i<AliITSRecoParam::fgkMaxClusterPerLayer; i++) fClusters[i]=0;
 
 }
 
@@ -1000,9 +1000,9 @@ Bool_t AliITStrackerV2::RefitAt(Double_t xx,AliITStrackV2 *t,
   // If "extra"==kTRUE, 
   //    the clusters from overlapped modules get attached to "t" 
   //--------------------------------------------------------------------
-  Int_t index[kMaxLayer];
+  Int_t index[AliITSgeomTGeo::kNLayers];
   Int_t k;
-  for (k=0; k<kMaxLayer; k++) index[k]=-1;
+  for (k=0; k<AliITSgeomTGeo::GetNLayers(); k++) index[k]=-1;
   Int_t nc=c->GetNumberOfClusters();
   for (k=0; k<nc; k++) { 
     Int_t idx=c->GetClusterIndex(k),nl=(idx&0xf0000000)>>28;
@@ -1011,10 +1011,10 @@ Bool_t AliITStrackerV2::RefitAt(Double_t xx,AliITStrackV2 *t,
 
   Int_t from, to, step;
   if (xx > t->GetX()) {
-      from=0; to=kMaxLayer;
+      from=0; to=AliITSgeomTGeo::GetNLayers();
       step=+1;
   } else {
-      from=kMaxLayer-1; to=-1;
+      from=AliITSgeomTGeo::GetNLayers()-1; to=-1;
       step=-1;
   }
 
index 8277a3b65580b44ef04f91afab28e22757cc553e..e49294df733c75dc9bdf07467fe2dfedb35c99f7 100644 (file)
@@ -11,6 +11,8 @@
 #include "AliTracker.h"
 #include "AliITSRecoParam.h"
 #include "AliITStrackV2.h"
+#include "AliITSgeomTGeo.h"
+
 
 class AliITSRecPoint;
 class AliESDEvent;
@@ -58,7 +60,7 @@ public:
 
   class AliITSlayer {
   public:
-    enum {kNsector=5, kMaxClusterPerSector=kMaxClusterPerLayer/kNsector};
+    enum {kNsector=5, kMaxClusterPerSector=AliITSRecoParam::fgkMaxClusterPerLayer/kNsector};
     AliITSlayer();
     AliITSlayer(Double_t r, Double_t p, Double_t z, Int_t nl, Int_t nd);
    ~AliITSlayer();
@@ -86,10 +88,10 @@ public:
     Int_t fNdetectors;          // detectors/ladder
     AliITSdetector *fDetectors; // array of detectors
 
-    AliITSRecPoint *fClusters[kMaxClusterPerLayer]; // pointers to clusters
+    AliITSRecPoint *fClusters[AliITSRecoParam::fgkMaxClusterPerLayer]; // pointers to clusters
     Int_t fN[kNsector];         // numbers of clusters sector by sector 
 
-    Int_t fIndex[kMaxClusterPerLayer]; // indexes of selected clusters 
+    Int_t fIndex[AliITSRecoParam::fgkMaxClusterPerLayer]; // indexes of selected clusters 
     Int_t fNsel;                       // number of selected clusters
 
     Double_t fRoad;     // road defined by the cluster density
@@ -111,14 +113,14 @@ protected:
      new(&fTrackToFollow) AliITStrackV2(t);
   }
   Int_t fI;                              // index of the current layer
-  static AliITSlayer fgLayers[kMaxLayer];// ITS layers
-  AliITStrackV2 fTracks[kMaxLayer];      // track estimations at the ITS layers
+  static AliITSlayer fgLayers[AliITSgeomTGeo::kNLayers];// ITS layers
+  AliITStrackV2 fTracks[AliITSgeomTGeo::kNLayers];      // track estimations at the ITS layers
   AliITStrackV2 fBestTrack;              // "best" track 
   AliITStrackV2 fTrackToFollow;          // followed track
   Int_t fPass;                           // current pass through the data 
   Int_t fConstraint[2];                  // constraint flags
 
-  Int_t fLayersNotToSkip[kMaxLayer];     // layer masks
+  Int_t fLayersNotToSkip[AliITSgeomTGeo::kNLayers];     // layer masks
   Int_t fLastLayerToTrackTo;             // the innermost layer to track to
 
 private: