]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDtracker.cxx
New version of TOF tracker which uses TOF clusters as an input (A. De Caro)
[u/mrichter/AliRoot.git] / TRD / AliTRDtracker.cxx
index 2269cae1e3b819cd63ea2a2424b1609a431d73c4..6e82a97621e1b0ba3c200ff9307582539112cb0d 100644 (file)
 
 #include "AliTRDgeometry.h"
 #include "AliTRDparameter.h"
+#include "AliTRDpadPlane.h"
 #include "AliTRDgeometryDetail.h"
-#include "AliTRDgeometryHole.h"
 #include "AliTRDcluster.h" 
 #include "AliTRDtrack.h"
-#include "AliTRDPartID.h"
-#include "../TPC/AliTPCtrack.h"
+#include "AliESD.h"
 
+#include "TTreeStream.h"
+#include "TGraph.h"
 #include "AliTRDtracker.h"
+//
 
 ClassImp(AliTRDtracker) 
 
@@ -65,10 +67,26 @@ ClassImp(AliTRDtracker)
 
   const  Double_t    AliTRDtracker::fgkMaxChi2            = 12.; 
 
+//   const  Double_t    AliTRDtracker::fgkOffset             = -0.012;
+//   const  Double_t    AliTRDtracker::fgkOffsetX            = 0.35;
+//   const  Double_t    AliTRDtracker::fgkCoef               = 0.00;
+//   const  Double_t    AliTRDtracker::fgkMean               = 8.;
+//   const  Double_t    AliTRDtracker::fgkDriftCorrection    = 1.07;
+//   const  Double_t    AliTRDtracker::fgkExB                = 0.072;
+
+  const  Double_t    AliTRDtracker::fgkOffset             = -0.015;
+const  Double_t    AliTRDtracker::fgkOffsetX            = 0.26;       // "time offset"  
+  const  Double_t    AliTRDtracker::fgkCoef               = 0.0096;   // angular shift 
+  const  Double_t    AliTRDtracker::fgkMean               = 0.;
+  const  Double_t    AliTRDtracker::fgkDriftCorrection    = 1.04;   // drift coefficient correction
+  const  Double_t    AliTRDtracker::fgkExB                = 0.072;  // ExB angle - for error parameterization
+
+
+//     poscorrection =  fgkCoef*(GetLocalTimeBin() - fgkMean)+fgkOffset; 
+
 const Int_t AliTRDtracker::fgkFirstPlane = 5;
 const Int_t AliTRDtracker::fgkLastPlane = 17;
 
-
 //____________________________________________________________________
 AliTRDtracker::AliTRDtracker():AliTracker(),
                               fGeom(0),
@@ -87,9 +105,12 @@ AliTRDtracker::AliTRDtracker():AliTracker(),
                               fAddTRDseeds(kFALSE),
                               fNoTilt(kFALSE)
 {
+  // Default constructor
+
   for(Int_t i=0;i<kTrackingSectors;i++) fTrSec[i]=0;
   for(Int_t j=0;j<5;j++)
     for(Int_t k=0;k<18;k++) fHoles[j][k]=kFALSE;
+  fDebugStreamer = 0;
 } 
 //____________________________________________________________________
 AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
@@ -120,13 +141,13 @@ AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
 
   if(fGeom) {
     //    fTzero = geo->GetT0();
-    printf("Found geometry version %d on file \n", fGeom->IsVersion());
+    //    printf("Found geometry version %d on file \n", fGeom->IsVersion());
   }
   else { 
     printf("AliTRDtracker::AliTRDtracker(): can't find TRD geometry!\n");
     //printf("The DETAIL TRD geometry will be used\n");
     //fGeom = new AliTRDgeometryDetail();
-    fGeom = new AliTRDgeometryHole();
+    fGeom = new AliTRDgeometryDetail();
     fGeom->SetPHOShole();
     fGeom->SetRICHhole();    
   } 
@@ -134,9 +155,10 @@ AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
   if (!fPar) {  
     printf("AliTRDtracker::AliTRDtracker(): can't find TRD parameter!\n");
     printf("The DEFAULT TRD parameter will be used\n");
-    fPar = new AliTRDparameter();
+    fPar = new AliTRDparameter("Pica","Vyjebana");
   }
-  fPar->ReInit();
+  fPar = new AliTRDparameter("Pica","Vyjebana");
+  fPar->Init();
 
   savedir->cd();  
 
@@ -157,8 +179,9 @@ AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
       fHoles[icham][trS]=fGeom->IsHole(0,icham,geomS);
     }
   }
-
-  Float_t tiltAngle = TMath::Abs(fPar->GetTiltingAngle()); 
+  AliTRDpadPlane *padPlane = fPar->GetPadPlane(0,0);
+  Float_t tiltAngle = TMath::Abs(padPlane->GetTiltingAngle());
+  //  Float_t tiltAngle = TMath::Abs(fPar->GetTiltingAngle()); 
   if(tiltAngle < 0.1) {
     fNoTilt = kTRUE;
   }
@@ -174,7 +197,9 @@ AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
   Double_t dxAmp = (Double_t) fGeom->CamHght();   // Amplification region
   Double_t dxDrift = (Double_t) fGeom->CdrHght(); // Drift region
 
-  Double_t dx = (Double_t) fPar->GetTimeBinSize();   
+  Double_t dx = fgkDriftCorrection*(Double_t) fPar->GetDriftVelocity()
+                         / fPar->GetSamplingFrequency();
+
   Int_t tbAmp = fPar->GetTimeBefore();
   Int_t maxAmp = (Int_t) ((dxAmp+0.000001)/dx);
   if(kTRUE) maxAmp = 0;  // intentional until we change the parameter class 
@@ -188,14 +213,8 @@ AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
   fMaxGap = (Int_t) (fTimeBinsPerPlane * fGeom->Nplan() * fgkSkipDepth);
 
   fVocal = kFALSE;
-
-
-  // Barrel Tracks [SR, 03.04.2003]
-
-  fBarrelFile = 0;
-  fBarrelTree = 0;
-  fBarrelArray = 0;
-  fBarrelTrack = 0;
+  
+  fDebugStreamer = new TTreeSRedirector("TRDdebug.root");
 
   savedir->cd();
 }   
@@ -225,82 +244,11 @@ AliTRDtracker::~AliTRDtracker()
   for(Int_t geomS = 0; geomS < kTrackingSectors; geomS++) {
     delete fTrSec[geomS];
   }
-}   
-
-//_____________________________________________________________________
-
-void AliTRDtracker::SetBarrelTree(const char *mode) {
-  //
-  //
-  //
-
-  if (!IsStoringBarrel()) return;
-
-  TDirectory *sav = gDirectory;
-  if (!fBarrelFile) fBarrelFile = new TFile("AliBarrelTracks.root", "UPDATE");
-
-  char buff[40];
-  sprintf(buff,  "BarrelTRD_%d_%s", GetEventNumber(), mode);
-
-  fBarrelFile->cd();
-  fBarrelTree = new TTree(buff, "Barrel TPC tracks");
-  
-  Int_t nRefs = fgkLastPlane - fgkFirstPlane + 1;
-
-  if (!fBarrelArray) fBarrelArray = new TClonesArray("AliBarrelTrack", nRefs);
-  for(Int_t i=0; i<nRefs; i++) new((*fBarrelArray)[i]) AliBarrelTrack();
-  
-  fBarrelTree->Branch("tracks", &fBarrelArray);
-  sav->cd();
-}
-  
-//_____________________________________________________________________
-
-void AliTRDtracker::StoreBarrelTrack(AliTRDtrack *ps, Int_t refPlane, Int_t isIn) {
-  //
-  //
-  //
-  
-  if (!IsStoringBarrel()) return;
-  
-  static Int_t nClusters;
-  static Int_t nWrong;
-  static Double_t chi2;
-  static Int_t index;
-  static Bool_t wasLast = kTRUE;
-  
-  Int_t newClusters, newWrong;
-  Double_t newChi2;
-  
-  if (wasLast) {   
-    fBarrelArray->Clear();
-    nClusters = nWrong = 0;
-    chi2 = 0.0;
-    index = 0;
-    wasLast = kFALSE;
+  if (fDebugStreamer) {    
+    //fDebugStreamer->Close();
+    delete fDebugStreamer;
   }
-  
-  fBarrelTrack = (AliBarrelTrack*)(*fBarrelArray)[index++];
-  ps->GetBarrelTrack(fBarrelTrack);
-  
-  newClusters = ps->GetNumberOfClusters() - nClusters; 
-  newWrong = ps->GetNWrong() - nWrong;
-  newChi2 = ps->GetChi2() - chi2;
-  
-  nClusters =  ps->GetNumberOfClusters();
-  nWrong = ps->GetNWrong();
-  chi2 = ps->GetChi2();  
-
-  if (refPlane != fgkLastPlane) {
-    fBarrelTrack->SetNClusters(newClusters, newChi2);
-    fBarrelTrack->SetNWrongClusters(newWrong);
-  } else {
-    wasLast = kTRUE;
-  } 
-
-  fBarrelTrack->SetRefPlane(refPlane, isIn);
-}
+}   
 
 //_____________________________________________________________________
 
@@ -380,7 +328,7 @@ inline Double_t f3trd(Double_t x1,Double_t y1,
 }            
 
 
-AliTRDcluster * AliTRDtracker::GetCluster(AliTRDtrack * track, Int_t plane, Int_t timebin){
+AliTRDcluster * AliTRDtracker::GetCluster(AliTRDtrack * track, Int_t plane, Int_t timebin, UInt_t &index){
   //
   //try to find cluster in the backup list
   //
@@ -394,6 +342,7 @@ AliTRDcluster * AliTRDtracker::GetCluster(AliTRDtrack * track, Int_t plane, Int_
     Int_t iplane = fGeom->GetPlane(cli->GetDetector());
     if (iplane==plane) {
       cl = cli;
+      index = indexes[i];
       break;
     }
   }
@@ -416,173 +365,6 @@ Int_t  AliTRDtracker::GetLastPlane(AliTRDtrack * track){
   }
   return lastplane;
 }
-//___________________________________________________________________
-Int_t AliTRDtracker::Clusters2Tracks(const TFile *inp, TFile *out)
-{
-  //
-  // Finds tracks within the TRD. File <inp> is expected to contain seeds 
-  // at the outer part of the TRD. If <inp> is NULL, the seeds
-  // are found within the TRD if fAddTRDseeds is TRUE. 
-  // The tracks are propagated to the innermost time bin 
-  // of the TRD and stored in file <out>. 
-  //
-
-  LoadEvent();
-  TDirectory *savedir=gDirectory;
-
-  char   tname[100];
-
-  if (!out->IsOpen()) {
-    cerr<<"AliTRDtracker::Clusters2Tracks(): output file is not open !\n";
-    return 1;
-  }    
-
-  sprintf(tname,"seedTRDtoTPC_%d",GetEventNumber()); 
-  TTree tpcTree(tname,"Tree with seeds from TRD at outer TPC pad row");
-  AliTPCtrack *iotrack=0;
-  tpcTree.Branch("tracks","AliTPCtrack",&iotrack,32000,0); 
-
-  sprintf(tname,"TreeT%d_TRD",GetEventNumber());
-  TTree trdTree(tname,"TRD tracks at inner TRD time bin");
-  AliTRDtrack *iotrackTRD=0;
-  trdTree.Branch("tracks","AliTRDtrack",&iotrackTRD,32000,0);  
-
-  Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
-  Float_t foundMin = fgkMinClustersInTrack * timeBins; 
-
-  if (inp) {
-     TFile *in=(TFile*)inp;
-     if (!in->IsOpen()) {
-        cerr<<
-          "AliTRDtracker::Clusters2Tracks(): file with seeds is not open !\n";
-        cerr<<" ... going for seeds finding inside the TRD\n";
-     }
-     else {
-       in->cd();
-       sprintf(tname,"TRDb_%d",GetEventNumber());  
-       TTree *seedTree=(TTree*)in->Get(tname);  
-       if (!seedTree) {
-         cerr<<"AliTRDtracker::Clusters2Tracks(): ";
-         cerr<<"can't get a tree with track seeds !\n";
-         return 3;
-       }  
-       AliTRDtrack *seed=new AliTRDtrack;
-       seedTree->SetBranchAddress("tracks",&seed);
-
-       Int_t n=(Int_t)seedTree->GetEntries();
-       for (Int_t i=0; i<n; i++) {
-         seedTree->GetEvent(i);
-         seed->ResetCovariance(); 
-         AliTRDtrack *tr = new AliTRDtrack(*seed,seed->GetAlpha());
-         fSeeds->AddLast(tr);
-         fNseeds++;
-       }          
-       delete seed;
-       delete seedTree;
-     }
-  }
-
-  out->cd();
-
-
-  // find tracks from loaded seeds
-
-  Int_t nseed=fSeeds->GetEntriesFast();
-  Int_t i, found = 0;
-  Int_t innerTB = fTrSec[0]->GetInnerTimeBin();
-
-  for (i=0; i<nseed; i++) {   
-    AliTRDtrack *pt=(AliTRDtrack*)fSeeds->UncheckedAt(i), &t=*pt; 
-    FollowProlongation(t, innerTB); 
-    if (t.GetNumberOfClusters() >= foundMin) {
-      UseClusters(&t);
-      CookLabel(pt, 1-fgkLabelFraction);
-      //      t.CookdEdx();
-    }
-    iotrackTRD = pt;
-    trdTree.Fill();
-    found++;
-//    cout<<found<<'\r';     
-
-    if(PropagateToTPC(t)) {
-      AliTPCtrack *tpc = new AliTPCtrack(*pt,pt->GetAlpha());
-      iotrack = tpc;
-      tpcTree.Fill();
-      delete tpc;
-    }  
-    delete fSeeds->RemoveAt(i);
-    fNseeds--;
-  }     
-
-  cout<<"Number of loaded seeds: "<<nseed<<endl;  
-  cout<<"Number of found tracks from loaded seeds: "<<found<<endl;
-
-  // after tracks from loaded seeds are found and the corresponding 
-  // clusters are used, look for additional seeds from TRD
-
-  if(fAddTRDseeds) { 
-    // Find tracks for the seeds in the TRD
-    Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
-  
-    Int_t nSteps = (Int_t) (fgkSeedDepth / fgkSeedStep);
-    Int_t gap = (Int_t) (timeBins * fgkSeedGap);
-    Int_t step = (Int_t) (timeBins * fgkSeedStep);
-  
-    // make a first turn with tight cut on initial curvature
-    for(Int_t turn = 1; turn <= 2; turn++) {
-      if(turn == 2) {
-        nSteps = (Int_t) (fgkSeedDepth / (3*fgkSeedStep));
-        step = (Int_t) (timeBins * (3*fgkSeedStep));
-      }
-      for(Int_t i=0; i<nSteps; i++) {
-        Int_t outer=timeBins-1-i*step; 
-        Int_t inner=outer-gap;
-
-        nseed=fSeeds->GetEntriesFast();
-      
-        MakeSeeds(inner, outer, turn);
-      
-        nseed=fSeeds->GetEntriesFast();
-        printf("\n turn %d, step %d: number of seeds for TRD inward %d\n", 
-               turn, i, nseed); 
-              
-        for (Int_t i=0; i<nseed; i++) {   
-          AliTRDtrack *pt=(AliTRDtrack*)fSeeds->UncheckedAt(i), &t=*pt; 
-          FollowProlongation(t,innerTB); 
-          if (t.GetNumberOfClusters() >= foundMin) {
-            UseClusters(&t);
-            CookLabel(pt, 1-fgkLabelFraction);
-            t.CookdEdx();
-            found++;
-//            cout<<found<<'\r';     
-            iotrackTRD = pt;
-            trdTree.Fill();
-            if(PropagateToTPC(t)) {
-              AliTPCtrack *tpc = new AliTPCtrack(*pt,pt->GetAlpha());
-              iotrack = tpc;
-              tpcTree.Fill();
-              delete tpc;
-            }        
-          }
-          delete fSeeds->RemoveAt(i);
-          fNseeds--;
-        }
-      }
-    }
-  }
-  tpcTree.Write(); 
-  trdTree.Write(); 
-  
-  cout<<"Total number of found tracks: "<<found<<endl;
-    
-  UnloadEvent();
-    
-  savedir->cd();  
-  
-  return 0;    
-}     
-          
 //___________________________________________________________________
 Int_t AliTRDtracker::Clusters2Tracks(AliESD* event)
 {
@@ -607,7 +389,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESD* event)
     if ( (status & AliESDtrack::kTRDout ) == 0 ) continue;
     if ( (status & AliESDtrack::kTRDin) != 0 ) continue;
     nseed++;
-
+    
     AliTRDtrack* seed2 = new AliTRDtrack(*seed);
     //seed2->ResetCovariance(); 
     AliTRDtrack *pt = new AliTRDtrack(*seed2,seed2->GetAlpha());
@@ -657,8 +439,8 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESD* event)
         MakeSeeds(inner, outer, turn);
       
         nseed=fSeeds->GetEntriesFast();
