]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITStrackerMI.cxx
Fixes for some mem-leaks: most changes where pretty basic (i.e. adding deletes).
[u/mrichter/AliRoot.git] / ITS / AliITStrackerMI.cxx
index 9cf70904c364c936a3e19b5aa78411d0569c3c1e..9599f7921864cacc3274a3b8eb59dce25bf9ff9c 100644 (file)
@@ -1,5 +1,5 @@
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
  * Contributors are mentioned in the code where appropriate.              *
@@ -12,7 +12,6 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
 /* $Id$ */
 
 //-------------------------------------------------------------------------
 //    It reads AliITSRecPoint clusters and creates AliITStrackMI tracks
 //                   and fills with them the ESD
 //          Origin: Marian Ivanov, CERN, Marian.Ivanov@cern.ch 
-//     dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
-//     
+//     dE/dx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
+//     Params moved to AliITSRecoParam by: Andrea Dainese, INFN
+//     Material budget from TGeo by: Ludovic Gaudichet & Andrea Dainese, INFN
 //-------------------------------------------------------------------------
 
 #include <TMatrixD.h>
 #include <TTree.h>
 #include <TTreeStream.h>
 #include <TTree.h>
+#include <TDatabasePDG.h>
+#include <TString.h>
+
 
-#include "AliESD.h"
+#include "AliESDEvent.h"
+#include "AliESDtrack.h"
+#include "AliESDVertex.h"
 #include "AliV0.h"
 #include "AliHelix.h"
 #include "AliITSRecPoint.h"
 #include "AliITSgeomTGeo.h"
 #include "AliITStrackerMI.h"
+#include "AliITSReconstructor.h"
 #include "AliTrackPointArray.h"
 #include "AliAlignObj.h"
 
@@ -43,6 +49,7 @@ ClassImp(AliITStrackerMI)
 
 
 AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[kMaxLayer]; // ITS layers
+
 AliITStrackerMI::AliITStrackerMI():AliTracker(),
 fI(0),
 fBestTrack(),
@@ -54,13 +61,14 @@ fCurrentEsdTrack(),
 fPass(0),
 fAfterV0(kFALSE),
 fLastLayerToTrackTo(0),
-fCoeficients(0),
+fCoefficients(0),
 fEsd(0),
+fUseTGeo(kFALSE),
 fDebugStreamer(0){
   //Default constructor
+  for(Int_t i=0;i<4;i++) fSPDdetzcentre[i]=0.;
 }
-
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITStrackerMI(const Char_t *geom) : AliTracker(),
 fI(kMaxLayer),
 fBestTrack(),
@@ -72,8 +80,9 @@ fCurrentEsdTrack(),
 fPass(0),
 fAfterV0(kFALSE),
 fLastLayerToTrackTo(kLastLayerToTrackTo),
-fCoeficients(0),
+fCoefficients(0),
 fEsd(0),
+fUseTGeo(kFALSE),
 fDebugStreamer(0){
   //--------------------------------------------------------------------
   //This is the AliITStrackerMI constructor
@@ -82,7 +91,7 @@ fDebugStreamer(0){
     AliWarning("\"geom\" is actually a dummy argument !");
   }
 
-  fCoeficients = 0;
+  fCoefficients = 0;
   fAfterV0     = kFALSE;
 
   for (Int_t i=1; i<kMaxLayer+1; i++) {
@@ -130,19 +139,38 @@ fDebugStreamer(0){
   fPass=0;
   fConstraint[0]=1; fConstraint[1]=0;
 
-  Double_t xyz[]={kXV,kYV,kZV}, ers[]={kSigmaXV,kSigmaYV,kSigmaZV}; 
-  SetVertex(xyz,ers);
+  Double_t xyzVtx[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+                    AliITSReconstructor::GetRecoParam()->GetYVdef(),
+                    AliITSReconstructor::GetRecoParam()->GetZVdef()}; 
+  Double_t ersVtx[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
+                    AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
+                    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<100000;i++){
     fBestTrackIndex[i]=0;
   }
+
+  // store positions of centre of SPD modules (in z)
+  Double_t tr[3];
+  AliITSgeomTGeo::GetTranslation(1,1,1,tr);
+  fSPDdetzcentre[0] = tr[2];
+  AliITSgeomTGeo::GetTranslation(1,1,2,tr);
+  fSPDdetzcentre[1] = tr[2];
+  AliITSgeomTGeo::GetTranslation(1,1,3,tr);
+  fSPDdetzcentre[2] = tr[2];
+  AliITSgeomTGeo::GetTranslation(1,1,4,tr);
+  fSPDdetzcentre[3] = tr[2];
+
+
+  fUseTGeo = AliITSReconstructor::GetRecoParam()->GetUseTGeoInTracker();
   //
   fDebugStreamer = new TTreeSRedirector("ITSdebug.root");
 
 }
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITStrackerMI(const AliITStrackerMI &tracker):AliTracker(tracker),
 fI(tracker.fI),
 fBestTrack(tracker.fBestTrack),
@@ -154,39 +182,39 @@ fCurrentEsdTrack(tracker.fCurrentEsdTrack),
 fPass(tracker.fPass),
 fAfterV0(tracker.fAfterV0),
 fLastLayerToTrackTo(tracker.fLastLayerToTrackTo),
-fCoeficients(tracker.fCoeficients),
+fCoefficients(tracker.fCoefficients),
 fEsd(tracker.fEsd),
+fUseTGeo(tracker.fUseTGeo),
 fDebugStreamer(tracker.fDebugStreamer){
   //Copy constructor
 }
-
+//------------------------------------------------------------------------
 AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){
   //Assignment operator
   this->~AliITStrackerMI();
   new(this) AliITStrackerMI(tracker);
   return *this;
 }
-
-
+//------------------------------------------------------------------------
 AliITStrackerMI::~AliITStrackerMI()
 {
   //
   //destructor
   //
-  if (fCoeficients) delete []fCoeficients;
+  if (fCoefficients) delete []fCoefficients;
   if (fDebugStreamer) {
     //fDebugStreamer->Close();
     delete fDebugStreamer;
   }
 }
-
+//------------------------------------------------------------------------
 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];
 }
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
   //--------------------------------------------------------------------
   //This function loads ITS clusters
@@ -210,59 +238,47 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
       Int_t ncl=clusters->GetEntriesFast();
       SignDeltas(clusters,GetZ());
  
-      //*** The Delta transformation
-      TGeoHMatrix delta; 
-      AliITSgeomTGeo::GetTrackingMatrix(j,delta);
-      TGeoHMatrix m;
-      AliITSgeomTGeo::GetOrigMatrix(j,m);
-      delta.MultiplyLeft(&(m.Inverse()));
-      const TGeoHMatrix *tm = AliITSgeomTGeo::GetTracking2LocalMatrix(j);
-      delta.MultiplyLeft(&(tm->Inverse())); 
-      //***
-
       while (ncl--) {
         AliITSRecPoint *c=(AliITSRecPoint*)clusters->UncheckedAt(ncl);
+        detector=c->GetDetectorIndex();
 
-        //*** Shift the cluster to the misaligned position
-        Double_t  xyz[3]={c->GetX(),c->GetY(),c->GetZ()};
-        Double_t mxyz[3]={0.};                    
-        
-        delta.LocalToMaster(xyz,mxyz);
-
-        c->SetX(mxyz[0]);
-        c->AliCluster::SetY(mxyz[1]);
-        c->AliCluster::SetZ(mxyz[2]);
-       //***
+       if (!c->Misalign()) AliWarning("Can't misalign this cluster !");
 
         fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
       }
       clusters->Delete();
-      //add dead zone virtual "cluster"      
-      if (i<2){
-       for (Float_t ydead = 0; ydead < 1.31 ; ydead+=(i+1.)*0.018){     
-         Int_t lab[4] = {0,0,0,detector};
-         Int_t info[3] = {0,0,0};
-         Float_t hit[5]={0,0,0.004/12.,0.001/12.,0};
-         if (i==0) hit[0] =ydead-0.4;
-         if (i==1) hit[0]=ydead-3.75; 
-         hit[1] =-0.04;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
-         hit[1]=-7.05;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
-         hit[1]=-7.15;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
-         hit[1] =0.06;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
-         hit[1]=7.05;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));
-         hit[1]=7.25;
-         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.) 
-           fgLayers[i].InsertCluster(new AliITSRecPoint(lab, hit, info));       
+      // 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()) {
+         Int_t lab[4]   = {0,0,0,detector};
+         Int_t info[3]  = {0,0,i};
+         Float_t q      = 0.;
+         Float_t hit[5] = {xdead,
+                           0.,
+                           AliITSReconstructor::GetRecoParam()->GetSigmaXDeadZoneHit2(),
+                           AliITSReconstructor::GetRecoParam()->GetSigmaZDeadZoneHit2(),
+                           q};
+         Bool_t local   = kTRUE;
+         Double_t zwindow = AliITSReconstructor::GetRecoParam()->GetZWindowDeadZone();
+         hit[1] = fSPDdetzcentre[0]+0.5*kSPDdetzlength;
+         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;
+         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;
+         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;
+         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;
+         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;
+         if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow) 
+           fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
        }
       }
       
@@ -274,49 +290,49 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
 
   return 0;
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::UnloadClusters() {
   //--------------------------------------------------------------------
   //This function unloads ITS clusters
   //--------------------------------------------------------------------
   for (Int_t i=0; i<kMaxLayer; i++) fgLayers[i].ResetClusters();
 }
-
-static Int_t CorrectForDeadZoneMaterial(AliITStrackMI *t) {
+//------------------------------------------------------------------------
+static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) {
   //--------------------------------------------------------------------
   // Correction for the material between the TPC and the ITS
-  // (should it belong to the TPC code ?)
   //--------------------------------------------------------------------
-  Double_t riw=80., diw=0.0053, x0iw=30; // TPC inner wall ? 
-  Double_t rcd=61., dcd=0.0053, x0cd=30; // TPC "central drum" ?
-  Double_t yr=12.8, dr=0.03; // rods ?
-  Double_t zm=0.2, dm=0.40;  // membrane
-  //Double_t rr=52., dr=0.19, x0r=24., yyr=7.77; //rails
-  Double_t rs=50., ds=0.001; // something belonging to the ITS (screen ?)
-
-  if (t->GetX() > riw) {
-     if (!t->PropagateTo(riw,diw,x0iw)) return 1;
-     if (TMath::Abs(t->GetY())>yr) t->CorrectForMaterial(dr); 
-     if (TMath::Abs(t->GetZ())<zm) t->CorrectForMaterial(dm); 
-     if (!t->PropagateTo(rcd,dcd,x0cd)) 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(rs,ds)) return 1;
-  } else if (t->GetX() < rs) {
-     if (!t->PropagateTo(rs,-ds)) 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(rcd,-dcd,x0cd)) return 1;
-     if (!t->PropagateTo(riw+0.001,-diw,x0iw)) return 1;
+  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; */
   } else {
-  ::Error("CorrectForDeadZoneMaterial","track is already in the dead zone !");
+    Error("CorrectForTPCtoITSDeadZoneMaterial","Track is already in the dead zone !");
     return 1;
   }
   
   return 0;
 }
-
-Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
   //--------------------------------------------------------------------
   // This functions reconstructs ITS tracks
   // The clusters must be already loaded !
@@ -324,7 +340,20 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
   TObjArray itsTracks(15000);
   fOriginal.Clear();
   fEsd = event;         // store pointer to the esd 
