]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDtrackerV1.cxx
Remove obsolete stepmanager functions
[u/mrichter/AliRoot.git] / TRD / AliTRDtrackerV1.cxx
index 2ad36db4ab14c2ede3dba746a32f75ea8df18796..ad607ed9c39e99b7cf17ee1bdcc77bde146649ca 100644 (file)
@@ -1,18 +1,17 @@
-
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
+* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+*                                                                        *
+* Author: The ALICE Off-line Project.                                    *
+* Contributors are mentioned in the code where appropriate.              *
+*                                                                        *
+* Permission to use, copy, modify and distribute this software and its   *
+* documentation strictly for non-commercial purposes is hereby granted   *
+* without fee, provided that the above copyright notice appears in all   *
+* copies and that both the copyright notice and this permission notice   *
+* appear in the supporting documentation. The authors make no claims     *
+* about the suitability of this software for any purpose. It is          *
+* provided "as is" without express or implied warranty.                  *
+**************************************************************************/
 
 /* $Id$ */
 
 #include <TTree.h>  
 #include <TClonesArray.h>
 #include <TTreeStream.h>
+#include <TGeoMatrix.h>
+#include <TGeoManager.h>
 
 #include "AliLog.h"
+#include "AliMathBase.h"
 #include "AliESDEvent.h"
 #include "AliGeomManager.h"
 #include "AliRieman.h"
@@ -72,17 +74,19 @@ Double_t AliTRDtrackerV1::fgTopologicQA[kNConfigs] = {
   0.1112, 0.1112, 0.1112, 0.0786, 0.0786,
   0.0786, 0.0786, 0.0579, 0.0579, 0.0474,
   0.0474, 0.0408, 0.0335, 0.0335, 0.0335
-};
+};  
+const Double_t AliTRDtrackerV1::fgkX0[kNPlanes]    = {
+  300.2, 312.8, 325.4, 338.0, 350.6, 363.2};
 Int_t AliTRDtrackerV1::fgNTimeBins = 0;
-TTreeSRedirector *AliTRDtrackerV1::fgDebugStreamer = 0x0;
 AliRieman* AliTRDtrackerV1::fgRieman = 0x0;
 TLinearFitter* AliTRDtrackerV1::fgTiltedRieman = 0x0;
 TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = 0x0;
 
 //____________________________________________________________________
-AliTRDtrackerV1::AliTRDtrackerV1() 
+AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec
   :AliTracker()
-  ,fGeom(new AliTRDgeometry())
+  ,fReconstructor(0x0)
+  ,fGeom(0x0)
   ,fClusters(0x0)
   ,fTracklets(0x0)
   ,fTracks(0x0)
@@ -91,18 +95,44 @@ AliTRDtrackerV1::AliTRDtrackerV1()
   //
   // Default constructor.
   // 
-  if (!AliTRDcalibDB::Instance()) {
-    AliFatal("Could not get calibration object");
+  
+  SetReconstructor(rec); // initialize reconstructor
+
+  // initialize geometry
+  if(!AliGeomManager::GetGeometry()){
+    AliFatal("Could not get geometry.");
+  }
+  fGeom = new AliTRDgeometry();
+  fGeom->CreateClusterMatrixArray();
+  TGeoHMatrix *matrix = 0x0;
+  Double_t loc[] = {0., 0., 0.};
+  Double_t glb[] = {0., 0., 0.};
+  for(Int_t ily=kNPlanes; ily--;){
+    Int_t ism = 0;
+    while(!(matrix = fGeom->GetClusterMatrix(AliTRDgeometry::GetDetector(ily, 2, ism)))) ism++;
+    if(!matrix){
+      AliError(Form("Could not get transformation matrix for layer %d. Use default.", ily));
+      fR[ily] = fgkX0[ily];
+      continue;
+    }
+    matrix->LocalToMaster(loc, glb);
+    fR[ily] = glb[0]+ AliTRDgeometry::AnodePos()-.5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick();
   }
-  fgNTimeBins = AliTRDcalibDB::Instance()->GetNumberOfTimeBins();
 
-  for (Int_t isector = 0; isector < AliTRDgeometry::kNsect; isector++) new(&fTrSec[isector]) AliTRDtrackingSector(fGeom, isector);
-  
-  if(AliTRDReconstructor::StreamLevel() > 1){
-    TDirectory *savedir = gDirectory; 
-    fgDebugStreamer    = new TTreeSRedirector("TRD.TrackerDebug.root");
-    savedir->cd();
+  // initialize calibration values
+  AliTRDcalibDB *trd = 0x0;
+  if (!(trd = AliTRDcalibDB::Instance())) {
+    AliFatal("Could not get calibration.");
   }
+  if(!fgNTimeBins) fgNTimeBins = trd->GetNumberOfTimeBins();
+
+  // initialize cluster containers
+  for (Int_t isector = 0; isector < AliTRDgeometry::kNsector; isector++) new(&fTrSec[isector]) AliTRDtrackingSector(fGeom, isector);
+  
+  // initialize arrays
+  memset(fTrackQuality, 0, kMaxTracksStack*sizeof(Double_t));
+  memset(fSeedLayer, 0, kMaxTracksStack*sizeof(Int_t));
+  memset(fSeedTB, 0, kNSeedPlanes*sizeof(AliTRDchamberTimeBin*));
 }
 
 //____________________________________________________________________
@@ -111,14 +141,16 @@ AliTRDtrackerV1::~AliTRDtrackerV1()
   //
   // Destructor
   //
-       
-  if(fgDebugStreamer) delete fgDebugStreamer;
-  if(fgRieman) delete fgRieman;
-  if(fgTiltedRieman) delete fgTiltedRieman;
-  if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained;
+  
+  if(fgRieman) delete fgRieman; fgRieman = 0x0;
+  if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = 0x0;
+  if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = 0x0;
+  for(Int_t isl =0; isl<kNSeedPlanes; isl++) if(fSeedTB[isl]) delete fSeedTB[isl];
   if(fTracks) {fTracks->Delete(); delete fTracks;}
   if(fTracklets) {fTracklets->Delete(); delete fTracklets;}
-  if(fClusters) {fClusters->Delete(); delete fClusters;}
+  if(fClusters) {
+    fClusters->Delete(); delete fClusters;
+  }
   if(fGeom) delete fGeom;
 }
 
@@ -140,14 +172,14 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
   //    See AliTRDtrackerV1::Clusters2TracksSM() for details.
   //
 
-  if(!AliTRDReconstructor::RecoParam()){
+  if(!fReconstructor->GetRecoParam() ){
     AliError("Reconstruction configuration not initialized. Call first AliTRDReconstructor::SetRecoParam().");
     return 0;
   }
-       
+  
   //AliInfo("Start Track Finder ...");
   Int_t ntracks = 0;
-  for(int ism=0; ism<AliTRDgeometry::kNsect; ism++){
+  for(int ism=0; ism<AliTRDgeometry::kNsector; ism++){
     // for(int ism=1; ism<2; ism++){
     //AliInfo(Form("Processing supermodule %i ...", ism));
     ntracks += Clusters2TracksSM(ism, esd);
@@ -161,51 +193,42 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
 Bool_t AliTRDtrackerV1::GetTrackPoint(Int_t index, AliTrackPoint &p) const
 {
   //AliInfo(Form("Asking for tracklet %d", index));
-       
-  if(index<0) return kFALSE;
-  AliTRDseedV1 *tracklet = 0x0; 
-  if(!(tracklet = (AliTRDseedV1*)fTracklets->UncheckedAt(index))) return kFALSE;
-       
+  
+  // reset position of the point before using it
+  p.SetXYZ(0., 0., 0.);
+  AliTRDseedV1 *tracklet = GetTracklet(index); 
+  if (!tracklet) return kFALSE;
+
   // get detector for this tracklet
-  AliTRDcluster *cl = 0x0;
-  Int_t ic = 0; do; while(!(cl = tracklet->GetClusters(ic++)));         
-  Int_t  idet     = cl->GetDetector();
-               
+  Int_t det = tracklet->GetDetector();
+  Int_t sec = fGeom->GetSector(det);
+  Double_t alpha = (sec+.5)*AliTRDgeometry::GetAlpha(),
+           sinA  = TMath::Sin(alpha),
+           cosA  = TMath::Cos(alpha);
   Double_t local[3];
-  local[0] = tracklet->GetX0(); 
-  local[1] = tracklet->GetYfit(0);
-  local[2] = tracklet->GetZfit(0);
+  local[0] = tracklet->GetX(); 
+  local[1] = tracklet->GetY();
+  local[2] = tracklet->GetZ();
   Double_t global[3];
-  fGeom->RotateBack(idet, local, global);
-  p.SetXYZ(global[0],global[1],global[2]);
-       
-       
+  fGeom->RotateBack(det, local, global);
+
+  Double_t cov2D[3]; Float_t cov[6];
+  tracklet->GetCovAt(local[0], cov2D);
+  cov[0] = cov2D[0]*sinA*sinA;
+  cov[1] =-cov2D[0]*sinA*cosA;
+  cov[2] =-cov2D[1]*sinA;
+  cov[3] = cov2D[0]*cosA*cosA;
+  cov[4] = cov2D[1]*cosA;
+  cov[5] = cov2D[2];
+  // store the global position of the tracklet and its covariance matrix in the track point 
+  p.SetXYZ(global[0],global[1],global[2], cov);
+  
   // setting volume id
-  AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
-  switch (fGeom->GetPlane(idet)) {
-  case 0:
-    iLayer = AliGeomManager::kTRD1;
-    break;
-  case 1:
-    iLayer = AliGeomManager::kTRD2;
-    break;
-  case 2:
-    iLayer = AliGeomManager::kTRD3;
-    break;
-  case 3:
-    iLayer = AliGeomManager::kTRD4;
-    break;
-  case 4:
-    iLayer = AliGeomManager::kTRD5;
-    break;
-  case 5:
-    iLayer = AliGeomManager::kTRD6;
-    break;
-  };
-  Int_t    modId = fGeom->GetSector(idet) * fGeom->Ncham() + fGeom->GetChamber(idet);
+  AliGeomManager::ELayerID iLayer = AliGeomManager::ELayerID(AliGeomManager::kTRD1+fGeom->GetLayer(det));
+  Int_t    modId = fGeom->GetSector(det) * AliTRDgeometry::kNstack + fGeom->GetStack(det);
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer, modId);
   p.SetVolumeID(volid);
-               
+    
   return kTRUE;
 }
 
@@ -222,14 +245,14 @@ TLinearFitter* AliTRDtrackerV1::GetTiltedRiemanFitterConstraint()
   if(!fgTiltedRiemanConstrained) fgTiltedRiemanConstrained = new TLinearFitter(2, "hyp2");
   return fgTiltedRiemanConstrained;
 }
-       
+  
 //____________________________________________________________________ 
 AliRieman* AliTRDtrackerV1::GetRiemanFitter()
 {
-  if(!fgRieman) fgRieman = new AliRieman(AliTRDtrackingChamber::kNTimeBins * AliTRDgeometry::kNplan);
+  if(!fgRieman) fgRieman = new AliRieman(AliTRDseedV1::kNtb * AliTRDgeometry::kNlayer);
   return fgRieman;
 }
-       
+  
 //_____________________________________________________________________________
 Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) 
 {
@@ -246,173 +269,185 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
   if (!calibra) AliInfo("Could not get Calibra instance\n");
   
-  Int_t   found    = 0;     // number of tracks found
+  // Define scalers
+  Int_t nFound   = 0, // number of tracks found
+        nSeeds   = 0, // total number of ESD seeds
+        nTRDseeds= 0, // number of seeds in the TRD acceptance
+        nTPCseeds= 0; // number of TPC seeds
   Float_t foundMin = 20.0;
-       
-  Int_t    nSeed   = event->GetNumberOfTracks();
-  if(!nSeed){
-    // run stand alone tracking
-    if (AliTRDReconstructor::SeedingOn()) Clusters2Tracks(event);
-    return 0;
+  
+  Float_t *quality = 0x0;
+  Int_t   *index   = 0x0;
+  nSeeds   = event->GetNumberOfTracks();
+  // Sort tracks according to quality 
+  // (covariance in the yz plane)
+  if(nSeeds){  
+    quality = new Float_t[nSeeds];
+    index   = new Int_t[nSeeds];
+    for (Int_t iSeed = nSeeds; iSeed--;) {
+      AliESDtrack *seed = event->GetTrack(iSeed);
+      Double_t covariance[15];
+      seed->GetExternalCovariance(covariance);
+      quality[iSeed] = covariance[0] + covariance[2];
+    }
+    TMath::Sort(nSeeds, quality, index,kFALSE);
   }
-       
-  Float_t *quality = new Float_t[nSeed];
-  Int_t   *index   = new Int_t[nSeed];
-  for (Int_t iSeed = 0; iSeed < nSeed; iSeed++) {
-    AliESDtrack *seed = event->GetTrack(iSeed);
-    Double_t covariance[15];
-    seed->GetExternalCovariance(covariance);
-    quality[iSeed] = covariance[0] + covariance[2];
-  }
-  // Sort tracks according to covariance of local Y and Z
-  TMath::Sort(nSeed,quality,index,kFALSE);
-       
-  // Backpropagate all seeds
+  
+  // Propagate all seeds
   Int_t   expectedClr;
   AliTRDtrackV1 track;
-  for (Int_t iSeed = 0; iSeed < nSeed; iSeed++) {
-       
+  for (Int_t iSeed = 0; iSeed < nSeeds; iSeed++) {
+  
     // Get the seeds in sorted sequence
     AliESDtrack *seed = event->GetTrack(index[iSeed]);
-       
+    Float_t p4  = seed->GetC(seed->GetBz());
+  
     // Check the seed status
     ULong_t status = seed->GetStatus();
     if ((status & AliESDtrack::kTPCout) == 0) continue;
     if ((status & AliESDtrack::kTRDout) != 0) continue;
-       
-    // Do the back prolongation
-    Int_t   lbl         = seed->GetLabel();
+
+    // Propagate to the entrance in the TRD mother volume
     new(&track) AliTRDtrackV1(*seed);
-    //track->Print();
-    track.SetSeedLabel(lbl);
-    seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup); // Make backup
-    Float_t p4          = track.GetC();
-    if((expectedClr = FollowBackProlongation(track))){
+    if(AliTRDgeometry::GetXtrdBeg() > (fgkMaxStep + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), fgkMaxStep)){ 
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+      continue;
+    }    
+    if(!AdjustSector(&track)){
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+      continue;
+    }
+    if(TMath::Abs(track.GetSnp()) > fgkMaxSnp) {
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+      continue;
+    }
+
+    nTPCseeds++;
+
+    // store track status at TRD entrance
+    seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
+
+    // prepare track and do propagation in the TRD
+    track.SetReconstructor(fReconstructor);
+    track.SetKink(Bool_t(seed->GetKinkIndex(0)));
+    expectedClr = FollowBackProlongation(track);
+    // check if track entered the TRD fiducial volume
+    if(track.GetTrackLow()){ 
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDin);
+      nTRDseeds++;
+    }
+    // check if track was stopped in the TRD
+    if (expectedClr<0){      
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+      continue;
+    }
+
+    if(expectedClr){
+      nFound++;  
       // computes PID for track
       track.CookPID();
       // update calibration references using this track
       if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
+      // save calibration object
+      if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){ 
+        AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
+        calibTrack->SetOwner();
+        seed->AddCalibObject(calibTrack);
+      }
+      //update ESD track
+      if ((track.GetNumberOfClusters() > 15) && (track.GetNumberOfClusters() > 0.5*expectedClr)) {
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+        track.UpdateESDtrack(seed);
+      }
     }
 
-    if ((TMath::Abs(track.GetC() - p4) / TMath::Abs(p4) < 0.2) ||
-       (track.Pt() > 0.8)) {
-      //
+    if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) {
+
       // Make backup for back propagation
-      //
       Int_t foundClr = track.GetNumberOfClusters();
       if (foundClr >= foundMin) {
-       //AliInfo(Form("Making backup track ncls [%d]...", foundClr));
-       track.CookdEdx();
-       track.CookdEdxTimBin(seed->GetID());
-       track.CookLabel(1. - fgkLabelFraction);
-       if(track.GetBackupTrack()) UseClusters(track.GetBackupTrack());
-                               
-
-       // Sign only gold tracks
-       if (track.GetChi2() / track.GetNumberOfClusters() < 4) {
-         if ((seed->GetKinkIndex(0)      ==   0) &&
-             (track.Pt()                <  1.5)) UseClusters(&track);
-       }
-       Bool_t isGold = kFALSE;
-       
-       // Full gold track
-       if (track.GetChi2() / track.GetNumberOfClusters() < 5) {
-         if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+        track.CookLabel(1. - fgkLabelFraction);
+        //if(track.GetBackupTrack()) UseClusters(track.GetBackupTrack());
+
+        // Sign only gold tracks
+        if (track.GetChi2() / track.GetNumberOfClusters() < 4) {
+          //if ((seed->GetKinkIndex(0)      ==   0) && (track.Pt() <  1.5)) UseClusters(&track);
+        }
+        Bool_t isGold = kFALSE;
+  
+        // Full gold track
+        if (track.GetChi2() / track.GetNumberOfClusters() < 5) {
+          if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
 
-         isGold = kTRUE;
-       }
-       
-       // Almost gold track
-       if ((!isGold)  && (track.GetNCross() == 0) &&
-           (track.GetChi2() / track.GetNumberOfClusters()  < 7)) {
-         //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->GetNCross() == 0) && (Float_t(track->GetNumberOfClusters()) / Float_t(track->GetNExpected())  > 0.4)) {
-       //seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
-       //}
+          isGold = kTRUE;
+        }
+  
+        // Almost gold track
+        if ((!isGold)  && (track.GetNCross() == 0) &&  (track.GetChi2() / track.GetNumberOfClusters()  < 7)) {
+          //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;
+          }
+        }
       }
     }
-
-    // Propagation to the TOF (I.Belikov)
-    if (track.GetStop() == kFALSE) {
-      Double_t xtof  = 371.0;
-      Double_t xTOF0 = 370.0;
-               
-      Double_t c2    = track.GetSnp() + track.GetC() * (xtof - track.GetX());
-      if (TMath::Abs(c2) >= 0.99) continue;
-                       
-      PropagateToX(track, xTOF0, fgkMaxStep);
-       
-      // Energy losses taken to the account - check one more time
-      c2 = track.GetSnp() + track.GetC() * (xtof - track.GetX());
-      if (TMath::Abs(c2) >= 0.99) continue;
-                       
-      //if (!PropagateToX(*track,xTOF0,fgkMaxStep)) {
-      //       fHBackfit->Fill(7);
-      //delete track;
-      //       continue;
-      //}
-       
-      Double_t ymax = xtof * TMath::Tan(0.5 * AliTRDgeometry::GetAlpha());
-      Double_t y;
-      track.GetYAt(xtof,GetBz(),y);
-      if (y >  ymax) {
-       if (!track.Rotate( AliTRDgeometry::GetAlpha())) continue;
-      }else if (y < -ymax) {
-       if (!track.Rotate(-AliTRDgeometry::GetAlpha())) continue;
+    
+    // Propagation to the TOF
+    if(!(seed->GetStatus()&AliESDtrack::kTRDStop)) {
+      Int_t sm = track.GetSector();
+      // default value in case we have problems with the geometry.
+      Double_t xtof  = 371.; 
+      //Calculate radial position of the beginning of the TOF
+      //mother volume. In order to avoid mixing of the TRD 
+      //and TOF modules some hard values are needed. This are:
+      //1. The path to the TOF module.
+      //2. The width of the TOF (29.05 cm)
+      //(with the help of Annalisa de Caro Mar-17-2009)
+      if(gGeoManager){
+        gGeoManager->cd(Form("/ALIC_1/B077_1/BSEGMO%d_1/BTOF%d_1", sm, sm));
+        TGeoHMatrix *m = 0x0;
+        Double_t loc[]={0., 0., -.5*29.05}, glob[3];
+        
+        if((m=gGeoManager->GetCurrentMatrix())){
+          m->LocalToMaster(loc, glob);
+          xtof = TMath::Sqrt(glob[0]*glob[0]+glob[1]*glob[1]);
+        }
       }
-                                       
-      if (track.PropagateTo(xtof)) {
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-       track.UpdateESDtrack(seed);
-                               
-       // Add TRD track to ESDfriendTrack
-       if (AliTRDReconstructor::StreamLevel() > 0 /*&& quality TODO*/){ 
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
-         calibTrack->SetOwner();
-         seed->AddCalibObject(calibTrack);
-       }
-       found++;
+      if(xtof > (fgkMaxStep + track.GetX()) && !PropagateToX(track, xtof, fgkMaxStep)){ 
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
       }
-    } else {                   
-      if ((track.GetNumberOfClusters() >              15) &&
-         (track.GetNumberOfClusters() > 0.5*expectedClr)) {
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-       
-       track.UpdateESDtrack(seed);
-                               
-       // Add TRD track to ESDfriendTrack
-       if (AliTRDReconstructor::StreamLevel() > 0 /*&& quality TODO*/){ 
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
-         calibTrack->SetOwner();
-         seed->AddCalibObject(calibTrack);
-       }
-       found++;
+      if(!AdjustSector(&track)){ 
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
       }
+      if(TMath::Abs(track.GetSnp()) > fgkMaxSnp){ 
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
+      }
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+      // TODO obsolete - delete
+      seed->SetTRDQuality(track.StatusForTOF()); 
     }
-       
-    seed->SetTRDQuality(track.StatusForTOF());
     seed->SetTRDBudget(track.GetBudget(0));
   }
-       
+  if(index) delete [] index;
+  if(quality) delete [] quality;
+  
 
-  AliInfo(Form("Number of seeds: %d", nSeed));
-  AliInfo(Form("Number of back propagated TRD tracks: %d", found));
-                       
-  delete [] index;
-  delete [] quality;
-       
+  AliInfo(Form("Number of TPC seeds: %d (%d)", nTRDseeds, nTPCseeds));
+  AliInfo(Form("Number of propagated TRD tracks: %d", nFound));
+      
+  // run stand alone tracking
+  if (fReconstructor->IsSeeding()) Clusters2Tracks(event);
+  
   return 0;
 }
 
@@ -442,9 +477,11 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
       continue;
     }
 
+    // reject tracks which failed propagation in the TRD or
+    // are produced by the TRD stand alone tracker
     ULong_t status = seed->GetStatus();
-    if((status & AliESDtrack::kTRDout) == 0) continue;
-    if((status & AliESDtrack::kTRDin)  != 0) continue;
+    if(!(status & AliESDtrack::kTRDout)) continue;
+    if(!(status & AliESDtrack::kTRDin)) continue;
     nseed++; 
 
     track.ResetCovariance(50.0);
@@ -455,16 +492,26 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
     if(FollowProlongation(track)){     
       // Prolongate to TPC
       if (PropagateToX(track, xTPC, fgkMaxStep)) { //  -with update
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
-       found++;
-       kUPDATE = kTRUE;
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
+        found++;
+        kUPDATE = kTRUE;
       }
-    }   
-               
+
+      // Update the friend track
+      if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){ 
+        TObject *o = 0x0; Int_t ic = 0;
+        AliTRDtrackV1 *calibTrack = 0x0; 
+        while((o = seed->GetCalibObject(ic++))){
+          if(!(calibTrack = dynamic_cast<AliTRDtrackV1*>(o))) continue;
+          calibTrack->SetTrackHigh(track.GetTrackHigh());
+        }
+      }
+    }
+    
     // Prolongate to TPC without update
     if(!kUPDATE) {
       AliTRDtrackV1 tt(*seed);
-      if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDrefit);
+      if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup);
     }
   }
   AliInfo(Form("Number of loaded seeds: %d",nseed));