-        printf("\n turn %d, step %d: number of seeds for TRD inward %d\n", 
-               turn, i, nseed); 
+       //        printf("\n turn %d, step %d: number of seeds for TRD inward %d\n", 
+       //               turn, i, nseed); 
               
         for (Int_t i=0; i<nseed; i++) {   
           AliTRDtrack *pt=(AliTRDtrack*)fSeeds->UncheckedAt(i), &t=*pt; 
@@ -673,6 +455,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESD* event)
              AliESDtrack track;
              track.UpdateTrackParams(pt,AliESDtrack::kTRDin);
              event->AddTrack(&track);
+             //              track.SetTRDtrack(new AliTRDtrack(*pt));
             }        
           }
           delete fSeeds->RemoveAt(i);
@@ -689,196 +472,6 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESD* event)
      
   
 
-//_____________________________________________________________________________
-Int_t AliTRDtracker::PropagateBack(const TFile *inp, TFile *out) {
-  //
-  // Reads seeds from file <inp>. The seeds are AliTPCtrack's found and
-  // backpropagated by the TPC tracker. Each seed is first propagated 
-  // to the TRD, and then its prolongation is searched in the TRD.
-  // If sufficiently long continuation of the track is found in the TRD
-  // the track is updated, otherwise it's stored as originaly defined 
-  // by the TPC tracker.   
-  //  
-
-  LoadEvent();
-
-  TDirectory *savedir=gDirectory;
-
-  TFile *in=(TFile*)inp;
-
-  if (!in->IsOpen()) {
-     cerr<<"AliTRDtracker::PropagateBack(): ";
-     cerr<<"file with back propagated TPC tracks is not open !\n";
-     return 1;
-  }                   
-
-  if (!out->IsOpen()) {
-     cerr<<"AliTRDtracker::PropagateBack(): ";
-     cerr<<"file for back propagated TRD tracks is not open !\n";
-     return 2;
-  }      
-
-  in->cd();
-  char   tname[100];
-  sprintf(tname,"seedsTPCtoTRD_%d",GetEventNumber());       
-  TTree *seedTree=(TTree*)in->Get(tname);
-  if (!seedTree) {
-     cerr<<"AliTRDtracker::PropagateBack(): ";
-     cerr<<"can't get a tree with seeds from TPC !\n";
-     cerr<<"check if your version of TPC tracker creates tree "<<tname<<"\n";
-     return 3;
-  }
-
-  AliTPCtrack *seed=new AliTPCtrack;
-  seedTree->SetBranchAddress("tracks",&seed);
-
-  Int_t n=(Int_t)seedTree->GetEntries();
-  for (Int_t i=0; i<n; i++) {
-     seedTree->GetEvent(i);
-     Int_t lbl = seed->GetLabel();
-     AliTRDtrack *tr = new AliTRDtrack(*seed,seed->GetAlpha());
-     tr->SetSeedLabel(lbl);
-     fSeeds->AddLast(tr);
-     fNseeds++;
-  }
-
-  delete seed;
-  delete seedTree;
-
-  out->cd();
-
-  AliTPCtrack *otrack=0;
-
-  sprintf(tname,"seedsTRDtoTOF1_%d",GetEventNumber());  
-  TTree tofTree1(tname,"Tracks back propagated through TPC and TRD");
-  tofTree1.Branch("tracks","AliTPCtrack",&otrack,32000,0);  
-
-  sprintf(tname,"seedsTRDtoTOF2_%d",GetEventNumber());  
-  TTree tofTree2(tname,"Tracks back propagated through TPC and TRD");
-  tofTree2.Branch("tracks","AliTPCtrack",&otrack,32000,0);  
-
-  sprintf(tname,"seedsTRDtoPHOS_%d",GetEventNumber());  
-  TTree phosTree(tname,"Tracks back propagated through TPC and TRD");
-  phosTree.Branch("tracks","AliTPCtrack",&otrack,32000,0);  
-
-  sprintf(tname,"seedsTRDtoRICH_%d",GetEventNumber());  
-  TTree richTree(tname,"Tracks back propagated through TPC and TRD");
-  richTree.Branch("tracks","AliTPCtrack",&otrack,32000,0);  
-
-  sprintf(tname,"TRDb_%d",GetEventNumber());  
-  TTree trdTree(tname,"Back propagated TRD tracks at outer TRD time bin");
-  AliTRDtrack *otrackTRD=0;
-  trdTree.Branch("tracks","AliTRDtrack",&otrackTRD,32000,0);   
-     
-  if (IsStoringBarrel()) SetBarrelTree("back");
-  out->cd();
-
-  Int_t found=0;  
-  Int_t nseed=fSeeds->GetEntriesFast();
-
-  //  Float_t foundMin = fgkMinClustersInTrack * fTimeBinsPerPlane * fGeom->Nplan(); 
-  Float_t foundMin = 40;
-
-  Int_t outermostTB  = fTrSec[0]->GetOuterTimeBin();
-
-  for (Int_t i=0; i<nseed; i++) {  
-
-    AliTRDtrack *ps=(AliTRDtrack*)fSeeds->UncheckedAt(i), &s=*ps;
-    Int_t expectedClr = FollowBackProlongation(s);
-
-    if (IsStoringBarrel()) {
-      StoreBarrelTrack(ps, fgkLastPlane, kTrackBack);
-      fBarrelTree->Fill();        
-    }
-
-    Int_t foundClr = s.GetNumberOfClusters();
-    Int_t lastTB = fTrSec[0]->GetLayerNumber(s.GetX());
-
-    //    printf("seed %d: found %d out of %d expected clusters, Min is %f\n",
-    //     i, foundClr, expectedClr, foundMin);
-
-    if (foundClr >= foundMin) {
-      if(foundClr >= 2) {
-       s.CookdEdx(); 
-       CookLabel(ps, 1-fgkLabelFraction);
-       UseClusters(ps);
-      }
-      
-      // Propagate to outer reference plane [SR, GSI, 18.02.2003]
-      ps->PropagateTo(364.8);
-      otrackTRD=ps;
-      trdTree.Fill();
-      found++;
-//      cout<<found<<'\r';
-    }
-
-    if(((expectedClr < 10) && (lastTB == outermostTB)) ||
-       ((expectedClr >= 10) && 
-        (((Float_t) foundClr) / ((Float_t) expectedClr) >= 
-         fgkMinFractionOfFoundClusters) && (lastTB == outermostTB))) {
-
-      Double_t xTOF = 375.5;
-    
-      if(PropagateToOuterPlane(s,xTOF)) {
-        AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
-        otrack = pt;
-        tofTree1.Fill();
-        delete pt;
-
-        xTOF = 381.5;
-    
-        if(PropagateToOuterPlane(s,xTOF)) {
-          AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
-          otrack = pt;
-          tofTree2.Fill();
-          delete pt;
-
-          Double_t xPHOS = 460.;
-          
-          if(PropagateToOuterPlane(s,xPHOS)) {
-            AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
-            otrack = pt;
-            phosTree.Fill();
-            delete pt;
-            
-            Double_t xRICH = 490+1.267;
-            
-            if(PropagateToOuterPlane(s,xRICH)) {
-              AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
-              otrack = pt;
-              richTree.Fill();
-              delete pt;
-            }   
-          }
-        }
-      }      
-    }
-  }
-  
-  
-  out->cd();
-  tofTree1.Write(); 
-  tofTree2.Write(); 
-  phosTree.Write(); 
-  richTree.Write(); 
-  trdTree.Write(); 
-
-  if (IsStoringBarrel()) { // [SR, 03.04.2003]
-    fBarrelFile->cd();
-    fBarrelTree->Write();
-    fBarrelFile->Flush();
-  }
-
-  savedir->cd();  
-  cerr<<"Number of seeds: "<<nseed<<endl;  
-  cerr<<"Number of back propagated TRD tracks: "<<found<<endl;
-
-  UnloadEvent();
-
-  return 0;
-
-}
-
 //_____________________________________________________________________________
 Int_t AliTRDtracker::PropagateBack(AliESD* event) {
   //
@@ -891,11 +484,24 @@ Int_t AliTRDtracker::PropagateBack(AliESD* event) {
   //  
 
   Int_t found=0;  
-  Float_t foundMin = 40;
-
+  Float_t foundMin = 20;
   Int_t n = event->GetNumberOfTracks();
+  //
+  //Sort tracks
+  Float_t *quality =new Float_t[n];
+  Int_t *index   =new Int_t[n];
   for (Int_t i=0; i<n; i++) {
     AliESDtrack* seed=event->GetTrack(i);
+    Double_t covariance[15];
+    seed->GetExternalCovariance(covariance);
+    quality[i] = covariance[0]+covariance[2];      
+  }
+  TMath::Sort(n,quality,index,kFALSE);
+  //
+  for (Int_t i=0; i<n; i++) {
+    //    AliESDtrack* seed=event->GetTrack(i);
+    AliESDtrack* seed=event->GetTrack(index[i]);
+
     ULong_t status=seed->GetStatus();
     if ( (status & AliESDtrack::kTPCout ) == 0 ) continue;
     if ( (status & AliESDtrack::kTRDout) != 0 ) continue;
@@ -903,9 +509,13 @@ Int_t AliTRDtracker::PropagateBack(AliESD* event) {
     Int_t lbl = seed->GetLabel();
     AliTRDtrack *track = new AliTRDtrack(*seed);
     track->SetSeedLabel(lbl);
+    seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup); //make backup
     fNseeds++;
-
+    Float_t p4     = track->GetC();
+    //
     Int_t expectedClr = FollowBackProlongation(*track);
+    /*
+      // only debug purpose
     if (track->GetNumberOfClusters()<expectedClr/3){
       AliTRDtrack *track1 = new AliTRDtrack(*seed);
       track1->SetSeedLabel(lbl);
@@ -916,53 +526,121 @@ Int_t AliTRDtracker::PropagateBack(AliESD* event) {
       delete track1;
       delete track2;
     }
-    
-    Int_t foundClr = track->GetNumberOfClusters();
-    if (foundClr >= foundMin) {
-      if(foundClr >= 2) {
+    */
+    if (TMath::Abs(track->GetC()-p4)/TMath::Abs(p4)<0.2 || TMath::Abs(track->GetPt())>0.8 ) {
+      // 
+      //make backup for back propagation 
+      //
+      Int_t foundClr = track->GetNumberOfClusters();
+      if (foundClr >= foundMin) {
        track->CookdEdx(); 
-//     CookLabel(track, 1-fgkLabelFraction);
-       UseClusters(track);
+       CookLabel(track, 1-fgkLabelFraction);
+       if(track->GetChi2()/track->GetNumberOfClusters()<4) {   // sign only gold tracks
+         if (seed->GetKinkIndex(0)==0&&TMath::Abs(track->GetPt())<1.5 ) UseClusters(track);
+       }
+       Bool_t isGold = kFALSE;
+       
+       if (track->GetChi2()/track->GetNumberOfClusters()<5) {  //full gold track
+         // seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
+          if (track->GetBackupTrack()) seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
+         isGold = kTRUE;
+       }
+       if (!isGold && track->GetNCross()==0&&track->GetChi2()/track->GetNumberOfClusters()<7){ //almost gold track
+         //      seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
+         if (track->GetBackupTrack()) seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
+         isGold = kTRUE;
+       }
+       if (!isGold && track->GetBackupTrack()){
+         if (track->GetBackupTrack()->GetNumberOfClusters()>foundMin&&
+             (track->GetBackupTrack()->GetChi2()/(track->GetBackupTrack()->GetNumberOfClusters()+1))<7){         
+           seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
+           isGold = kTRUE;
+         }
+       }
+       if (track->StatusForTOF()>0 &&track->fNCross==0 && Float_t(track->fN)/Float_t(track->fNExpected)>0.4){
+         seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
+       }
       }
-      
-      // Propagate to outer reference plane [SR, GSI, 18.02.2003]
-//      track->PropagateTo(364.8);  why?
-      
-      //seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
-      //found++;
     }
-
+    //
     //Propagation to the TOF (I.Belikov)
     
     if (track->GetStop()==kFALSE){
-      Double_t xTOF = 375.5;    
-      PropagateToOuterPlane(*track,xTOF); 
       
-      Double_t xtof=378.;
+      Double_t xtof=371.;
       Double_t c2=track->GetC()*xtof - track->GetEta();
-      if (TMath::Abs(c2)>=0.9999999) continue;
-      
+      if (TMath::Abs(c2)>=0.99) {
+       delete track;
+       continue;
+      }
+      Double_t xTOF0 = 365. ;          
+      PropagateToOuterPlane(*track,xTOF0); 
+      //
+      //energy losses taken to the account - check one more time
+      c2=track->GetC()*xtof - track->GetEta();
+      if (TMath::Abs(c2)>=0.99) {
+       delete track;
+       continue;
+      }
+
+      //      
       Double_t ymax=xtof*TMath::Tan(0.5*AliTRDgeometry::GetAlpha());
       Double_t y=track->GetYat(xtof);
       if (y > ymax) {
-       if (!track->Rotate(AliTRDgeometry::GetAlpha())) return 1;
+       if (!track->Rotate(AliTRDgeometry::GetAlpha())) {
+         delete track;
+         continue;
+       }
       } else if (y <-ymax) {
-       if (!track->Rotate(-AliTRDgeometry::GetAlpha())) return 1;
+       if (!track->Rotate(-AliTRDgeometry::GetAlpha())) {
+         delete track;
+         continue;
+       }
       }
       
       if (track->PropagateTo(xtof)) {
-       seed->UpdateTrackParams(track, AliESDtrack::kTRDout);    
+       seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
+        for (Int_t i=0;i<kNPlane;i++) {
+           seed->SetTRDsignals(track->GetPIDsignals(i),i);
+           seed->SetTRDTimBin(track->GetPIDTimBin(i),i);
+        }
+       //      seed->SetTRDtrack(new AliTRDtrack(*track));
        if (track->GetNumberOfClusters()>foundMin) found++;
       }
     }else{
       if (track->GetNumberOfClusters()>15&&track->GetNumberOfClusters()>0.5*expectedClr){
        seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
-       seed->UpdateTrackParams(track, AliESDtrack::kTRDStop);    
+       //seed->SetStatus(AliESDtrack::kTRDStop);    
+        for (Int_t i=0;i<kNPlane;i++) {
+           seed->SetTRDsignals(track->GetPIDsignals(i),i);
+           seed->SetTRDTimBin(track->GetPIDTimBin(i),i);
+        }
+       //seed->SetTRDtrack(new AliTRDtrack(*track));
        found++;
       }
     }
-
-    
+    seed->SetTRDQuality(track->StatusForTOF());    
+    //
+    // Debug part of tracking
+    TTreeSRedirector& cstream = *fDebugStreamer;
+    Int_t eventNr = event->GetEventNumber();
+    if (track->GetBackupTrack()){
+      cstream<<"Tracks"<<
+       "EventNr="<<eventNr<<
+       "ESD.="<<seed<<
+       "trd.="<<track<<
+       "trdback.="<<track->GetBackupTrack()<<  
+       "\n";
+    }else{
+      cstream<<"Tracks"<<
+       "EventNr="<<eventNr<<
+       "ESD.="<<seed<<
+       "trd.="<<track<<
+       "trdback.="<<track<<
+       "\n";
+    }
+    delete track;
+    //
     //End of propagation to the TOF
     //if (foundClr>foundMin)
     //  seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
@@ -973,8 +651,13 @@ Int_t AliTRDtracker::PropagateBack(AliESD* event) {
   cerr<<"Number of seeds: "<<fNseeds<<endl;  
   cerr<<"Number of back propagated TRD tracks: "<<found<<endl;
 
-  fSeeds->Clear(); fNseeds=0;
+  //  MakeSeedsMI(3,5); //new seeding
+
 
+  fSeeds->Clear(); fNseeds=0;
+  delete [] index;
+  delete [] quality;
+  
   return 0;
 
 }
@@ -995,19 +678,42 @@ Int_t AliTRDtracker::RefitInward(AliESD* event)
   Int_t nseed = 0;
   Int_t found = 0;
   Int_t innerTB = fTrSec[0]->GetInnerTimeBin();
+  AliTRDtrack seed2;
 
   Int_t n = event->GetNumberOfTracks();
   for (Int_t i=0; i<n; i++) {
     AliESDtrack* seed=event->GetTrack(i);
+    new(&seed2) AliTRDtrack(*seed);
+    if (seed2.GetX()<270){
+      seed->UpdateTrackParams(&seed2, AliESDtrack::kTRDbackup); // backup TPC track - only update
+      continue;
+    }
+
     ULong_t status=seed->GetStatus();
-    if ( (status & AliESDtrack::kTRDout ) == 0 ) continue;
-    if ( (status & AliESDtrack::kTRDin) != 0 ) continue;
-    nseed++;
+    if ( (status & AliESDtrack::kTRDout ) == 0 ) {
+      continue;
+    }
+    if ( (status & AliESDtrack::kTRDin) != 0 ) {
+      continue;
+    }
+    nseed++;    
+//     if (1/seed2.Get1Pt()>1.5&& seed2.GetX()>260.) {
+//       Double_t oldx = seed2.GetX();
+//       seed2.PropagateTo(500.);
+//       seed2.ResetCovariance(1.);
+//       seed2.PropagateTo(oldx);
+//     }
+//     else{
+//       seed2.ResetCovariance(5.); 
+//     }
+
+    AliTRDtrack *pt = new AliTRDtrack(seed2,seed2.GetAlpha());
+    UInt_t * indexes2 = seed2.GetIndexes();
+    for (Int_t i=0;i<kNPlane;i++) {
+      pt->SetPIDsignals(seed2.GetPIDsignals(i),i);
+      pt->SetPIDTimBin(seed2.GetPIDTimBin(i),i);
+    }
 
-    AliTRDtrack* seed2 = new AliTRDtrack(*seed);
-    seed2->ResetCovariance(5.); 
-    AliTRDtrack *pt = new AliTRDtrack(*seed2,seed2->GetAlpha());
-    UInt_t * indexes2 = seed2->GetIndexes();
     UInt_t * indexes3 = pt->GetBackupIndexes();
     for (Int_t i=0;i<200;i++) {
       if (indexes2[i]==0) break;
@@ -1016,34 +722,40 @@ Int_t AliTRDtracker::RefitInward(AliESD* event)
     //AliTRDtrack *pt = seed2;
     AliTRDtrack &t=*pt; 
     FollowProlongation(t, innerTB); 
-
-    if (t.GetNumberOfClusters()<seed->GetTRDclusters(indexes3)*0.5){
-      // debug  - why we dont go back?
-      AliTRDtrack *pt2 = new AliTRDtrack(*seed2,seed2->GetAlpha());
-      UInt_t * indexes2 = seed2->GetIndexes();
-      UInt_t * indexes3 = pt2->GetBackupIndexes();
-      for (Int_t i=0;i<200;i++) {
-       if (indexes2[i]==0) break;
-       indexes3[i] = indexes2[i];
-      }  
-      FollowProlongation(*pt2, innerTB);
-      delete pt2;
-    }
-
     if (t.GetNumberOfClusters() >= foundMin) {
       //      UseClusters(&t);
       //CookLabel(pt, 1-fgkLabelFraction);
-      //      t.CookdEdx();
+      t.CookdEdx();
+      CookdEdxTimBin(t);
     }
     found++;
 //    cout<<found<<'\r';     
 
     if(PropagateToTPC(t)) {
       seed->UpdateTrackParams(pt, AliESDtrack::kTRDrefit);
+      for (Int_t i=0;i<kNPlane;i++) {
+        seed->SetTRDsignals(pt->GetPIDsignals(i),i);
+        seed->SetTRDTimBin(pt->GetPIDTimBin(i),i);
+      }
+    }else{
+      //if not prolongation to TPC - propagate without update
+      AliTRDtrack* seed2 = new AliTRDtrack(*seed);
+      seed2->ResetCovariance(5.); 
+      AliTRDtrack *pt2 = new AliTRDtrack(*seed2,seed2->GetAlpha());
+      delete seed2;
+      if (PropagateToTPC(*pt2)) { 
+        pt2->CookdEdx(0.,1.);
+        CookdEdxTimBin(*pt2);
+       seed->UpdateTrackParams(pt2, AliESDtrack::kTRDrefit);
+        for (Int_t i=0;i<kNPlane;i++) {
+          seed->SetTRDsignals(pt2->GetPIDsignals(i),i);
+          seed->SetTRDTimBin(pt2->GetPIDTimBin(i),i);
+        }
+      }
+      delete pt2;
     }  
-    delete seed2;
     delete pt;
-  }     
+  }   
 
   cout<<"Number of loaded seeds: "<<nseed<<endl;  
   cout<<"Number of found tracks from loaded seeds: "<<found<<endl;
@@ -1168,7 +880,7 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack& t, Int_t rf)
       wZwindow  = TMath::Sqrt(2.25 * 12 * sz2);   
 
       // Find the closest correct cluster for debugging purposes
-      if (timeBin) {
+      if (timeBin&&fVocal) {
         Float_t minDY = 1000000;
         for (Int_t i=0; i<timeBin; i++) {
           AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
@@ -1199,7 +911,7 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack& t, Int_t rf)
        Int_t plane = fGeom->GetPlane(cl0->GetDetector());
        if (plane>lastplane) continue;
        Int_t timebin = cl0->GetLocalTimeBin();
-       AliTRDcluster * cl2= GetCluster(&t,plane, timebin);
+       AliTRDcluster * cl2= GetCluster(&t,plane, timebin,index);
        if (cl2) {
          cl =cl2;      
          Double_t h01 = GetTiltFactor(cl);
@@ -1212,51 +924,14 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack& t, Int_t rf)
          continue;
        }             
 
-
-       if(!cl){
-
-         for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
-           AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
-           if (c->GetY() > y+road) break;
-           if (c->IsUsed() > 0) continue;
-           if((c->GetZ()-z)*(c->GetZ()-z) > 3 * sz2) continue;
-           
-           Double_t h01 = GetTiltFactor(c);
-           Double_t chi2=t.GetPredictedChi2(c,h01);
-           
-           if (chi2 > maxChi2) continue;
-           maxChi2=chi2;
-           cl=c;
-           index=timeBin.GetIndex(i);
-         }               
-       }
-
-        if(!cl) {
-
-          for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
-            AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
-            
-            if (c->GetY() > y+road) break;
-            if (c->IsUsed() > 0) continue;
-            if((c->GetZ()-z)*(c->GetZ()-z) > 12 * sz2) continue;
-            
-            Double_t h01 = GetTiltFactor(c);
-            Double_t chi2=t.GetPredictedChi2(c, h01);
-            
-            if (chi2 > maxChi2) continue;
-            maxChi2=chi2;
-            cl=c;
-            index=timeBin.GetIndex(i);
-          }
-        }        
         if (cl) {
+         
           wYclosest = cl->GetY();
           wZclosest = cl->GetZ();
           Double_t h01 = GetTiltFactor(cl);
 
-          t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters()); 
-         //printf("Track   position\t%f\t%f\t%f\n",t.GetX(),t.GetY(),t.GetZ());
-         //printf("Cluster position\t%d\t%f\t%f\n",cl->GetLocalTimeBin(),cl->GetY(),cl->GetZ());
+          if (cl->GetNPads()<5) 
+           t.SetSampledEdx(TMath::Abs(cl->GetQ()/dx)); 
          Int_t det = cl->GetDetector();    
          Int_t plane = fGeom->GetPlane(det);
 
@@ -1270,32 +945,6 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack& t, Int_t rf)
           //if (tryAgain==0) break; 
           tryAgain--;
         }