+
+  // temporary (for cosmics)
+  if(event->GetVertex()) {
+    TString title = event->GetVertex()->GetTitle();
+    if(title.Contains("cosmics")) {
+      Double_t xyz[3]={GetX(),GetY(),GetZ()};
+      Double_t exyz[3]={0.1,0.1,0.1};
+      SetVertex(xyz,exyz);
+    }
+  }
+  // temporary
+
   {/* Read ESD tracks */
+    Double_t pimass = TDatabasePDG::Instance()->GetParticle(211)->Mass();
     Int_t nentr=event->GetNumberOfTracks();
     Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
     while (nentr--) {
@@ -342,33 +371,31 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
         delete t;
         continue;
       }
-      //t->fD[0] = t->GetD(GetX(),GetY());
-      //t->fD[1] = t->GetZat(GetX())-GetZ();
       t->GetDZ(GetX(),GetY(),GetZ(),t->GetDP());              //I.B.
       Double_t vdist = TMath::Sqrt(t->GetD(0)*t->GetD(0)+t->GetD(1)*t->GetD(1));
-      if (t->GetMass()<0.13) t->SetMass(0.13957); // MI look to the esd - mass hypothesys  !!!!!!!!!!!
+      // look at the ESD mass hypothesys !
+      if (t->GetMass()<0.9*pimass) t->SetMass(pimass); 
       // write expected q
       t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
 
-      if (esd->GetV0Index(0)>0 && t->GetD(0)<30){
+      if (esd->GetV0Index(0)>0 && t->GetD(0)<AliITSReconstructor::GetRecoParam()->GetMaxDforV0dghtrForProlongation()){
        //track - can be  V0 according to TPC
-      }
-      else{    
-       if (TMath::Abs(t->GetD(0))>10) {
+      } else { 
+       if (TMath::Abs(t->GetD(0))>AliITSReconstructor::GetRecoParam()->GetMaxDForProlongation()) {
          delete t;
          continue;
        }
        
-       if (TMath::Abs(vdist)>20) {
+       if (TMath::Abs(vdist)>AliITSReconstructor::GetRecoParam()->GetMaxDZForProlongation()) {
          delete t;
          continue;
        }
-       if (TMath::Abs(1/t->Get1Pt())<0.120) {
+       if (t->Pt()<AliITSReconstructor::GetRecoParam()->GetMinPtForProlongation()) {
          delete t;
          continue;
        }
        
-       if (CorrectForDeadZoneMaterial(t)!=0) {
+       if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
          //Warning("Clusters2Tracks",
          //        "failed to correct for the material in the dead zone !\n");
          delete t;
@@ -386,21 +413,22 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
   Int_t nentr=itsTracks.GetEntriesFast();
   fTrackHypothesys.Expand(nentr);
   fBestHypothesys.Expand(nentr);
-  MakeCoeficients(nentr);
+  MakeCoefficients(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';
+       //cerr<<fPass<<"    "<<i<<'\r';
        fCurrentEsdTrack = i;
        AliITStrackMI *t=(AliITStrackMI*)itsTracks.UncheckedAt(i);
        if (t==0) continue;              //this track has been already tracked
        if (t->GetReconstructed()&&(t->GetNUsed()<1.5)) continue;  //this track was  already  "succesfully" reconstructed
-       //if ( (TMath::Abs(t->GetD(GetX(),GetY()))  >3.) && fConstraint[fPass]) continue;
-       //if ( (TMath::Abs(t->GetZat(GetX())-GetZ())>3.) && fConstraint[fPass]) continue;
        Float_t dz[2]; t->GetDZ(GetX(),GetY(),GetZ(),dz);              //I.B.
-       if ( (TMath::Abs(dz[0])>3.) && fConstraint[fPass]) continue;
-       if ( (TMath::Abs(dz[1])>3.) && fConstraint[fPass]) continue;
+       if (fConstraint[fPass]) { 
+        if (TMath::Abs(dz[0])>AliITSReconstructor::GetRecoParam()->GetMaxDZToUseConstraint() ||
+            TMath::Abs(dz[1])>AliITSReconstructor::GetRecoParam()->GetMaxDZToUseConstraint()) continue;
+       }
 
        Int_t tpcLabel=t->GetLabel(); //save the TPC track label       
        fI = 6;
@@ -419,26 +447,17 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
        CookLabel(besttrack,0.); //For comparison only
        UpdateESDtrack(besttrack,AliESDtrack::kITSin);
 
-       /*       
-       if ( besttrack->GetNumberOfClusters()<6 && fConstraint[fPass]) {         
-        continue;
-       }
-       if (besttrack->fChi2MIP[0]+besttrack->fNUsed>3.5) continue;
-       if ( (TMath::Abs(besttrack->fD[0]*besttrack->fD[0]+besttrack->fD[1]*besttrack->fD[1])>0.1) && fConstraint[fPass])  continue;     
-       //delete itsTracks.RemoveAt(i);
-       */
        if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue;  //to be tracked also without vertex constrain 
 
-
        t->SetReconstructed(kTRUE);
        ntrk++;                     
      }
      GetBestHypothesysMIP(itsTracks); 
-  }
+  } // end loop on the two tracking passes
 
   //GetBestHypothesysMIP(itsTracks);
-  UpdateTPCV0(event);
-  FindV02(event);
+  if(event->GetNumberOfV0s()>0) UpdateTPCV0(event);
+  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event);
   fAfterV0 = kTRUE;
   //GetBestHypothesysMIP(itsTracks);
   //
@@ -454,15 +473,14 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
   fTrackHypothesys.Delete();
   fBestHypothesys.Delete();
   fOriginal.Clear();
-  delete []fCoeficients;
-  fCoeficients=0;
+  delete [] fCoefficients;
+  fCoefficients=0;
   Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk);
   
   return 0;
 }
-
-
-Int_t AliITStrackerMI::PropagateBack(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
   //--------------------------------------------------------------------
   // This functions propagates reconstructed ITS tracks back
   // The clusters must be loaded !
@@ -489,18 +507,27 @@ Int_t AliITStrackerMI::PropagateBack(AliESD *event) {
 
      ResetTrackToFollow(*t);
 
-     // propagete to vertex [SR, GSI 17.02.2003]
+     // propagate to vertex [SR, GSI 17.02.2003]
      // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov
-     if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {
-       if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
-          fTrackToFollow.StartTimeIntegral();
+     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);
        }
-       fTrackToFollow.PropagateTo(3.,-0.0028,65.19);
      }
 
      fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters();
-     if (RefitAt(49.,&fTrackToFollow,t)) {
-        if (CorrectForDeadZoneMaterial(&fTrackToFollow)!=0) {
+     if (RefitAt(krInsideITSscreen,&fTrackToFollow,t)) {
+        if (CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)!=0) {
           //Warning("PropagateBack",
           //        "failed to correct for the material in the dead zone !\n");
           delete t;
@@ -520,14 +547,14 @@ Int_t AliITStrackerMI::PropagateBack(AliESD *event) {
 
   return 0;
 }
-
-Int_t AliITStrackerMI::RefitInward(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
   //--------------------------------------------------------------------
   // This functions refits ITS tracks using the 
   // "inward propagated" TPC tracks
   // The clusters must be loaded !
   //--------------------------------------------------------------------
-  RefitV02(event);
+  if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event);
   Int_t nentr=event->GetNumberOfTracks();
   Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
 
@@ -549,7 +576,7 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) {
         continue;
     }
     t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
-    if (CorrectForDeadZoneMaterial(t)!=0) {
+    if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
       //Warning("RefitInward",
       //         "failed to correct for the material in the dead zone !\n");
        delete t;
@@ -563,21 +590,29 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) {
       fTrackToFollow.ResetCovariance(10.);
 
     //Refitting...
-    if (RefitAt(3.7, &fTrackToFollow, t,kTRUE)) {
+    if (RefitAt(krInsideSPD1, &fTrackToFollow, t,kTRUE)) {
        fTrackToFollow.SetLabel(t->GetLabel());
        //       fTrackToFollow.CookdEdx();
        CookdEdx(&fTrackToFollow);
 
        CookLabel(&fTrackToFollow,0.0); //For comparison only
 
-       if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {//The beam pipe    
-         AliESDtrack  *esdTrack =fTrackToFollow.GetESDtrack();
-         esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit);
-         Float_t r[3]={0.,0.,0.};
-         Double_t maxD=3.;
+       //The beam pipe
+       Bool_t okToPipe;
+       if(fUseTGeo) { 
+        okToPipe = fTrackToFollow.PropagateToTGeo(krInsidePipe,1); 
+       } else {
+        okToPipe = fTrackToFollow.PropagateTo(krInsidePipe,kdPipe,kX0Be);
+       }
+       if(okToPipe) {
+        AliESDtrack  *esdTrack =fTrackToFollow.GetESDtrack();
+        esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit);
+        Float_t r[3]={0.,0.,0.};
+        Double_t maxD=3.;
         esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD);
-         ntrk++;
+        ntrk++;
        }
+
     }
     delete t;
   }
@@ -586,7 +621,7 @@ Int_t AliITStrackerMI::RefitInward(AliESD *event) {
 
   return 0;
 }
-
+//------------------------------------------------------------------------
 AliCluster *AliITStrackerMI::GetCluster(Int_t index) const {
   //--------------------------------------------------------------------
   //       Return pointer to a given cluster
@@ -595,117 +630,147 @@ AliCluster *AliITStrackerMI::GetCluster(Int_t index) const {
   Int_t c=(index & 0x0fffffff) >> 00;
   return fgLayers[l].GetCluster(c);
 }
-
-#include "TGeoManager.h"
-#include "TGeoMatrix.h"
-#include "TGeoPhysicalNode.h"
-
+//------------------------------------------------------------------------
 Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const {
-  //
+  //--------------------------------------------------------------------
   // Get track space point with index i
-  //
+  //--------------------------------------------------------------------
+
   Int_t l=(index & 0xf0000000) >> 28;
   Int_t c=(index & 0x0fffffff) >> 00;
   AliITSRecPoint *cl = fgLayers[l].GetCluster(c);
   Int_t idet = cl->GetDetectorIndex();
 
-  const char* name = AliAlignObj::SymName((AliAlignObj::ELayerID)
-                                         (l+AliAlignObj::kFirstLayer), idet);
-  TGeoPNEntry *mapPN = gGeoManager->GetAlignableEntry(name);
+  Float_t xyz[3];
+  Float_t cov[6];
+  cl->GetGlobalXYZ(xyz);
+  cl->GetGlobalCov(cov);
+  p.SetXYZ(xyz, cov);
 
-  if (!mapPN) return kFALSE;
-  TGeoPhysicalNode *node = mapPN->GetPhysicalNode();
-  if (!node) {
-    gGeoManager->MakeAlignablePN(name);
-    node = mapPN->GetPhysicalNode();
-  }
-  if (!node) return kFALSE;
-  TGeoHMatrix* matrix = node->GetMatrix();
-  if (!matrix) return kFALSE;
-
-  //
-  // Calculate the global coordinates
-  //
-  Double_t localCoord[]  = {cl->GetDetLocalX(), 0, cl->GetDetLocalZ()};
-  // LG  AliAlignObj makes life simple but keep in mind that alignable
-  // LG  volume doesn't mean sensitive volume. There might be a shift
-  // LG  between the 2, has it is here for the SPD :
-  if (l<2) localCoord[1] = 0.01;
-  // LG   !!!   Check for this when the new geometry comes   !!!
-  Double_t globalCoord[3] = {0};
-  matrix->LocalToMaster(localCoord, globalCoord);
-  Float_t xyz[3]= {globalCoord[0], globalCoord[1], globalCoord[2]};
-
-  //
-  // Calculate the cov matrix
-  //
-  TGeoRotation rotMatrix(*matrix);
-  TGeoRotation rotMatrixTr(rotMatrix.Inverse());
-  Double_t sigmaArray[] = {cl->GetSigmaY2(),0,0, 0,0,0, 0,0,cl->GetSigmaZ2()};
-  TGeoRotation sigmMatrix;
-  sigmMatrix.SetMatrix( sigmaArray );
-  sigmMatrix.MultiplyBy(&rotMatrixTr, kFALSE);
-  sigmMatrix.MultiplyBy(&rotMatrix, kTRUE);
-  const Double_t *globalSigma =  sigmMatrix.GetRotationMatrix();
-  Float_t cov[6]= { globalSigma[0], globalSigma[1], globalSigma[2],
-                                   globalSigma[4], globalSigma[5],
-                                                   globalSigma[8] };
-
-  p.SetXYZ(xyz[0],xyz[1],xyz[2],cov);
-  AliAlignObj::ELayerID iLayer = AliAlignObj::kInvalidLayer; 
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
   switch (l) {
   case 0:
-    iLayer = AliAlignObj::kSPD1;
+    iLayer = AliGeomManager::kSPD1;
     break;
   case 1:
-    iLayer = AliAlignObj::kSPD2;
+    iLayer = AliGeomManager::kSPD2;
     break;
   case 2:
-    iLayer = AliAlignObj::kSDD1;
+    iLayer = AliGeomManager::kSDD1;
     break;
   case 3:
-    iLayer = AliAlignObj::kSDD2;
+    iLayer = AliGeomManager::kSDD2;
     break;
   case 4:
-    iLayer = AliAlignObj::kSSD1;
+    iLayer = AliGeomManager::kSSD1;
     break;
   case 5:
-    iLayer = AliAlignObj::kSSD2;
+    iLayer = AliGeomManager::kSSD2;
     break;
   default:
     AliWarning(Form("Wrong layer index in ITS (%d) !",l));
     break;
   };
-  UShort_t volid = AliAlignObj::LayerToVolUID(iLayer,idet);
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
   p.SetVolumeID((UShort_t)volid);
   return kTRUE;
 }
+//------------------------------------------------------------------------
+Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, 
+                       AliTrackPoint& p, const AliESDtrack *t) {
+  //--------------------------------------------------------------------
+  // Get track space point with index i
+  // (assign error estimated during the tracking)
+  //--------------------------------------------------------------------
 
+  Int_t l=(index & 0xf0000000) >> 28;
+  Int_t c=(index & 0x0fffffff) >> 00;
+  const AliITSRecPoint *cl = fgLayers[l].GetCluster(c);
+  Int_t idet = cl->GetDetectorIndex();
+  const AliITSdetector &det=fgLayers[l].GetDetector(idet);
+
+  // tgphi and tglambda of the track in tracking frame with alpha=det.GetPhi
+  Float_t detxy[2];
+  detxy[0] = det.GetR()*TMath::Cos(det.GetPhi());
+  detxy[1] = det.GetR()*TMath::Sin(det.GetPhi());
+  Double_t alpha = t->GetAlpha();
+  Double_t xdetintrackframe = detxy[0]*TMath::Cos(alpha)+detxy[1]*TMath::Sin(alpha);
+  Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe,AliTracker::GetBz()));
+  phi += alpha-det.GetPhi();
+  Float_t tgphi = TMath::Tan(phi);
+
+  Float_t tgl = t->GetTgl(); // tgl about const along track
+  Float_t expQ = TMath::Max(0.8*t->GetTPCsignal(),30.);
+
+  Float_t errlocalx,errlocalz;
+  GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz);
+
+
+  Float_t xyz[3];
+  Float_t cov[6];
+  cl->GetGlobalXYZ(xyz);
+  //  cl->GetGlobalCov(cov);
+  Float_t pos[3] = {0.,0.,0.};
+  AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errlocalx*errlocalx,errlocalz*errlocalz,0);
+  tmpcl.GetGlobalCov(cov);
+
+  p.SetXYZ(xyz, cov);
+
+  AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; 
+  switch (l) {
+  case 0:
+    iLayer = AliGeomManager::kSPD1;
+    break;
+  case 1:
+    iLayer = AliGeomManager::kSPD2;
+    break;
+  case 2:
+    iLayer = AliGeomManager::kSDD1;
+    break;
+  case 3:
+    iLayer = AliGeomManager::kSDD2;
+    break;
+  case 4:
+    iLayer = AliGeomManager::kSSD1;
+    break;
+  case 5:
+    iLayer = AliGeomManager::kSSD2;
+    break;
+  default:
+    AliWarning(Form("Wrong layer index in ITS (%d) !",l));
+    break;
+  };
+  UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
+  p.SetVolumeID((UShort_t)volid);
+  return kTRUE;
+}
+//------------------------------------------------------------------------
 void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdindex, Bool_t constrain) 
 {
   //--------------------------------------------------------------------
   // Follow prolongation tree
   //--------------------------------------------------------------------
   //
+  Double_t xyzVtx[]={GetX(),GetY(),GetZ()};
+  Double_t ersVtx[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
+
   AliESDtrack * esd = otrack->GetESDtrack();
-  if (esd->GetV0Index(0)>0){
-    //
+  if (esd->GetV0Index(0)>0) {
     // TEMPORARY SOLLUTION: map V0 indexes to point to proper track
-    //                      mapping of esd track is different as its track in Containers
+    //                      mapping of ESD track is different as ITS track in Containers
     //                      Need something more stable
-    //                      Indexes are set back againg to the ESD track indexes in UpdateTPCV0
+    //                      Indexes are set back again to the ESD track indexes in UpdateTPCV0
     for (Int_t i=0;i<3;i++){
       Int_t  index = esd->GetV0Index(i);
       if (index==0) break;
       AliESDv0 * vertex = fEsd->GetV0(index);
       if (vertex->GetStatus()<0) continue;     // rejected V0
       //
-            if (esd->GetSign()>0) {
-              vertex->SetIndex(0,esdindex);
-            }
-            else{
-              vertex->SetIndex(1,esdindex);
-            }
+      if (esd->GetSign()>0) {
+       vertex->SetIndex(0,esdindex);
+      } else {
+       vertex->SetIndex(1,esdindex);
+      }
     }
   }
   TObjArray *bestarray = (TObjArray*)fBestHypothesys.At(esdindex);
@@ -753,207 +818,281 @@ 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 rs=0.5*(fgLayers[ilayer+1].GetR() + r);
-       Double_t d=0.0034, x0=38.6;
-       if (ilayer==1) {rs=9.; d=0.0097; x0=42;}
-       if (!currenttrack1.PropagateTo(rs,d,x0)) {
-         continue;
+       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;
        }
       }
-      //
-      //find intersection with layer
-      Double_t x,y,z;  
-      if (!currenttrack1.GetGlobalXYZat(r,x,y,z)) {
-       continue;
-      }
-      Double_t phi=TMath::ATan2(y,x);
+
+      Double_t phi,z;
+      if (!currenttrack1.GetPhiZat(r,phi,z)) continue;
+
       Int_t idet=layer.FindDetectorIndex(phi,z);
-      if (idet<0) {
-       continue;
-      }
+      if (idet<0) continue;
+      
+      Double_t trackGlobXYZ1[3],trackGlobXYZ2[3];
+      currenttrack1.GetXYZ(trackGlobXYZ1);
+
       //propagate to the intersection
       const AliITSdetector &det=layer.GetDetector(idet);
-      phi=det.GetPhi();
       new(&currenttrack2)  AliITStrackMI(currenttrack1);
-      if (!currenttrack1.Propagate(phi,det.GetR())) {  
-       continue;
-      }
-      currenttrack2.Propagate(phi,det.GetR());  //
+      if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue;
+      currenttrack2.Propagate(det.GetPhi(),det.GetR());
       currenttrack1.SetDetectorIndex(idet);
       currenttrack2.SetDetectorIndex(idet);
       
+      // 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);
+      }
+
+
+      //***************
+      // DEFINITION OF SEARCH ROAD FOR CLUSTERS SELECTION
       //
-      //
-      Double_t dz=7.5*TMath::Sqrt(currenttrack1.GetSigmaZ2() + 16.*kSigmaZ2[ilayer]);
-      Double_t dy=7.5*TMath::Sqrt(currenttrack1.GetSigmaY2() + 16.*kSigmaY2[ilayer]);
-      //
-      Bool_t isBoundary=kFALSE;
-      if (currenttrack1.GetY()-dy< det.GetYmin()+0.2) isBoundary = kTRUE;  
-      if (currenttrack1.GetY()+dy> det.GetYmax()-0.2) isBoundary = kTRUE;
-      if (currenttrack1.GetZ()-dz< det.GetZmin()+0.2) isBoundary = kTRUE;
-      if (currenttrack1.GetZ()+dz> det.GetZmax()-0.2) isBoundary = kTRUE;
+      Double_t dz=AliITSReconstructor::GetRecoParam()->GetNSigmaRoadZ()*
+                    TMath::Sqrt(currenttrack1.GetSigmaZ2() + 
+                   AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+                   AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+                   AliITSReconstructor::GetRecoParam()->GetSigmaZ2(ilayer));
+      Double_t dy=AliITSReconstructor::GetRecoParam()->GetNSigmaRoadY()*
+                    TMath::Sqrt(currenttrack1.GetSigmaY2() + 
+                   AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+                   AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+                   AliITSReconstructor::GetRecoParam()->GetSigmaY2(ilayer));
       
-      if (isBoundary){ // track at boundary between detectors
-       Float_t maxtgl = TMath::Abs(currenttrack1.GetTgl());
-       if (maxtgl>1) maxtgl=1;
-       dz = TMath::Sqrt(dz*dz+0.25*maxtgl*maxtgl);
-       //
-       Float_t maxsnp = TMath::Abs(currenttrack1.GetSnp());
-       if (maxsnp>0.95) continue;
-       //if (maxsnp>0.5) maxsnp=0.5;
-       dy=TMath::Sqrt(dy*dy+0.25*maxsnp*maxsnp);
-      }
+      // 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) ) {
+       Float_t tgl = TMath::Abs(currenttrack1.GetTgl());
+       if (tgl > 1.) tgl=1.;
+       dz = TMath::Sqrt(dz*dz+kDeltaXNeighbDets*kDeltaXNeighbDets*tgl*tgl);
+       Float_t snp = TMath::Abs(currenttrack1.GetSnp());
+       if (snp > AliITSReconstructor::GetRecoParam()->GetMaxSnp()) continue;
+       dy = TMath::Sqrt(dy*dy+kDeltaXNeighbDets*kDeltaXNeighbDets*snp*snp);
+      } // boundary
       