@@ -473,7 +520,6 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
   return 0;
 }
 
-
 //____________________________________________________________________
 Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
 {
@@ -501,24 +547,24 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
   // Debug level 2
   //
   
+  Bool_t kStoreIn = kTRUE;
   Int_t    nClustersExpected = 0;
-  Int_t lastplane = 5; //GetLastPlane(&t);
-  for (Int_t iplane = lastplane; iplane >= 0; iplane--) {
+  for (Int_t iplane = kNPlanes; iplane--;) {
     Int_t   index   = 0;
     AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
     if(!tracklet) continue;
     if(!tracklet->IsOK()) AliWarning("tracklet not OK");
-               
-    Double_t x  = tracklet->GetX0();
+    
+    Double_t x  = tracklet->GetX();//GetX0();
     // reject tracklets which are not considered for inward refit
     if(x > t.GetX()+fgkMaxStep) continue;
 
     // append tracklet to track
-    t.SetTracklet(tracklet, iplane, index);
-               
+    t.SetTracklet(tracklet, index);
+    
     if (x < (t.GetX()-fgkMaxStep) && !PropagateToX(t, x+fgkMaxStep, fgkMaxStep)) break;
     if (!AdjustSector(&t)) break;
-     
+    
     // Start global position
     Double_t xyz0[3];
     t.GetXYZ(xyz0);
@@ -530,38 +576,53 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
     xyz1[0] =  x * TMath::Cos(alpha) - y * TMath::Sin(alpha);
     xyz1[1] =  x * TMath::Sin(alpha) + y * TMath::Cos(alpha);
     xyz1[2] =  z;
-                               
-    // Get material budget
-    Double_t param[7];
-    AliTracker::MeanMaterialBudget(xyz0, xyz1, param);
-    Double_t xrho= param[0]*param[4];
-    Double_t xx0 = param[1]; // Get mean propagation parameters
+        
+    Double_t length = TMath::Sqrt(
+      (xyz0[0]-xyz1[0])*(xyz0[0]-xyz1[0]) +
+      (xyz0[1]-xyz1[1])*(xyz0[1]-xyz1[1]) +
+      (xyz0[2]-xyz1[2])*(xyz0[2]-xyz1[2])
+    );
+    if(length>0.){
+      // Get material budget
+      Double_t param[7];
+      if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param)<=0.) break;
+      Double_t xrho= param[0]*param[4];
+      Double_t xx0 = param[1]; // Get mean propagation parameters
+  
+      // Propagate and update          
+      t.PropagateTo(x, xx0, xrho);
+      if (!AdjustSector(&t)) break;
+    }
+    if(kStoreIn){
+      t.SetTrackHigh(); 
+      kStoreIn = kFALSE;
+    }
 
-    // Propagate and update            
-    t.PropagateTo(x, xx0, xrho);
-    if (!AdjustSector(&t)) break;
-         
-    Double_t maxChi2 = t.GetPredictedChi2(tracklet);
-    if (maxChi2 < 1e+10 && t.Update(tracklet, maxChi2)){ 
+    Double_t cov[3]; tracklet->GetCovAt(x, cov);
+    Double_t p[2] = { tracklet->GetY(), tracklet->GetZ()};
+    Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov);
+    if (chi2 < 1e+10 && t.Update(p, cov, chi2)){ 
       nClustersExpected += tracklet->GetN();
     }
   }
 
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
     Int_t index;
-    for(int iplane=0; iplane<6; iplane++){
+    for(int iplane=0; iplane<AliTRDgeometry::kNlayer; iplane++){
       AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
       if(!tracklet) continue;
-      t.SetTracklet(tracklet, iplane, index);
+      t.SetTracklet(tracklet, index);
     }
 
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+    AliTRDtrackV1 track(t);
+    track.SetOwner();
     cstreamer << "FollowProlongation"
-             << "EventNumber=" << eventNumber
-             << "ncl="                                 << nClustersExpected
-             << "track.="                      << &t
-             << "\n";
+        << "EventNumber="      << eventNumber
+        << "ncl="                                      << nClustersExpected
+        << "track.="                   << &track
+        << "\n";
   }
 
   return nClustersExpected;
@@ -595,131 +656,250 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
   // Debug level 2
   //
 
-  Int_t nClustersExpected = 0;
-  Double_t clength = AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick();
+  Int_t n = 0;
+  Double_t driftLength = .5*AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick();
   AliTRDtrackingChamber *chamber = 0x0;
   
-  // Loop through the TRD planes
-  for (Int_t iplane = 0; iplane < AliTRDgeometry::Nplan(); iplane++) {
-    // BUILD TRACKLET IF NOT ALREADY BUILT
-    Double_t x = 0., y, z, alpha;
-    AliTRDseedV1 tracklet(*t.GetTracklet(iplane));
-    if(!tracklet.IsOK()){
-      alpha = t.GetAlpha();
-      Int_t sector = Int_t(alpha/AliTRDgeometry::GetAlpha() + (alpha>0. ? 0 : AliTRDgeometry::kNsect));
-
-      if(!fTrSec[sector].GetNChambers()) continue;
-               
-      if((x = fTrSec[sector].GetX(iplane)) < 1.) continue;
-               
-      if (!t.GetProlongation(x, y, z)) break;
-      Int_t stack = fGeom->GetChamber(z, iplane);
-      Int_t nCandidates = stack >= 0 ? 1 : 2;
-      z -= stack >= 0 ? 0. : 4.; 
-                       
-      for(int icham=0; icham<nCandidates; icham++, z+=8){
-       if((stack = fGeom->GetChamber(z, iplane)) < 0) continue;
-                       
-       if(!(chamber = fTrSec[sector].GetChamber(stack, iplane))) continue;
-                       
-       if(chamber->GetNClusters() < fgNTimeBins*AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
-                       
-       x = chamber->GetX();
-                       
-       AliTRDpadPlane *pp = fGeom->GetPadPlane(iplane, stack);
-       tracklet.SetTilt(TMath::Tan(-TMath::DegToRad()*pp->GetTiltingAngle()));
-       tracklet.SetPadLength(pp->GetLengthIPad());
-       tracklet.SetPlane(iplane);
-       tracklet.SetX0(x);
-       tracklet.Init(&t);
-       if(!tracklet.AttachClustersIter(chamber, 1000.)) continue;
-       tracklet.Init(&t);
-               
-       if(tracklet.GetN() < fgNTimeBins * AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
-                       
-       break;
+  AliTRDseedV1 tracklet, *ptrTracklet = 0x0;
+  // in case of stand alone tracking we store all the pointers to the tracklets in a temporary array
+  AliTRDseedV1 *tracklets[kNPlanes];
+  memset(tracklets, 0, sizeof(AliTRDseedV1 *) * kNPlanes);
+  for(Int_t ip = 0; ip < kNPlanes; ip++){
+    tracklets[ip] = t.GetTracklet(ip);
+    t.UnsetTracklet(ip);
+  } 
+  Bool_t kStoreIn = kTRUE, kPropagateIn = kTRUE;
+
+  // Loop through the TRD layers
+  TGeoHMatrix *matrix = 0x0;
+  Double_t x, y, z;
+  for (Int_t ily=0, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) {
+    // rough estimate of the entry point
+    if (!t.GetProlongation(fR[ily], y, z)){
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kProlongation);
+      break;
+    }
+
+    // find sector / stack / detector
+    sm = t.GetSector();
+    // TODO cross check with y value !
+    stk = fGeom->GetStack(z, ily);
+    det = stk>=0 ? AliTRDgeometry::GetDetector(ily, stk, sm) : -1;
+    matrix = det>=0 ? fGeom->GetClusterMatrix(det) : 0x0;
+
+    // check if supermodule/chamber is installed
+    if( !fGeom->GetSMstatus(sm) ||
+        stk<0. ||
+        fGeom->IsHole(ily, stk, sm) ||
+        !matrix ){ 
+      // propagate to the default radial position
+      if(fR[ily] > (fgkMaxStep + t.GetX()) && !PropagateToX(t, fR[ily], fgkMaxStep)){
+        n=-1; 
+        t.SetStatus(AliTRDtrackV1::kPropagation);
+        break;
+      }
+      if(!AdjustSector(&t)){
+        n=-1; 
+        t.SetStatus(AliTRDtrackV1::kAdjustSector);
+        break;
+      }
+      if(TMath::Abs(t.GetSnp()) > fgkMaxSnp){
+        n=-1; 
+        t.SetStatus(AliTRDtrackV1::kSnp);
+        break;
+      }
+      t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+      continue;
+    }
+
+    // retrieve rotation matrix for the current chamber
+    Double_t loc[] = {AliTRDgeometry::AnodePos()- driftLength, 0., 0.};
+    Double_t glb[] = {0., 0., 0.};
+    matrix->LocalToMaster(loc, glb);
+
+    // Propagate to the radial distance of the current layer
+    x = glb[0] - fgkMaxStep;
+    if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)){
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kPropagation);
+      break;
+    }
+    if(!AdjustSector(&t)){
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      break;
+    }
+    if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kSnp);
+      break;
+    }
+    Bool_t RECALCULATE = kFALSE;
+    if(sm != t.GetSector()){
+      sm = t.GetSector(); 
+      RECALCULATE = kTRUE;
+    }
+    if(stk != fGeom->GetStack(z, ily)){
+      stk = fGeom->GetStack(z, ily);
+      RECALCULATE = kTRUE;
+    }
+    if(RECALCULATE){
+      det = AliTRDgeometry::GetDetector(ily, stk, sm);
+      if(!(matrix = fGeom->GetClusterMatrix(det))){ 
+        t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+        continue;
       }
+      matrix->LocalToMaster(loc, glb);
+      x = glb[0] - fgkMaxStep;
     }
-    if(!tracklet.IsOK()){
-      if(x < 1.) continue; //temporary
-      if(!PropagateToX(t, x-fgkMaxStep, fgkMaxStep)) break;
-      if(!AdjustSector(&t)) break;
-      if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) break;
+
+    // check if track is well inside fiducial volume 
+    if (!t.GetProlongation(x+fgkMaxStep, y, z)) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kProlongation);
+      break;
+    }
+    if(fGeom->IsOnBoundary(det, y, z, .5)){ 
+      t.SetStatus(AliTRDtrackV1::kBoundary, ily);
       continue;
     }