-
-        /*
-        if((((Int_t) wTB)%15 == 0) || (((Int_t) wTB)%15 == 14)) {
-          
-          printf(" %f", wIndex);       //1
-          printf(" %f", wTB);          //2
-          printf(" %f", wYrt);         //3
-          printf(" %f", wYclosest);    //4
-          printf(" %f", wYcorrect);    //5
-          printf(" %f", wYwindow);     //6
-          printf(" %f", wZrt);         //7
-          printf(" %f", wZclosest);    //8
-          printf(" %f", wZcorrect);    //9
-          printf(" %f", wZwindow);     //10
-          printf(" %f", wPx);          //11
-          printf(" %f", wPy);          //12
-          printf(" %f", wPz);          //13
-          printf(" %f", wSigmaC2*1000000);  //14
-          printf(" %f", wSigmaTgl2*1000);   //15
-          printf(" %f", wSigmaY2);     //16
-          //      printf(" %f", wSigmaZ2);     //17
-          printf(" %f", wChi2);     //17
-          printf(" %f", wC);           //18
-          printf("\n");
-        } 
-        */                        
       }
     }  
   }
@@ -1313,23 +962,19 @@ Int_t AliTRDtracker::FollowBackProlongation(AliTRDtrack& t)
   // layers confirms prolongation if a close cluster is found. 
   // Returns the number of clusters expected to be found in sensitive layers
 
-  Float_t  wIndex, wTB, wChi2;
-  Float_t  wYrt, wYclosest, wYcorrect, wYwindow;
-  Float_t  wZrt, wZclosest, wZcorrect, wZwindow;
-  Float_t  wPx, wPy, wPz, wC;
-  Double_t px, py, pz;
-  Float_t  wSigmaC2, wSigmaTgl2, wSigmaY2, wSigmaZ2;
-
-  Int_t trackIndex = t.GetLabel();  
   Int_t tryAgain=fMaxGap;
 
   Double_t alpha=t.GetAlpha();
   TVector2::Phi_0_2pi(alpha);
 
   Int_t s;