-      Double_t zmin=currenttrack1.GetZ() - dz; 
-      Double_t zmax=currenttrack1.GetZ() + dz;
-      Double_t ymin=currenttrack1.GetY() + r*phi - dy;
-      Double_t ymax=currenttrack1.GetY() + r*phi + dy;
+      // road in global (rphi,z)
+      Double_t zmin = currenttrack1.GetZ() - dz; 
+      Double_t zmax = currenttrack1.GetZ() + dz;
+      Double_t ymin = currenttrack1.GetY() + r*det.GetPhi() - dy;
+      Double_t ymax = currenttrack1.GetY() + r*det.GetPhi() + dy;
+      // select clusters in road
       layer.SelectClusters(zmin,zmax,ymin,ymax); 
+      //********************
+
+      // Define criteria for track-cluster association
+      Double_t msz = currenttrack1.GetSigmaZ2() + 
+       AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+       AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+       AliITSReconstructor::GetRecoParam()->GetSigmaZ2(ilayer);
+      Double_t msy = currenttrack1.GetSigmaY2() + 
+       AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+       AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+       AliITSReconstructor::GetRecoParam()->GetSigmaY2(ilayer);
+      if (constrain) {
+       msz *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadZC();
+       msy *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadYC(); 
+      }  else {
+       msz *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadZNonC();
+       msy *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadYNonC(); 
+      }
+      msz = 1./msz; // 1/RoadZ^2
+      msy = 1./msy; // 1/RoadY^2
       //