-    
-    // Propagate closer to the current chamber if neccessary 
-    x -= clength;
-    if (x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x-fgkMaxStep, fgkMaxStep)) break;
-    if (!AdjustSector(&t)) break;
-    if (TMath::Abs(t.GetSnp()) > fgkMaxSnp) break;
-               
-    // load tracklet to the tracker and the track
-    Int_t index = SetTracklet(&tracklet);
-    t.SetTracklet(&tracklet, iplane, index);
-   
-   
-    // Calculate the mean material budget along the path inside the chamber
-    //Calculate global entry and exit positions of the track in chamber (only track prolongation)
-    Double_t xyz0[3]; // entry point 
-    t.GetXYZ(xyz0);
-    alpha = t.GetAlpha();
-    x = tracklet.GetX0();
-    if (!t.GetProlongation(x, y, z)) break;
-    Double_t xyz1[3]; // exit point
-    xyz1[0] =  x * TMath::Cos(alpha) - y * TMath::Sin(alpha); 
-    xyz1[1] = +x * TMath::Sin(alpha) + y * TMath::Cos(alpha);
-    xyz1[2] =  z;
-    Double_t param[7];
-    AliTracker::MeanMaterialBudget(xyz0, xyz1, param); 
-    // The mean propagation parameters
-    Double_t xrho = param[0]*param[4]; // density*length
-    Double_t xx0  = param[1]; // radiation length
-               
-    // Propagate and update track
-    t.PropagateTo(x, xx0, xrho);
-    if (!AdjustSector(&t)) break;
-    Double_t maxChi2 = t.GetPredictedChi2(&tracklet);
-    if (maxChi2<1e+10 && t.Update(&tracklet, maxChi2)){ 
-      nClustersExpected += tracklet.GetN();
+    // mark track as entering the FIDUCIAL volume of TRD
+    if(kStoreIn){
+      t.SetTrackLow(); 
+      kStoreIn = kFALSE;
+    }
+
+    ptrTracklet  = tracklets[ily];
+    if(!ptrTracklet){ // BUILD TRACKLET
+      // check data in supermodule
+      if(!fTrSec[sm].GetNChambers()){ 
+        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        continue;
+      }
+      if(fTrSec[sm].GetX(ily) < 1.){ 
+        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        continue;
+      }
+      
+      // check data in chamber
+      if(!(chamber = fTrSec[sm].GetChamber(stk, ily))){ 
+        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        continue;
+      }
+      if(chamber->GetNClusters() < fgNTimeBins*fReconstructor->GetRecoParam() ->GetFindableClusters()){ 
+        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        continue;
+      }      
+      // build tracklet
+      ptrTracklet = new(&tracklet) AliTRDseedV1(det);
+      ptrTracklet->SetReconstructor(fReconstructor);
+      ptrTracklet->SetKink(t.IsKink());
+      ptrTracklet->SetPadPlane(fGeom->GetPadPlane(ily, stk));
+      ptrTracklet->SetX0(glb[0]+driftLength);
+      if(!tracklet.Init(&t)){
+        n=-1; 
+        t.SetStatus(AliTRDtrackV1::kTrackletInit);
+        break;
+      }
+      if(!tracklet.AttachClusters(chamber, kTRUE)){   
+        t.SetStatus(AliTRDtrackV1::kNoAttach, ily);
+        continue;
+      }
+      if(tracklet.GetN() < fgNTimeBins*fReconstructor->GetRecoParam() ->GetFindableClusters()){
+        t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily);
+        continue;
+      }
+      ptrTracklet->UpdateUsed();
+    }
+
+    // propagate track to the radial position of the tracklet
+    ptrTracklet->UseClusters(); // TODO ? do we need this here ?
+    // fit tracklet no tilt correction
+    if(!ptrTracklet->Fit(kFALSE)){
+      t.SetStatus(AliTRDtrackV1::kNoFit, ily);
+      continue;
+    } 
+    x = ptrTracklet->GetX(); //GetX0();
+    if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kPropagation);
+      break;
+    }
+    if(!AdjustSector(&t)) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      break;
+    }
+    if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kSnp);
+      break;
+    }
+  
+    if(kPropagateIn){
+      t.SetTrackLow(); 
+      kPropagateIn = kFALSE;
     }
+
+    // update Kalman with the TRD measurement
+    Double_t cov[3]; ptrTracklet->GetCovAt(x, cov);
+    Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()};
+    Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov);
+    if(chi2>1e+10){ // TODO
+      t.SetStatus(AliTRDtrackV1::kChi2, ily);
+      continue; 
+    }
+    if(!t.Update(p, cov, chi2)) {
+      n=-1; 
+      t.SetStatus(AliTRDtrackV1::kUpdate);
+      break;
+    }
+    // fill residuals ?!
+    AliTracker::FillResiduals(&t, p, cov, ptrTracklet->GetVolumeId());
+  
+
+    // load tracklet to the tracker
+    ptrTracklet->Update(&t);
+    ptrTracklet = SetTracklet(ptrTracklet);
+    t.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
+    n += ptrTracklet->GetN();
+
     // Reset material budget if 2 consecutive gold
-    if(iplane>0 && tracklet.GetN() + t.GetTracklet(iplane-1)->GetN() > 20) t.SetBudget(2, 0.);
+//     if(ilayer>0 && t.GetTracklet(ilayer-1) && ptrTracklet->GetN() + t.GetTracklet(ilayer-1)->GetN() > 20) t.SetBudget(2, 0.);
 
     // Make backup of the track until is gold
     // TO DO update quality check of the track.
     // consider comparison with fTimeBinsRange
-    Float_t ratio0 = tracklet.GetN() / Float_t(fgNTimeBins);
+    Float_t ratio0 = ptrTracklet->GetN() / Float_t(fgNTimeBins);
     //Float_t ratio1 = Float_t(t.GetNumberOfClusters()+1) / Float_t(t.GetNExpected()+1);       
-    //printf("tracklet.GetChi2() %f     [< 18.0]\n", tracklet.GetChi2()); 
-    //printf("ratio0    %f              [>   0.8]\n", ratio0);
-    //printf("ratio1     %f             [>   0.6]\n", ratio1); 
-    //printf("ratio0+ratio1 %f          [>   1.5]\n", ratio0+ratio1); 
-    //printf("t.GetNCross()  %d         [==    0]\n", t.GetNCross()); 
-    //printf("TMath::Abs(t.GetSnp()) %f [<  0.85]\n", TMath::Abs(t.GetSnp()));
-    //printf("t.GetNumberOfClusters() %d [>    20]\n", t.GetNumberOfClusters());
     
-    if (//(tracklet.GetChi2()      <  18.0) && TO DO check with FindClusters and move it to AliTRDseed::Update 
+    if( (chi2                    <  18.0) &&  
         (ratio0                  >   0.8) && 
         //(ratio1                  >   0.6) && 
         //(ratio0+ratio1           >   1.5) && 
         (t.GetNCross()           ==    0) && 
         (TMath::Abs(t.GetSnp())  <  0.85) &&
-        (t.GetNumberOfClusters() >    20)) t.MakeBackupTrack();
-               
-  } // end planes loop
+        (t.GetNumberOfClusters() >    20)){
+      t.MakeBackupTrack();
+    }
+  } // end layers loop
+  //printf("clusters[%d] chi2[%f] x[%f] status[%d ", n, t.GetChi2(), t.GetX(), t.GetStatusTRD());
+  //for(int i=0; i<6; i++) printf("%d ", t.GetStatusTRD(i)); printf("]\n");
 
-  if(AliTRDReconstructor::StreamLevel() > 1){
-    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+    TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+    AliTRDtrackV1 track(t);
+    track.SetOwner();
     cstreamer << "FollowBackProlongation"
-             << "EventNumber="                 << eventNumber
-             << "ncl="                                                 << nClustersExpected
-             << "track.="                                      << &t
-             << "\n";
+        << "EventNumber=" << eventNumber
+        << "ncl="         << n
+        << "track.="      << &track
+        << "\n";
   }
-       
-  return nClustersExpected;
+  
+  return n;
 }
 
 //_________________________________________________________________________
@@ -746,7 +926,7 @@ Float_t AliTRDtrackerV1::FitRieman(AliTRDseedV1 *tracklets, Double_t *chi2, Int_
   }
   for(Int_t il = 0; il < maxLayers; il++){
     if(!tracklets[ppl[il]].IsOK()) continue;
-    fitter->AddPoint(tracklets[ppl[il]].GetX0(), tracklets[ppl[il]].GetYfitR(0), tracklets[ppl[il]].GetZProb(),1,10);
+    fitter->AddPoint(tracklets[ppl[il]].GetX0(), tracklets[ppl[il]].GetYfit(0), tracklets[ppl[il]].GetZfit(0),1,10);
   }
   fitter->Update();
   // Set the reference position of the fit and calculate the chi2 values