+  
+  Int_t clusters[1000];
+  for (Int_t i=0;i<1000;i++) clusters[i]=-1;
 
   Int_t outerTB = fTrSec[0]->GetOuterTimeBin();
-  Double_t radLength, rho, x, dx, y, ymax = 0, z;
+  //Double_t radLength, rho, x, dx, y, ymax = 0, z;
+  Double_t radLength, rho, x, dx, y, z;
   Bool_t lookForCluster;
 
   Int_t expectedNumberOfClusters = 0;
@@ -1337,18 +982,15 @@ Int_t AliTRDtracker::FollowBackProlongation(AliTRDtrack& t)
 
   alpha=AliTRDgeometry::GetAlpha();  // note: change in meaning
 
-  Int_t nRefPlane = fgkFirstPlane;
-  Bool_t isNewLayer = kFALSE; 
-
-  Double_t chi2;
-  Double_t minDY;
-  Int_t zone =-10;
+  //  Int_t zone =0;
   Int_t nr;
+  Float_t ratio0=0;
+  AliTRDtracklet tracklet;
+  //
   for (nr=fTrSec[0]->GetLayerNumber(t.GetX()); nr<outerTB+1; nr++) { 
-    
+   
     y = t.GetY(); 
     z = t.GetZ();
-
     // first propagate to the outer surface of the current time bin 
 
     s = t.GetSector();
@@ -1358,230 +1000,112 @@ Int_t AliTRDtracker::FollowBackProlongation(AliTRDtrack& t)
     z = t.GetZ();
 
     if(!t.PropagateTo(x,radLength,rho)) break;
-    //    if (!AdjustSector(&t)) break;
     //
     // MI -fix untill correct material desription will be implemented
     //
-    Float_t angle =  t.GetAlpha();  // MI - if rotation - we go through the material - 
-    if (!AdjustSector(&t)) break;
-    if (TMath::Abs(angle -  t.GetAlpha())>0.000001) break; //better to stop track
-    Int_t currentzone = fTrSec[s]->GetLayer(nr)->GetZone(z);
-    if (currentzone==-10) break;  // we are in the frame
-    if (currentzone>-10){   // layer knows where we are
-      if (zone==-10) zone = currentzone;
-      if (zone!=currentzone) break;  
-    }
+    //Int_t nrotate = t.GetNRotate();
+    if (!AdjustSector(&t)) break;    
     //
     //
-    s = t.GetSector();
-    if (!t.PropagateTo(x,radLength,rho)) break;
-
     y = t.GetY();
     z = t.GetZ();
-
-    // Barrel Tracks [SR, 04.04.2003]
-
     s = t.GetSector();
-    if (fTrSec[s]->GetLayer(nr)->IsSensitive() != 
-        fTrSec[s]->GetLayer(nr+1)->IsSensitive() ) {
-
-//      if (IsStoringBarrel()) StoreBarrelTrack(&t, nRefPlane++, kTrackBack);
-    }
-
-    if (fTrSec[s]->GetLayer(nr-1)->IsSensitive() && 
-          ! fTrSec[s]->GetLayer(nr)->IsSensitive()) {
-      isNewLayer = kTRUE;
-    } else {isNewLayer = kFALSE;}
-
-    y = t.GetY();
-    z = t.GetZ();
 
     // now propagate to the middle plane of the next time bin 
     fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
-
+//     if (nrotate!=t.GetNRotate()){
+//       rho = 1000*2.7; radLength = 24.01;  //TEMPORARY - aluminium in between z - will be detected using GeoModeler in future versions
+//     }
     x = fTrSec[s]->GetLayer(nr+1)->GetX(); 
-      if(!t.PropagateTo(x,radLength,rho)) break;
+    if(!t.PropagateTo(x,radLength,rho)) break;
     if (!AdjustSector(&t)) break;
     s = t.GetSector();
-      if(!t.PropagateTo(x,radLength,rho)) break;
+    //    if(!t.PropagateTo(x,radLength,rho)) break;
+    
+    if (TMath::Abs(t.GetSnp())>0.95) break;
 
     y = t.GetY();
     z = t.GetZ();
 
-    if(fVocal) printf("nr+1=%d, x %f, z %f, y %f, ymax %f\n",nr+1,x,z,y,ymax);
-    //    printf("label %d, pl %d, lookForCluster %d \n",
-    //     trackIndex, nr+1, lookForCluster);
-
     if(lookForCluster) {
-      expectedNumberOfClusters++;       
+      if (clusters[nr]==-1) {
+       Float_t  ncl   = FindClusters(s,nr,nr+30,&t,clusters,tracklet);
+       ratio0 = ncl/Float_t(fTimeBinsPerPlane);
+       Float_t  ratio1 = Float_t(t.fN+1)/Float_t(t.fNExpected+1.);     
+       if (tracklet.GetChi2()<18.&&ratio0>0.8 && ratio1>0.6 && ratio0+ratio1>1.5 && t.GetNCross()==0 && TMath::Abs(t.GetSnp())<0.85&&t.fN>20){
+         t.MakeBackupTrack();                            // make backup of the track until is gold
+       }
+//     if (ncl>4){
+//       t.PropagateTo(tracklet.GetX());
+//       t.UpdateMI(tracklet);
+//       nr = fTrSec[0]->GetLayerNumber(t.GetX())+1;
+//       continue;
+//     }
+      }
 
-      wIndex = (Float_t) t.GetLabel();
-      wTB = fTrSec[s]->GetLayer(nr+1)->GetTimeBinIndex();
+      expectedNumberOfClusters++;       
+      t.fNExpected++;
+      if (t.fX>345) t.fNExpectedLast++;
 
       AliTRDpropagationLayer& timeBin=*(fTrSec[s]->GetLayer(nr+1));
       Double_t sy2=ExpectedSigmaY2(t.GetX(),t.GetTgl(),t.GetPt());
-      Double_t sz2=ExpectedSigmaZ2(t.GetX(),t.GetTgl());
-      if((t.GetSigmaY2() + sy2) < 0) break;
+      if((t.GetSigmaY2() + sy2) < 0) {
+       printf("problem\n");
+       break;
+      }
       Double_t road = 10.*sqrt(t.GetSigmaY2() + sy2); 
-      Double_t y=t.GetY(), z=t.GetZ();
-
-      wYrt = (Float_t) y;
-      wZrt = (Float_t) z;
-      wYwindow = (Float_t) road;
-      t.GetPxPyPz(px,py,pz);
-      wPx = (Float_t) px;
-      wPy = (Float_t) py;
-      wPz = (Float_t) pz;
-      wC  = (Float_t) t.GetC();
-      wSigmaC2 = (Float_t) t.GetSigmaC2();
-      wSigmaTgl2    = (Float_t) t.GetSigmaTgl2();
-      wSigmaY2 = (Float_t) t.GetSigmaY2();
-      wSigmaZ2 = (Float_t) t.GetSigmaZ2();
-      wChi2 = -1;            
       
       if (road>fgkWideRoad) {
-        if (t.GetNumberOfClusters()>4)
-          cerr<<t.GetNumberOfClusters()
-              <<"FindProlongation warning: Too broad road !\n";
         return 0;
       }      
 
       AliTRDcluster *cl=0;
       UInt_t index=0;
-
       Double_t maxChi2=fgkMaxChi2;
-
-      if (isNewLayer) { 
-        road = 3 * road;
-        //sz2 = 3 * sz2;
-        maxChi2 = 10 * fgkMaxChi2;
-      }
-      
-      if (nRefPlane == fgkFirstPlane) maxChi2 = 20 * fgkMaxChi2; 
-      if (nRefPlane == fgkFirstPlane+2) maxChi2 = 15 * fgkMaxChi2;
-      if (t.GetNRotate() > 0) maxChi2 = 3 * maxChi2;
       
-
-      wYclosest = 12345678;
-      wYcorrect = 12345678;
-      wZclosest = 12345678;
-      wZcorrect = 12345678;
-      wZwindow  = TMath::Sqrt(2.25 * 12 * sz2);   
-
-      // Find the closest correct cluster for debugging purposes
-      if (timeBin) {
-        minDY = 1000000;
-        for (Int_t i=0; i<timeBin; i++) {
-          AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
-          if((c->GetLabel(0) != trackIndex) &&
-             (c->GetLabel(1) != trackIndex) &&
-             (c->GetLabel(2) != trackIndex)) continue;
-          if(TMath::Abs(c->GetY() - y) > minDY) continue;
-          //minDY = TMath::Abs(c->GetY() - y);
-          minDY = c->GetY() - y;
-          wYcorrect = c->GetY();
-          wZcorrect = c->GetZ();
-
-          Double_t h01 = GetTiltFactor(c);
-          wChi2 = t.GetPredictedChi2(c, h01);
-        }
-      }                    
-
       // Now go for the real cluster search
 
       if (timeBin) {
-
-        for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
-          AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
-          if (c->GetY() > y+road) break;
-          if (c->IsUsed() > 0) continue;
-          if((c->GetZ()-z)*(c->GetZ()-z) > 3 * sz2) continue;
-
-          Double_t h01 = GetTiltFactor(c);
-          chi2=t.GetPredictedChi2(c,h01);
-          
-          if (chi2 > maxChi2) continue;
-          maxChi2=chi2;
-          cl=c;
-          index=timeBin.GetIndex(i);
-
-          //check is correct
-          if((c->GetLabel(0) != trackIndex) &&
-             (c->GetLabel(1) != trackIndex) &&
-             (c->GetLabel(2) != trackIndex)) t.AddNWrong();
-        }               
        
-        if(!cl) {
-
-          for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
-            AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
-            
-            if (c->GetY() > y+road) break;
-            if (c->IsUsed() > 0) continue;
-            if((c->GetZ()-z)*(c->GetZ()-z) > 2.25 * 12 * sz2) continue;
-            
-            Double_t h01 = GetTiltFactor(c);
-            chi2=t.GetPredictedChi2(c,h01);
-            
-            if (chi2 > maxChi2) continue;
-            maxChi2=chi2;
-            cl=c;
-            index=timeBin.GetIndex(i);
-          }
-        }        
-        
+       if (clusters[nr+1]>0) {
+         index = clusters[nr+1];
+         cl    = (AliTRDcluster*)GetCluster(index);
+         Double_t h01 = GetTiltFactor(cl);
+          maxChi2=t.GetPredictedChi2(cl,h01);          
+       }
+       
         if (cl) {
-          wYclosest = cl->GetY();
-          wZclosest = cl->GetZ();
-
-          t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters()); 
+         if (cl->GetNPads()<5) 
+           t.SetSampledEdx(TMath::Abs(cl->GetQ()/dx)); 
           Double_t h01 = GetTiltFactor(cl);
          Int_t det = cl->GetDetector();    
          Int_t plane = fGeom->GetPlane(det);
-
+         if (t.fX>345){
+           t.fNLast++;
+           t.fChi2Last+=maxChi2;
+         }
          if(!t.UpdateMI(cl,maxChi2,index,h01,plane)) {
-          //if(!t.Update(cl,maxChi2,index,h01)) {
-            if(!tryAgain--) return 0;
+           if(!t.Update(cl,maxChi2,index,h01)) {
+             //if(!tryAgain--) return 0;
+           }
           }  
           else tryAgain=fMaxGap;
-        }
+         //
+         
+         if (cl->GetLocalTimeBin()==1&&t.fN>20 && float(t.fChi2)/float(t.fN)<5){
+           Float_t  ratio1 = Float_t(t.fN)/Float_t(t.fNExpected);      
+           if (tracklet.GetChi2()<18&&ratio0>0.8&&ratio1>0.6 &&ratio0+ratio1>1.5 && t.GetNCross()==0 && TMath::Abs(t.GetSnp())<0.85){
+             t.MakeBackupTrack();                            // make backup of the track until is gold
+           }
+         }
+         
+       }                       
         else {
-          if (tryAgain==0) break; 
-          tryAgain--;
-          
-          //if (minDY < 1000000 && isNewLayer) 
-            //cout << "\t" << nRefPlane << "\t" << "\t" << t.GetNRotate() <<  "\t" << 
-            //  road << "\t" << minDY << "\t" << chi2 << "\t" << wChi2 << "\t" << maxChi2 << endl;
-                                                                     
+         // if (tryAgain==0) break; 
+          //tryAgain--;                                                                               
         }
-
-        isNewLayer = kFALSE;
-
-        /*
-        if((((Int_t) wTB)%15 == 0) || (((Int_t) wTB)%15 == 14)) {
-          
-          printf(" %f", wIndex);       //1
-          printf(" %f", wTB);          //2
-          printf(" %f", wYrt);         //3
-          printf(" %f", wYclosest);    //4
-          printf(" %f", wYcorrect);    //5
-          printf(" %f", wYwindow);     //6
-          printf(" %f", wZrt);         //7
-          printf(" %f", wZclosest);    //8
-          printf(" %f", wZcorrect);    //9
-          printf(" %f", wZwindow);     //10
-          printf(" %f", wPx);          //11
-          printf(" %f", wPy);          //12
-          printf(" %f", wPz);          //13
-          printf(" %f", wSigmaC2*1000000);  //14
-          printf(" %f", wSigmaTgl2*1000);   //15
-          printf(" %f", wSigmaY2);     //16
-          //      printf(" %f", wSigmaZ2);     //17
-          printf(" %f", wChi2);     //17
-          printf(" %f", wC);           //18
-          printf("\n");
-        } 
-        */                        
+       
+       
       }
     }  
   }
@@ -1590,8 +1114,8 @@ Int_t AliTRDtracker::FollowBackProlongation(AliTRDtrack& t)
   else
     t.SetStop(kFALSE);
   return expectedNumberOfClusters;
-
-
+  
+  
 }         
 
 //---------------------------------------------------------------------------