-      // loop over all possible prolongations
       //
-      Double_t msz=1./((currenttrack1.GetSigmaZ2() + 16.*kSigmaZ2[ilayer]));
-      Double_t msy=1./((currenttrack1.GetSigmaY2() + 16.*kSigmaY2[ilayer]));
-      if (constrain){
-       msy/=60; msz/=60.;
-      }
-      else{
-       msy/=50; msz/=50.;
-      }
+      // LOOP OVER ALL POSSIBLE TRACK PROLONGATIONS ON THIS LAYER
       //
-      const AliITSRecPoint *c=0; Int_t ci=-1;
-      Double_t chi2=12345.;
+      const AliITSRecPoint *cl=0; 
+      Int_t clidx=-1;
+      Double_t chi2trkcl=AliITSReconstructor::GetRecoParam()->GetMaxChi2(); // init with big value
       Int_t deadzone=0;
       currenttrack = &currenttrack1;
-      while ((c=layer.GetNextCluster(ci))!=0) { 
+      // loop over selected clusters
+      while ((cl=layer.GetNextCluster(clidx))!=0) { 
        if (ntracks[ilayer]>95) break; //space for skipped clusters  
-       Bool_t change =kFALSE;  
-       if (c->GetQ()==0 && (deadzone==1)) continue;
-       Int_t idet=c->GetDetectorIndex();
-       if (currenttrack->GetDetectorIndex()!=idet) {
+       Bool_t changedet =kFALSE;  
+       if (cl->GetQ()==0 && (deadzone==1)) continue;
+       Int_t idet=cl->GetDetectorIndex();
+
+       if (currenttrack->GetDetectorIndex()==idet) { // track already on the cluster's detector
+         // a first cut on track-cluster distance
+         if ( (currenttrack->GetZ()-cl->GetZ())*(currenttrack->GetZ()-cl->GetZ())*msz + 
+              (currenttrack->GetY()-cl->GetY())*(currenttrack->GetY()-cl->GetY())*msy > 1. ) 
+           continue; // cluster not associated to track
+       } else {                                      // have to move track to cluster's detector
          const AliITSdetector &det=layer.GetDetector(idet);
+         // a first cut on track-cluster distance
          Double_t y,z;
          if (!currenttrack2.GetProlongationFast(det.GetPhi(),det.GetR(),y,z)) continue;
-         Float_t pz = (z - c->GetZ()) , py=(y - c->GetY());
-         if (pz*pz*msz+py*py*msy>1.) continue;
+         if ( (z-cl->GetZ())*(z-cl->GetZ())*msz + 
+              (y-cl->GetY())*(y-cl->GetY())*msy > 1. ) 
+           continue; // cluster not associated to track
          //
          new (&backuptrack) AliITStrackMI(currenttrack2);
-         change = kTRUE;
+         changedet = kTRUE;
          currenttrack =&currenttrack2;
          if (!currenttrack->Propagate(det.GetPhi(),det.GetR())) {
            new (currenttrack) AliITStrackMI(backuptrack);
-           change = kFALSE;
+           changedet = kFALSE;
            continue;
          }
          currenttrack->SetDetectorIndex(idet);
-       }
-       else{
-         Float_t pz = (currenttrack->GetZ() - c->GetZ()) , py=(currenttrack->GetY() - c->GetY());
-         if (pz*pz*msz+py*py*msy>1.) continue;
+         // 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);
+         }
        }
 
-       chi2=GetPredictedChi2MI(currenttrack,c,ilayer); 
-       if (chi2<kMaxChi2s[ilayer]){
-         if (c->GetQ()==0) deadzone=1;     // take dead zone only once   
+       // calculate track-clusters chi2
+       chi2trkcl = GetPredictedChi2MI(currenttrack,cl,ilayer); 
+       // chi2 cut
+       if (chi2trkcl < AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer)) {
+         if (cl->GetQ()==0) deadzone=1;            // take dead zone only once   
          if (ntracks[ilayer]>=100) continue;
          AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack);
          updatetrack->SetClIndex(ilayer,0);
-         if (change){
-           new (&currenttrack2) AliITStrackMI(backuptrack);
-         }
-         if (c->GetQ()!=0){
-           if (!UpdateMI(updatetrack,c,chi2,(ilayer<<28)+ci)) continue; 
-           updatetrack->SetSampledEdx(c->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
-         }
-         else {
+         if (changedet) new (&currenttrack2) AliITStrackMI(backuptrack);
+         
+         if (cl->GetQ()!=0) {
+           if (!UpdateMI(updatetrack,cl,chi2trkcl,(ilayer<<28)+clidx)) continue; 
+           updatetrack->SetSampledEdx(cl->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
+         } else { // cluster in dead zone
            updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
            updatetrack->SetDeadZoneProbability(GetDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
          }
-         if (c->IsUsed()){
-           updatetrack->IncrementNUsed();
+         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);        
          }
-         Double_t x0;
-         Double_t d=layer.GetThickness(updatetrack->GetY(),updatetrack->GetZ(),x0);
-         updatetrack->CorrectForMaterial(d,x0);          
-         if (constrain) {
+         if (constrain) { // apply vertex constrain
            updatetrack->SetConstrain(constrain);
-           fI = ilayer;
-           Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
-           Double_t xyz[]={GetX(),GetY(),GetZ()};
-           Double_t ptfactor = 1;
-           Double_t ers[]={GetSigmaX()*ptfactor,GetSigmaY()*ptfactor,GetSigmaZ()};
            Bool_t isPrim = kTRUE;
-           if (ilayer<4){
-             //updatetrack->fD[0] = updatetrack->GetD(GetX(),GetY());
-             //updatetrack->fD[1] = updatetrack->GetZat(GetX())-GetZ();
+           if (ilayer<4) { // check that it's close to the vertex
               updatetrack->GetDZ(GetX(),GetY(),GetZ(),updatetrack->GetDP()); //I.B.
-             if ( TMath::Abs(updatetrack->GetD(0)/(1.+ilayer))>0.4 ||  TMath::Abs(updatetrack->GetD(1)/(1.+ilayer))>0.4) isPrim=kFALSE;
+             if (TMath::Abs(updatetrack->GetD(0)/(1.+ilayer)) > // y
+                 AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk() || 
+                 TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z
+                 AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE;
            }
-           if (isPrim) updatetrack->Improve(d,xyz,ers);
+           if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
          } //apply vertex constrain              
          ntracks[ilayer]++;
-       }  // create new hypothes
+       }  // create new hypothesis
       } // loop over possible cluster prolongation      
-      //      if (constrain&&itrack<2&&currenttrack1.fNSkipped==0 && deadzone==0){     
-      if (constrain&&itrack<2&&currenttrack1.GetNSkipped()==0 && deadzone==0&&ntracks[ilayer]<100){    
+      if (constrain&&itrack<2&&currenttrack1.GetNSkipped()==0 && deadzone==0&&ntracks[ilayer]<100) {   
        AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
        vtrack->SetClIndex(ilayer,0);
-       fI = ilayer;
-       Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
-       Double_t xyz[]={GetX(),GetY(),GetZ()};
-       Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
-       vtrack->Improve(d,xyz,ers);
+       vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
        vtrack->IncrementNSkipped();
        ntracks[ilayer]++;
       }
 
-      if (constrain&&itrack<1&&TMath::Abs(currenttrack1.GetTgl())>1.1){  //big theta -- for low mult. runs
+      if (constrain&&itrack<1&&TMath::Abs(currenttrack1.GetTgl())>1.1) {  //big theta - for low flux
        AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
        vtrack->SetClIndex(ilayer,0);
-       fI = ilayer;
-       Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
-       Double_t xyz[]={GetX(),GetY(),GetZ()};
-       Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
-       vtrack->Improve(d,xyz,ers);
+       vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
        vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
        ntracks[ilayer]++;
       }
      
       
-    } //loop over track candidates
+    }
+
+    //loop over track candidates for the current layer
     //
     //
     Int_t accepted=0;
     
-    Int_t golds=0;
+    Int_t golden=0;
     for (Int_t itrack=0;itrack<ntracks[ilayer];itrack++){
       normalizedchi2[itrack] = NormalizedChi2(&tracks[ilayer][itrack],ilayer); 
-      if ( normalizedchi2[itrack]<3+0.5*ilayer) golds++;
-      if (ilayer>4) accepted++;
-      else{
-       if ( constrain && normalizedchi2[itrack]<kMaxNormChi2C[ilayer]+1) accepted++;
-       if (!constrain && normalizedchi2[itrack]<kMaxNormChi2NonC[ilayer]+1) accepted++;
+      if (normalizedchi2[itrack] < 
+         AliITSReconstructor::GetRecoParam()->GetMaxNormChi2ForGolden(ilayer)) golden++;
+      if (ilayer>4) {
+       accepted++;
+      } else {
+       if (constrain) { // constrain
+         if (normalizedchi2[itrack]<AliITSReconstructor::GetRecoParam()->GetMaxNormChi2C(ilayer)+1) 
+           accepted++;
+       } else {        // !constrain
+         if (normalizedchi2[itrack]<AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonC(ilayer)+1) 
+           accepted++;
+       }
       }
     }
-    TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE);
+    // sort tracks by increasing normalized chi2
+    TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE); 
     ntracks[ilayer] = TMath::Min(accepted,7+2*ilayer);
-    if (ntracks[ilayer]<golds+2+ilayer) ntracks[ilayer]=TMath::Min(golds+2+ilayer,accepted);
+    if (ntracks[ilayer]<golden+2+ilayer) ntracks[ilayer]=TMath::Min(golden+2+ilayer,accepted);
     if (ntracks[ilayer]>90) ntracks[ilayer]=90; 
-  } //loop over layers
+  } // end loop over layers
+
   //printf("%d\t%d\t%d\t%d\t%d\t%d\n",ntracks[0],ntracks[1],ntracks[2],ntracks[3],ntracks[4],ntracks[5]);
-  Int_t max = constrain? 20: 5;
 
-  for (Int_t i=0;i<TMath::Min(max,ntracks[0]);i++) {
+  //
+  // Now select tracks to be kept
+  //
+  Int_t max = constrain ? 20 : 5;
+
+  // tracks that reach layer 0 (SPD inner)
+  for (Int_t i=0; i<TMath::Min(max,ntracks[0]); i++) {
     AliITStrackMI & track= tracks[0][nindexes[0][i]];
     if (track.GetNumberOfClusters()<2) continue;
-    if (!constrain&&track.GetNormChi2(0)>7.)continue;
+    if (!constrain && track.GetNormChi2(0) >
+       AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
     AddTrackHypothesys(new AliITStrackMI(track), esdindex);
   }
+
+  // tracks that reach layer 1 (SPD outer)
   for (Int_t i=0;i<TMath::Min(2,ntracks[1]);i++) {
     AliITStrackMI & track= tracks[1][nindexes[1][i]];
     if (track.GetNumberOfClusters()<4) continue;
-    if (!constrain&&track.GetNormChi2(1)>7.)continue;
+    if (!constrain && track.GetNormChi2(1) >
+       AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
     if (constrain) track.IncrementNSkipped();
     if (!constrain) {
       track.SetD(0,track.GetD(GetX(),GetY()));   
@@ -964,13 +1103,14 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
     }
     AddTrackHypothesys(new AliITStrackMI(track), esdindex);
   }
-  //}
-  
+
+  // tracks that reack layer 2 (SDD inner), only during non-constrained pass
   if (!constrain){  
     for (Int_t i=0;i<TMath::Min(2,ntracks[2]);i++) {
       AliITStrackMI & track= tracks[2][nindexes[2][i]];
       if (track.GetNumberOfClusters()<3) continue;
-      if (!constrain&&track.GetNormChi2(2)>7.)continue;
+      if (!constrain && track.GetNormChi2(2) >
+         AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
       if (constrain) track.SetNSkipped(track.GetNSkipped()+2);      
       if (!constrain){
        track.SetD(0,track.GetD(GetX(),GetY()));
@@ -983,9 +1123,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
     }
   }
   
-  if (!constrain){
+  if (!constrain) {
     //
-    // register best tracks - important for V0 finder
+    // register best track of each layer - important for V0 finder
     //
     for (Int_t ilayer=0;ilayer<5;ilayer++){
       if (ntracks[ilayer]==0) continue;
@@ -1003,7 +1143,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
     for (Int_t i=0;i<3;i++){
       Int_t  index = otrack->GetESDtrack()->GetV0Index(i); 
       if (index==0) break;
-      AliV0 * vertex = (AliV0*)fEsd->GetV0(index);
+      AliV0 *vertex = (AliV0*)fEsd->GetV0(index);
       if (vertex->GetStatus()<0) continue;     // rejected V0
       //
       if (otrack->GetSign()>0) {
@@ -1029,7 +1169,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
          if (track.GetSign()>0) {
            vertex->SetParamP(track);
            vertex->Update(fprimvertex);
-           //      vertex->SetIndex(0,track.fESDtrack->GetID()); 
+           //vertex->SetIndex(0,track.fESDtrack->GetID()); 
            if (track.GetNumberOfClusters()>2) AddTrackHypothesys(new AliITStrackMI(track), esdindex);
          }else{
            vertex->SetParamN(track);
@@ -1039,23 +1179,14 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin
          }
          vertex->SetStatus(vertex->GetStatus()+1);
        }else{
-         //  vertex->SetStatus(-2);  // reject V0  - not enough clusters
+         //vertex->SetStatus(-2);  // reject V0  - not enough clusters
        }
       }
-      // if (nearestold>3){
-//     Int_t indexlayer = (ntracks[0]>0)? 0:1;
-//     if (ntracks[indexlayer]>0){
-//       AliITStrackMI & track= tracks[indexlayer][nindexes[indexlayer][0]];
-//       if (track.GetNumberOfClusters()>4&&track.fNormChi2[indexlayer]<4){
-//         vertex->SetStatus(-1);  // reject V0 - clusters before
-//       }
-//     }
-//      }
     }
-  }  
+  } 
+  
 }
-
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITSlayer & AliITStrackerMI::GetLayer(Int_t layer) const
 {
   //--------------------------------------------------------------------
@@ -1063,7 +1194,7 @@ AliITStrackerMI::AliITSlayer & AliITStrackerMI::GetLayer(Int_t layer) const
   //
   return fgLayers[layer];
 }
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITSlayer::AliITSlayer():
 fR(0),
 fPhiOffset(0),
@@ -1100,7 +1231,7 @@ fRoad(0){
     fClusterTracks[3][i]=-1;    
   }
 }
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITSlayer::
 AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd):
 fR(r),
@@ -1131,9 +1262,9 @@ fRoad(0) {
   //main AliITSlayer constructor
   //--------------------------------------------------------------------
   fDetectors=new AliITSdetector[fNladders*fNdetectors];
-  fRoad=2*fR*TMath::Sqrt(3.14/1.);//assuming that there's only one cluster
+  fRoad=2*fR*TMath::Sqrt(TMath::Pi()/1.);//assuming that there's only one cluster
 }
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITSlayer::AliITSlayer(const AliITSlayer& layer):
 fR(layer.fR),
 fPhiOffset(layer.fPhiOffset),
@@ -1161,8 +1292,7 @@ fAccepted(layer.fAccepted),
 fRoad(layer.fRoad){
   //Copy constructor
 }
-
-
+//------------------------------------------------------------------------
 AliITStrackerMI::AliITSlayer::~AliITSlayer() {
   //--------------------------------------------------------------------
   // AliITSlayer destructor
@@ -1177,7 +1307,7 @@ AliITStrackerMI::AliITSlayer::~AliITSlayer() {
     fClusterTracks[3][i]=-1;    
   }
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::AliITSlayer::ResetClusters() {
   //--------------------------------------------------------------------
   // This function removes loaded clusters
@@ -1194,7 +1324,7 @@ void AliITStrackerMI::AliITSlayer::ResetClusters() {
   fN=0;
   fI=0;
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::AliITSlayer::ResetWeights() {
   //--------------------------------------------------------------------
   // This function reset weights of the clusters
@@ -1212,7 +1342,7 @@ void AliITStrackerMI::AliITSlayer::ResetWeights() {
   }
 
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::AliITSlayer::ResetRoad() {
   //--------------------------------------------------------------------
   // This function calculates the road defined by the cluster density
@@ -1221,12 +1351,10 @@ void AliITStrackerMI::AliITSlayer::ResetRoad() {
   for (Int_t i=0; i<fN; i++) {
      if (TMath::Abs(fClusters[i]->GetZ())<fR) n++;
   }
-  //if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n);
-  if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n);
+  if (n>1) fRoad=2*fR*TMath::Sqrt(TMath::Pi()/n);
 }
-
-
-Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *c) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *cl) {
   //--------------------------------------------------------------------
   //This function adds a cluster to this layer
   //--------------------------------------------------------------------
@@ -1235,17 +1363,17 @@ Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *c) {
     return 1;
   }
   fCurrentSlice=-1;
-  fClusters[fN]=c;
+  fClusters[fN]=cl;
   fN++;
-  AliITSdetector &det=GetDetector(c->GetDetectorIndex());    
-  if (c->GetY()<det.GetYmin()) det.SetYmin(c->GetY());
-  if (c->GetY()>det.GetYmax()) det.SetYmax(c->GetY());
-  if (c->GetZ()<det.GetZmin()) det.SetZmin(c->GetZ());
-  if (c->GetZ()>det.GetZmax()) det.SetZmax(c->GetZ());
+  AliITSdetector &det=GetDetector(cl->GetDetectorIndex());    
+  if (cl->GetY()<det.GetYmin()) det.SetYmin(cl->GetY());
+  if (cl->GetY()>det.GetYmax()) det.SetYmax(cl->GetY());
+  if (cl->GetZ()<det.GetZmin()) det.SetZmin(cl->GetZ());
+  if (cl->GetZ()>det.GetZmax()) det.SetZmax(cl->GetZ());
                             
   return 0;
 }
-
+//------------------------------------------------------------------------
 void  AliITStrackerMI::AliITSlayer::SortClusters()
 {
   //
@@ -1350,8 +1478,7 @@ void  AliITStrackerMI::AliITSlayer::SortClusters()
 
 
 }
-
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::AliITSlayer::FindClusterIndex(Float_t z) const {
   //--------------------------------------------------------------------
   // This function returns the index of the nearest cluster 
@@ -1376,8 +1503,7 @@ Int_t AliITStrackerMI::AliITSlayer::FindClusterIndex(Float_t z) const {
   }
   return m;
 }
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::AliITSlayer::
 SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
   //--------------------------------------------------------------------
@@ -1453,16 +1579,18 @@ SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
   fSkip = 0;
   fAccepted =0;
 }
-
-
-
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::AliITSlayer::
 FindDetectorIndex(Double_t phi, Double_t z) const {
   //--------------------------------------------------------------------
   //This function finds the detector crossed by the track
   //--------------------------------------------------------------------
-  Double_t dphi=-(phi-fPhiOffset);
+  Double_t dphi;
+  if (fZOffset<0)            // old geometry
+    dphi = -(phi-fPhiOffset);
+  else                       // new geometry
+    dphi = phi-fPhiOffset;
+
   if      (dphi <  0) dphi += 2*TMath::Pi();
   else if (dphi >= 2*TMath::Pi()) dphi -= 2*TMath::Pi();
   Int_t np=Int_t(dphi*fNladders*0.5/TMath::Pi()+0.5);
@@ -1476,8 +1604,7 @@ FindDetectorIndex(Double_t phi, Double_t z) const {
 
   return np*fNdetectors + nz;
 }
-
-
+//------------------------------------------------------------------------
 const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
   //--------------------------------------------------------------------
   // This function returns clusters within the "window" 
@@ -1509,16 +1636,14 @@ const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
   }
   return 0;
 }
-
-
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::AliITSlayer::GetThickness(Double_t y,Double_t z,Double_t &x0)
 const {
   //--------------------------------------------------------------------
-  //This function returns the layer thickness at this point (units X0)
+  // This function returns the layer thickness at this point (units X0)
   //--------------------------------------------------------------------
   Double_t d=0.0085;
-  x0=21.82;
+  x0=kX0Air;
   if (43<fR&&fR<45) { //SSD2
      Double_t dd=0.0034;
      d=dd;
@@ -1598,47 +1723,47 @@ const {
      Double_t dd=0.0063; x0=21.5;
      d=dd;
      if (TMath::Abs(y-3.08)>0.5) d+=dd;
-     //if (TMath::Abs(y-3.08)>0.45) d+=dd;
-     if (TMath::Abs(y-3.03)<0.10) {d+=0.014;}
+     if (TMath::Abs(y-3.03)<0.10) d+=0.014;
   } else
   if (3<fR&&fR<5) {   //SPD1
      Double_t dd=0.0063; x0=21.5;
      d=dd;
      if (TMath::Abs(y+0.21)>0.6) d+=dd;
-     //if (TMath::Abs(y+0.21)>0.45) d+=dd;
-     if (TMath::Abs(y+0.10)<0.10) {d+=0.014;}
+     if (TMath::Abs(y+0.10)<0.10) d+=0.014;
   }
 
   return d;
 }
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetEffectiveThickness(Double_t y,Double_t z) const
 {
   //--------------------------------------------------------------------
-  //Returns the thickness between the current layer and the vertex (units X0)
+  // Returns the thickness between the current layer and the vertex (units X0)
   //--------------------------------------------------------------------
-  Double_t d=0.0028*3*3; //beam pipe
-  Double_t x0=0;
 
+  // beam pipe
+  Double_t d=kdPipe*krPipe*krPipe;
+
+  // 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;
   }
 
+  // shields
   if (fI>1) {
-    Double_t xi=9.;
-    d+=0.0097*xi*xi;
+    d+=kdshieldSPD*krshieldSPD*krshieldSPD;
   }
-
   if (fI>3) {
     Double_t xi=0.5*(fgLayers[3].GetR()+fgLayers[4].GetR());
-    d+=0.0034*xi*xi;
+    d+=kdshieldSDD*xi*xi;
   }
 
   return d/(xn*xn);
 }
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::AliITSlayer::InRoad() const {
   //--------------------------------------------------------------------
   // This function returns number of clusters within the "window" 
@@ -1660,7 +1785,7 @@ Int_t AliITStrackerMI::AliITSlayer::InRoad() const {
   }
   return ncl;
 }
-
+//------------------------------------------------------------------------
 Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
                                const AliITStrackMI *c, Bool_t extra) {
   //--------------------------------------------------------------------
@@ -1678,31 +1803,48 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
     index[nl]=idx; 
   }
 
+  // special for cosmics: check which the innermost layer crossed
+  // by the track
+  Int_t innermostlayer=5;
+  Double_t d = TMath::Abs(t->GetD(0.,0.));
+  for(innermostlayer=0; innermostlayer<kMaxLayer; 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=0; to=kMaxLayer;
+      from=innermostlayer; to=kMaxLayer;
       step=+1;
   } else {
-      from=kMaxLayer-1; to=-1;
+      from=kMaxLayer-1; to=innermostlayer-1;
       step=-1;
   }
 
+  // loop on the layers
   for (Int_t i=from; i != to; i += step) {
      AliITSlayer &layer=fgLayers[i];
      Double_t r=layer.GetR();
  
-     {
+     // 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 rs=0.5*(fgLayers[i-step].GetR() + r);
-        Double_t d=0.0034, x0=38.6; 
-        if (TMath::Abs(hI-1.5)<0.01) {rs=9.; d=0.0097; x0=42;}
-        if (!t->PropagateTo(rs,-step*d,x0)) {
-          return kFALSE;
-        }
-     }
+       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;
+       }
      }
-
+     
      // remember old position [SR, GSI 18.02.2003]
      Double_t oldX=0., oldY=0., oldZ=0.;
      if (t->IsStartedTimeIntegral() && step==1) {
@@ -1710,15 +1852,17 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      }
      //
 
-     Double_t x,y,z;
-     if (!t->GetGlobalXYZat(r,x,y,z)) { 
-       return kFALSE;
-     }
-     Double_t phi=TMath::ATan2(y,x);
+     Double_t oldGlobXYZ[3];
+     t->GetXYZ(oldGlobXYZ);
+
+     Double_t phi,z;
+     if (!t->GetPhiZat(r,phi,z)) return kFALSE;
+
      Int_t idet=layer.FindDetectorIndex(phi,z);
      if (idet<0) { 
        return kFALSE;
      }
+
      const AliITSdetector &det=layer.GetDetector(idet);
      phi=det.GetPhi();
      if (!t->Propagate(phi,det.GetR())) {
@@ -1727,10 +1871,10 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      t->SetDetectorIndex(idet);
 
      const AliITSRecPoint *cl=0;
-     Double_t maxchi2=1000.*kMaxChi2;
+     Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2();
 
      Int_t idx=index[i];
-     if (idx>0) {
+     if (idx>=0) {
         const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx); 
        if (c){
          if (idet != c->GetDetectorIndex()) {
@@ -1754,24 +1898,36 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      }
 
      if (cl) {
-       //if (!t->Update(cl,maxchi2,idx)) {
-       if (!UpdateMI(t,cl,maxchi2,idx)) {
-          return kFALSE;
-       }
+       if (!UpdateMI(t,cl,maxchi2,idx)) return kFALSE;
        t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
      }
 
-     {
-     Double_t x0;
-     Double_t d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-     t->CorrectForMaterial(-step*d,x0);
+     // 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()+kSigmaZ2[i]);
+        Double_t dz=4*TMath::Sqrt(tmp.GetSigmaZ2()+AliITSReconstructor::GetRecoParam()->GetSigmaZ2(i));
         if (dz < 0.5*TMath::Abs(tmp.GetTgl())) dz=0.5*TMath::Abs(tmp.GetTgl());
-        Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+kSigmaY2[i]);
+        Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+AliITSReconstructor::GetRecoParam()->GetSigmaY2(i));
         if (dy < 0.5*TMath::Abs(tmp.GetSnp())) dy=0.5*TMath::Abs(tmp.GetSnp());
         Double_t zmin=t->GetZ() - dz;
         Double_t zmax=t->GetZ() + dz;
@@ -1780,7 +1936,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
         layer.SelectClusters(zmin,zmax,ymin,ymax);
 
         const AliITSRecPoint *c=0; Int_t ci=-1,cci=-1;
-        Double_t maxchi2=1000.*kMaxChi2, tolerance=0.1;
+        Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2(), tolerance=0.1;
         while ((c=layer.GetNextCluster(ci))!=0) {
            if (idet == c->GetDetectorIndex()) continue;
 
@@ -1807,12 +1963,12 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
      }
      //
 
-  }
+  } // end loop on the layers
 
   if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
   return kTRUE;
 }