@@ -754,7 +934,7 @@ Float_t AliTRDtrackerV1::FitRieman(AliTRDseedV1 *tracklets, Double_t *chi2, Int_
   for(Int_t il = 0; il < maxLayers; il++){
     // Reference positions
     tracklets[ppl[il]].Init(fitter);
-               
+    
     // chi2
     if((!tracklets[ppl[il]].IsOK()) && (!planes)) continue;
     chi2[0] += tracklets[ppl[il]].GetChi2Y();
@@ -779,11 +959,12 @@ void AliTRDtrackerV1::FitRieman(AliTRDcluster **seedcl, Double_t chi2[2])
   //
   AliRieman *fitter = AliTRDtrackerV1::GetRiemanFitter();
   fitter->Reset();
-  for(Int_t i = 0; i < 4; i++)
-    fitter->AddPoint(seedcl[i]->GetX(), seedcl[i]->GetY(), seedcl[i]->GetZ(), 1, 10);
+  for(Int_t i = 0; i < 4; i++){
+    fitter->AddPoint(seedcl[i]->GetX(), seedcl[i]->GetY(), seedcl[i]->GetZ(), 1., 10.);
+  }
   fitter->Update();
-       
-       
+  
+  
   // Update the seed and calculated the chi2 value
   chi2[0] = 0; chi2[1] = 0;
   for(Int_t ipl = 0; ipl < kNSeedPlanes; ipl++){
@@ -827,25 +1008,25 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
   fitter->StoreData(kTRUE);
   fitter->ClearPoints();
   AliTRDcluster *cl = 0x0;
-       
+  
   Float_t x, y, z, w, t, error, tilt;
   Double_t uvt[2];
   Int_t nPoints = 0;
-  for(Int_t ipl = 0; ipl < AliTRDgeometry::kNplan; ipl++){
-    if(!tracklets[ipl].IsOK()) continue;
-    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
-      if(!tracklets[ipl].IsUsable(itb)) continue;
-      cl = tracklets[ipl].GetClusters(itb);
+  for(Int_t ilr = 0; ilr < AliTRDgeometry::kNlayer; ilr++){
+    if(!tracklets[ilr].IsOK()) continue;
+    for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){
+      if(!tracklets[ilr].IsUsable(itb)) continue;
+      cl = tracklets[ilr].GetClusters(itb);
       x = cl->GetX();
       y = cl->GetY();
       z = cl->GetZ();
-      tilt = tracklets[ipl].GetTilt();
+      tilt = tracklets[ilr].GetTilt();
       // Transformation
       t = 1./(x * x + y * y);
       uvt[0] = 2. * x * t;
       uvt[1] = 2. * x * t * tilt ;
       w = 2. * (y + tilt * (z - zVertex)) * t;
-      error = 2. * 0.2 * t;
+      error = 2. * TMath::Sqrt(cl->GetSigmaY2()) * t;
       fitter->AddPoint(uvt, w, error);
       nPoints++;
     }
@@ -859,9 +1040,9 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
 
   Float_t chi2track = fitter->GetChisquare()/Double_t(nPoints);
   for(Int_t ip = 0; ip < AliTRDtrackerV1::kNPlanes; ip++)
-    tracklets[ip].SetCC(curvature);
+    tracklets[ip].SetC(curvature);
 
-  if(AliTRDReconstructor::StreamLevel() >= 5){
+/*  if(fReconstructor->GetStreamLevel() >= 5){
     //Linear Model on z-direction
     Double_t xref = CalculateReferenceX(tracklets);            // Relative to the middle of the stack
     Double_t slope = fitter->GetParameter(2);
@@ -869,16 +1050,16 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
     Float_t chi2Z = CalculateChi2Z(tracklets, zref, slope, xref);
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-    TTreeSRedirector &treeStreamer = *fgDebugStreamer;
+    TTreeSRedirector &treeStreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
     treeStreamer << "FitTiltedRiemanConstraint"
-                << "EventNumber="              << eventNumber
-                << "CandidateNumber="  << candidateNumber
-                << "Curvature="                                << curvature
-                << "Chi2Track="                                << chi2track
-                << "Chi2Z="                                            << chi2Z
-                << "zref="                                             << zref
-                << "\n";
-  }
+    << "EventNumber="          << eventNumber
+    << "CandidateNumber="      << candidateNumber
+    << "Curvature="                            << curvature
+    << "Chi2Track="                            << chi2track
+    << "Chi2Z="                                                << chi2Z
+    << "zref="                                         << zref
+    << "\n";
+  }*/
   return chi2track;
 }
 
@@ -927,13 +1108,13 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
   // Containers for Least-square fitter
   for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
     if(!tracklets[ipl].IsOK()) continue;
-    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+    tilt = tracklets[ipl].GetTilt();
+    for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){
       if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
       if (!tracklets[ipl].IsUsable(itb)) continue;
       x = cl->GetX();
       y = cl->GetY();
       z = cl->GetZ();
-      tilt = tracklets[ipl].GetTilt();
       dx = x - xref;
       // Transformation
       t = 1./(x*x + y*y);
@@ -944,7 +1125,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
       w = 2. * (y + tilt*z) * t;
       // error definition changes for the different calls
       we = 2. * t;
-      we *= sigError ? tracklets[ipl].GetSigmaY() : 0.2;
+      we *= sigError ? TMath::Sqrt(cl->GetSigmaY2()) : 0.2;
       fitter->AddPoint(uvt, w, we);
       zfitter.AddPoint(&x, z, static_cast<Double_t>(TMath::Sqrt(cl->GetSigmaZ2())));
       nPoints++;
@@ -963,7 +1144,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
   for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
     if(!tracklets[iLayer].IsOK()) continue;
     zref = offset + slope * (tracklets[iLayer].GetX0() - xref);
-    if (TMath::Abs(tracklets[iLayer].GetZProb() - zref) > tracklets[iLayer].GetPadLength() * 0.5 + 1.0) 
+    if (TMath::Abs(tracklets[iLayer].GetZfit(0) - zref) > tracklets[iLayer].GetPadLength() * 0.5 + 1.0) 
       acceptablez = kFALSE;
   }
   if (!acceptablez) {
@@ -1018,9 +1199,9 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
     Double_t x0 = -b / a;
     if (-c * a + b * b + 1 > 0) {
       if (1.0/(curvature * curvature) - (x - x0) * (x - x0) > 0.0) {
-       Double_t yderiv = (x - x0) / TMath::Sqrt(1.0/(curvature * curvature) - (x - x0) * (x - x0));
-       if (a < 0) yderiv *= -1.0;
-       dy = yderiv;
+  Double_t yderiv = (x - x0) / TMath::Sqrt(1.0/(curvature * curvature) - (x - x0) * (x - x0));
+  if (a < 0) yderiv *= -1.0;
+  dy = yderiv;
       }
     }
     z  = offset + slope * (x - xref);
@@ -1032,22 +1213,366 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
     tracklets[iLayer].SetC(curvature);
     tracklets[iLayer].SetChi2(chi2track);
   }
-       
-  if(AliTRDReconstructor::StreamLevel() >=5){
-    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+  
+/*  if(fReconstructor->GetStreamLevel() >=5){
+    TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
     Int_t eventNumber                  = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber      = AliTRDtrackerDebug::GetCandidateNumber();
     Double_t chi2z = CalculateChi2Z(tracklets, offset, slope, xref);
     cstreamer << "FitTiltedRieman0"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber="     << candidateNumber
-             << "xref="                                                << xref
-             << "Chi2Z="                                               << chi2z
-             << "\n";
-  }
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "xref="                                             << xref
+        << "Chi2Z="                                            << chi2z
+        << "\n";
+  }*/
   return chi2track;
 }
 
+
+//____________________________________________________________________
+Double_t AliTRDtrackerV1::FitLine(const AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t err, Int_t np, AliTrackPoint *points)
+{
+  AliTRDLeastSquare yfitter, zfitter;
+  AliTRDcluster *cl = 0x0;
+
+  AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+  if(!tracklets){
+    for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+      if(!(tracklet = track->GetTracklet(ipl))) continue;
+      if(!tracklet->IsOK()) continue;
+      new(&work[ipl]) AliTRDseedV1(*tracklet);
+    }
+    tracklets = &work[0];
+  }
+
+  Double_t xref = CalculateReferenceX(tracklets);
+  Double_t x, y, z, dx, ye, yr, tilt;
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      z = cl->GetZ();
+      dx = x - xref;
+      zfitter.AddPoint(&dx, z, static_cast<Double_t>(TMath::Sqrt(cl->GetSigmaZ2())));
+    }
+  }
+  zfitter.Eval();
+  Double_t z0    = zfitter.GetFunctionParameter(0);
+  Double_t dzdx  = zfitter.GetFunctionParameter(1);
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      y = cl->GetY();
+      z = cl->GetZ();
+      tilt = tracklets[ipl].GetTilt();
+      dx = x - xref;
+      yr = y + tilt*(z - z0 - dzdx*dx); 
+      // error definition changes for the different calls
+      ye = tilt*TMath::Sqrt(cl->GetSigmaZ2());
+      ye += err ? tracklets[ipl].GetSigmaY() : 0.2;
+      yfitter.AddPoint(&dx, yr, ye);
+    }
+  }
+  yfitter.Eval();
+  Double_t y0   = yfitter.GetFunctionParameter(0);
+  Double_t dydx = yfitter.GetFunctionParameter(1);
+  Double_t chi2 = 0.;//yfitter.GetChisquare()/Double_t(nPoints);
+
+  //update track points array
+  if(np && points){
+    Float_t xyz[3];
+    for(int ip=0; ip<np; ip++){
+      points[ip].GetXYZ(xyz);
+      xyz[1] = y0 + dydx * (xyz[0] - xref);
+      xyz[2] = z0 + dzdx * (xyz[0] - xref);
+      points[ip].SetXYZ(xyz);
+    }
+  }
+  return chi2;
+}
+
+
+//_________________________________________________________________________
+Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t sigError, Int_t np, AliTrackPoint *points)
+{
+  //
+  // Performs a Riemann fit taking tilting pad correction into account
+  // The equation of a Riemann circle, where the y position is substituted by the 
+  // measured y-position taking pad tilting into account, has to be transformed
+  // into a 4-dimensional hyperplane equation
+  // Riemann circle: (x-x0)^2 + (y-y0)^2 -R^2 = 0
+  // Measured y-Position: ymeas = y - tan(phiT)(zc - zt)
+  //          zc: center of the pad row
+  //          zt: z-position of the track
+  // The z-position of the track is assumed to be linear dependent on the x-position
+  // Transformed equation: a + b * u + c * t + d * v  + e * w - 2 * (ymeas + tan(phiT) * zc) * t = 0
+  // Transformation:       u = 2 * x * t
+  //                       v = 2 * tan(phiT) * t
+  //                       w = 2 * tan(phiT) * (x - xref) * t
+  //                       t = 1 / (x^2 + ymeas^2)
+  // Parameters:           a = -1/y0
+  //                       b = x0/y0
+  //                       c = (R^2 -x0^2 - y0^2)/y0
+  //                       d = offset
+  //                       e = dz/dx
+  // If the offset respectively the slope in z-position is impossible, the parameters are fixed using 
+  // results from the simple riemann fit. Afterwards the fit is redone.
+  // The curvature is calculated according to the formula:
+  //                       curv = a/(1 + b^2 + c*a) = 1/R
+  //
+  // Paramters:   - Array of tracklets (connected to the track candidate)
+  //              - Flag selecting the error definition
+  // Output:      - Chi2 values of the track (in Parameter list)
+  //
+  TLinearFitter *fitter = GetTiltedRiemanFitter();
+  fitter->StoreData(kTRUE);
+  fitter->ClearPoints();
+  AliTRDLeastSquare zfitter;
+  AliTRDcluster *cl = 0x0;
+
+  AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+  if(!tracklets){
+    for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+      if(!(tracklet = track->GetTracklet(ipl))) continue;
+      if(!tracklet->IsOK()) continue;
+      new(&work[ipl]) AliTRDseedV1(*tracklet);
+    }
+    tracklets = &work[0];
+  }
+
+  Double_t xref = CalculateReferenceX(tracklets);
+  Double_t x, y, z, t, tilt, dx, w, we;
+  Double_t uvt[4];
+  Int_t nPoints = 0;
+  // Containers for Least-square fitter
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      y = cl->GetY();
+      z = cl->GetZ();
+      tilt = tracklets[ipl].GetTilt();
+      dx = x - xref;
+      // Transformation
+      t = 1./(x*x + y*y);
+      uvt[0] = 2. * x * t;
+      uvt[1] = t;
+      uvt[2] = 2. * tilt * t;
+      uvt[3] = 2. * tilt * dx * t;
+      w = 2. * (y + tilt*z) * t;
+      // error definition changes for the different calls
+      we = 2. * t;
+      we *= sigError ? TMath::Sqrt(cl->GetSigmaY2()) : 0.2;
+      fitter->AddPoint(uvt, w, we);
+      zfitter.AddPoint(&x, z, static_cast<Double_t>(TMath::Sqrt(cl->GetSigmaZ2())));
+      nPoints++;
+    }
+  }
+  if(fitter->Eval()) return 1.E10;
+
+  Double_t z0    = fitter->GetParameter(3);
+  Double_t dzdx  = fitter->GetParameter(4);
+
+
+  // Linear fitter  - not possible to make boundaries
+  // Do not accept non possible z and dzdx combinations
+  Bool_t accept = kTRUE;
+  Double_t zref = 0.0;
+  for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
+    if(!tracklets[iLayer].IsOK()) continue;
+    zref = z0 + dzdx * (tracklets[iLayer].GetX0() - xref);
+    if (TMath::Abs(tracklets[iLayer].GetZfit(0) - zref) > tracklets[iLayer].GetPadLength() * 0.5 + 1.0) 
+      accept = kFALSE;
+  }
+  if (!accept) {
+    zfitter.Eval();
+    Double_t dzmf      = zfitter.GetFunctionParameter(1);
+    Double_t zmf       = zfitter.GetFunctionValue(&xref);
+    fitter->FixParameter(3, zmf);
+    fitter->FixParameter(4, dzmf);
+    fitter->Eval();
+    fitter->ReleaseParameter(3);
+    fitter->ReleaseParameter(4);
+    z0   = fitter->GetParameter(3); // = zmf ?
+    dzdx = fitter->GetParameter(4); // = dzmf ?
+  }
+
+  // Calculate Curvature
+  Double_t a    =  fitter->GetParameter(0);
+  Double_t b    =  fitter->GetParameter(1);
+  Double_t c    =  fitter->GetParameter(2);
+  Double_t y0   = 1. / a;
+  Double_t x0   = -b * y0;
+  Double_t tmp  = y0*y0 + x0*x0 - c*y0;
+  if(tmp<=0.) return 1.E10;
+  Double_t R    = TMath::Sqrt(tmp);
+  Double_t C    =  1.0 + b*b - c*a;
+  if (C > 0.0) C  =  a / TMath::Sqrt(C);
+
+  // Calculate chi2 of the fit 
+  Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints);
+
+  // Update the tracklets
+  if(!track){
+    for(Int_t ip = 0; ip < kNPlanes; ip++) {
+      x = tracklets[ip].GetX0();
+      tmp = R*R-(x-x0)*(x-x0);  
+      if(tmp <= 0.) continue;
+      tmp = TMath::Sqrt(tmp);  
+
+      // y:     R^2 = (x - x0)^2 + (y - y0)^2
+      //     =>   y = y0 +/- Sqrt(R^2 - (x - x0)^2)
+      tracklets[ip].SetYref(0, y0 - (y0>0.?1.:-1)*tmp);
+      //     => dy/dx = (x - x0)/Sqrt(R^2 - (x - x0)^2) 
+      tracklets[ip].SetYref(1, (x - x0) / tmp);
+      tracklets[ip].SetZref(0, z0 + dzdx * (x - xref));
+      tracklets[ip].SetZref(1, dzdx);
+      tracklets[ip].SetC(C);
+      tracklets[ip].SetChi2(chi2);
+    }
+  }
+  //update track points array
+  if(np && points){
+    Float_t xyz[3];
+    for(int ip=0; ip<np; ip++){
+      points[ip].GetXYZ(xyz);
+      xyz[1] = TMath::Abs(xyz[0] - x0) > R ? 100. : y0 - (y0>0.?1.:-1.)*TMath::Sqrt((R-(xyz[0]-x0))*(R+(xyz[0]-x0)));
+      xyz[2] = z0 + dzdx * (xyz[0] - xref);
+      points[ip].SetXYZ(xyz);
+    }
+  }
+  
+  return chi2;
+}
+
+
+//____________________________________________________________________
+Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t up, Int_t np, AliTrackPoint *points)
+{
+//   Kalman filter implementation for the TRD.
+//   It returns the positions of the fit in the array "points"
+// 
+//   Author : A.Bercuci@gsi.de
+
+  // printf("Start track @ x[%f]\n", track->GetX());
+       
+  //prepare marker points along the track
+  Int_t ip = np ? 0 : 1;
+  while(ip<np){
+    if((up?-1:1) * (track->GetX() - points[ip].GetX()) > 0.) break;
+    //printf("AliTRDtrackerV1::FitKalman() : Skip track marker x[%d] = %7.3f. Before track start ( %7.3f ).\n", ip, points[ip].GetX(), track->GetX());
+    ip++;
+  }
+  //if(points) printf("First marker point @ x[%d] = %f\n", ip, points[ip].GetX());
+
+
+  AliTRDseedV1 tracklet, *ptrTracklet = 0x0;
+
+  //Loop through the TRD planes
+  for (Int_t jplane = 0; jplane < kNPlanes; jplane++) {
+    // GET TRACKLET OR BUILT IT                
+    Int_t iplane = up ? jplane : kNPlanes - 1 - jplane;
+    if(tracklets){ 
+      if(!(ptrTracklet = &tracklets[iplane])) continue;
+    }else{
+      if(!(ptrTracklet  = track->GetTracklet(iplane))){ 
+      /*AliTRDtrackerV1 *tracker = 0x0;
+        if(!(tracker = dynamic_cast<AliTRDtrackerV1*>( AliTRDReconstructor::Tracker()))) continue;
+        ptrTracklet = new(&tracklet) AliTRDseedV1(iplane);
+        if(!tracker->MakeTracklet(ptrTracklet, track)) */
+        continue;
+      }
+    }
+    if(!ptrTracklet->IsOK()) continue;
+
+    Double_t x = ptrTracklet->GetX0();
+
+    while(ip < np){
+      //don't do anything if next marker is after next update point.
+      if((up?-1:1) * (points[ip].GetX() - x) - fgkMaxStep < 0) break;
+      if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.;
+      
+      Double_t xyz[3]; // should also get the covariance
+      track->GetXYZ(xyz);
+      track->Global2LocalPosition(xyz, track->GetAlpha());
+      points[ip].SetXYZ(xyz[0], xyz[1], xyz[2]);
+      ip++;
+    }
+    // printf("plane[%d] tracklet[%p] x[%f]\n", iplane, ptrTracklet, x);
+
+    // Propagate closer to the next update point 
+    if(((up?-1:1) * (x - track->GetX()) + fgkMaxStep < 0) && !PropagateToX(*track, x + (up?-1:1)*fgkMaxStep, fgkMaxStep)) return -1.;
+
+    if(!AdjustSector(track)) return -1;
+    if(TMath::Abs(track->GetSnp()) > fgkMaxSnp) return -1;
+    
+    //load tracklet to the tracker and the track
+/*    Int_t index;
+    if((index = FindTracklet(ptrTracklet)) < 0){
+      ptrTracklet = SetTracklet(&tracklet);
+      index = fTracklets->GetEntriesFast()-1;
+    }
+    track->SetTracklet(ptrTracklet, index);*/
+
+
+    // register tracklet to track with tracklet creation !!
+    // PropagateBack : loaded tracklet to the tracker and update index 
+    // RefitInward : update index 
+    // MakeTrack   : loaded tracklet to the tracker and update index 
+    if(!tracklets) track->SetTracklet(ptrTracklet, -1);
+    
+  
+    //Calculate the mean material budget along the path inside the chamber
+    Double_t xyz0[3]; track->GetXYZ(xyz0);
+    Double_t alpha = track->GetAlpha();
+    Double_t xyz1[3], y, z;
+    if(!track->GetProlongation(x, y, z)) return -1;
+    xyz1[0] =  x * TMath::Cos(alpha) - y * TMath::Sin(alpha); 
+    xyz1[1] = +x * TMath::Sin(alpha) + y * TMath::Cos(alpha);
+    xyz1[2] =  z;
+    if((xyz0[0] - xyz1[9] < 1e-3) && (xyz0[0] - xyz1[9] < 1e-3)) continue; // check wheter we are at the same global x position
+    Double_t param[7];
+    if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param) <=0.) break;  
+    Double_t xrho = param[0]*param[4]; // density*length
+    Double_t xx0  = param[1]; // radiation length
+    
+    //Propagate the track
+    track->PropagateTo(x, xx0, xrho);
+    if (!AdjustSector(track)) break;
+  
+    //Update track
+    Double_t cov[3]; ptrTracklet->GetCovAt(x, cov);
+    Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()};
+    Double_t chi2 = ((AliExternalTrackParam*)track)->GetPredictedChi2(p, cov);
+    if(chi2<1e+10) track->Update(p, cov, chi2);
+    if(!up) continue;
+
+               //Reset material budget if 2 consecutive gold
+               if(iplane>0 && track->GetTracklet(iplane-1) && ptrTracklet->GetN() + track->GetTracklet(iplane-1)->GetN() > 20) track->SetBudget(2, 0.);
+       } // end planes loop
+
+  // extrapolation
+  while(ip < np){
+    if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.;
+    
+    Double_t xyz[3]; // should also get the covariance
+    track->GetXYZ(xyz); 
+    track->Global2LocalPosition(xyz, track->GetAlpha());
+    points[ip].SetXYZ(xyz[0], xyz[1], xyz[2]);
+    ip++;
+  }
+
+       return track->GetChi2();
+}
+
 //_________________________________________________________________________
 Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
 {
@@ -1062,10 +1587,10 @@ Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset
   // Output:     - The Chi2 value of the track in z-Direction
   //
   Float_t chi2Z = 0, nLayers = 0;
-  for (Int_t iLayer = 0; iLayer < AliTRDgeometry::kNplan; iLayer++) {
+  for (Int_t iLayer = 0; iLayer < AliTRDgeometry::kNlayer; iLayer++) {
     if(!tracklets[iLayer].IsOK()) continue;
     Double_t z = offset + slope * (tracklets[iLayer].GetX0() - xref);
-    chi2Z += TMath::Abs(tracklets[iLayer].GetMeanz() - z);
+    chi2Z += TMath::Abs(tracklets[iLayer].GetZfit(0) - z);
     nLayers++;
   }
   chi2Z /= TMath::Max((nLayers - 3.0),1.0);
@@ -1119,12 +1644,10 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
 
     // Calculate the mean material budget between start and
     // end point of this prolongation step
-    AliTracker::MeanMaterialBudget(xyz0, xyz1, param);
+    if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param)<=0.) return 0;
 
     // Propagate the track to the X-position after the next step
-    if (!t.PropagateTo(x,param[1],param[0]*param[4])) {
-      return 0;
-    }
+    if (!t.PropagateTo(x, param[1], param[0]*param[4])) return 0;
 
     // Rotate the track if necessary
     AdjustSector(&t);
@@ -1159,7 +1682,9 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
   branch->SetAddress(&clusterArray); 
   
   if(!fClusters){ 
-    array = new TClonesArray("AliTRDcluster", nsize);
+    Float_t nclusters =  fReconstructor->GetRecoParam()->GetNClusters();
+    if(fReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
+    array = new TClonesArray("AliTRDcluster", Int_t(nclusters));
     array->SetOwner(kTRUE);
   }
   
@@ -1178,7 +1703,7 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
       if(!(c = (AliTRDcluster *) clusterArray->UncheckedAt(iCluster))) continue;
       c->SetInChamber();
       new((*fClusters)[ncl++]) AliTRDcluster(*c);
-      clusterArray->RemoveAt(iCluster); 
+      delete (clusterArray->RemoveAt(iCluster)); 
     }
 
   }
@@ -1191,44 +1716,86 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
 Int_t AliTRDtrackerV1::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
+  // Fills clusters into TRD tracking sectors
   //
+  
+  if(!fReconstructor->IsWritingClusters()){ 
+    fClusters = AliTRDReconstructor::GetClusters();
+  } else {
+    if (ReadClusters(fClusters, cTree)) {
+      AliError("Problem with reading the clusters !");
+      return 1;
+    }
+  }
+  SetClustersOwner();
 
-       
-  if (ReadClusters(fClusters, cTree)) {
-    AliError("Problem with reading the clusters !");
+  if(!fClusters || !fClusters->GetEntriesFast()){ 
+    AliInfo("No TRD clusters");
     return 1;
   }
-  Int_t ncl  = fClusters->GetEntriesFast(), nin = 0;
-  if(!ncl){ 
-    AliInfo("Clusters 0");
+
+  //Int_t nin = 
+  BuildTrackingContainers();  
+
+  //Int_t ncl  = fClusters->GetEntriesFast();
+  //AliInfo(Form("Clusters %d [%6.2f %% in the active volume]", ncl, 100.*float(nin)/ncl));
+
+  return 0;
+}
+
+//_____________________________________________________________________________
+Int_t AliTRDtrackerV1::LoadClusters(TClonesArray *clusters)
+{
+  //
+  // Fills clusters into TRD tracking sectors
+  // Function for use in the HLT
+  
+  if(!clusters || !clusters->GetEntriesFast()){ 
+    AliInfo("No TRD clusters");
     return 1;
   }
 
-  Int_t icl = ncl;
+  fClusters = clusters;
+  SetClustersOwner();
+
+  //Int_t nin = 
+  BuildTrackingContainers();  
+
+  //Int_t ncl  = fClusters->GetEntriesFast();
+  //AliInfo(Form("Clusters %d [%6.2f %% in the active volume]", ncl, 100.*float(nin)/ncl));
+
+  return 0;
+}
+
+
+//____________________________________________________________________
+Int_t AliTRDtrackerV1::BuildTrackingContainers()
+{
+// Building tracking containers for clusters
+
+  Int_t nin =0, icl = fClusters->GetEntriesFast();
   while (icl--) {
     AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(icl);
     if(c->IsInChamber()) nin++;
     Int_t detector       = c->GetDetector();
     Int_t sector         = fGeom->GetSector(detector);
-    Int_t stack          = fGeom->GetChamber(detector);
-    Int_t plane          = fGeom->GetPlane(detector);
-               
-    fTrSec[sector].GetChamber(stack, plane, kTRUE)->InsertCluster(c, icl);
+    Int_t stack          = fGeom->GetStack(detector);
+    Int_t layer          = fGeom->GetLayer(detector);
+    
+    fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, icl);
   }
-  AliInfo(Form("Clusters %d in %6.2f %%", ncl, 100.*float(nin)/ncl));
-       
-  for(int isector =0; isector<AliTRDgeometry::kNsect; isector++){ 
+
+  const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
+  for(int isector =0; isector<AliTRDgeometry::kNsector; isector++){ 
     if(!fTrSec[isector].GetNChambers()) continue;
-    fTrSec[isector].Init();
+    fTrSec[isector].Init(fReconstructor, cal);
   }
-  
-  return 0;
+
+  return nin;
 }
 
 
+
 //____________________________________________________________________
 void AliTRDtrackerV1::UnloadClusters() 
 { 
@@ -1238,14 +1805,40 @@ void AliTRDtrackerV1::UnloadClusters()
 
   if(fTracks) fTracks->Delete(); 
   if(fTracklets) fTracklets->Delete();
-  if(fClusters) fClusters->Delete();
+  if(fClusters){ 
+    if(IsClustersOwner()) fClusters->Delete();
+    
+    // save clusters array in the reconstructor for further use.
+    if(!fReconstructor->IsWritingClusters()){
+      AliTRDReconstructor::SetClusters(fClusters);
+      SetClustersOwner(kFALSE);
+    } else AliTRDReconstructor::SetClusters(0x0);
+  }
 
-  for (int i = 0; i < AliTRDgeometry::kNsect; i++) fTrSec[i].Clear();
+  for (int i = 0; i < AliTRDgeometry::kNsector; i++) fTrSec[i].Clear();
 
   // Increment the Event Number
   AliTRDtrackerDebug::SetEventNumber(AliTRDtrackerDebug::GetEventNumber()  + 1);
 }
 
+// //____________________________________________________________________
+// void AliTRDtrackerV1::UseClusters(const AliKalmanTrack *t, Int_t) const
+// {
+//   const AliTRDtrackV1 *track = dynamic_cast<const AliTRDtrackV1*>(t);
+//   if(!track) return;
+// 
+//   AliTRDseedV1 *tracklet = 0x0;
+//   for(Int_t ily=AliTRDgeometry::kNlayer; ily--;){
+//     if(!(tracklet = track->GetTracklet(ily))) continue;
+//     AliTRDcluster *c = 0x0;
+//     for(Int_t ic=AliTRDseed::kNclusters; ic--;){
+//       if(!(c=tracklet->GetClusters(ic))) continue;
+//       c->Use();
+//     }
+//   }
+// }
+// 
+
 //_____________________________________________________________________________
 Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *track) 
 {
@@ -1256,7 +1849,7 @@ Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *track)
   Double_t alpha = AliTRDgeometry::GetAlpha(); 
   Double_t y     = track->GetY();
   Double_t ymax  = track->GetX()*TMath::Tan(0.5*alpha);