@@ -1683,7 +1207,9 @@ Int_t AliTRDtracker::Refit(AliTRDtrack& t, Int_t rf)
     AliTRDcluster *cl=(AliTRDcluster*)GetCluster(iCluster[nr-1]);
     Double_t h01 = GetTiltFactor(cl);
     Double_t chi2=t.GetPredictedChi2(cl, h01);
-    t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters()); 
+    if (cl->GetNPads()<5) t.SetSampledEdx(TMath::Abs(cl->GetQ()/dx)); 
+
+      //t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters()); 
     t.Update(cl,chi2,iCluster[nr-1],h01);
   }
 
@@ -1784,59 +1310,27 @@ Int_t AliTRDtracker::PropagateToTPC(AliTRDtrack& t)
     y = t.GetY(); 
     z = t.GetZ();
 
-    // first propagate to the outer surface of the current time bin 
-    fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
-    x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; 
-    
-    if(!t.PropagateTo(x,radLength,rho)) return 0;
-    AdjustSector(&t);
-    if(!t.PropagateTo(x,radLength,rho)) return 0;
-
-    y = t.GetY(); 
-    z = t.GetZ();
-
-    // now propagate to the middle plane of the next time bin 
-    fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
-    x = fTrSec[s]->GetLayer(nr-1)->GetX(); 
-    
-    if(!t.PropagateTo(x,radLength,rho)) return 0;
-    AdjustSector(&t);
-    if(!t.PropagateTo(x,radLength,rho)) return 0;
-  }
-  return 1;
-}         
-
-void AliTRDtracker::LoadEvent()
-{
-  // Fills clusters into TRD tracking_sectors 
-  // Note that the numbering scheme for the TRD tracking_sectors 
-  // differs from that of TRD sectors
-
-  ReadClusters(fClusters);
-  Int_t ncl=fClusters->GetEntriesFast();
-  cout<<"\n LoadSectors: sorting "<<ncl<<" clusters"<<endl;
-              
-  UInt_t index;
-  while (ncl--) {
-//    printf("\r %d left  ",ncl); 
-    AliTRDcluster *c=(AliTRDcluster*)fClusters->UncheckedAt(ncl);
-    Int_t detector=c->GetDetector();
-    Int_t localTimeBin=c->GetLocalTimeBin();
-    Int_t sector=fGeom->GetSector(detector);
-    Int_t plane=fGeom->GetPlane(detector);
-
-    Int_t trackingSector = CookSectorIndex(sector);
-
-    Int_t gtb = fTrSec[trackingSector]->CookTimeBinIndex(plane,localTimeBin);
-    if(gtb < 0) continue; 
-    Int_t layer = fTrSec[trackingSector]->GetLayerNumber(gtb);
+    // first propagate to the outer surface of the current time bin 
+    fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
+    x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; 
+    
+    if(!t.PropagateTo(x,radLength,rho)) return 0;
+    AdjustSector(&t);
+    if(!t.PropagateTo(x,radLength,rho)) return 0;
 
-    index=ncl;
-    fTrSec[trackingSector]->GetLayer(layer)->InsertCluster(c,index);
-  }    
-  printf("\r\n");
+    y = t.GetY(); 
+    z = t.GetZ();
 
-}
+    // now propagate to the middle plane of the next time bin 
+    fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
+    x = fTrSec[s]->GetLayer(nr-1)->GetX(); 
+    
+    if(!t.PropagateTo(x,radLength,rho)) return 0;
+    AdjustSector(&t);
+    if(!t.PropagateTo(x,radLength,rho)) return 0;
+  } 
+  return 1;
+}         
 
 //_____________________________________________________________________________
 Int_t AliTRDtracker::LoadClusters(TTree *cTree)
@@ -1844,12 +1338,13 @@ Int_t AliTRDtracker::LoadClusters(TTree *cTree)
   // Fills clusters into TRD tracking_sectors 
   // Note that the numbering scheme for the TRD tracking_sectors 
   // differs from that of TRD sectors
-
+  cout<<"\n Read Sectors  clusters"<<endl;
   if (ReadClusters(fClusters,cTree)) {
      Error("LoadClusters","Problem with reading the clusters !");
      return 1;
   }
   Int_t ncl=fClusters->GetEntriesFast();
+  fNclusters=ncl;
   cout<<"\n LoadSectors: sorting "<<ncl<<" clusters"<<endl;
               
   UInt_t index;
@@ -1880,7 +1375,7 @@ Int_t AliTRDtracker::LoadClusters(TTree *cTree)
     index=ncl;
     fTrSec[trackingSector]->GetLayer(layer)->InsertCluster(c,index);
   }    
-  printf("\r\n");
+  //  printf("\r\n");
   //
   //
   /*
@@ -1895,7 +1390,7 @@ Int_t AliTRDtracker::LoadClusters(TTree *cTree)
 }
 
 //_____________________________________________________________________________
-void AliTRDtracker::UnloadEvent() 
+void AliTRDtracker::UnloadClusters() 
 { 
   //
   // Clears the arrays of clusters and tracks. Resets sectors and timebins 
@@ -1905,6 +1400,7 @@ void AliTRDtracker::UnloadEvent()
 
   nentr = fClusters->GetEntriesFast();
   for (i = 0; i < nentr; i++) delete fClusters->RemoveAt(i);
+  fNclusters = 0;
 
   nentr = fSeeds->GetEntriesFast();
   for (i = 0; i < nentr; i++) delete fSeeds->RemoveAt(i);
@@ -2092,169 +1588,201 @@ void AliTRDtracker::MakeSeeds(Int_t inner, Int_t outer, Int_t turn)
     }
   }
 }            
-
-//_____________________________________________________________________________
-Int_t AliTRDtracker::ReadClusters(TObjArray *array, TTree *ClusterTree) 
+//__________________________________________________________________________
+void AliTRDtracker::MakeSeedsMI(Int_t /*inner*/, Int_t /*outer*/)
 {
   //
-  // Reads AliTRDclusters (option >= 0) or AliTRDrecPoints (option < 0) 
-  // from the file. The names of the cluster tree and branches 
-  // should match the ones used in AliTRDclusterizer::WriteClusters()
+  // Creates  seeds using clusters between  position inner plane  and outer plane 
   //
-  TObjArray *clusterArray = new TObjArray(400); 
-  
-  TBranch *branch=ClusterTree->GetBranch("TRDcluster");
-  if (!branch) {
-    Error("ReadClusters","Can't get the branch !");
-    return 1;
-  }
-  branch->SetAddress(&clusterArray); 
-  
-  Int_t nEntries = (Int_t) ClusterTree->GetEntries();
-  printf("found %d entries in %s.\n",nEntries,ClusterTree->GetName());
-  
-  // Loop through all entries in the tree
-  Int_t nbytes;
-  AliTRDcluster *c = 0;
-  printf("\n");
 
-  for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {    
-    
-    // Import the tree
-    nbytes += ClusterTree->GetEvent(iEntry);  
-    
-    // Get the number of points in the detector
-    Int_t nCluster = clusterArray->GetEntriesFast();  
-//    printf("\r Read %d clusters from entry %d", nCluster, iEntry);
-    
-    // Loop through all TRD digits
-    for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) { 
-      c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
-      AliTRDcluster *co = new AliTRDcluster(*c);
-      co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
-      Int_t ltb = co->GetLocalTimeBin();
-      if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
-      else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
-      array->AddLast(co);
-      delete clusterArray->RemoveAt(iCluster); 
+  const Double_t maxtheta = 2;
+  const Double_t maxphi   = 1.5;
+  Int_t maxSec=AliTRDgeometry::kNsect;
+
+  //  
+  // find the maximal and minimal layer for the planes
+  // fucking "object oriented" geometry - find the time bin range for different planes
+  //
+  Int_t layers[6][2];
+  for (Int_t i=0;i<6;i++){layers[i][0]=10000; layers[i][1]=0;}
+
+  for (Int_t ns=0;ns<maxSec;ns++){
+    for (Int_t ilayer=0;ilayer<fTrSec[ns]->GetNumberOfLayers();ilayer++){
+      AliTRDpropagationLayer& layer=*(fTrSec[ns]->GetLayer(ilayer));
+      if (layer==0) continue;
+      Int_t det   = layer[0]->GetDetector();    
+      Int_t plane = fGeom->GetPlane(det);
+      if (ilayer<layers[plane][0]) layers[plane][0] = ilayer;
+      if (ilayer>layers[plane][1]) layers[plane][1] = ilayer;
     }
   }
-
-  delete clusterArray;
-
-  return 0;
-}
-
-//______________________________________________________________________
-void AliTRDtracker::ReadClusters(TObjArray *array, const Char_t *filename)
-{
   //
-  // Reads AliTRDclusters from file <filename>. The names of the cluster
-  // tree and branches should match the ones used in
-  // AliTRDclusterizer::WriteClusters()
-  // if <array> == 0, clusters are added into AliTRDtracker fCluster array
-  //
-
-  TDirectory *savedir=gDirectory;
-
-  TFile *file = TFile::Open(filename);
-  if (!file->IsOpen()) {
-    cerr<<"Can't open file with TRD clusters"<<endl;
-    return;
-  }
-
-  Char_t treeName[12];
-  sprintf(treeName,"TreeR%d_TRD",GetEventNumber());
-  TTree *clusterTree = (TTree*) gDirectory->Get(treeName);
-
-  if (!clusterTree) {
-     cerr<<"AliTRDtracker::ReadClusters(): ";
-     cerr<<"can't get a tree with clusters !\n";
-     return;
-  }
-
-  TObjArray *clusterArray = new TObjArray(400);
-
-  clusterTree->GetBranch("TRDcluster")->SetAddress(&clusterArray);
-
-  Int_t nEntries = (Int_t) clusterTree->GetEntries();
-  cout<<"found "<<nEntries<<" in clusterTree"<<endl;   
-
-  // Loop through all entries in the tree
-  Int_t nbytes;
-  AliTRDcluster *c = 0;
-
-  printf("\n");
-
-  for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
-
-    // Import the tree
-    nbytes += clusterTree->GetEvent(iEntry);
+      
+  Int_t ilayer1 = layers[5][1];  // time bin in mplification region
+  Int_t ilayer2 = layers[3][1];  //
+  Int_t ilayerM = layers[4][1];  //
+  //    
+  Double_t x1 = fTrSec[0]->GetX(ilayer1);
+  Double_t x2 = fTrSec[0]->GetX(ilayer2);
+  Double_t xm = fTrSec[0]->GetX(ilayerM);
+  Double_t dist = x2-x1;
+  //  Int_t indexes1[20];
+  //Int_t indexes2[20];
+  AliTRDcluster *clusters1[15],*clusters2[15],*clustersM[15];
+  //
+  //      
+  for (Int_t ns=0; ns<maxSec; ns++) {
+    AliTRDpropagationLayer& layer1=*(fTrSec[ns]->GetLayer(ilayer1));  //select propagation layers
+    AliTRDpropagationLayer& layer2=*(fTrSec[ns]->GetLayer(ilayer2));
+    //  
+    for (Int_t icl1=0;icl1<layer1;icl1++){
+      AliTRDcluster *cl1 = layer1[icl1];
+      if (!cl1) continue;
+      Double_t y1 = cl1->GetY();
+      Double_t z1 = cl1->GetZ();
+      //
+      for (Int_t icl2=0;icl2<layer2;icl2++){
+       AliTRDcluster *cl2 = layer2[icl2];
+       if (!cl2) continue;
+       Double_t y2 = cl2->GetY();
+       Double_t z2 = cl2->GetZ();      
+       Double_t tanphi   = (y2-y1)/dist; 
+       Double_t tantheta = (z2-z1)/dist; 
+       if (TMath::Abs(tanphi)>maxphi) continue;
+       if (TMath::Abs(tantheta)>maxtheta) continue;
+       //
+       clusters1[0] = cl1;
+       clusters2[0] = cl2;
+       Double_t road =  0.5+TMath::Abs(tanphi)*1;
+       Int_t ncl=0;
+       Double_t sum1=0, sumx1=0,sum2x1=0,sumxy1=0, sumy1=0;
+       Double_t sum2=0, sumx2=0,sum2x2=0,sumxy2=0, sumy2=0;
+       //
+       for (Int_t dlayer=1;dlayer<15;dlayer++){
+         clusters1[dlayer]=0;
+         clusters2[dlayer]=0;
+         AliTRDpropagationLayer& layer1C=*(fTrSec[ns]->GetLayer(ilayer1-dlayer));  //select propagation layers
+         AliTRDpropagationLayer& layer2C=*(fTrSec[ns]->GetLayer(ilayer2-dlayer));  //
+         Double_t yy1 = y1+(tanphi)  *(layer1C.GetX()-x1);
+         Double_t zz1 = z1+(tantheta)*(layer1C.GetX()-x1);
+         Double_t yy2 = y1+(tanphi)  *(layer2C.GetX()-x1);
+         Double_t zz2 = z1+(tantheta)*(layer2C.GetX()-x1);
+         Int_t index1 = layer1C.FindNearestCluster(yy1,zz1,road);
+         Int_t index2 = layer2C.FindNearestCluster(yy2,zz2,road);
+         if (index1>=0) {
+           clusters1[dlayer]= (AliTRDcluster*)GetCluster(index1);
+           ncl++;
+           sum1++;
+           Double_t dx = layer1C.GetX()-x1;
+           sumx1 +=dx;
+           sum2x1+=dx*dx;
+           sumxy1+=dx*clusters1[dlayer]->GetY();       
+           sumy1 +=clusters1[dlayer]->GetY();
+         }
+         if (index2>=0) {
+           clusters2[dlayer]= (AliTRDcluster*)GetCluster(index2);
+           ncl++;
+           sum2++;
+           Double_t dx = layer2C.GetX()-x2;
+           sumx2 +=dx;
+           sum2x2+=dx*dx;
+           sumxy2+=dx*clusters2[dlayer]->GetY();
+           sumy2 +=clusters2[dlayer]->GetY();
+         }
+       }
+       if (sum1<10) continue;
+       if (sum2<10) continue;
+       //
+       Double_t det1   = sum1*sum2x1-sumx1*sumx1;
+       Double_t angle1 = (sum1*sumxy1-sumx1*sumy1)/det1;
+       Double_t pos1   = (sum2x1*sumy1-sumx1*sumxy1)/det1;  // at x1 
+       //
+       Double_t det2   = sum2*sum2x2-sumx2*sumx2;
+       Double_t angle2 = (sum2*sumxy2-sumx2*sumy2)/det2;
+       Double_t pos2   = (sum2x2*sumy2-sumx2*sumxy2)/det2;  // at x2
+       //
+       //
 
-    // Get the number of points in the detector
-    Int_t nCluster = clusterArray->GetEntriesFast();
-    printf("\n Read %d clusters from entry %d", nCluster, iEntry);
+       Double_t sumM=0, sumxM=0,sum2xM=0,sumxyM=0, sumyM=0;
+       //
+       for (Int_t dlayer=1;dlayer<15;dlayer++){
+         clustersM[dlayer]=0;
+         AliTRDpropagationLayer& layerM=*(fTrSec[ns]->GetLayer(ilayerM-dlayer));  //select propagation layers
+         Double_t yyM = y1+(tanphi)  *(layerM.GetX()-x1);
+         Double_t zzM = z1+(tantheta)*(layerM.GetX()-x1);
+         Int_t indexM = layerM.FindNearestCluster(yyM,zzM,road);
+         if (indexM>=0) {
+           clustersM[dlayer]= (AliTRDcluster*)GetCluster(indexM);
+           ncl++;
+           sumM++;
+           Double_t dx = layerM.GetX()-xm;
+           sumxM +=dx;
+           sum2xM+=dx*dx;
+           sumxyM+=dx*clustersM[dlayer]->GetY();       
+           sumyM +=clustersM[dlayer]->GetY();
+         }
+       }
+       Double_t detM   = sumM*sum2xM-sumxM*sumxM;
+       Double_t posM=0, angleM=0;
+       if (TMath::Abs(detM)>0.0000001){
+         angleM = (sumM*sumxyM-sumxM*sumyM)/detM;
+         posM   = (sum2xM*sumyM-sumxM*sumxyM)/detM;  // at xm
+       }
+       //
 
-    // Loop through all TRD digits
-    for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) {
-      c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
-      AliTRDcluster *co = new AliTRDcluster(*c);
-      co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
-      Int_t ltb = co->GetLocalTimeBin();
-      if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
-      else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
-      array->AddLast(co);
-      delete clusterArray->RemoveAt(iCluster);
+       if (ncl>15){
+         TTreeSRedirector& cstream = *fDebugStreamer;
+         cstream<<"Seeds"<<
+           "Ncl="<<ncl<<
+           "SumM="<<sumM<<
+           "x1="<<x1<<
+           "x2="<<x2<<
+           "Cl1.="<<cl1<<
+           "Cl2.="<<cl2<<
+           "Phi="<<tanphi<<
+           "Theta="<<tantheta<<
+           "Pos1="<<pos1<<
+           "Pos2="<<pos2<<
+           "PosM="<<posM<<
+           "Angle1="<<angle1<<
+           "Angle2="<<angle2<<
+           "AngleM="<<angleM<<
+           "\n";
+       }
+      }
     }
   }
+}            
 
-  file->Close();
-  delete clusterArray;
-  savedir->cd();
-
-}                      
-
-void AliTRDtracker::ReadClusters(TObjArray *array, const TFile *inp) 
+//_____________________________________________________________________________
+Int_t AliTRDtracker::ReadClusters(TObjArray *array, TTree *ClusterTree) const
 {
   //
   // Reads AliTRDclusters (option >= 0) or AliTRDrecPoints (option < 0) 
   // from the file. The names of the cluster tree and branches 
   // should match the ones used in AliTRDclusterizer::WriteClusters()
   //
-
-  TDirectory *savedir=gDirectory; 
-
-  if (inp) {
-     TFile *in=(TFile*)inp;
-     if (!in->IsOpen()) {
-        cerr<<"AliTRDtracker::ReadClusters(): input file is not open !\n";
-        return;
-     }
-     else{
-       in->cd();
-     }
-  }
-
-  Char_t treeName[12];
-  sprintf(treeName,"TreeR%d_TRD",GetEventNumber());
-  TTree *clusterTree = (TTree*) gDirectory->Get(treeName);
+  Int_t nsize = Int_t(ClusterTree->GetTotBytes()/(sizeof(AliTRDcluster))); 
+  TObjArray *clusterArray = new TObjArray(nsize+1000); 
   
-  TObjArray *clusterArray = new TObjArray(400); 
-  
-  clusterTree->GetBranch("TRDcluster")->SetAddress(&clusterArray); 
+  TBranch *branch=ClusterTree->GetBranch("TRDcluster");
+  if (!branch) {
+    Error("ReadClusters","Can't get the branch !");
+    return 1;
+  }
+  branch->SetAddress(&clusterArray); 
   
-  Int_t nEntries = (Int_t) clusterTree->GetEntries();
-  printf("found %d entries in %s.\n",nEntries,clusterTree->GetName());
+  Int_t nEntries = (Int_t) ClusterTree->GetEntries();
+  //  printf("found %d entries in %s.\n",nEntries,ClusterTree->GetName());
   
   // Loop through all entries in the tree
-  Int_t nbytes;
+  Int_t nbytes = 0;
   AliTRDcluster *c = 0;
-  printf("\n");
-
+  //  printf("\n");
   for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {    
     
     // Import the tree
-    nbytes += clusterTree->GetEvent(iEntry);  
+    nbytes += ClusterTree->GetEvent(iEntry);  
     
     // Get the number of points in the detector
     Int_t nCluster = clusterArray->GetEntriesFast();  
@@ -2263,19 +1791,26 @@ void AliTRDtracker::ReadClusters(TObjArray *array, const TFile *inp)
     // Loop through all TRD digits
     for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) { 
       c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
-      AliTRDcluster *co = new AliTRDcluster(*c);
+//       if (c->GetNPads()>3&&(iCluster%3>0)) {
+//     delete clusterArray->RemoveAt(iCluster);
+//     continue;
+//       }
+      //      AliTRDcluster *co = new AliTRDcluster(*c);  //remove unnecesary coping - + clusters are together in memory
+      AliTRDcluster *co = c;
       co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
       Int_t ltb = co->GetLocalTimeBin();
       if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
       else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
       array->AddLast(co);
-      delete clusterArray->RemoveAt(iCluster); 
+      //      delete clusterArray->RemoveAt(iCluster); 
+      clusterArray->RemoveAt(iCluster); 
     }
   }