-
+//------------------------------------------------------------------------
 Bool_t 
 AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
   //--------------------------------------------------------------------
@@ -1827,29 +1983,46 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
     index[k]=clindex[k]; 
   }
 
+  // special for cosmics: check which the innermost layer crossed
+  // by the track
+  Int_t innermostlayer=5;
+  Double_t d = TMath::Abs(t->GetD(0.,0.));
+  for(innermostlayer=0; innermostlayer<kMaxLayer; 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=0; to=kMaxLayer;
+      from=innermostlayer; to=kMaxLayer;
       step=+1;
   } else {
-      from=kMaxLayer-1; to=-1;
+      from=kMaxLayer-1; to=innermostlayer-1;
       step=-1;
   }
 
   for (Int_t i=from; i != to; i += step) {
      AliITSlayer &layer=fgLayers[i];
      Double_t r=layer.GetR();
-     if (step<0 && xx>r) break;  //
-     {
+     if (step<0 && xx>r) break;
+
+     // 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 rs=0.5*(fgLayers[i-step].GetR() + r);
-        Double_t d=0.0034, x0=38.6; 
-        if (TMath::Abs(hI-1.5)<0.01) {rs=9.; d=0.0097; x0=42;}
-        if (!t->PropagateTo(rs,-step*d,x0)) {
-          return kFALSE;
-        }
-     }
+       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;
+       }
      }
 
      // remember old position [SR, GSI 18.02.2003]