-
+  
   if      (y >  ymax) {
     if (!track->Rotate( alpha)) {
       return kFALSE;
@@ -1288,13 +1881,13 @@ AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *track, Int_t p, Int_t
   // Detailed description
   //
   idx = track->GetTrackletIndex(p);
-  AliTRDseedV1 *tracklet = idx<0 ? 0x0 : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
+  AliTRDseedV1 *tracklet = (idx==0xffff) ? 0x0 : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
 
   return tracklet;
 }
 
 //____________________________________________________________________
-Int_t AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
+AliTRDseedV1* AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
 {
   // Add this tracklet to the list of tracklets stored in the tracker
   //
@@ -1309,14 +1902,38 @@ Int_t AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
   // and adds the new tracklet to the list.
   //
   if(!fTracklets){
-    fTracklets = new TClonesArray("AliTRDseedV1", AliTRDgeometry::Nsect()*kMaxTracksStack);
+    fTracklets = new TClonesArray("AliTRDseedV1", AliTRDgeometry::Nsector()*kMaxTracksStack);
     fTracklets->SetOwner(kTRUE);
   }
   Int_t nentries = fTracklets->GetEntriesFast();
-  new ((*fTracklets)[nentries]) AliTRDseedV1(*tracklet);
-  return nentries;
+  return new ((*fTracklets)[nentries]) AliTRDseedV1(*tracklet);
 }
 
+//____________________________________________________________________
+AliTRDtrackV1* AliTRDtrackerV1::SetTrack(AliTRDtrackV1 *track)
+{
+  // Add this track to the list of tracks stored in the tracker
+  //
+  // Parameters
+  //   - track : pointer to the track to be added to the list
+  //
+  // Output
+  //   - the pointer added
+  //
+  // Detailed description
+  // Build the tracks list if it is not yet created (late initialization)
+  // and adds the new track to the list.
+  //
+  if(!fTracks){
+    fTracks = new TClonesArray("AliTRDtrackV1", AliTRDgeometry::Nsector()*kMaxTracksStack);
+    fTracks->SetOwner(kTRUE);
+  }
+  Int_t nentries = fTracks->GetEntriesFast();
+  return new ((*fTracks)[nentries]) AliTRDtrackV1(*track);
+}
+
+
+
 //____________________________________________________________________
 Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
 {
@@ -1338,29 +1955,29 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
   //    See AliTRDtrackerV1::Clusters2TracksStack() for details.
   // 3. Pack results in the ESD event.
   //
-       
+  
   // allocate space for esd tracks in this SM
   TClonesArray esdTrackList("AliESDtrack", 2*kMaxTracksStack);
   esdTrackList.SetOwner();
-       
+  
   Int_t nTracks   = 0;
   Int_t nChambers = 0;
   AliTRDtrackingChamber **stack = 0x0, *chamber = 0x0;
-  for(int istack = 0; istack<AliTRDgeometry::kNcham; istack++){
+  for(int istack = 0; istack<AliTRDgeometry::kNstack; istack++){
     if(!(stack = fTrSec[sector].GetStack(istack))) continue;
     nChambers = 0;
-    for(int iplane=0; iplane<AliTRDgeometry::kNplan; iplane++){
-      if(!(chamber = stack[iplane])) continue;
-      if(chamber->GetNClusters() < fgNTimeBins * AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
+    for(int ilayer=0; ilayer<AliTRDgeometry::kNlayer; ilayer++){
+      if(!(chamber = stack[ilayer])) continue;
+      if(chamber->GetNClusters() < fgNTimeBins * fReconstructor->GetRecoParam() ->GetFindableClusters()) continue;
       nChambers++;
-      //AliInfo(Form("sector %d stack %d plane %d clusters %d", sector, istack, iplane, chamber->GetNClusters()));
+      //AliInfo(Form("sector %d stack %d layer %d clusters %d", sector, istack, ilayer, chamber->GetNClusters()));
     }
     if(nChambers < 4) continue;
     //AliInfo(Form("Doing stack %d", istack));
     nTracks += Clusters2TracksStack(stack, &esdTrackList);
   }
   //AliInfo(Form("Found %d tracks in SM %d [%d]\n", nTracks, sector, esd->GetNumberOfTracks()));
-       
+  
   for(int itrack=0; itrack<nTracks; itrack++)
     esd->AddTrack((AliESDtrack*)esdTrackList[itrack]);
 
@@ -1399,46 +2016,61 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
   // 8. Build ESD track and register it to the output list
   //
 
-  AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
-  if (!calibra) AliInfo("Could not get Calibra instance\n");
-
+  const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
   AliTRDtrackingChamber *chamber = 0x0;
+  AliTRDtrackingChamber **ci = 0x0;
   AliTRDseedV1 sseed[kMaxTracksStack*6]; // to be initialized
   Int_t pars[4]; // MakeSeeds parameters
 
   //Double_t alpha = AliTRDgeometry::GetAlpha();
   //Double_t shift = .5 * alpha;
   Int_t configs[kNConfigs];
-       
+  
+  // Purge used clusters from the containers
+  ci = &stack[0];
+  for(Int_t ic = kNPlanes; ic--; ci++){
+    if(!(*ci)) continue;
+    (*ci)->Update();
+  }
+
   // Build initial seeding configurations
   Double_t quality = BuildSeedingConfigs(stack, configs);
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){
     AliInfo(Form("Plane config %d %d %d Quality %f"
-                , configs[0], configs[1], configs[2], quality));
+    , configs[0], configs[1], configs[2], quality));
   }
-       
+
+  
   // Initialize contors
   Int_t ntracks,      // number of TRD track candidates
     ntracks1,     // number of registered TRD tracks/iter
     ntracks2 = 0; // number of all registered TRD tracks in stack
   fSieveSeeding = 0;
+
+  // Get stack index
+  Int_t ic = 0; ci = &stack[0];
+  while(ic<kNPlanes && !(*ci)){ic++; ci++;}
+  if(!(*ci)) return ntracks2;
+  Int_t istack = fGeom->GetStack((*ci)->GetDetector());
+
   do{
     // Loop over seeding configurations
     ntracks = 0; ntracks1 = 0;
     for (Int_t iconf = 0; iconf<3; iconf++) {
       pars[0] = configs[iconf];
       pars[1] = ntracks;
+      pars[2] = istack;
       ntracks = MakeSeeds(stack, &sseed[6*ntracks], pars);
       if(ntracks == kMaxTracksStack) break;
     }
-    if(AliTRDReconstructor::StreamLevel() > 1) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
-               
+    if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
+    
     if(!ntracks) break;
-               
+    
     // Sort the seeds according to their quality
     Int_t sort[kMaxTracksStack];
     TMath::Sort(ntracks, fTrackQuality, sort, kTRUE);
-       
+  
     // Initialize number of tracks so far and logic switches
     Int_t ntracks0 = esdTrackList->GetEntriesFast();
     Bool_t signedTrack[kMaxTracksStack];
@@ -1448,7 +2080,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       fakeTrack[i] = kFALSE;
     }
     //AliInfo("Selecting track candidates ...");
-               
+    
     // Sieve clusters in decreasing order of track quality
     Double_t trackParams[7];
     //                 AliTRDseedV1 *lseed = 0x0;
@@ -1459,213 +2091,146 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       // Check track candidates
       candidates = 0;
       for (Int_t itrack = 0; itrack < ntracks; itrack++) {
-       Int_t trackIndex = sort[itrack];
-       if (signedTrack[trackIndex] || fakeTrack[trackIndex]) continue;
-       
-                               
-       // Calculate track parameters from tracklets seeds
-       Int_t labelsall[1000];
-       Int_t nlabelsall = 0;
-       Int_t naccepted  = 0;
-       Int_t ncl        = 0;
-       Int_t nused      = 0;
-       Int_t nlayers    = 0;
-       Int_t findable   = 0;
-       for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+jLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         if (TMath::Abs(sseed[jseed].GetYref(0) / sseed[jseed].GetX0()) < 0.15) findable++;
-       
-         sseed[jseed].UpdateUsed();
-         ncl   += sseed[jseed].GetN2();
-         nused += sseed[jseed].GetNUsed();
-         nlayers++;
-       
-         // Cooking label
-         for (Int_t itime = 0; itime < fgNTimeBins; itime++) {
-           if(!sseed[jseed].IsUsable(itime)) continue;
-           naccepted++;
-           Int_t tindex = 0, ilab = 0;
-           while(ilab<3 && (tindex = sseed[jseed].GetClusters(itime)->GetLabel(ilab)) >= 0){
-             labelsall[nlabelsall++] = tindex;
-             ilab++;
-           }
-         }
-       }
-       // Filter duplicated tracks
-       if (nused > 30){
-         //printf("Skip %d nused %d\n", trackIndex, nused);
-         fakeTrack[trackIndex] = kTRUE;
-         continue;
-       }
-       if (Float_t(nused)/ncl >= .25){
-         //printf("Skip %d nused/ncl >= .25\n", trackIndex);
-         fakeTrack[trackIndex] = kTRUE;
-         continue;
-       }
-                               
-       // Classify tracks
-       Bool_t skip = kFALSE;
-       switch(jSieve){
-       case 0:
-         if(nlayers < 6) {skip = kTRUE; break;}
-         if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
-         break;
-       
-       case 1:
-         if(nlayers < findable){skip = kTRUE; break;}
-         if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;}
-         break;
-       
-       case 2:
-         if ((nlayers == findable) || (nlayers == 6)) { skip = kTRUE; break;}
-         if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;}
-         break;
-       
-       case 3:
-         if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
-         break;
-       
-       case 4:
-         if (nlayers == 3){skip = kTRUE; break;}
-         //if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) - nused/(nlayers-3.0) < -15.0){skip = kTRUE; break;}
-         break;
-       }
-       if(skip){
-         candidates++;
-         //printf("REJECTED : %d [%d] nlayers %d trackQuality = %e nused %d\n", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused);
-         continue;
-       }
-       signedTrack[trackIndex] = kTRUE;
-                                               
-
-       // Build track label - what happens if measured data ???
-       Int_t labels[1000];
-       Int_t outlab[1000];
-       Int_t nlab = 0;
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+iLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         for(int ilab=0; ilab<2; ilab++){
-           if(sseed[jseed].GetLabels(ilab) < 0) continue;
-           labels[nlab] = sseed[jseed].GetLabels(ilab);
-           nlab++;
-         }
-       }
-       Freq(nlab,labels,outlab,kFALSE);
-       Int_t   label     = outlab[0];
-       Int_t   frequency = outlab[1];
-       Freq(nlabelsall,labelsall,outlab,kFALSE);
-       Int_t   label1    = outlab[0];
-       Int_t   label2    = outlab[2];
-       Float_t fakeratio = (naccepted - outlab[1]) / Float_t(naccepted);
-       
-                               
-       // Sign clusters
-       AliTRDcluster *cl = 0x0; Int_t clusterIndex = -1;
-       for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+jLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         if(TMath::Abs(sseed[jseed].GetYfit(1) - sseed[jseed].GetYfit(1)) >= .2) continue; // check this condition with Marian
-         sseed[jseed].UseClusters();
-         if(!cl){
-           Int_t ic = 0;
-           while(!(cl = sseed[jseed].GetClusters(ic))) ic++;
-           clusterIndex =  sseed[jseed].GetIndexes(ic);
-         }
-       }
-       if(!cl) continue;
-
-                               
-       // Build track parameters
-       AliTRDseedV1 *lseed =&sseed[trackIndex*6];
-       Int_t idx = 0;
-       while(idx<3 && !lseed->IsOK()) {
-         idx++;
-         lseed++;
-       }
-       Double_t cR = lseed->GetC();
-       trackParams[1] = lseed->GetYref(0);
-       trackParams[2] = lseed->GetZref(0);
-       trackParams[3] = lseed->GetX0() * cR - TMath::Sin(TMath::ATan(lseed->GetYref(1)));
-       trackParams[4] = lseed->GetZref(1) / TMath::Sqrt(1. + lseed->GetYref(1) * lseed->GetYref(1));
-       trackParams[5] = cR;
-       trackParams[0] = lseed->GetX0();
-       Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
-       trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift;      // Supermodule*/
-
-       if(AliTRDReconstructor::StreamLevel() > 1){
-         AliInfo(Form("Track %d [%d] nlayers %d trackQuality = %e nused %d, yref = %3.3f", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused, trackParams[1]));
-                                       
-         Int_t nclusters = 0;
-         AliTRDseedV1 *dseed[6];
-         for(int is=0; is<6; is++){
-           dseed[is] = new AliTRDseedV1(sseed[trackIndex*6+is]);
-           dseed[is]->SetOwner();
-           nclusters += sseed[is].GetN2();
-         }
-         //Int_t eventNrInFile = esd->GetEventNumberInFile();
-         //AliInfo(Form("Number of clusters %d.", nclusters));
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         cstreamer << "Clusters2TracksStack"
-                   << "EventNumber="           << eventNumber
-                   << "TrackNumber="           << trackNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "Iter="                          << fSieveSeeding
-                   << "Like="                          << fTrackQuality[trackIndex]
-                   << "S0.="                           << dseed[0]
-                   << "S1.="                           << dseed[1]
-                   << "S2.="                           << dseed[2]
-                   << "S3.="                           << dseed[3]
-                   << "S4.="                           << dseed[4]
-                   << "S5.="                           << dseed[5]
-                   << "p0="                            << trackParams[0]
-                   << "p1="                            << trackParams[1]
-                   << "p2="                            << trackParams[2]
-                   << "p3="                            << trackParams[3]
-                   << "p4="                            << trackParams[4]
-                   << "p5="                            << trackParams[5]
-                   << "p6="                            << trackParams[6]
-                   << "Label="                         << label
-                   << "Label1="                        << label1
-                   << "Label2="                        << label2
-                   << "FakeRatio="                     << fakeratio
-                   << "Freq="                          << frequency
-                   << "Ncl="                           << ncl
-                   << "NLayers="                       << nlayers
-                   << "Findable="                      << findable
-
-                   << "NUsed="                         << nused
-                   << "\n";
-       }
-                       
-       AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
-       // computes PID for track
-       track->CookPID();
-       // update calibration references using this track
-       if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(track);
-
-       if(!track){
-         //AliWarning("Fail to build a TRD Track.");
-         continue;
-       }
-       //AliInfo("End of MakeTrack()");
-       AliESDtrack esdTrack;
-       esdTrack.UpdateTrackParams(track, AliESDtrack::kTRDout);
-       esdTrack.SetLabel(track->GetLabel());
-       // write ESD-friends if neccessary
-       if (AliTRDReconstructor::StreamLevel() > 0){
-         //printf("Creating Calibrations Object\n");
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
-         calibTrack->SetOwner();
-         esdTrack.AddCalibObject(calibTrack);
-       }
-       new ((*esdTrackList)[ntracks0++]) AliESDtrack(esdTrack);
-       ntracks1++;
-       AliTRDtrackerDebug::SetTrackNumber(AliTRDtrackerDebug::GetTrackNumber() + 1);
+        Int_t trackIndex = sort[itrack];
+        if (signedTrack[trackIndex] || fakeTrack[trackIndex]) continue;
+  
+        
+        // Calculate track parameters from tracklets seeds
+        Int_t ncl        = 0;
+        Int_t nused      = 0;
+        Int_t nlayers    = 0;
+        Int_t findable   = 0;
+        for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) {
+          Int_t jseed = kNPlanes*trackIndex+jLayer;
+          if(!sseed[jseed].IsOK()) continue;
+          if (TMath::Abs(sseed[jseed].GetYref(0) / sseed[jseed].GetX0()) < 0.158) findable++;
+          // TODO here we get a sig fault which should never happen !
+          sseed[jseed].UpdateUsed();
+          ncl   += sseed[jseed].GetN2();
+          nused += sseed[jseed].GetNUsed();
+          nlayers++;
+        }
+
+        // Filter duplicated tracks
+        if (nused > 30){
+          //printf("Skip %d nused %d\n", trackIndex, nused);
+          fakeTrack[trackIndex] = kTRUE;
+          continue;
+        }
+        if (Float_t(nused)/ncl >= .25){
+          //printf("Skip %d nused/ncl >= .25\n", trackIndex);
+          fakeTrack[trackIndex] = kTRUE;
+          continue;
+        }
+
+        // Classify tracks
+        Bool_t skip = kFALSE;
+        switch(jSieve){
+          case 0:
+            if(nlayers < 6) {skip = kTRUE; break;}
+            if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
+            break;
+
+          case 1:
+            if(nlayers < findable){skip = kTRUE; break;}
+            if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;}
+            break;
+
+          case 2:
+            if ((nlayers == findable) || (nlayers == 6)) { skip = kTRUE; break;}
+            if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;}
+            break;
+
+          case 3:
+            if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
+            break;
+
+          case 4:
+            if (nlayers == 3){skip = kTRUE; break;}
+            //if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) - nused/(nlayers-3.0) < -15.0){skip = kTRUE; break;}
+            break;
+        }
+        if(skip){
+          candidates++;
+          //printf("REJECTED : %d [%d] nlayers %d trackQuality = %e nused %d\n", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused);
+          continue;
+        }
+        signedTrack[trackIndex] = kTRUE;
+
+        // Build track parameters
+        AliTRDseedV1 *lseed =&sseed[trackIndex*6];
+      /*  Int_t idx = 0;
+        while(idx<3 && !lseed->IsOK()) {
+          idx++;
+          lseed++;
+        }*/
+        Double_t x = lseed->GetX0();// - 3.5;
+        trackParams[0] = x; //NEW AB
+        trackParams[1] = lseed->GetYref(0); // lseed->GetYat(x);  
+        trackParams[2] = lseed->GetZref(0); // lseed->GetZat(x); 
+        trackParams[3] = TMath::Sin(TMath::ATan(lseed->GetYref(1)));
+        trackParams[4] = lseed->GetZref(1) / TMath::Sqrt(1. + lseed->GetYref(1) * lseed->GetYref(1));
+        trackParams[5] = lseed->GetC();
+        Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
+        trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift;     // Supermodule*/
+
+        if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+          //AliInfo(Form("Track %d [%d] nlayers %d trackQuality = %e nused %d, yref = %3.3f", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused, trackParams[1]));
+
+          AliTRDseedV1 *dseed[6];
+          for(Int_t iseed = AliTRDgeometry::kNlayer; iseed--;) dseed[iseed] = new AliTRDseedV1(lseed[iseed]);
+
+          //Int_t eventNrInFile = esd->GetEventNumberInFile();
+          //AliInfo(Form("Number of clusters %d.", nclusters));
+          Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+          Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
+          Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+          TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          cstreamer << "Clusters2TracksStack"
+              << "EventNumber="                << eventNumber
+              << "TrackNumber="                << trackNumber
+              << "CandidateNumber="    << candidateNumber
+              << "Iter="                               << fSieveSeeding
+              << "Like="                               << fTrackQuality[trackIndex]
+              << "S0.="                                << dseed[0]
+              << "S1.="                                << dseed[1]
+              << "S2.="                                << dseed[2]
+              << "S3.="                                << dseed[3]
+              << "S4.="                                << dseed[4]
+              << "S5.="                                << dseed[5]
+              << "p0="                         << trackParams[0]
+              << "p1="                         << trackParams[1]
+              << "p2="                         << trackParams[2]
+              << "p3="                         << trackParams[3]
+              << "p4="                         << trackParams[4]
+              << "p5="                         << trackParams[5]
+              << "p6="                         << trackParams[6]
+              << "Ncl="                                << ncl
+              << "NLayers="                    << nlayers
+              << "Findable="                   << findable
+              << "NUsed="                              << nused
+              << "\n";
+        }
+
+        AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
+        if(!track){
+          AliWarning("Fail to build a TRD Track.");
+          continue;
+        }
+      
+        //AliInfo("End of MakeTrack()");
+        AliESDtrack *esdTrack = new ((*esdTrackList)[ntracks0++]) AliESDtrack();
+        esdTrack->UpdateTrackParams(track, AliESDtrack::kTRDout);
+        esdTrack->SetLabel(track->GetLabel());
+        track->UpdateESDtrack(esdTrack);
+        // write ESD-friends if neccessary
+        if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){
+          AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
+          calibTrack->SetOwner();
+          esdTrack->AddCalibObject(calibTrack);
+        }
+        ntracks1++;
+        AliTRDtrackerDebug::SetTrackNumber(AliTRDtrackerDebug::GetTrackNumber() + 1);
       }
 
       jSieve++;