+//   cout<<"Allocated"<<nsize<<"\tLoaded"<<array->GetEntriesFast()<<"\n";
 
   delete clusterArray;
-  savedir->cd();   
 
+  return 0;
 }
 
 //__________________________________________________________________
@@ -2458,6 +1993,7 @@ AliTRDtracker::AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry* geo, I
   //
   // AliTRDtrackingSector Constructor
   //
+  AliTRDpadPlane *padPlane = 0;
 
   fGeom = geo;
   fPar = par;
@@ -2614,21 +2150,32 @@ AliTRDtracker::AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry* geo, I
     }
 
     ymax          = fGeom->GetChamberWidth(plane)/2.;
-    ymaxsensitive = (fPar->GetColPadSize(plane)*fPar->GetColMax(plane)-4)/2.;
+    // Modidified for new pad plane class, 22.04.05 (C.B.)
+    // ymaxsensitive = (fPar->GetColPadSize(plane)*fPar->GetColMax(plane)-4)/2.;
+    padPlane = fPar->GetPadPlane(plane,0);
+    ymaxsensitive = (padPlane->GetColSize(1)*padPlane->GetNcols()-4)/2.;
+
+    //    ymaxsensitive = (fPar->GetColPadSize(plane)*fPar->GetColMax(plane)-4)/2.;
     
     for(Int_t ch = 0; ch < kNchambers; ch++) {
       zmax[ch] = fGeom->GetChamberLength(plane,ch)/2;
-      Float_t pad = fPar->GetRowPadSize(plane,ch,0);
+      //
+      // Modidified for new pad plane class, 22.04.05 (C.B.)
+      //Float_t pad = fPar->GetRowPadSize(plane,ch,0);
+      Float_t pad = padPlane->GetRowSize(1);
+      //Float_t pad = fPar->GetRowPadSize(plane,ch,0);
       Float_t row0 = fPar->GetRow0(plane,ch,0);
       Int_t nPads = fPar->GetRowMax(plane,ch,0);
       zmaxsensitive[ch] = Float_t(nPads)*pad/2.;      
       //      zc[ch] = (pad * nPads)/2 + row0 - pad/2;
-      zc[ch] = (pad * nPads)/2 + row0;
+      //      zc[ch] = (pad * nPads)/2 + row0;
+      zc[ch] = -(pad * nPads)/2 + row0;
       //zc[ch] = row0+zmax[ch]-AliTRDgeometry::RpadW();
 
     }
 
-    dx = fPar->GetTimeBinSize(); 
+    dx  = fgkDriftCorrection*fPar->GetDriftVelocity()
+        / fPar->GetSamplingFrequency();
     rho = 0.00295 * 0.85; radLength = 11.0;  
 
     Double_t x0 = (Double_t) fPar->GetTime0(plane);
@@ -2639,7 +2186,7 @@ AliTRDtracker::AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry* geo, I
     steps = (Int_t) (dxAmp/dx);
 
     for(tb = 0; tb < steps; tb++) {
-      x = x0 + tb * dx + dx/2;
+      x = x0 + tb * dx + dx/2+ fgkOffsetX;
       tbIndex = CookTimeBinIndex(plane, -tb-1);
       ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
       ppl->SetYmax(ymax,ymaxsensitive);
@@ -2657,11 +2204,13 @@ AliTRDtracker::AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry* geo, I
     InsertLayer(ppl);
 
     // Drift region
-    dx = fPar->GetTimeBinSize();
+
+    dx = fgkDriftCorrection*fPar->GetDriftVelocity()
+       / fPar->GetSamplingFrequency();
     steps = (Int_t) (dxDrift/dx);
 
     for(tb = 0; tb < steps; tb++) {
-      x = x0 - tb * dx - dx/2;
+      x = x0 - tb * dx - dx/2 + fgkOffsetX;                      //temporary fix - fix it the parameters
       tbIndex = CookTimeBinIndex(plane, tb);
 
       ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
@@ -2722,6 +2271,7 @@ AliTRDtracker::AliTRDtrackingSector::AliTRDtrackingSector(AliTRDgeometry* geo, I
   MapTimeBinLayers();
   delete [] zc;
   delete [] zmax;
+  delete [] zmaxsensitive;
 
 }
 
@@ -2736,7 +2286,9 @@ Int_t  AliTRDtracker::AliTRDtrackingSector::CookTimeBinIndex(Int_t plane, Int_t
 
   Double_t dxAmp = (Double_t) fGeom->CamHght();   // Amplification region
   Double_t dxDrift = (Double_t) fGeom->CdrHght(); // Drift region  
-  Double_t dx = (Double_t) fPar->GetTimeBinSize();  
+  
+  Double_t dx = fgkDriftCorrection*(Double_t) fPar->GetDriftVelocity()
+                         / fPar->GetSamplingFrequency();
 
   Int_t tbAmp = fPar->GetTimeBefore();
   Int_t maxAmp = (Int_t) ((dxAmp+0.000001)/dx);
@@ -2791,15 +2343,15 @@ void AliTRDtracker::AliTRDtrackingSector::MapTimeBinLayers()
     x2 = fLayers[i+1]->GetX();
     dx2 = fLayers[i+1]->GetdX();
     gap = (x2 - dx2/2) - (x1 + dx1/2);
-    if(gap < -0.01) {
-      printf("*** warning: layers %d and %d are overlayed:\n",i,i+1);
-      printf("             %f + %f + %f > %f\n", x1, dx1/2, dx2/2, x2);
-    }
-    if(gap > 0.01) { 
-      printf("*** warning: layers %d and %d have a large gap:\n",i,i+1);
-      printf("             (%f - %f) - (%f + %f) = %f\n", 
-             x2, dx2/2, x1, dx1, gap);
-    }
+//     if(gap < -0.01) {
+//       printf("*** warning: layers %d and %d are overlayed:\n",i,i+1);
+//       printf("             %f + %f + %f > %f\n", x1, dx1/2, dx2/2, x2);
+//     }
+//     if(gap > 0.01) { 
+//       printf("*** warning: layers %d and %d have a large gap:\n",i,i+1);
+//       printf("             (%f - %f) - (%f + %f) = %f\n", 
+//              x2, dx2/2, x1, dx1, gap);
+//     }
   }
 }
   
@@ -2903,6 +2455,10 @@ Int_t AliTRDtracker::AliTRDtrackingSector::Find(Double_t x) const
   return m;
 }             
 
+
+
+
+
 //______________________________________________________
 void AliTRDtracker::AliTRDpropagationLayer::SetZ(Double_t* center, Double_t *w, Double_t *wsensitive )
 {
@@ -2930,7 +2486,7 @@ void AliTRDtracker::AliTRDpropagationLayer::SetHoles(Bool_t *holes)
 
 
 
-void AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
+Bool_t AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
         Double_t y, Double_t z, Double_t &dx, Double_t &rho, Double_t &radLength, 
         Bool_t &lookForCluster) const
 {
@@ -2939,35 +2495,49 @@ void AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
   // and sensitivity <lookForCluster> in point <y,z>  
   //
 
+  Double_t alpha =  AliTRDgeometry::GetAlpha(); 
+  Double_t ymax  =  fX*TMath::Tan(0.5*alpha);
+
+
   dx  = fdX;
   rho = fRho;
   radLength  = fX0;
   lookForCluster = kFALSE;
+  Bool_t cross =kFALSE;
+  //
+  //
+  if ( (ymax-TMath::Abs(y))<3.){   //cross material
+    rho*=40.;
+    radLength*=40.;
+    cross=kTRUE;
+  }
   //
   // check dead regions in sensitive volume 
-  if(fTimeBinIndex >= 0) {
     //
-    Int_t zone=-1;
-    for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
-      if  (TMath::Abs(z - fZc[ch]) < fZmaxSensitive[ch]){ 
-       zone = ch;
-       lookForCluster = !(fIsHole[zone]);
-       if(TMath::Abs(y) > fYmaxSensitive){  
-         lookForCluster = kFALSE;
-       }
-       if (fIsHole[zone]) {
-         //if hole
-         rho = 1.29e-3;
-         radLength = 36.66;
-       }
-      }    
-    }
-    return;
+  Int_t zone=-1;
+  for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
+    if (TMath::Abs(z - fZc[ch]) > fZmax[ch]) continue;  //not in given zone
+    //
+    if  (TMath::Abs(z - fZc[ch]) < fZmaxSensitive[ch]){ 
+      if (fTimeBinIndex>=0) lookForCluster = !(fIsHole[zone]);
+      if(TMath::Abs(y) > fYmaxSensitive){  
+       lookForCluster = kFALSE;        
+      }
+      if (fIsHole[zone]) {
+       //if hole
+       rho = 1.29e-3;
+       radLength = 36.66;
+      }
+    }else{
+      cross = kTRUE; rho = 2.7; radLength = 24.01;  //aluminium in between
+    }        
   }
   //