@@ -1858,12 +2031,12 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
         t->GetGlobalXYZat(t->GetX(),oldX,oldY,oldZ);
      }
      //
+     Double_t oldGlobXYZ[3];
+     t->GetXYZ(oldGlobXYZ);
+
+     Double_t phi,z;
+     if (!t->GetPhiZat(r,phi,z)) return kFALSE;
 
-     Double_t x,y,z;
-     if (!t->GetGlobalXYZat(r,x,y,z)) { 
-       return kFALSE;
-     }
-     Double_t phi=TMath::ATan2(y,x);
      Int_t idet=layer.FindDetectorIndex(phi,z);
      if (idet<0) { 
        return kFALSE;
@@ -1876,10 +2049,10 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
      t->SetDetectorIndex(idet);
 
      const AliITSRecPoint *cl=0;
-     Double_t maxchi2=1000.*kMaxChi2;
+     Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2();
 
      Int_t idx=index[i];
-     if (idx>0) {
+     if (idx>=0) {
         const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx); 
        if (c){
          if (idet != c->GetDetectorIndex()) {
@@ -1901,37 +2074,30 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
          }
        }
      }
-     /*
-     if (cl==0)
-     if (t->GetNumberOfClusters()>2) {
-        Double_t dz=4*TMath::Sqrt(t->GetSigmaZ2()+kSigmaZ2[i]);
-        Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+kSigmaY2[i]);
-        Double_t zmin=t->GetZ() - dz;
-        Double_t zmax=t->GetZ() + dz;
-        Double_t ymin=t->GetY() + phi*r - dy;
-        Double_t ymax=t->GetY() + phi*r + dy;
-        layer.SelectClusters(zmin,zmax,ymin,ymax);
 
-        const AliITSRecPoint *c=0; Int_t ci=-1;
-        while ((c=layer.GetNextCluster(ci))!=0) {
-           if (idet != c->GetDetectorIndex()) continue;
-           Double_t chi2=t->GetPredictedChi2(c);
-           if (chi2<maxchi2) { cl=c; maxchi2=chi2; idx=ci; }
-        }
-     }
-     */
      if (cl) {
-       //if (!t->Update(cl,maxchi2,idx)) {
-       if (!UpdateMI(t,cl,maxchi2,idx)) {
-          return kFALSE;
-       }
+       if (!UpdateMI(t,cl,maxchi2,idx)) return kFALSE;
        t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
      }
 
-     {
-     Double_t x0;
-     Double_t d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
-     t->CorrectForMaterial(-step*d,x0);
+     // 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);
      }
                  
      // track time update [SR, GSI 17.02.2003]
@@ -1949,7 +2115,7 @@ AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
   if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
   return kTRUE;
 }
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode)
 {
   //
@@ -2045,8 +2211,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode)
  
  return normchi2;
 }
-
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI * track2)
 {
   //
@@ -2058,7 +2223,7 @@ Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI
   vec(1,0)=track1->GetZ()   - track3.GetZ();
   vec(2,0)=track1->GetSnp() - track3.GetSnp();
   vec(3,0)=track1->GetTgl() - track3.GetTgl();
-  vec(4,0)=track1->Get1Pt() - track3.Get1Pt();
+  vec(4,0)=track1->GetSigned1Pt() - track3.GetSigned1Pt();
   //
   TMatrixD cov(5,5);
   cov(0,0) = track1->GetSigmaY2()+track3.GetSigmaY2();
@@ -2086,31 +2251,39 @@ Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI
   TMatrixD chi2(vec2,TMatrixD::kTransposeMult,vec);
   return chi2(0,0);
 }
-
+//------------------------------------------------------------------------
 Double_t  AliITStrackerMI::GetDeadZoneProbability(Double_t zpos, Double_t zerr)
 {
   //
-  //  return probability that given point - characterized by z position and error  is in dead zone
+  //  return probability that given point (characterized by z position and error) 
+  //  is in SPD dead zone
   //
-  Double_t probability =0;
+  Double_t probability = 0.;
   Double_t absz = TMath::Abs(zpos);
-  Double_t nearestz = (absz<2)? 0.:7.1;
-  if (TMath::Abs(absz-nearestz)>0.25+3*zerr) return 0;
-  Double_t zmin=0, zmax=0;   
-  if (zpos<-6.){
-    zmin = -7.25; zmax = -6.95; 
-  }
-  if (zpos>6){
-    zmin = 7.0; zmax =7.3;
-  }
-  if (absz<2){
-    zmin = -0.75; zmax = 1.5;
+  Double_t nearestz = (absz<2.) ? 0.5*(fSPDdetzcentre[1]+fSPDdetzcentre[2]) : 
+                                  0.5*(fSPDdetzcentre[2]+fSPDdetzcentre[3]);
+  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;
+  } else if (zpos>6.) { // dead zone at z = +7
+    zmin = fSPDdetzcentre[2] + 0.5*kSPDdetzlength;
+    zmax = fSPDdetzcentre[3] - 0.5*kSPDdetzlength;
+  } else if (absz<2.) { // dead zone at z = 0
+    zmin = fSPDdetzcentre[1] + 0.5*kSPDdetzlength;
+    zmax = fSPDdetzcentre[2] - 0.5*kSPDdetzlength;
+  } else {
+    zmin = 0.;
+    zmax = 0.;
   }
-  probability = (TMath::Erf((zpos-zmin)/zerr) - TMath::Erf((zpos-zmax)/zerr))*0.5;
+  // probability that the true z is in the range [zmin,zmax] (i.e. inside 
+  // dead zone)
+  probability = 0.5*( TMath::Erf((zpos-zmin)/zerr/TMath::Sqrt(2.)) - 
+                     TMath::Erf((zpos-zmax)/zerr/TMath::Sqrt(2.)) );
   return probability;
 }
-
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac)
 {
   //
@@ -2138,8 +2311,7 @@ Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac)
   Double_t normchi2 = sumchi/sumweight;
   return normchi2;
 }
-
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliITStrackMI * backtrack)
 {
   //
@@ -2165,17 +2337,13 @@ Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliI
     npoints++;
   }
   if (npoints>1) return 
-                  TMath::Max(TMath::Abs(0.3*forwardtrack->Get1Pt())-0.5,0.)+
+                   TMath::Max(0.3*forwardtrack->OneOverPt()-0.5,0.)+
                   //2*forwardtrack->fNUsed+
                   res/TMath::Max(double(npoints-forwardtrack->GetNSkipped()),
                                  1./(1.+forwardtrack->GetNSkipped()));
   return 1000;
 }