@@ -1674,22 +2239,24 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
 
     // increment counters
     ntracks2 += ntracks1;
+
+    if(fReconstructor->IsHLT()) break;
     fSieveSeeding++;
 
     // Rebuild plane configurations and indices taking only unused clusters into account
     quality = BuildSeedingConfigs(stack, configs);
-    if(quality < 1.E-7) break; //AliTRDReconstructor::RecoParam()->GetPlaneQualityThreshold()) break;
-               
+    if(quality < 1.E-7) break; //fReconstructor->GetRecoParam() ->GetPlaneQualityThreshold()) break;
+    
     for(Int_t ip = 0; ip < kNPlanes; ip++){ 
       if(!(chamber = stack[ip])) continue;
-      chamber->Build(fGeom);//Indices(fSieveSeeding);
+      chamber->Build(fGeom, cal);//Indices(fSieveSeeding);
     }
 
-    if(AliTRDReconstructor::StreamLevel() > 1){ 
+    if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){ 
       AliInfo(Form("Sieve level %d Plane config %d %d %d Quality %f", fSieveSeeding, configs[0], configs[1], configs[2], quality));
     }
   } while(fSieveSeeding<10); // end stack clusters sieve
-       
+  
 
 
   //AliInfo(Form("Registered TRD tracks %d in stack %d.", ntracks2, pars[1]));
@@ -1724,26 +2291,26 @@ Double_t AliTRDtrackerV1::BuildSeedingConfigs(AliTRDtrackingChamber **stack, Int
   // The overall chamber quality is given by the product of this 2 contributions.
   // 
 
-  Double_t chamberQ[kNPlanes];
+  Double_t chamberQ[kNPlanes];memset(chamberQ, 0, kNPlanes*sizeof(Double_t));
   AliTRDtrackingChamber *chamber = 0x0;
   for(int iplane=0; iplane<kNPlanes; iplane++){
     if(!(chamber = stack[iplane])) continue;
     chamberQ[iplane] = (chamber = stack[iplane]) ?  chamber->GetQuality() : 0.;
   }
 
-  Double_t tconfig[kNConfigs];
-  Int_t planes[4];
+  Double_t tconfig[kNConfigs];memset(tconfig, 0, kNConfigs*sizeof(Double_t));
+  Int_t planes[] = {0, 0, 0, 0};
   for(int iconf=0; iconf<kNConfigs; iconf++){
     GetSeedingConfig(iconf, planes);
     tconfig[iconf] = fgTopologicQA[iconf];
     for(int iplane=0; iplane<4; iplane++) tconfig[iconf] *= chamberQ[planes[iplane]]; 
   }
-       
+  
   TMath::Sort((Int_t)kNConfigs, tconfig, configs, kTRUE);
   //   AliInfo(Form("q[%d] = %f", configs[0], tconfig[configs[0]]));
   //   AliInfo(Form("q[%d] = %f", configs[1], tconfig[configs[1]]));
   //   AliInfo(Form("q[%d] = %f", configs[2], tconfig[configs[2]]));
-       
+  
   return tconfig[configs[0]];
 }
 
@@ -1800,7 +2367,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
   //
 
   AliTRDtrackingChamber *chamber = 0x0;
-  AliTRDcluster *c[4] = {0x0, 0x0, 0x0, 0x0}; // initilize seeding clusters
+  AliTRDcluster *c[kNSeedPlanes] = {0x0, 0x0, 0x0, 0x0}; // initilize seeding clusters
   AliTRDseedV1 *cseed = &sseed[0]; // initialize tracklets for first track
   Int_t ncl, mcl; // working variable for looping over clusters
   Int_t index[AliTRDchamberTimeBin::kMaxClustersLayer], jndex[AliTRDchamberTimeBin::kMaxClustersLayer];
@@ -1809,312 +2376,318 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
   // chi2[1] = tracklet chi2 on the R direction
   Double_t chi2[4];
 
-
   // this should be data member of AliTRDtrack
   Double_t seedQuality[kMaxTracksStack];
-       
+  
   // unpack control parameters
   Int_t config  = ipar[0];
   Int_t ntracks = ipar[1];
+  Int_t istack  = ipar[2];
   Int_t planes[kNSeedPlanes]; GetSeedingConfig(config, planes);        
-       
+  Int_t planesExt[kNPlanes-kNSeedPlanes];         GetExtrapolationConfig(config, planesExt);
+
+
   // Init chambers geometry
-  Int_t ic = 0; while(!(chamber = stack[ic])) ic++;
-  Int_t istack = fGeom->GetChamber(chamber->GetDetector());
   Double_t hL[kNPlanes];       // Tilting angle
   Float_t padlength[kNPlanes]; // pad lenghts
+  Float_t padwidth[kNPlanes];  // pad widths
   AliTRDpadPlane *pp = 0x0;
   for(int iplane=0; iplane<kNPlanes; iplane++){
     pp                = fGeom->GetPadPlane(iplane, istack);
-    hL[iplane]        = TMath::Tan(-TMath::DegToRad()*pp->GetTiltingAngle());
+    hL[iplane]        = TMath::Tan(TMath::DegToRad()*pp->GetTiltingAngle());
     padlength[iplane] = pp->GetLengthIPad();
+    padwidth[iplane] = pp->GetWidthIPad();
   }