+  if (fTimeBinIndex>=0) return cross;
+  //
   //
   // check hole
-  if (fHole==kFALSE) return;
+  if (fHole==kFALSE) return cross;
   //
   for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
     if  (TMath::Abs(z - fZc[ch]) < fZmax[ch]){ 
@@ -2975,10 +2545,10 @@ void AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
        //if hole
        rho = 1.29e-3;
        radLength = 36.66;
-      }
+      }    
     }
   }
-  return;
+  return cross;
 }
 
 Int_t  AliTRDtracker::AliTRDpropagationLayer::GetZone( Double_t z) const
@@ -3035,26 +2605,557 @@ Int_t AliTRDtracker::AliTRDpropagationLayer::Find(Double_t y) const {
   return m;
 }    
 
+Int_t AliTRDtracker::AliTRDpropagationLayer::FindNearestCluster(Double_t y, Double_t z, Double_t maxroad) const 
+{
+  //
+  // Returns index of the cluster nearest to the given y,z
+  //
+  Int_t index = -1;
+  Int_t maxn = fN;
+  Double_t mindist = maxroad;                  
+  Float_t padlength =-1;
+  //
+  for (Int_t i=Find(y-maxroad); i<maxn; i++) {
+    AliTRDcluster* c=(AliTRDcluster*)(fClusters[i]);
+    if (padlength<0){
+      padlength = TMath::Sqrt(c->GetSigmaZ2()*12); 
+    }
+    //
+    if (c->GetY() > y+maxroad) break;
+    if((c->GetZ()-z)*(c->GetZ()-z) > padlength*0.75) continue;      
+    if (TMath::Abs(c->GetY()-y)<mindist){
+      mindist = TMath::Abs(c->GetY()-y);
+      index = GetIndex(i);
+    }        
+  }                                            
+  return index;
+}             
+
+
 //---------------------------------------------------------
 
 Double_t AliTRDtracker::GetTiltFactor(const AliTRDcluster* c) {
 //
 //  Returns correction factor for tilted pads geometry 
 //
-
-  Double_t h01 = sin(TMath::Pi() / 180.0 * fPar->GetTiltingAngle());
   Int_t det = c->GetDetector();    
   Int_t plane = fGeom->GetPlane(det);
-
-  if((plane == 1) || (plane == 3) || (plane == 5)) h01=-h01;
+  AliTRDpadPlane *padPlane = fPar->GetPadPlane(plane,0);
+  Double_t h01 = TMath::Tan(-TMath::Pi() / 180.0 * padPlane->GetTiltingAngle());
 
   if(fNoTilt) h01 = 0;
-  
   return h01;
 }
 
 