-   
-
-
-
-
+//------------------------------------------------------------------------
 Float_t  *AliITStrackerMI::GetWeight(Int_t index) {
   //--------------------------------------------------------------------
   //       Return pointer to a given cluster
@@ -2184,7 +2352,7 @@ Float_t  *AliITStrackerMI::GetWeight(Int_t index) {
   Int_t c=(index & 0x0fffffff) >> 00;
   return fgLayers[l].GetWeight(c);
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id)
 {
   //---------------------------------------------
@@ -2206,6 +2374,7 @@ void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id)
     }
   }
 }
+//------------------------------------------------------------------------
 void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id)
 {
   //---------------------------------------------
@@ -2222,6 +2391,7 @@ void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id)
     }
   }
 }
+//------------------------------------------------------------------------
 Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id, Int_t list[6], AliITSRecPoint *clist[6])
 {
   //-------------------------------------------------------------
@@ -2268,7 +2438,7 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id
   track->SetNUsed(shared);
   return shared;
 }
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6])
 {
   //
@@ -2377,8 +2547,7 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_
   }
   return sharedtrack;
 }
-
-
+//------------------------------------------------------------------------
 AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, Float_t th0, Float_t th1){
   //
   // try to find track hypothesys without conflicts
@@ -2392,7 +2561,7 @@ AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2,
   //
   AliITStrackMI * track10=(AliITStrackMI*) arr1->UncheckedAt(0);
   AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0);