-       
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  
+  // Init anode wire position for chambers
+  Double_t x0[kNPlanes],       // anode wire position
+           driftLength = .5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick(); // drift length
+  TGeoHMatrix *matrix = 0x0;
+  Double_t loc[] = {AliTRDgeometry::AnodePos(), 0., 0.};
+  Double_t glb[] = {0., 0., 0.};
+  AliTRDtrackingChamber **cIter = &stack[0];
+  for(int iLayer=0; iLayer<kNPlanes; iLayer++,cIter++){
+    if(!(*cIter)) continue;
+    if(!(matrix = fGeom->GetClusterMatrix((*cIter)->GetDetector()))){ 
+      continue;
+      x0[iLayer] = fgkX0[iLayer];
+    }
+    matrix->LocalToMaster(loc, glb);
+    x0[iLayer] = glb[0];
+  }
+
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){
     AliInfo(Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
   }
 
+  // Build seeding layers
+  ResetSeedTB();
   Int_t nlayers = 0;
-  AliTRDchamberTimeBin *layer[] = {0x0, 0x0, 0x0, 0x0};
   for(int isl=0; isl<kNSeedPlanes; isl++){ 
     if(!(chamber = stack[planes[isl]])) continue;
-    if(!(layer[isl] = chamber->GetSeedingLayer(fGeom))) continue;
+    if(!chamber->GetSeedingLayer(fSeedTB[isl], fGeom, fReconstructor)) continue;
     nlayers++;
-    //AliInfo(Form("seeding plane %d clusters %d", planes[isl], Int_t(*layer[isl])));
   }
-  if(nlayers < 4) return 0;
-       
-       
+  if(nlayers < kNSeedPlanes) return ntracks;
+  
+  
   // Start finding seeds
   Double_t cond0[4], cond1[4], cond2[4];
   Int_t icl = 0;
-  while((c[3] = (*layer[3])[icl++])){
+  while((c[3] = (*fSeedTB[3])[icl++])){
     if(!c[3]) continue;
-    layer[0]->BuildCond(c[3], cond0, 0);
-    layer[0]->GetClusters(cond0, index, ncl);
+    fSeedTB[0]->BuildCond(c[3], cond0, 0);
+    fSeedTB[0]->GetClusters(cond0, index, ncl);
     //printf("Found c[3] candidates 0 %d\n", ncl);
     Int_t jcl = 0;
     while(jcl<ncl) {
-      c[0] = (*layer[0])[index[jcl++]];
+      c[0] = (*fSeedTB[0])[index[jcl++]];
       if(!c[0]) continue;
       Double_t dx    = c[3]->GetX() - c[0]->GetX();
       Double_t theta = (c[3]->GetZ() - c[0]->GetZ())/dx;
       Double_t phi   = (c[3]->GetY() - c[0]->GetY())/dx;
-      layer[1]->BuildCond(c[0], cond1, 1, theta, phi);
-      layer[1]->GetClusters(cond1, jndex, mcl);
+      fSeedTB[1]->BuildCond(c[0], cond1, 1, theta, phi);
+      fSeedTB[1]->GetClusters(cond1, jndex, mcl);
       //printf("Found c[0] candidates 1 %d\n", mcl);
 
       Int_t kcl = 0;
       while(kcl<mcl) {
-       c[1] = (*layer[1])[jndex[kcl++]];
-       if(!c[1]) continue;
-       layer[2]->BuildCond(c[1], cond2, 2, theta, phi);
-       c[2] = layer[2]->GetNearestCluster(cond2);
-       //printf("Found c[1] candidate 2 %p\n", c[2]);
-       if(!c[2]) continue;
-                               
-       //                              AliInfo("Seeding clusters found. Building seeds ...");
-       //                              for(Int_t i = 0; i < kNSeedPlanes; i++) printf("%i. coordinates: x = %6.3f, y = %6.3f, z = %6.3f\n", i, c[i]->GetX(), c[i]->GetY(), c[i]->GetZ());
-                               
-       for (Int_t il = 0; il < 6; il++) cseed[il].Reset();
-
-       FitRieman(c, chi2);
-
-       AliTRDseedV1 *tseed = 0x0;
-       for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
-         Int_t jLayer = planes[iLayer];
-         tseed = &cseed[jLayer];
-         tseed->SetPlane(jLayer);
-         tseed->SetTilt(hL[jLayer]);
-         tseed->SetPadLength(padlength[jLayer]);
-         tseed->SetX0(stack[jLayer]->GetX());
-         tseed->Init(GetRiemanFitter());
-       }
-
-       Bool_t isFake = kFALSE;
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-         if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-         if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-
-         Double_t xpos[4];
-         for(Int_t l = 0; l < kNSeedPlanes; l++) xpos[l] = layer[l]->GetX();
-         Float_t yref[4];
-         for(int il=0; il<4; il++) yref[il] = cseed[planes[il]].GetYref(0);
-         Int_t ll = c[3]->GetLabel(0);
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         AliRieman *rim = GetRiemanFitter();
-         TTreeSRedirector &cs0 = *fgDebugStreamer;
-         cs0 << "MakeSeeds0"
-             <<"EventNumber="          << eventNumber
-             <<"CandidateNumber="      << candidateNumber
-             <<"isFake="                               << isFake
-             <<"config="                               << config
-             <<"label="                                << ll
-             <<"chi2z="                                << chi2[0]
-             <<"chi2y="                                << chi2[1]
-             <<"Y2exp="                                << cond2[0]     
-             <<"Z2exp="                                << cond2[1]
-             <<"X0="                                   << xpos[0] //layer[sLayer]->GetX()
-             <<"X1="                                   << xpos[1] //layer[sLayer + 1]->GetX()
-             <<"X2="                                   << xpos[2] //layer[sLayer + 2]->GetX()
-             <<"X3="                                   << xpos[3] //layer[sLayer + 3]->GetX()
-             <<"yref0="                                << yref[0]
-             <<"yref1="                                << yref[1]
-             <<"yref2="                                << yref[2]
-             <<"yref3="                                << yref[3]
-             <<"c0.="                          << c[0]
-             <<"c1.="                          << c[1]
-             <<"c2.="                          << c[2]
-             <<"c3.="                          << c[3]
-             <<"Seed0.="                               << &cseed[planes[0]]
-             <<"Seed1.="                               << &cseed[planes[1]]
-             <<"Seed2.="                               << &cseed[planes[2]]
-             <<"Seed3.="                               << &cseed[planes[3]]
-             <<"RiemanFitter.="                << rim
-             <<"\n";
-       }
-
-       if(chi2[0] > AliTRDReconstructor::RecoParam()->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
-         //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       if(chi2[1] > AliTRDReconstructor::RecoParam()->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
-         //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo("Passed chi2 filter.");
-
-       // try attaching clusters to tracklets
-       Int_t nUsedCl = 0;
-       Int_t nlayers = 0;
-       for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
-         Int_t jLayer = planes[iLayer];
-         if(!cseed[jLayer].AttachClustersIter(stack[jLayer], 5., kFALSE, c[iLayer])) continue;
-         nUsedCl += cseed[jLayer].GetNUsed();
-         if(nUsedCl > 25) break;
-         nlayers++;
-       }
-       if(nlayers < kNSeedPlanes){ 
-         //AliInfo(Form("Failed updating all seeds %d [%d].", nlayers, kNSeedPlanes));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       // fit tracklets and cook likelihood
-       FitTiltedRieman(&cseed[0], kTRUE);// Update Seeds and calculate Likelihood
-       chi2[0] = GetChi2Y(&cseed[0]);
-       chi2[1] = GetChi2Z(&cseed[0]);
-       //Chi2 definitions in testing stage
-       //chi2[0] = GetChi2YTest(&cseed[0]);
-       //chi2[1] = GetChi2ZTest(&cseed[0]);
-       Double_t like = CookLikelihood(&cseed[0], planes, chi2); // to be checked
-
-       if (TMath::Log(1.E-9 + like) < AliTRDReconstructor::RecoParam()->GetTrackLikelihood()){
-         //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo(Form("Passed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
-
-       // book preliminary results
-       seedQuality[ntracks] = like;
-       fSeedLayer[ntracks]  = config;/*sLayer;*/
-
-       // attach clusters to the extrapolation seeds
-       Int_t lextrap[2];
-       GetExtrapolationConfig(config, lextrap);
-       Int_t nusedf   = 0; // debug value
-       for(int iLayer=0; iLayer<2; iLayer++){
-         Int_t jLayer = lextrap[iLayer];
-         if(!(chamber = stack[jLayer])) continue;
-                                               
-         // prepare extrapolated seed
-         cseed[jLayer].Reset();
-         cseed[jLayer].SetPlane(jLayer);
-         cseed[jLayer].SetTilt(hL[jLayer]);
-         cseed[jLayer].SetX0(chamber->GetX());
-         cseed[jLayer].SetPadLength(padlength[jLayer]);
-
-         // fit extrapolated seed
-         if ((jLayer == 0) && !(cseed[1].IsOK())) continue;
-         if ((jLayer == 5) && !(cseed[4].IsOK())) continue;
-         AliTRDseedV1 tseed = cseed[jLayer];
-         if(!tseed.AttachClustersIter(chamber, 1000.)) continue;
-         cseed[jLayer] = tseed;
-         nusedf += cseed[jLayer].GetNUsed(); // debug value
-         FitTiltedRieman(cseed,  kTRUE);
-       }
-
-       // AliInfo("Extrapolation done.");
-       // Debug Stream containing all the 6 tracklets
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
-         Int_t eventNumber             = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         cstreamer << "MakeSeeds1"
-                   << "EventNumber="           << eventNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "S0.="                           << &cseed[0]
-                   << "S1.="                           << &cseed[1]
-                   << "S2.="                           << &cseed[2]
-                   << "S3.="                           << &cseed[3]
-                   << "S4.="                           << &cseed[4]
-                   << "S5.="                           << &cseed[5]
-                   << "FitterT.="                      << tiltedRieman
-                   << "\n";
-       }
-                               
-       if(ImproveSeedQuality(stack, cseed) < 4){
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo("Improve seed quality done.");
-
-       // fit full track and cook likelihoods
-       //                              Double_t curv = FitRieman(&cseed[0], chi2);
-       //                              Double_t chi2ZF = chi2[0] / TMath::Max((nlayers - 3.), 1.);
-       //                              Double_t chi2RF = chi2[1] / TMath::Max((nlayers - 3.), 1.);
-
-       // do the final track fitting (Once with vertex constraint and once without vertex constraint)
-       Double_t chi2Vals[3];
-       chi2Vals[0] = FitTiltedRieman(&cseed[0], kFALSE);
-       chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ());
-       chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((nlayers - 3.), 1.);
-       // Chi2 definitions in testing stage
-       //chi2Vals[2] = GetChi2ZTest(&cseed[0]);
-       fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]);
-       //AliInfo("Hyperplane fit done\n");
-
-       // finalize tracklets
-       Int_t labels[12];
-       Int_t outlab[24];
-       Int_t nlab = 0;
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         if (!cseed[iLayer].IsOK()) continue;
-
-         if (cseed[iLayer].GetLabels(0) >= 0) {
-           labels[nlab] = cseed[iLayer].GetLabels(0);
-           nlab++;
-         }
-
-         if (cseed[iLayer].GetLabels(1) >= 0) {
-           labels[nlab] = cseed[iLayer].GetLabels(1);
-           nlab++;
-         }
-       }
-       Freq(nlab,labels,outlab,kFALSE);
-       Int_t label     = outlab[0];
-       Int_t frequency = outlab[1];
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         cseed[iLayer].SetFreq(frequency);
-         cseed[iLayer].SetChi2Z(chi2[1]);
-       }
-           
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
-         TLinearFitter *fitterT = GetTiltedRiemanFitter();
-         cstreamer << "MakeSeeds2"
-                   << "EventNumber="           << eventNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "Chi2TR="                        << chi2Vals[0]
-                   << "Chi2TC="                        << chi2Vals[1]
-                   << "Nlayers="                       << nlayers
-                   << "NUsedS="                        << nUsedCl
-                   << "NUsed="                         << nusedf
-                   << "Like="                          << like
-                   << "S0.="                           << &cseed[0]
-                   << "S1.="                           << &cseed[1]
-                   << "S2.="                           << &cseed[2]
-                   << "S3.="                           << &cseed[3]
-                   << "S4.="                           << &cseed[4]
-                   << "S5.="                           << &cseed[5]
-                   << "Label="                         << label
-                   << "Freq="                          << frequency
-                   << "FitterT.="                      << fitterT
-                   << "FitterTC.="                     << fitterTC
-                   << "\n";
-       }
-                               
-       ntracks++;
-       AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-       if(ntracks == kMaxTracksStack){
-         AliWarning(Form("Number of seeds reached maximum allowed (%d) in stack.", kMaxTracksStack));
-         for(int isl=0; isl<4; isl++) delete layer[isl];
-         return ntracks;
-       }
-       cseed += 6;
+        c[1] = (*fSeedTB[1])[jndex[kcl++]];
+        if(!c[1]) continue;
+        fSeedTB[2]->BuildCond(c[1], cond2, 2, theta, phi);
+        c[2] = fSeedTB[2]->GetNearestCluster(cond2);
+        //printf("Found c[1] candidate 2 %p\n", c[2]);
+        if(!c[2]) continue;
+              
+        //                             AliInfo("Seeding clusters found. Building seeds ...");
+        //                             for(Int_t i = 0; i < kNSeedPlanes; i++) printf("%i. coordinates: x = %6.3f, y = %6.3f, z = %6.3f\n", i, c[i]->GetX(), c[i]->GetY(), c[i]->GetZ());
+              
+        for (Int_t il = 0; il < kNPlanes; il++) cseed[il].Reset();
+      
+        FitRieman(c, chi2);
+      
+        AliTRDseedV1 *tseed = &cseed[0];
+        cIter = &stack[0];
+        for(int iLayer=0; iLayer<kNPlanes; iLayer++, tseed++, cIter++){
+          Int_t det = (*cIter) ? (*cIter)->GetDetector() : -1;
+          tseed->SetDetector(det);
+          tseed->SetTilt(hL[iLayer]);
+          tseed->SetPadLength(padlength[iLayer]);
+          tseed->SetPadWidth(padwidth[iLayer]);
+          tseed->SetReconstructor(fReconstructor);
+          tseed->SetX0(det<0 ? fR[iLayer]+driftLength : x0[iLayer]);
+          tseed->Init(GetRiemanFitter());
+          tseed->SetStandAlone(kTRUE);
+        }
+      
+        Bool_t isFake = kFALSE;
+        if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+          if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+          if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+          if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+      
+          Double_t xpos[4];
+          for(Int_t l = 0; l < kNSeedPlanes; l++) xpos[l] = fSeedTB[l]->GetX();
+          Float_t yref[4];
+          for(int il=0; il<4; il++) yref[il] = cseed[planes[il]].GetYref(0);
+          Int_t ll = c[3]->GetLabel(0);
+          Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+          Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+          AliRieman *rim = GetRiemanFitter();
+          TTreeSRedirector &cs0 = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          cs0 << "MakeSeeds0"
+              <<"EventNumber="         << eventNumber
+              <<"CandidateNumber="     << candidateNumber
+              <<"isFake="                              << isFake
+              <<"config="                              << config
+              <<"label="                               << ll
+              <<"chi2z="                               << chi2[0]
+              <<"chi2y="                               << chi2[1]
+              <<"Y2exp="                               << cond2[0]     
+              <<"Z2exp="                               << cond2[1]
+              <<"X0="                                  << xpos[0] //layer[sLayer]->GetX()
+              <<"X1="                                  << xpos[1] //layer[sLayer + 1]->GetX()
+              <<"X2="                                  << xpos[2] //layer[sLayer + 2]->GetX()
+              <<"X3="                                  << xpos[3] //layer[sLayer + 3]->GetX()
+              <<"yref0="                               << yref[0]
+              <<"yref1="                               << yref[1]
+              <<"yref2="                               << yref[2]
+              <<"yref3="                               << yref[3]
+              <<"c0.="                         << c[0]
+              <<"c1.="                         << c[1]
+              <<"c2.="                         << c[2]
+              <<"c3.="                         << c[3]
+              <<"Seed0.="                              << &cseed[planes[0]]
+              <<"Seed1.="                              << &cseed[planes[1]]
+              <<"Seed2.="                              << &cseed[planes[2]]
+              <<"Seed3.="                              << &cseed[planes[3]]
+              <<"RiemanFitter.="               << rim
+              <<"\n";
+        }
+        if(chi2[0] > fReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
+//          //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
+          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+          continue;
+        }
+        if(chi2[1] > fReconstructor->GetRecoParam() ->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
+//          //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
+          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+          continue;
+        }
+        //AliInfo("Passed chi2 filter.");
+      
+        // try attaching clusters to tracklets
+        Int_t mlayers = 0;
+        for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
+          Int_t jLayer = planes[iLayer];
+          if(!cseed[jLayer].AttachClusters(stack[jLayer], kTRUE)) continue;
+          cseed[jLayer].UpdateUsed();
+          if(!cseed[jLayer].IsOK()) continue;
+          mlayers++;
+        }
+
+        if(mlayers < kNSeedPlanes){ 
+          //AliInfo(Form("Failed updating all seeds %d [%d].", mlayers, kNSeedPlanes));
+          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+          continue;
+        }
+
+        // temporary exit door for the HLT
+        if(fReconstructor->IsHLT()){ 
+          // attach clusters to extrapolation chambers
+          for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
+            Int_t jLayer = planesExt[iLayer];
+            if(!(chamber = stack[jLayer])) continue;
+            cseed[jLayer].AttachClusters(chamber, kTRUE);
+          }
+          fTrackQuality[ntracks] = 1.; // dummy value
+          ntracks++;
+          if(ntracks == kMaxTracksStack) return ntracks;
+          cseed += 6; 
+          continue;
+        }
+
+
+        // Update Seeds and calculate Likelihood
+        // fit tracklets and cook likelihood
+        FitTiltedRieman(&cseed[0], kTRUE);
+        for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
+          Int_t jLayer = planes[iLayer];
+          cseed[jLayer].Fit(kTRUE);
+        }
+        Double_t like = CookLikelihood(&cseed[0], planes); // to be checked
+      
+        if (TMath::Log(1.E-9 + like) < fReconstructor->GetRecoParam() ->GetTrackLikelihood()){
+          //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+          continue;
+        }
+        //AliInfo(Form("Passed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+      
+        // book preliminary results
+        seedQuality[ntracks] = like;
+        fSeedLayer[ntracks]  = config;/*sLayer;*/
+      
+        // attach clusters to the extrapolation seeds
+        for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
+          Int_t jLayer = planesExt[iLayer];
+          if(!(chamber = stack[jLayer])) continue;
+      
+          // fit extrapolated seed
+          if ((jLayer == 0) && !(cseed[1].IsOK())) continue;
+          if ((jLayer == 5) && !(cseed[4].IsOK())) continue;
+          AliTRDseedV1 pseed = cseed[jLayer];
+          if(!pseed.AttachClusters(chamber, kTRUE)) continue;
+          pseed.Fit(kTRUE);
+          cseed[jLayer] = pseed;
+          FitTiltedRieman(cseed,  kTRUE);
+          cseed[jLayer].Fit(kTRUE);
+        }
+      
+        // AliInfo("Extrapolation done.");
+        // Debug Stream containing all the 6 tracklets
+        if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+          TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
+          Int_t eventNumber            = AliTRDtrackerDebug::GetEventNumber();
+          Int_t candidateNumber        = AliTRDtrackerDebug::GetCandidateNumber();
+          cstreamer << "MakeSeeds1"
+              << "EventNumber="                << eventNumber
+              << "CandidateNumber="    << candidateNumber
+              << "S0.="                                << &cseed[0]
+              << "S1.="                                << &cseed[1]
+              << "S2.="                                << &cseed[2]
+              << "S3.="                                << &cseed[3]
+              << "S4.="                                << &cseed[4]
+              << "S5.="                                << &cseed[5]
+              << "FitterT.="                   << tiltedRieman
+              << "\n";
+        }
+              
+        if(fReconstructor->HasImproveTracklets() && ImproveSeedQuality(stack, cseed) < 4){
+          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+          continue;
+        }
+        //AliInfo("Improve seed quality done.");
+      
+        // fit full track and cook likelihoods
+        //                             Double_t curv = FitRieman(&cseed[0], chi2);
+        //                             Double_t chi2ZF = chi2[0] / TMath::Max((mlayers - 3.), 1.);
+        //                             Double_t chi2RF = chi2[1] / TMath::Max((mlayers - 3.), 1.);
+      
+        // do the final track fitting (Once with vertex constraint and once without vertex constraint)
+        Double_t chi2Vals[3];
+        chi2Vals[0] = FitTiltedRieman(&cseed[0], kFALSE);
+        if(fReconstructor->HasVertexConstrained())
+          chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ()); // Do Vertex Constrained fit if desired
+        else
+          chi2Vals[1] = 1.;
+        chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((mlayers - 3.), 1.);
+        // Chi2 definitions in testing stage
+        //chi2Vals[2] = GetChi2ZTest(&cseed[0]);
+        fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]);
+        //AliInfo("Hyperplane fit done\n");
+                  
+        if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+          TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+          Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+          TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
+          TLinearFitter *fitterT = GetTiltedRiemanFitter();
+          Int_t ncls = 0; 
+          for(Int_t iseed = 0; iseed < kNPlanes; iseed++){
+               ncls += cseed[iseed].IsOK() ? cseed[iseed].GetN2() : 0;
+          }
+          cstreamer << "MakeSeeds2"
+              << "EventNumber="                << eventNumber
+              << "CandidateNumber="    << candidateNumber
+              << "Chi2TR="                     << chi2Vals[0]
+              << "Chi2TC="                     << chi2Vals[1]
+              << "Nlayers="                    << mlayers
+              << "NClusters="   << ncls
+              << "Like="                               << like
+              << "S0.="                                << &cseed[0]
+              << "S1.="                                << &cseed[1]
+              << "S2.="                                << &cseed[2]
+              << "S3.="                                << &cseed[3]
+              << "S4.="                                << &cseed[4]
+              << "S5.="                                << &cseed[5]
+              << "FitterT.="                   << fitterT
+              << "FitterTC.="                  << fitterTC
+              << "\n";
+        }
+              
+        ntracks++;
+        AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+        if(ntracks == kMaxTracksStack){
+          AliWarning(Form("Number of seeds reached maximum allowed (%d) in stack.", kMaxTracksStack));
+          return ntracks;
+        }
+        cseed += 6;
       }
     }
   }
-  for(int isl=0; isl<4; isl++) delete layer[isl];
-       
+  
   return ntracks;
 }
 
@@ -2136,6 +2709,7 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 *seeds, Double_t *params)
   // To be discussed with Marian !!
   //
 
+
   Double_t alpha = AliTRDgeometry::GetAlpha();
   Double_t shift = AliTRDgeometry::GetAlpha()/2.0;
   Double_t c[15];
@@ -2146,21 +2720,69 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 *seeds, Double_t *params)
   c[ 6] = 0.0; c[ 7] = 0.0; c[ 8] = 0.0;  c[ 9] = 0.1;
   c[10] = 0.0; c[11] = 0.0; c[12] = 0.0;  c[13] = 0.0; c[14] = params[5]*params[5]*0.01;
 
-  AliTRDtrackV1 *track = new AliTRDtrackV1(seeds, &params[1], c, params[0], params[6]*alpha+shift);
-  track->PropagateTo(params[0]-5.0);
-  track->ResetCovariance(1);
-  Int_t nc = FollowBackProlongation(*track);
-  //AliInfo(Form("N clusters for track %d", nc));
-  if (nc < 30) {
-    delete track;
-    track = 0x0;
-  } else {
-    track->CookdEdx();
-    track->CookdEdxTimBin(-1);
-    track->CookLabel(.9);
+  AliTRDtrackV1 track(seeds, &params[1], c, params[0], params[6]*alpha+shift);
+  track.PropagateTo(params[0]-5.0);
+  AliTRDseedV1 *ptrTracklet = 0x0;
+  // Sign clusters
+  for (Int_t jLayer = 0; jLayer < AliTRDgeometry::kNlayer; jLayer++) {
+    ptrTracklet = &seeds[jLayer];
+    if(!ptrTracklet->IsOK()) continue;
+    if(TMath::Abs(ptrTracklet->GetYref(1) - ptrTracklet->GetYfit(1)) >= .2) continue; // check this condition with Marian
   }
+  // 
+  if(fReconstructor->IsHLT()){ 
+    for(Int_t ip=0; ip<kNPlanes; ip++){
+      track.UnsetTracklet(ip);
+      ptrTracklet = SetTracklet(&seeds[ip]);
+      ptrTracklet->UseClusters();
+      track.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
+    }
+    AliTRDtrackV1 *ptrTrack = SetTrack(&track);
+    ptrTrack->SetReconstructor(fReconstructor);
+    return ptrTrack;
+  }
+
+  track.ResetCovariance(1);
+  Int_t nc = TMath::Abs(FollowBackProlongation(track));
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 5){
+    Int_t eventNumber          = AliTRDtrackerDebug::GetEventNumber();
+    Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+    Double_t p[5]; // Track Params for the Debug Stream
+    track.GetExternalParameters(params[0], p);
+    TTreeSRedirector &cs = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+    cs << "MakeTrack"
+    << "EventNumber="     << eventNumber
+    << "CandidateNumber=" << candidateNumber
+    << "nc="     << nc
+    << "X="      << params[0]
+    << "Y="      << p[0]
+    << "Z="      << p[1]
+    << "snp="    << p[2]
+    << "tnd="    << p[3]
+    << "crv="    << p[4]
+    << "Yin="    << params[1]
+    << "Zin="    << params[2]
+    << "snpin="  << params[3]
+    << "tndin="  << params[4]
+    << "crvin="  << params[5]
+    << "track.=" << &track
+    << "\n";
+  }
+  if (nc < 30) return 0x0;
 
-  return track;
+  AliTRDtrackV1 *ptrTrack = SetTrack(&track);
+  ptrTrack->SetReconstructor(fReconstructor);
+  ptrTrack->CookLabel(.9);
+  
+  // computes PID for track
+  ptrTrack->CookPID();
+  // update calibration references using this track
+  AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
+  if (!calibra){ 
+    AliInfo("Could not get Calibra instance\n");
+    if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(ptrTrack);
+  }
+  return ptrTrack;
 }
 
 
@@ -2174,7 +2796,7 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
   //  layers : Array of propagation layers for a stack/supermodule
   //  cseed  : Array of 6 seeding tracklets which has to be improved
   // 
-  // Output :
+  // Output : 
   //   cssed : Improved seeds
   // 
   // Detailed description
@@ -2185,13 +2807,13 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
   //
   // debug level: 7
   //
-       
+  
   // make a local working copy
   AliTRDtrackingChamber *chamber = 0x0;
   AliTRDseedV1 bseed[6];
   Int_t nLayers = 0;
   for (Int_t jLayer = 0; jLayer < 6; jLayer++) bseed[jLayer] = cseed[jLayer];
-       
+  
   Float_t lastquality = 10000.0;
   Float_t lastchi2    = 10000.0;
   Float_t chi2        =  1000.0;
@@ -2202,7 +2824,7 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
     Int_t   sortindexes[6];
 
     for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
-      squality[jLayer]  = bseed[jLayer].IsOK() ? bseed[jLayer].GetQuality(kTRUE) : -1.;
+      squality[jLayer]  = bseed[jLayer].IsOK() ? bseed[jLayer].GetQuality(kTRUE) : 1000.;
       sumquality += squality[jLayer];
     }
     if ((sumquality >= lastquality) || (chi2       >     lastchi2)) break;