+void AliTRDtracker::CookdEdxTimBin(AliTRDtrack& TRDtrack)
+{
+  // *** ADDED TO GET MORE INFORMATION FOR TRD PID  ---- PS
+  // This is setting fdEdxPlane and fTimBinPlane
+  // Sums up the charge in each plane for track TRDtrack and also get the 
+  // Time bin for Max. Cluster
+  // Prashant Shukla (shukla@physi.uni-heidelberg.de)
+
+  //  const Int_t kNPlane = AliTRDgeometry::Nplan();
+  //  const Int_t kNPlane = 6;
+  Double_t  clscharge[kNPlane], maxclscharge[kNPlane];
+  Int_t  nCluster[kNPlane], timebin[kNPlane];
+
+  //Initialization of cluster charge per plane.  
+  for (Int_t iPlane = 0; iPlane < kNPlane; iPlane++) {
+    clscharge[iPlane] = 0.0;
+    nCluster[iPlane] = 0;
+    timebin[iPlane] = -1;
+    maxclscharge[iPlane] = 0.0;
+  }
+
+  // Loop through all clusters associated to track TRDtrack
+  Int_t nClus = TRDtrack.GetNumberOfClusters();  // from Kalmantrack
+  for (Int_t iClus = 0; iClus < nClus; iClus++) {
+    Double_t charge = TRDtrack.GetClusterdQdl(iClus);
+    Int_t index = TRDtrack.GetClusterIndex(iClus);
+    AliTRDcluster *TRDcluster = (AliTRDcluster *) GetCluster(index); 
+    if (!TRDcluster) continue;
+    Int_t tb = TRDcluster->GetLocalTimeBin();
+    if (!tb) continue;
+    Int_t detector = TRDcluster->GetDetector();
+    Int_t iPlane   = fGeom->GetPlane(detector);
+    clscharge[iPlane] = clscharge[iPlane]+charge;
+    if(charge > maxclscharge[iPlane]) {
+      maxclscharge[iPlane] = charge;
+      timebin[iPlane] = tb;
+    }
+    nCluster[iPlane]++;
+  } // end of loop over cluster
+
+  // Setting the fdEdxPlane and fTimBinPlane variabales 
+  Double_t Total_ch = 0;
+  for (Int_t iPlane = 0; iPlane < kNPlane; iPlane++) {
+    // Quality control of TRD track.
+    if (nCluster[iPlane]<= 5) {
+      clscharge[iPlane]=0.0;
+      timebin[iPlane]=-1;
+    }
+    if (nCluster[iPlane]) clscharge[iPlane] /= nCluster[iPlane];
+    TRDtrack.SetPIDsignals(clscharge[iPlane], iPlane);
+    TRDtrack.SetPIDTimBin(timebin[iPlane], iPlane);
+    Total_ch= Total_ch+clscharge[iPlane];
+  }
+  //  Int_t i;
+  //  Int_t nc=TRDtrack.GetNumberOfClusters(); 
+  //  Float_t dedx=0;
+  //  for (i=0; i<nc; i++) dedx += TRDtrack.GetClusterdQdl(i);
+  //  dedx /= nc;
+  //  for (Int_t iPlane = 0; iPlane < kNPlane; iPlane++) {
+  //    TRDtrack.SetPIDsignals(dedx, iPlane);
+  //    TRDtrack.SetPIDTimBin(timbin[iPlane], iPlane);
+  //  }
+
+} // end of function
 
 
+Int_t AliTRDtracker::FindClusters(Int_t sector, Int_t t0, Int_t t1, AliTRDtrack * track, Int_t *clusters,AliTRDtracklet&tracklet)
+{
+  //
+  //
+  //  try to find nearest clusters to the track in timebins from t0 to t1 
+  //  
+  //
+  //  
+  // correction coeficients   - depends on TRD parameters  - to be changed according it
+  //
+
+  Double_t x[100],yt[100],zt[100];
+  Double_t xmean=0;   //reference x
+  Double_t dz[10][100],dy[10][100];
+  Float_t zmean[100], nmean[100];
+  Int_t    clfound=0;
+  Int_t    indexes[10][100];    // indexes of the clusters in the road
+  AliTRDcluster *cl[10][100];   // pointers to the clusters in the road
+  Int_t    best[10][100];       // index of best matching cluster 
+  //
+  //
+  TClonesArray array0("AliTRDcluster",1);
+  TClonesArray array1("AliTRDcluster",1);
+  for (Int_t it=0;it<t1-t0; it++){
+    x[it]=0;
+    yt[it]=0;
+    zt[it]=0;
+    clusters[it+t0]=-2;
+    zmean[it]=0;
+    nmean[it]=0;
+    //
+    for (Int_t ih=0;ih<10;ih++){
+      indexes[ih][it]=-2;              //reset indexes1
+      cl[ih][it]=0;
+      dz[ih][it]=-100;
+      dy[ih][it]=-100;
+      best[ih][it]=0;
+    }
+  }  
+  //
+  Double_t x0 = track->GetX();
+  Double_t sigmaz = TMath::Sqrt(track->GetSigmaZ2());
+  Int_t nall=0;
+  Int_t nfound=0;
+  Double_t h01 =0;
+  Int_t plane =-1;
+  Float_t padlength=0;
+  AliTRDtrack track2(*track);
+  Float_t snpy = track->GetSnp();
+  Float_t tany = TMath::Sqrt(snpy*snpy/(1.-snpy*snpy)); 
+  if (snpy<0) tany*=-1;
+  //
+  Double_t sy2=ExpectedSigmaY2(x0,track->GetTgl(),track->GetPt());
+  Double_t sz2=ExpectedSigmaZ2(x0,track->GetTgl());
+  Double_t road = 15.*sqrt(track->GetSigmaY2() + sy2);
+  if (road>6.) road=6.;
+
+  //
+  for (Int_t it=0;it<t1-t0;it++){
+    Double_t maxChi2[2]={fgkMaxChi2,fgkMaxChi2};      
+    AliTRDpropagationLayer& timeBin=*(fTrSec[sector]->GetLayer(it+t0));
+    if (timeBin==0) continue;  // no indexes1
+    Int_t maxn = timeBin;
+    x[it] = timeBin.GetX();
+    track2.PropagateTo(x[it]);
+    yt[it] = track2.GetY();
+    zt[it] = track2.GetZ();
+    
+    Double_t  y=yt[it],z=zt[it];
+    Double_t chi2 =1000000;
+    nall++;
+    //
+    // find 2 nearest cluster at given time bin
+    // 
+    // 
+    for (Int_t i=timeBin.Find(y-road); i<maxn; i++) {
+      AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
+      h01 = GetTiltFactor(c);
+      if (plane<0){
+       Int_t det = c->GetDetector();    
+       plane = fGeom->GetPlane(det);
+       padlength = TMath::Sqrt(c->GetSigmaZ2()*12.);
+      }
+      //      if (c->GetLocalTimeBin()==0) continue;
+      if (c->GetY() > y+road) break;
+      if((c->GetZ()-z)*(c->GetZ()-z) > 12. * sz2) continue;      
+
+      Double_t dist = TMath::Abs(c->GetZ()-z);
+      if (dist> (0.5*padlength+6.*sigmaz)) continue;   // 6 sigma boundary cut
+      Double_t cost = 0;
+      //
+      if (dist> (0.5*padlength-sigmaz)){   //  sigma boundary cost function
+       cost =  (dist-0.5*padlength)/(2.*sigmaz);
+       if (cost>-1) cost= (cost+1.)*(cost+1.);
+       else cost=0;
+      }      
+      //      Int_t label = TMath::Abs(track->GetLabel());
+      //      if (c->GetLabel(0)!=label && c->GetLabel(1)!=label&&c->GetLabel(2)!=label) continue;
+      chi2=track2.GetPredictedChi2(c,h01)+cost;
+      //
+      clfound++;      
+      if (chi2 > maxChi2[1]) continue;
+      
+      for (Int_t ih=2;ih<9; ih++){  //store the clusters in the road
+       if (cl[ih][it]==0){
+         cl[ih][it] = c;
+         indexes[ih][it] =timeBin.GetIndex(i);   // index - 9 - reserved for outliers
+         break;
+       }
+      }
+      //
+      if (chi2 <maxChi2[0]){
+       maxChi2[1]     = maxChi2[0];
+       maxChi2[0]     = chi2;
+       indexes[1][it] = indexes[0][it];
+       cl[1][it]      = cl[0][it];
+       indexes[0][it] = timeBin.GetIndex(i);
+       cl[0][it]      = c;
+       continue;
+      }
+      maxChi2[1]=chi2;
+      cl[1][it] = c;
+      indexes[1][it] =timeBin.GetIndex(i); 
+    }         
+    if (cl[0][it]){
+      nfound++;
+      xmean += x[it];
+    }
+  }
+  //
+  if (nfound<4) return 0;  
+  xmean /=Float_t(nfound);     // middle x
+  track2.PropagateTo(xmean);   // propagate track to the center
+  //
+  // choose one of the variants
+  //
+  Int_t changes[10];
+  Float_t sumz      = 0;
+  Float_t sum       = 0;
+  Double_t sumdy    = 0;
+  Double_t sumdy2   = 0;
+  Double_t sumx     = 0;
+  Double_t sumxy    = 0;
+  Double_t sumx2    = 0;
+  Double_t mpads    = 0;
+  //
+  Int_t   ngood[10];
+  Int_t   nbad[10];
+  //
+  Double_t meanz[10];
+  Double_t moffset[10];    // mean offset
+  Double_t mean[10];       // mean value
+  Double_t angle[10];      // angle
+  //
+  Double_t smoffset[10];   // sigma of mean offset
+  Double_t smean[10];      // sigma of mean value
+  Double_t sangle[10];     // sigma of angle
+  Double_t smeanangle[10]; // correlation
+  //
+  Double_t sigmas[10];     
+  Double_t tchi2s[10];      // chi2s for tracklet
+  //
+  // calculate zmean
+  //
+  for (Int_t it=0;it<t1-t0;it++){
+    if (!cl[0][it]) continue;
+    for (Int_t dt=-3;dt<=3;dt++){
+      if (it+dt<0) continue;
+      if (it+dt>t1) continue;
+      if (!cl[0][it+dt]) continue;
+      zmean[it]+=cl[0][it+dt]->GetZ();
+      nmean[it]+=1.;
+    }
+    zmean[it]/=nmean[it]; 
+  }
+  //
+  for (Int_t it=0; it<t1-t0;it++){
+    best[0][it]=0;
+    for (Int_t ih=0;ih<10;ih++){
+      dz[ih][it]=-100;
+      dy[ih][it]=-100;
+      if (!cl[ih][it]) continue;
+      Float_t poscor =  fgkCoef*(cl[ih][it]->GetLocalTimeBin() - fgkMean)+fgkOffset;      
+      dz[ih][it]  = cl[ih][it]->GetZ()- zt[it];                               // calculate distance from track  in z
+      dy[ih][it]  = cl[ih][it]->GetY()+ dz[ih][it]*h01 - poscor  -yt[it];     //                                in y
+    }
+    // minimize changes
+    if (!cl[0][it]) continue;
+    if (TMath::Abs(cl[0][it]->GetZ()-zmean[it])> padlength*0.8 &&cl[1][it])
+      if (TMath::Abs(cl[1][it]->GetZ()-zmean[it])< padlength*0.5){
+       best[0][it]=1;
+      }
+  }
+  //
+  // iterative choosing of "best path"
+  //
+  //
+  Int_t label = TMath::Abs(track->GetLabel());
+  Int_t bestiter=0;
+  //
+  for (Int_t iter=0;iter<9;iter++){
+    //
+    changes[iter]= 0;
+    sumz      = 0; sum=0; sumdy=0;sumdy2=0;sumx=0;sumx2=0;sumxy=0;mpads=0; ngood[iter]=0; nbad[iter]=0; 
+    // linear fit
+    for (Int_t it=0;it<t1-t0;it++){
+      if (!cl[best[iter][it]][it]) continue;
+      //calculates pad-row changes
+      Double_t zbefore= cl[best[iter][it]][it]->GetZ();
+      Double_t zafter = cl[best[iter][it]][it]->GetZ();
+      for (Int_t itd = it-1; itd>=0;itd--) {
+       if (cl[best[iter][itd]][itd]) {
+         zbefore= cl[best[iter][itd]][itd]->GetZ();
+         break;
+       }
+      }
+      for (Int_t itd = it+1; itd<t1-t0;itd++) {
+       if (cl[best[iter][itd]][itd]) {
+         zafter= cl[best[iter][itd]][itd]->GetZ();
+         break;
+       }
+      }
+      if (TMath::Abs(cl[best[iter][it]][it]->GetZ()-zbefore)>0.1&&TMath::Abs(cl[best[iter][it]][it]->GetZ()-zafter)>0.1) changes[iter]++;
+      //
+      Double_t dx = x[it]-xmean;  // distance to reference x
+      sumz += cl[best[iter][it]][it]->GetZ();      
+      sum++;
+      sumdy += dy[best[iter][it]][it];
+      sumdy2+= dy[best[iter][it]][it]*dy[best[iter][it]][it];
+      sumx  += dx;
+      sumx2 += dx*dx;
+      sumxy  += dx*dy[best[iter][it]][it];
+      mpads += cl[best[iter][it]][it]->GetNPads();
+      if (cl[best[iter][it]][it]->GetLabel(0)==label || cl[best[iter][it]][it]->GetLabel(1)==label||cl[best[iter][it]][it]->GetLabel(2)==label){
+       ngood[iter]++;
+      }
+      else{
+       nbad[iter]++;
+      }
+    }
+    //
+    // calculates line parameters
+    //
+    Double_t det  = sum*sumx2-sumx*sumx;
+    angle[iter]   = (sum*sumxy-sumx*sumdy)/det;
+    mean[iter]    = (sumx2*sumdy-sumx*sumxy)/det;
+    meanz[iter]   = sumz/sum;    
+    moffset[iter] = sumdy/sum;
+    mpads        /= sum;                         // mean number of pads
+    //
+    //
+    Double_t  sigma2 = 0;   // normalized residuals - for line fit
+    Double_t  sigma1 = 0;   // normalized residuals - constant fit
+    //
+    for (Int_t it=0;it<t1-t0;it++){
+      if (!cl[best[iter][it]][it]) continue;
+      Double_t dx = x[it]-xmean;
+      Double_t ytr = mean[iter]+angle[iter]*dx;
+      sigma2 += (dy[best[iter][it]][it]-ytr)*(dy[best[iter][it]][it]-ytr);
+      sigma1 +=  (dy[best[iter][it]][it]-moffset[iter])*(dy[best[iter][it]][it]-moffset[iter]);
+      sum++;
+    }
+    sigma2      /=(sum-2);                    // normalized residuals
+    sigma1      /=(sum-1);                    // normalized residuals
+    //
+    smean[iter]       = sigma2*(sumx2/det);   // estimated error2 of mean
+    sangle[iter]      = sigma2*(sum/det);     // estimated error2 of angle
+    smeanangle[iter]  = sigma2*(-sumx/det);   // correlation
+    //
+    //
+    sigmas[iter]  = TMath::Sqrt(sigma1);      //
+    smoffset[iter]= (sigma1/sum)+0.01*0.01;             // sigma of mean offset + unisochronity sigma 
+    //
+    // iterative choosing of "better path"
+    //
+    for (Int_t it=0;it<t1-t0;it++){
+      if (!cl[best[iter][it]][it]) continue;
+      //
+      Double_t sigmatr2 = smoffset[iter]+0.5*tany*tany;             //add unisochronity + angular effect contribution
+      Double_t sweight  = 1./sigmatr2+1./track->fCyy;
+      Double_t weighty  = (moffset[iter]/sigmatr2)/sweight;         // weighted mean
+      Double_t sigmacl  = TMath::Sqrt(sigma1*sigma1+track->fCyy);   //
+      Double_t mindist=100000; 
+      Int_t ihbest=0;
+      for (Int_t ih=0;ih<10;ih++){
+       if (!cl[ih][it]) break;
+       Double_t dist2 = (dy[ih][it]-weighty)/sigmacl;
+       dist2*=dist2;    //chi2 distance
+       if (dist2<mindist){
+         mindist = dist2;
+         ihbest =ih;
+       }
+      }
+      best[iter+1][it]=ihbest;
+    }
+    //
+    //  update best hypothesy if better chi2 according tracklet position and angle
+    //
+    Double_t sy2 = smean[iter]  + track->fCyy;
+    Double_t sa2 = sangle[iter] + track->fCee;
+    Double_t say = track->fCey;
+    //    Double_t chi20 = mean[bestiter]*mean[bestiter]/sy2+angle[bestiter]*angle[bestiter]/sa2;
+    // Double_t chi21 = mean[iter]*mean[iter]/sy2+angle[iter]*angle[iter]/sa2;
+
+    Double_t detchi    = sy2*sa2-say*say;
+    Double_t invers[3] = {sa2/detchi, sy2/detchi, -say/detchi};   //inverse value of covariance matrix  
+    
+    Double_t chi20 = mean[bestiter]*mean[bestiter]*invers[0]+angle[bestiter]*angle[bestiter]*invers[1]+
+      2.*mean[bestiter]*angle[bestiter]*invers[2];
+    Double_t chi21 = mean[iter]*mean[iter]*invers[0]+angle[iter]*angle[iter]*invers[1]+
+      2*mean[iter]*angle[iter]*invers[2];
+    tchi2s[iter] =chi21;
+    //
+    if (changes[iter]<=changes[bestiter] && chi21<chi20) {
+      bestiter =iter;      
+    }
+  }
+  //
+  //set clusters 
+  //
+  Double_t sigma2 = sigmas[0];   // choose as sigma  from 0 iteration
+  //if (tchi2s[bestiter]>25.) sigma2*=tchi2s[bestiter]/25.;
+  //if (tchi2s[bestiter]>25.) sigma2=1000.;  // dont'accept
+
+  Double_t expectederr = sigma2*sigma2+0.01*0.01;
+  if (mpads>3.5) expectederr  +=   (mpads-3.5)*0.04;
+  if (changes[bestiter]>1) expectederr+=   changes[bestiter]*0.01; 
+  expectederr+=(0.03*(tany-fgkExB)*(tany-fgkExB))*15;
+  //  if (tchi2s[bestiter]>18.) expectederr*= tchi2s[bestiter]/18.;
+  //expectederr+=10000;
+  for (Int_t it=0;it<t1-t0;it++){
+    if (!cl[best[bestiter][it]][it]) continue;
+    Float_t poscor =  fgkCoef*(cl[best[bestiter][it]][it]->GetLocalTimeBin() - fgkMean)+fgkOffset;          
+    cl[best[bestiter][it]][it]->SetSigmaY2(expectederr);  // set cluster error
+    if (!cl[best[bestiter][it]][it]->IsUsed()){
+      cl[best[bestiter][it]][it]->SetY( cl[best[bestiter][it]][it]->GetY()-poscor);  // ExB corrction correction    
+      cl[best[bestiter][it]][it]->Use();
+    }
+    clusters[it+t0] = indexes[best[bestiter][it]][it];    
+  } 
+  //
+  // set tracklet parameters
+  //
+  Double_t trackleterr2 = smoffset[bestiter]+0.01*0.01;
+  if (mpads>3.5) trackleterr2  +=   (mpads-3.5)*0.04;
+  trackleterr2+=   changes[bestiter]*0.01;
+  trackleterr2*=   TMath::Max(14.-nfound,1.);
+  trackleterr2+=   0.2*(tany-fgkExB)*(tany-fgkExB); 
+  //
+  tracklet.Set(xmean, track2.GetY()+moffset[bestiter], meanz[bestiter], track2.GetAlpha(), trackleterr2);  //set tracklet parameters
+  tracklet.SetTilt(h01);
+  tracklet.SetP0(mean[bestiter]);
+  tracklet.SetP1(angle[bestiter]);
+  tracklet.SetN(nfound);
+  tracklet.SetNCross(changes[bestiter]);
+  tracklet.SetPlane(plane);
+  tracklet.SetSigma2(expectederr);
+  tracklet.SetChi2(tchi2s[bestiter]);
+  track->fTracklets[plane] = tracklet;
+  track->fNWrong+=nbad[0];
+  //
+  // Debuging part
+  //
+  TTreeSRedirector& cstream = *fDebugStreamer;
+  AliTRDcluster dummy;
+  Double_t dy0[100];
+  Double_t dyb[100];  
+  for (Int_t it=0;it<t1-t0;it++){
+    dy0[it] = dy[0][it];
+    dyb[it] = dy[best[bestiter][it]][it];
+    if(cl[0][it]) {
+      new(array0[it]) AliTRDcluster(*cl[0][it]);
+    }
+    else{
+      new(array0[it]) AliTRDcluster(dummy);
+    }
+    if(cl[best[bestiter][it]][it]) {
+      new(array1[it]) AliTRDcluster(*cl[best[bestiter][it]][it]);
+    }
+    else{
+      new(array1[it]) AliTRDcluster(dummy);
+    }
+  }
+  TGraph graph0(t1-t0,x,dy0);
+  TGraph graph1(t1-t0,x,dyb);
+  TGraph graphy(t1-t0,x,yt);
+  TGraph graphz(t1-t0,x,zt);
+  //
+  //
+  cstream<<"tracklet"<<
+    "track.="<<track<<                                       // track parameters
+    "tany="<<tany<<                                          // tangent of the local track angle 
+    "xmean="<<xmean<<                                        // xmean - reference x of tracklet  
+    "tilt="<<h01<<                                           // tilt angle
+    "nall="<<nall<<                                          // number of foundable clusters 
+    "nfound="<<nfound<<                                      // number of found clusters
+    "clfound="<<clfound<<                                    // total number of found clusters in road 
+    "mpads="<<mpads<<                                        // mean number of pads per cluster
+    "plane="<<plane<<                                        // plane number 
+    "road="<<road<<                                          // the width of the used road
+    "graph0.="<<&graph0<<                                    // x - y = dy for closest cluster
+    "graph1.="<<&graph1<<                                    // x - y = dy for second closest cluster    
+    "graphy.="<<&graphy<<                                    // y position of the track
+    "graphz.="<<&graphz<<                                    // z position of the track
+    "fCl.="<<&array0<<                                       // closest cluster
+    "fCl2.="<<&array1<<                                      // second closest cluster
+    //
+    "bestiter="<<bestiter<<                                  // best iteration number 
+    "tracklet.="<<&tracklet<<                                // corrspond to the best iteration
+    "tchi20="<<tchi2s[0]<<                                   // chi2 of cluster in the 0 iteration
+    "tchi2b="<<tchi2s[bestiter]<<                            // chi2 of cluster in the best  iteration
+    "sigmas0="<<sigmas[0]<<                                  // residuals sigma 
+    "sigmasb="<<sigmas[bestiter]<<                           // residulas sigma
+    //
+    "ngood0="<<ngood[0]<<                                    // number of good clusters in 0 iteration
+    "nbad0="<<nbad[0]<<                                      // number of bad clusters in 0 iteration
+    "ngoodb="<<ngood[bestiter]<<                             //                        in  best iteration    
+    "nbadb="<<nbad[bestiter]<<                               //                        in  best iteration
+    //
+    "changes0="<<changes[0]<<                                // changes of pardrows in iteration number 0 
+    "changesb="<<changes[bestiter]<<                         // changes of pardrows in best iteration
+    //
+    "moffset0="<<moffset[0]<<                                // offset fixing angle in iter=0
+    "smoffset0="<<smoffset[0]<<                              // sigma of offset fixing angle in iter=0
+    "moffsetb="<<moffset[bestiter]<<                         // offset fixing angle in iter=best
+    "smoffsetb="<<smoffset[bestiter]<<                       // sigma of offset fixing angle in iter=best
+    //
+    "mean0="<<mean[0]<<                                      // mean dy in iter=0;
+    "smean0="<<smean[0]<<                                    // sigma of mean dy in iter=0
+    "meanb="<<mean[bestiter]<<                               // mean dy in iter=best
+    "smeanb="<<smean[bestiter]<<                             // sigma of mean dy in iter=best
+    //
+    "angle0="<<angle[0]<<                                    // angle deviation in the iteration number 0 
+    "sangle0="<<sangle[0]<<                                  // sigma of angular deviation in iteration number 0
+    "angleb="<<angle[bestiter]<<                             // angle deviation in the best iteration   
+    "sangleb="<<sangle[bestiter]<<                           // sigma of angle deviation in the best iteration   
+    //
+    "expectederr="<<expectederr<<                            // expected error of cluster position
+    "\n";
+  //
+  //
+  return nfound;
+}