-  if (TMath::Abs(1./track10->Get1Pt())>0.5+TMath::Abs(1/track20->Get1Pt())) return track10;
+  if (track10->Pt()>0.5+track20->Pt()) return track10;
 
   for (Int_t itrack=0;itrack<entries1;itrack++){
     AliITStrackMI * track=(AliITStrackMI*) arr1->UncheckedAt(itrack);
@@ -2455,11 +2624,11 @@ AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2,
   //
   w1 = (d2/(d1+d2)+ 2*s2/(s1+s2)+
        +s2/(s1+s2)*0.5*(chi22+2.)/(chi21+chi22+4.)
-       +1.*TMath::Abs(1./track10->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+       +1.*track10->Pt()/(track10->Pt()+track20->Pt())
        );
   w2 = (d1/(d1+d2)+ 2*s1/(s1+s2)+
        s1/(s1+s2)*0.5*(chi21+2.)/(chi21+chi22+4.)
-       +1.*TMath::Abs(1./track20->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+       +1.*track20->Pt()/(track10->Pt()+track20->Pt())
        );
 
   Double_t sumw = w1+w2;
@@ -2611,22 +2780,22 @@ AliITStrackMI *  AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2,
     UnRegisterClusterTracks(track,trackID2);
   }
 
-  if (track10->GetConstrain()&&track10->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&track10->GetChi2MIP(1)<kMaxChi2PerCluster[1]
-      &&track10->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&track10->GetChi2MIP(3)<kMaxChi2PerCluster[3]){ 
-    //  if (track10->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track10->fChi2MIP[1]<kMaxChi2PerCluster[1]
-  //    &&track10->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track10->fChi2MIP[3]<kMaxChi2PerCluster[3]){ 
+  if (track10->GetConstrain()&&track10->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track10->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+      &&track10->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track10->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){ 
+    //  if (track10->fChi2MIP[0]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track10->fChi2MIP[1]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+  //    &&track10->fChi2MIP[2]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track10->fChi2MIP[3]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){ 
     RegisterClusterTracks(track10,trackID1);
   }
-  if (track20->GetConstrain()&&track20->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&track20->GetChi2MIP(1)<kMaxChi2PerCluster[1]
-      &&track20->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&track20->GetChi2MIP(3)<kMaxChi2PerCluster[3]){ 
-    //if (track20->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track20->fChi2MIP[1]<kMaxChi2PerCluster[1]
-    //  &&track20->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track20->fChi2MIP[3]<kMaxChi2PerCluster[3]){ 
+  if (track20->GetConstrain()&&track20->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track20->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+      &&track20->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track20->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){ 
+    //if (track20->fChi2MIP[0]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track20->fChi2MIP[1]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+    //  &&track20->fChi2MIP[2]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track20->fChi2MIP[3]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){ 
     RegisterClusterTracks(track20,trackID2);  
   }
   return track10; 
  
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::UseClusters(const AliKalmanTrack *t, Int_t from) const {
   //--------------------------------------------------------------------
   // This function marks clusters assigned to the track
@@ -2641,8 +2810,7 @@ void AliITStrackerMI::UseClusters(const AliKalmanTrack *t, Int_t from) const {
   if (c->GetSigmaZ2()>0.1) c->Use();
 
 }
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::AddTrackHypothesys(AliITStrackMI * track, Int_t esdindex)
 {
   //------------------------------------------------------------------
@@ -2658,7 +2826,7 @@ void AliITStrackerMI::AddTrackHypothesys(AliITStrackMI * track, Int_t esdindex)
   }
   array->AddLast(track);
 }
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mode)
 {
   //-------------------------------------------------------------------
@@ -2685,8 +2853,8 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
     track->SetFakeRatio(1.);
     CookLabel(track,0.); //For comparison only
     //
-    //if (chi2<kMaxChi2PerCluster[0]&&track->fFakeRatio==0){
-    if (chi2<kMaxChi2PerCluster[0]){
+    //if (chi2<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track->fFakeRatio==0){
+    if (chi2<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
       if (track->GetNumberOfClusters()<maxn) continue;
       maxn = track->GetNumberOfClusters();
       if (chi2<minchi2){
@@ -2724,7 +2892,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
     AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
     if (track){
       track->SetChi2MIP(0,GetNormalizedChi2(track, mode));            
-      if (track->GetChi2MIP(0)<kMaxChi2PerCluster[0]
+      if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)
        chi2[itrack] = track->GetChi2MIP(0);
       else{
        if (track->GetConstrain() || track->GetNumberOfClusters()>5){  //keep best short tracks - without vertex constrain
@@ -2736,7 +2904,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
   //
   TMath::Sort(entries,chi2,index,kFALSE);
   besttrack = (AliITStrackMI*)array->At(index[0]);
-  if (besttrack&&besttrack->GetChi2MIP(0)<kMaxChi2PerCluster[0]){
+  if (besttrack&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
     for (Int_t i=0;i<6;i++){
       if (besttrack->GetClIndex(i)>0){
        erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
@@ -2753,7 +2921,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
     AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
     if (track){      
       track->SetChi2MIP(0,GetNormalizedChi2(track,mode));            
-      if (track->GetChi2MIP(0)<kMaxChi2PerCluster[0]
+      if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)
        chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); 
       else
        {
@@ -2781,7 +2949,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
        }
       }
       besttrack->SetChi2MIP(0,GetNormalizedChi2(besttrack,mode));
-      Float_t minchi2 = TMath::Min(besttrack->GetChi2MIP(0)+5.+besttrack->GetNUsed(), double(kMaxChi2PerCluster[0]));
+      Float_t minchi2 = TMath::Min(besttrack->GetChi2MIP(0)+5.+besttrack->GetNUsed(), double(AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)));
       Float_t minn = besttrack->GetNumberOfClusters()-3;
       Int_t accepted=0;
       for (Int_t i=0;i<entries;i++){
@@ -2825,9 +2993,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo
   delete [] chi2;
   delete [] index;
 }
-
-
-
+//------------------------------------------------------------------------
 AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI * original, Int_t checkmax)
 {
   //-------------------------------------------------------------
@@ -2844,8 +3010,8 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
   //
   AliITStrackMI * backtrack    = new AliITStrackMI(*original);
   AliITStrackMI * forwardtrack = new AliITStrackMI(*original);
-  Double_t xyzv[]={GetX(),GetY(),GetZ()};      
-  Double_t ersv[]={GetSigmaX()/3.,GetSigmaY()/3.,GetSigmaZ()/3.};
+  Double_t xyzVtx[]={GetX(),GetY(),GetZ()};    
+  Double_t ersVtx[]={GetSigmaX()/3.,GetSigmaY()/3.,GetSigmaZ()/3.};
   //
   for (Int_t i=0;i<entries;i++){    
     AliITStrackMI * track = (AliITStrackMI*)array->At(i);    
@@ -2861,16 +3027,14 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     //
     // backtrack
     backtrack = new(backtrack) AliITStrackMI(*track); 
-    if (track->GetConstrain()){
-      if (!backtrack->PropagateTo(3.,0.0028,65.19)) continue;
-      if (!backtrack->Improve(0,xyzv,ersv))         continue;      
-      //if (!backtrack->PropagateTo(2.,0.0028,0))     continue; // This 
-      //if (!backtrack->Improve(0,xyzv,ersv))         continue; // is
-      //if (!backtrack->PropagateTo(1.,0.0028,0))     continue; // an over-kill
-      //if (!backtrack->Improve(0,xyzv,ersv))         continue; //   (I.B.)
-      //if (!backtrack->PropagateToVertex())          continue; //
+    if (track->GetConstrain()) {
+      if(fUseTGeo) {
+       if (!backtrack->PropagateToTGeo(krInsidePipe,1)) continue;
+      } else {
+       if (!backtrack->PropagateTo(krInsidePipe,kdPipe,kX0Be)) continue;
+      }
+      if (!backtrack->Improve(0,xyzVtx,ersVtx))         continue;     
       backtrack->ResetCovariance(10.);      
-      //if (!backtrack->Improve(0,xyzv,ersv))         continue;                        
     }else{
       backtrack->ResetCovariance(10.);
     }
@@ -2881,7 +3045,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     //
     track->SetChi2MIP(1,NormalizedChi2(backtrack,0));
     //for (Int_t i=2;i<6;i++){track->fDy[i]+=backtrack->fDy[i]; track->fDz[i]+=backtrack->fDz[i];}
-    if (track->GetChi2MIP(1)>kMaxChi2PerCluster[1]*6.)  continue;
+    if (track->GetChi2MIP(1)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)*6.)  continue;
     track->SetChi22(GetMatchingChi2(backtrack,original));
 
     if ((track->GetConstrain()) && track->GetChi22()>90.)  continue;
@@ -2889,9 +3053,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     if ( track->GetChi22()/track->GetNumberOfClusters()>11.)  continue;
 
 
-    if  (!(track->GetConstrain())&&track->GetChi2MIP(1)>kMaxChi2PerCluster[1])  continue;
-    Bool_t isOK=kTRUE;
-    if(!isOK) continue;
+    if  (!(track->GetConstrain())&&track->GetChi2MIP(1)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1))  continue;
     //
     //forward track - without constraint
     forwardtrack = new(forwardtrack) AliITStrackMI(*original);
@@ -2899,8 +3061,8 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     x = track->GetX();
     RefitAt(x,forwardtrack,track);
     track->SetChi2MIP(2,NormalizedChi2(forwardtrack,0));    
-    if  (track->GetChi2MIP(2)>kMaxChi2PerCluster[2]*6.0)  continue;
-    if  (!(track->GetConstrain())&&track->GetChi2MIP(2)>kMaxChi2PerCluster[2])  continue;
+    if  (track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)*6.0)  continue;
+    if  (!(track->GetConstrain())&&track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2))  continue;
     
     //track->fD[0] = forwardtrack->GetD(GetX(),GetY());
     //track->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
@@ -2915,8 +3077,8 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     }
     
     track->SetChi2MIP(3,GetInterpolatedChi2(forwardtrack,backtrack));
-    if  ( (track->GetChi2MIP(3)>6.*kMaxChi2PerCluster[3])) continue;    
-    if  ( (!track->GetConstrain()) && (track->GetChi2MIP(3)>2*kMaxChi2PerCluster[3])) {
+    if  ( (track->GetChi2MIP(3)>6.*AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3))) continue;    
+    if  ( (!track->GetConstrain()) && (track->GetChi2MIP(3)>2*AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3))) {
       track->SetChi2MIP(3,1000);
       continue; 
     }
@@ -2943,7 +3105,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
     AliITStrackMI * track = (AliITStrackMI*)array->At(i);   
     if (!track) continue;
     
-    if (accepted>checkmax || track->GetChi2MIP(3)>kMaxChi2PerCluster[3]*6. || 
+    if (accepted>checkmax || track->GetChi2MIP(3)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)*6. || 
        (track->GetNumberOfClusters()<besttrack->GetNumberOfClusters()-1.)||
        track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.){
       if (track->GetConstrain() || track->GetNumberOfClusters()>5){  //keep best short tracks - without vertex constrain
@@ -2982,8 +3144,8 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
   Int_t list[6];
   AliITSRecPoint * clist[6];
   Float_t shared = GetNumberOfSharedClusters(besttrack,esdindex,list,clist);
-  if (besttrack->GetConstrain()&&besttrack->GetChi2MIP(0)<kMaxChi2PerCluster[0]&&besttrack->GetChi2MIP(1)<kMaxChi2PerCluster[1]
-      &&besttrack->GetChi2MIP(2)<kMaxChi2PerCluster[2]&&besttrack->GetChi2MIP(3)<kMaxChi2PerCluster[3]){ 
+  if (besttrack->GetConstrain()&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&besttrack->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+      &&besttrack->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&besttrack->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){ 
     RegisterClusterTracks(besttrack,esdindex);
   }
   //
@@ -3047,9 +3209,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI
   }
   return besttrack;
 } 
-
-
-
+//------------------------------------------------------------------------
 void  AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks)
 {
   //
@@ -3093,7 +3253,7 @@ void  AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks)
     if (!longtrack) {longtrack = besttrack;}
     else besttrack= longtrack;
     //
-    if (besttrack){
+    if (besttrack) {
       Int_t list[6];
       AliITSRecPoint * clist[6];
       Float_t shared = GetNumberOfSharedClusters(longtrack,i,list,clist);
@@ -3101,37 +3261,31 @@ void  AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks)
       track->SetNUsed(shared);      
       track->SetNSkipped(besttrack->GetNSkipped());
       track->SetChi2MIP(0,besttrack->GetChi2MIP(0));
-      if (shared>0){
+      if (shared>0) {
+       if(!AliITSReconstructor::GetRecoParam()->GetAllowSharedClusters()) continue;
        Int_t nshared;
        Int_t overlist[6]; 
        //
        Int_t sharedtrack = GetOverlapTrack(longtrack, i, nshared, list, overlist);
        //if (sharedtrack==-1) sharedtrack=0;
-       if (sharedtrack>=0){       
+       if (sharedtrack>=0) {       
          besttrack = GetBest2Tracks(i,sharedtrack,10,5.5);                       
        }
       }   
-      if (besttrack&&fAfterV0){
+      if (besttrack&&fAfterV0) {
        UpdateESDtrack(besttrack,AliESDtrack::kITSin);
       }
       if (besttrack&&fConstraint[fPass]) 
        UpdateESDtrack(besttrack,AliESDtrack::kITSin);
-      //if (besttrack&&besttrack->fConstrain) 
-      //       UpdateESDtrack(besttrack,AliESDtrack::kITSin);
-      if (besttrack->GetChi2MIP(0)+besttrack->GetNUsed()>1.5){
-       if ( (TMath::Abs(besttrack->GetD(0))>0.1) && fConstraint[fPass]) {
-         track->SetReconstructed(kFALSE);
-       }
-       if ( (TMath::Abs(besttrack->GetD(1))>0.1) && fConstraint[fPass]){
-         track->SetReconstructed(kFALSE);
-       }
+      if (besttrack->GetChi2MIP(0)+besttrack->GetNUsed()>1.5 && fConstraint[fPass]) {
+       if ( TMath::Abs(besttrack->GetD(0))>0.1 || 
+            TMath::Abs(besttrack->GetD(1))>0.1 ) track->SetReconstructed(kFALSE);      
       }       
 
     }    
   }
 } 
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
   //--------------------------------------------------------------------
   //This function "cooks" a track label. If label<0, this track is fake.
@@ -3154,7 +3308,9 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
      track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
      nwrong+=isWrong;
    }
-   track->SetFakeRatio(double(nwrong)/double(track->GetNumberOfClusters()));
+   Int_t nclusters = track->GetNumberOfClusters();
+   if (nclusters > 0) //PH Some tracks don't have any cluster
+     track->SetFakeRatio(double(nwrong)/double(nclusters));
    if (tpcLabel>0){
      if (track->GetFakeRatio()>wrong) track->SetLabel(-tpcLabel);
      else
@@ -3162,9 +3318,7 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
    }
    
 }
-
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
 {
   //
@@ -3213,17 +3367,15 @@ void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
   }
   track->SetdEdx(sumamp/sumweight);
 }
-
-
-void  AliITStrackerMI::MakeCoeficients(Int_t ntracks){
+//------------------------------------------------------------------------
+void  AliITStrackerMI::MakeCoefficients(Int_t ntracks){
   //
   //
-  if (fCoeficients) delete []fCoeficients;
-  fCoeficients = new Float_t[ntracks*48];
-  for (Int_t i=0;i<ntracks*48;i++) fCoeficients[i]=-1.;
+  if (fCoefficients) delete []fCoefficients;
+  fCoefficients = new Float_t[ntracks*48];
+  for (Int_t i=0;i<ntracks*48;i++) fCoefficients[i]=-1.;
 }
-
-
+//------------------------------------------------------------------------
 Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSRecPoint *cluster,Int_t layer) 
 {
   //
@@ -3267,6 +3419,9 @@ Int_t    AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* c
 
   if (cl->GetQ()<=0) return 0;  // ingore the "virtual" clusters
 
+  //Float_t clxyz[3]; cl->GetGlobalXYZ(clxyz);Double_t trxyz[3]; track->GetXYZ(trxyz);printf("gtr %f %f %f\n",trxyz[0],trxyz[1],trxyz[2]);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+
+
   // Take into account the mis-alignment
   Double_t x=track->GetX()+cl->GetX();
   if (!track->PropagateTo(x,0.,0.)) return 0;
@@ -3312,7 +3467,6 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSRecPoint*cl, Float_t th
   //
   // PIXELS
   if (layer<2){
-    
     if (TMath::Abs(ny-cl->GetNy())>0.6)  {
       if (ny<cl->GetNy()){
        erry*=0.4+TMath::Abs(ny-cl->GetNy());
@@ -3328,12 +3482,12 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSRecPoint*cl, Float_t th
     }
     erry*=0.85;
     errz*=0.85;
-    erry= TMath::Min(erry,float(0.005));
-    errz= TMath::Min(errz,float(0.03));
+    erry= TMath::Min(erry,float(0.0050));
+    errz= TMath::Min(errz,float(0.0300));
     return 10;
   }
 
-//STRIPS
+  //STRIPS
   if (layer>3){ 
     //factor 1.8 appears in new simulation
     //
@@ -3454,9 +3608,7 @@ Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSRecPoint*cl, Float_t th
   errz= TMath::Min(errz,float(0.05));  
   return 200;
 }
-
-
-
+//------------------------------------------------------------------------
 void   AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
 {
   //
@@ -3464,8 +3616,8 @@ void   AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Fl
   //to be paramterized using external parameters in future 
   //
   // 
-  sigmarfi = 0.004+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC();
-  sigmaz   = 0.011+4.37*TMath::Abs(track->GetC());
+  sigmarfi = 0.0040+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC();
+  sigmaz   = 0.0110+4.37*TMath::Abs(track->GetC());
 }
 
 
@@ -3537,8 +3689,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz)
     }   
   }
 }
-
-
+//------------------------------------------------------------------------
 void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const
 {
   //
@@ -3551,9 +3702,7 @@ void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const
     printf("Problem\n");
   }
 }
-
-
-
+//------------------------------------------------------------------------
 Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
   //
   //Get nearest upper layer close to the point xr.
@@ -3570,9 +3719,8 @@ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
   }
   return res;
 }
-
-
-void AliITStrackerMI::UpdateTPCV0(AliESD *event){
+//------------------------------------------------------------------------
+void AliITStrackerMI::UpdateTPCV0(AliESDEvent *event){
   //
   //try to update, or reject TPC  V0s
   //
@@ -3682,10 +3830,8 @@ void AliITStrackerMI::UpdateTPCV0(AliESD *event){
   }
   //
 }
-
-
-
-void  AliITStrackerMI::FindV02(AliESD *event)
+//------------------------------------------------------------------------
+void  AliITStrackerMI::FindV02(AliESDEvent *event)
 {
   //
   // V0 finder
@@ -3740,7 +3886,7 @@ void  AliITStrackerMI::FindV02(AliESD *event)
   //
   Float_t primvertex[3]={GetX(),GetY(),GetZ()};
   //
-  // make its -  esd map
+  // make ITS -  ESD map
   //
   for (Int_t itrack=0;itrack<ntracks+2;itrack++) {
     itsmap[itrack]        = -1;
@@ -3755,7 +3901,7 @@ void  AliITStrackerMI::FindV02(AliESD *event)
     itsmap[esdindex]         =   itrack;
   }
   //
-  // create its tracks from esd tracks if not done before
+  // create ITS tracks from ESD tracks if not done before
   //
   for (Int_t itrack=0;itrack<ntracks;itrack++){
     if (itsmap[itrack]>=0) continue;
@@ -3766,7 +3912,7 @@ void  AliITStrackerMI::FindV02(AliESD *event)
     if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){
       // tracks which can reach inner part of ITS
       // propagate track to outer its volume - with correction for material
-      CorrectForDeadZoneMaterial(tpctrack);  
+      CorrectForTPCtoITSDeadZoneMaterial(tpctrack);  
     }
     itsmap[itrack] = nitstracks;
     fOriginal.AddAt(tpctrack,nitstracks);
@@ -4292,6 +4438,7 @@ void  AliITStrackerMI::FindV02(AliESD *event)
   //
   // delete temporary arrays
   //  
+  delete[] forbidden;
   delete[] minPointAngle;
   delete[] maxr;
   delete[] minr;
@@ -4304,9 +4451,8 @@ void  AliITStrackerMI::FindV02(AliESD *event)
   delete[] helixes;
   delete   pvertex;
 }
-
-
-void AliITStrackerMI::RefitV02(AliESD *event)
+//------------------------------------------------------------------------
+void AliITStrackerMI::RefitV02(AliESDEvent *event)
 {
   //
   //try to refit  V0s in the third path of the reconstruction
@@ -4349,8 +4495,8 @@ void AliITStrackerMI::RefitV02(AliESD *event)
       continue;
     }
     if (v0mi->GetRr()>35){
-      CorrectForDeadZoneMaterial(&tpc0);
-      CorrectForDeadZoneMaterial(&tpc1);
+      CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
+      CorrectForTPCtoITSDeadZoneMaterial(&tpc1);
       if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
        v0temp.SetParamN(tpc0);
        v0temp.SetParamP(tpc1);
@@ -4370,8 +4516,8 @@ void AliITStrackerMI::RefitV02(AliESD *event)
       }
       continue;
     }
-    CorrectForDeadZoneMaterial(&tpc0);
-    CorrectForDeadZoneMaterial(&tpc1);    
+    CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
+    CorrectForTPCtoITSDeadZoneMaterial(&tpc1);    
     //    if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
     if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){
       v0temp.SetParamN(tpc0);
@@ -4392,6 +4538,7 @@ void AliITStrackerMI::RefitV02(AliESD *event)
     }    
   }
 }
+//------------------------------------------------------------------------