@@ -2216,31 +2838,31 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
     for (Int_t jLayer = 5; jLayer > 1; jLayer--) {
       Int_t bLayer = sortindexes[jLayer];
       if(!(chamber = stack[bLayer])) continue;
-      bseed[bLayer].AttachClustersIter(chamber, squality[bLayer], kTRUE);
+      bseed[bLayer].AttachClusters(chamber, kTRUE);
+      bseed[bLayer].Fit(kTRUE);
       if(bseed[bLayer].IsOK()) nLayers++;
     }
 
     chi2 = FitTiltedRieman(bseed, kTRUE);
-    if(AliTRDReconstructor::StreamLevel() >= 7){
+    if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 7){
       Int_t eventNumber                = AliTRDtrackerDebug::GetEventNumber();
       Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
       TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
-      TTreeSRedirector &cstreamer = *fgDebugStreamer;
+      TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
       cstreamer << "ImproveSeedQuality"
-               << "EventNumber="               << eventNumber
-               << "CandidateNumber="   << candidateNumber
-               << "Iteration="                         << iter
-               << "S0.="                                                       << &bseed[0]
-               << "S1.="                                                       << &bseed[1]
-               << "S2.="                                                       << &bseed[2]
-               << "S3.="                                                       << &bseed[3]
-               << "S4.="                                                       << &bseed[4]
-               << "S5.="                                                       << &bseed[5]
-               << "FitterT.="                          << tiltedRieman
-               << "\n";
+    << "EventNumber="          << eventNumber
+    << "CandidateNumber="      << candidateNumber
+    << "Iteration="                            << iter
+    << "S0.="                                                  << &bseed[0]
+    << "S1.="                                                  << &bseed[1]
+    << "S2.="                                                  << &bseed[2]
+    << "S3.="                                                  << &bseed[3]
+    << "S4.="                                                  << &bseed[4]
+    << "S5.="                                                  << &bseed[5]
+    << "FitterT.="                             << tiltedRieman
+    << "\n";
     }
   } // Loop: iter
-       
   // we are sure that at least 2 tracklets are OK !
   return nLayers+2;
 }
@@ -2265,41 +2887,41 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(AliTRDseedV1 *tracklets, Doub
   // debug level 2
   //
 
-  Double_t sumdaf = 0, nLayers = 0;
+  Double_t chi2phi = 0, nLayers = 0;
   for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
     if(!tracklets[iLayer].IsOK()) continue;
-    sumdaf += TMath::Abs((tracklets[iLayer].GetYfit(1) - tracklets[iLayer].GetYref(1))/ tracklets[iLayer].GetSigmaY2());
+    chi2phi += tracklets[iLayer].GetChi2Phi();
     nLayers++;
   }
-  sumdaf /= Float_t (nLayers - 2.0);
-       
+  chi2phi /= Float_t (nLayers - 2.0);
+  
   Double_t likeChi2Z  = TMath::Exp(-chi2[2] * 0.14);                   // Chi2Z 
-  Double_t likeChi2TC = TMath::Exp(-chi2[1] * 0.677);                  // Constrained Tilted Riemann
+  Double_t likeChi2TC = (fReconstructor->HasVertexConstrained()) ? 
+                                                                                       TMath::Exp(-chi2[1] * 0.677) : 1;                       // Constrained Tilted Riemann
   Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.78);                   // Non-constrained Tilted Riemann
-  Double_t likeAF     = TMath::Exp(-sumdaf * 3.23);
-  Double_t trackLikelihood     = likeChi2Z * likeChi2TR * likeAF;
+  Double_t likeChi2Phi= TMath::Exp(-chi2phi * 3.23);
+  Double_t trackLikelihood     = likeChi2Z * likeChi2TR * likeChi2Phi;
 
-  if(AliTRDReconstructor::StreamLevel() >= 2){
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
     cstreamer << "CalculateTrackLikelihood0"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber="     << candidateNumber
-             << "LikeChi2Z="                           << likeChi2Z
-             << "LikeChi2TR="                  << likeChi2TR
-             << "LikeChi2TC="                  << likeChi2TC
-             << "LikeAF="                                      << likeAF
-             << "TrackLikelihood=" << trackLikelihood
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "LikeChi2Z="                                << likeChi2Z
+        << "LikeChi2TR="                       << likeChi2TR
+        << "LikeChi2TC="                       << likeChi2TC
+        << "LikeChi2Phi="              << likeChi2Phi
+        << "TrackLikelihood=" << trackLikelihood
+        << "\n";
   }
 
   return trackLikelihood;
 }
 
 //____________________________________________________________________
-Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]
-                                        , Double_t *chi2)
+Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4])
 {
   //
   // Calculate the probability of this track candidate.
@@ -2324,59 +2946,67 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]
   // The distributions for each type of probabilities are given below as of
   // (date). They have to be checked to assure consistency of estimation.
   //
+
   // ratio of the total number of clusters/track which are expected to be found by the tracker.
-  Float_t fgFindable = AliTRDReconstructor::RecoParam()->GetFindableClusters();
+  const AliTRDrecoParam *fRecoPars = fReconstructor->GetRecoParam();
+  
+       Double_t chi2y = GetChi2Y(&cseed[0]);
+  Double_t chi2z = GetChi2Z(&cseed[0]);
 
-       
-  Int_t nclusters = 0;
+  Float_t nclusters = 0.;
   Double_t sumda = 0.;
   for(UChar_t ilayer = 0; ilayer < 4; ilayer++){
     Int_t jlayer = planes[ilayer];
     nclusters += cseed[jlayer].GetN2();
-    sumda += TMath::Abs(cseed[jlayer].GetYfitR(1) - cseed[jlayer].GetYref(1));
+    sumda += TMath::Abs(cseed[jlayer].GetYfit(1) - cseed[jlayer].GetYref(1));
   }
-  Double_t likea     = TMath::Exp(-sumda*10.6);
+  nclusters *= .25;
+
+  Double_t likea     = TMath::Exp(-sumda * fRecoPars->GetPhiSlope());
   Double_t likechi2y  = 0.0000000001;
-  if (chi2[0] < 0.5) likechi2y += TMath::Exp(-TMath::Sqrt(chi2[0]) * 7.73);
-  Double_t likechi2z = TMath::Exp(-chi2[1] * 0.088) / TMath::Exp(-chi2[1] * 0.019);
-  Int_t enc = Int_t(fgFindable*4.*fgNTimeBins);        // Expected Number Of Clusters, normally 72
-  Double_t likeN     = TMath::Exp(-(enc - nclusters) * 0.19);
-       
+  if (fReconstructor->IsCosmic() || chi2y < fRecoPars->GetChi2YCut()) likechi2y += TMath::Exp(-TMath::Sqrt(chi2y) * fRecoPars->GetChi2YSlope());
+  Double_t likechi2z = TMath::Exp(-chi2z * fRecoPars->GetChi2ZSlope());
+  Double_t likeN     = TMath::Exp(-(fRecoPars->GetNMeanClusters() - nclusters) / fRecoPars->GetNSigmaClusters());
   Double_t like      = likea * likechi2y * likechi2z * likeN;
 
   //   AliInfo(Form("sumda(%f) chi2[0](%f) chi2[1](%f) likea(%f) likechi2y(%f) likechi2z(%f) nclusters(%d) likeN(%f)", sumda, chi2[0], chi2[1], likea, likechi2y, likechi2z, nclusters, likeN));
-  if(AliTRDReconstructor::StreamLevel() >= 2){
+  if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+    Int_t nTracklets = 0; Float_t mean_ncls = 0;
+    for(Int_t iseed=0; iseed < kNPlanes; iseed++){
+       if(!cseed[iseed].IsOK()) continue;
+       nTracklets++;
+       mean_ncls += cseed[iseed].GetN2();
+    }
+    if(nTracklets) mean_ncls /= nTracklets;
     // The Debug Stream contains the seed 
-    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
     cstreamer << "CookLikelihood"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber=" << candidateNumber
-             << "tracklet0.="                  << &cseed[0]
-             << "tracklet1.="                  << &cseed[1]
-             << "tracklet2.="                  << &cseed[2]
-             << "tracklet3.="                  << &cseed[3]
-             << "tracklet4.="                  << &cseed[4]
-             << "tracklet5.="                  << &cseed[5]
-             << "sumda="                                               << sumda
-             << "chi0="                                                << chi2[0]
-             << "chi1="                                                << chi2[1]
-             << "likea="                                               << likea
-             << "likechi2y="                           << likechi2y
-             << "likechi2z="                           << likechi2z
-             << "nclusters="                           << nclusters
-             << "likeN="                                               << likeN
-             << "like="                                                << like
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber=" << candidateNumber
+        << "tracklet0.="                       << &cseed[0]
+        << "tracklet1.="                       << &cseed[1]
+        << "tracklet2.="                       << &cseed[2]
+        << "tracklet3.="                       << &cseed[3]
+        << "tracklet4.="                       << &cseed[4]
+        << "tracklet5.="                       << &cseed[5]
+        << "sumda="                                            << sumda
+        << "chi2y="                                            << chi2y
+        << "chi2z="                                            << chi2z
+        << "likea="                                            << likea
+        << "likechi2y="                                << likechi2y
+        << "likechi2z="                                << likechi2z
+        << "nclusters="                                << nclusters
+        << "likeN="                                            << likeN
+        << "like="                                             << like
+        << "meanncls="        << mean_ncls
+        << "\n";
   }
 
   return like;
 }
 
-
-
 //____________________________________________________________________
 void AliTRDtrackerV1::GetSeedingConfig(Int_t iconfig, Int_t planes[4])
 {
@@ -2602,7 +3232,21 @@ void AliTRDtrackerV1::GetExtrapolationConfig(Int_t iconfig, Int_t planes[2])
 AliCluster* AliTRDtrackerV1::GetCluster(Int_t idx) const
 {
   Int_t ncls = fClusters->GetEntriesFast();
-  return idx >= 0 || idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : 0x0;
+  return idx >= 0 && idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : 0x0;
+}
+
+//____________________________________________________________________
+AliTRDseedV1* AliTRDtrackerV1::GetTracklet(Int_t idx) const
+{
+  Int_t ntrklt = fTracklets->GetEntriesFast();
+  return idx >= 0 && idx < ntrklt ? (AliTRDseedV1*)fTracklets->UncheckedAt(idx) : 0x0;
+}
+
+//____________________________________________________________________
+AliKalmanTrack* AliTRDtrackerV1::GetTrack(Int_t idx) const
+{
+  Int_t ntrk = fTracks->GetEntriesFast();
+  return idx >= 0 && idx < ntrk ? (AliKalmanTrack*)fTracks->UncheckedAt(idx) : 0x0;
 }
 
 //____________________________________________________________________
@@ -2637,9 +3281,9 @@ Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
     // Strategy avoids a division by 0;
     for(Int_t il = 5; il >= 0; il--){
       if(tracklets[il].IsOK()){
-       xpos[iok] = tracklets[il].GetX0();
-       iok++;
-       startIndex = il;
+  xpos[iok] = tracklets[il].GetX0();
+  iok++;
+  startIndex = il;
       }
       if(iok) idiff++; // to get the right difference;
       if(iok > 1) break;
@@ -2658,91 +3302,107 @@ Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
   return tracklets[startIndex].GetX0() + (2.5 - startIndex) * meanDistance - 0.5 * (AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick());
 }
 
-//_____________________________________________________________________________
-Int_t AliTRDtrackerV1::Freq(Int_t n, const Int_t *inlist
-                           , Int_t *outlist, Bool_t down)
-{    
-  //
-  // Sort eleements according occurancy 
-  // The size of output array has is 2*n 
-  //
-
-  if (n <= 0) {
-    return 0;
-  }
+// //_____________________________________________________________________________
+// Int_t AliTRDtrackerV1::Freq(Int_t n, const Int_t *inlist
+//           , Int_t *outlist, Bool_t down)
+// {    
+//   //
+//   // Sort eleements according occurancy 
+//   // The size of output array has is 2*n 
+//   //
+// 
+//   if (n <= 0) {
+//     return 0;
+//   }
+// 
+//   Int_t *sindexS = new Int_t[n];   // Temporary array for sorting
+//   Int_t *sindexF = new Int_t[2*n];   
+//   for (Int_t i = 0; i < n; i++) {
+//     sindexF[i] = 0;
+//   }
+// 
+//   TMath::Sort(n,inlist,sindexS,down); 
+// 
+//   Int_t last     = inlist[sindexS[0]];
+//   Int_t val      = last;
+//   sindexF[0]     = 1;
+//   sindexF[0+n]   = last;
+//   Int_t countPos = 0;
+// 
+//   // Find frequency
+//   for (Int_t i = 1; i < n; i++) {
+//     val = inlist[sindexS[i]];
+//     if (last == val) {
+//       sindexF[countPos]++;
+//     }
+//     else {      
+//       countPos++;
+//       sindexF[countPos+n] = val;
+//       sindexF[countPos]++;
+//       last                = val;
+//     }
+//   }
+//   if (last == val) {
+//     countPos++;
+//   }
+// 
+//   // Sort according frequency
+//   TMath::Sort(countPos,sindexF,sindexS,kTRUE);
+// 
+//   for (Int_t i = 0; i < countPos; i++) {
+//     outlist[2*i  ] = sindexF[sindexS[i]+n];
+//     outlist[2*i+1] = sindexF[sindexS[i]];
+//   }
+// 
+//   delete [] sindexS;
+//   delete [] sindexF;
+//   
+//   return countPos;
+// 
+// }
 
-  Int_t *sindexS = new Int_t[n];   // Temporary array for sorting
-  Int_t *sindexF = new Int_t[2*n];   
-  for (Int_t i = 0; i < n; i++) {
-    sindexF[i] = 0;
-  }
-
-  TMath::Sort(n,inlist,sindexS,down); 
-  Int_t last     = inlist[sindexS[0]];
-  Int_t val      = last;
-  sindexF[0]     = 1;
-  sindexF[0+n]   = last;
-  Int_t countPos = 0;
-
-  // Find frequency
-  for (Int_t i = 1; i < n; i++) {
-    val = inlist[sindexS[i]];
-    if (last == val) {
-      sindexF[countPos]++;
-    }
-    else {      
-      countPos++;
-      sindexF[countPos+n] = val;
-      sindexF[countPos]++;
-      last                = val;
-    }
-  }
-  if (last == val) {
-    countPos++;
-  }
 
-  // Sort according frequency
-  TMath::Sort(countPos,sindexF,sindexS,kTRUE);
+//____________________________________________________________________
+void AliTRDtrackerV1::ResetSeedTB()
+{
+// reset buffer for seeding time bin layers. If the time bin 
+// layers are not allocated this function allocates them  
 
-  for (Int_t i = 0; i < countPos; i++) {
-    outlist[2*i  ] = sindexF[sindexS[i]+n];
-    outlist[2*i+1] = sindexF[sindexS[i]];
+  for(Int_t isl=0; isl<kNSeedPlanes; isl++){
+    if(!fSeedTB[isl]) fSeedTB[isl] = new AliTRDchamberTimeBin();
+    else fSeedTB[isl]->Clear();
   }
-
-  delete [] sindexS;
-  delete [] sindexF;
-  
-  return countPos;
-
 }
 
+
 //_____________________________________________________________________________
 Float_t AliTRDtrackerV1::GetChi2Y(AliTRDseedV1 *tracklets) const
 {
-  //   Chi2 definition on y-direction
+  //   Calculates normalized chi2 in y-direction
+  // chi2 = Sum chi2 / n_tracklets
 
-  Float_t chi2 = 0;
-  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+  Double_t chi2 = 0.; Int_t n = 0;
+  for(Int_t ipl = kNPlanes; ipl--;){
     if(!tracklets[ipl].IsOK()) continue;
-    Double_t distLayer = tracklets[ipl].GetYfit(0) - tracklets[ipl].GetYref(0); 
-    chi2 += distLayer * distLayer;
+    chi2 += tracklets[ipl].GetChi2Y();
+    n++;
   }
-  return chi2;
+  return n ? chi2/n : 0.;
 }
 
 //_____________________________________________________________________________
 Float_t AliTRDtrackerV1::GetChi2Z(AliTRDseedV1 *tracklets) const 
 {
-  //   Chi2 definition on z-direction
+  //   Calculates normalized chi2 in z-direction
+  // chi2 = Sum chi2 / n_tracklets
 
-  Float_t chi2 = 0;
-  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+  Double_t chi2 = 0; Int_t n = 0;
+  for(Int_t ipl = kNPlanes; ipl--;){
     if(!tracklets[ipl].IsOK()) continue;
-    Double_t distLayer = tracklets[ipl].GetMeanz() - tracklets[ipl].GetZref(0); 
-    chi2 += distLayer * distLayer;
+    chi2 += tracklets[ipl].GetChi2Z();
+    n++;
   }
-  return chi2;
+  return n ? chi2/n : 0.;
 }
 
 ///////////////////////////////////////////////////////
@@ -2800,15 +3460,17 @@ void AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
   // Calculation of the parameters
   // Calculation of the covariance matrix
   //
-       
+  
   Double_t denominator = fSums[0] * fSums[4] - fSums[1] *fSums[1];
+  if(denominator==0) return;
+
   //   for(Int_t isum = 0; isum < 5; isum++)
   //           printf("fSums[%d] = %f\n", isum, fSums[isum]);
   //   printf("denominator = %f\n", denominator);
   fParams[0] = (fSums[2] * fSums[4] - fSums[1] * fSums[3])/ denominator;
   fParams[1] = (fSums[0] * fSums[3] - fSums[1] * fSums[2]) / denominator;
   //   printf("fParams[0] = %f, fParams[1] = %f\n", fParams[0], fParams[1]);
-       
+  
   // Covariance matrix
   fCovarianceMatrix[0] = fSums[4] - fSums[1] * fSums[1] / fSums[0];
   fCovarianceMatrix[1] = fSums[5] - fSums[2] * fSums[2] / fSums[0];