]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDtrackerV1.cxx
i forgot header, sorry
[u/mrichter/AliRoot.git] / TRD / AliTRDtrackerV1.cxx
index 3f999a42149cc61d4645dad6323c9df797cf5fa3..c6539d40feb298e42f91ae9bb502f3967a6239f9 100644 (file)
@@ -49,6 +49,7 @@
 #include "AliTRDrecoParam.h"
 
 #include "AliTRDcluster.h" 
+#include "AliTRDdigitsParam.h"
 #include "AliTRDseedV1.h"
 #include "AliTRDtrackV1.h"
 #include "AliTRDtrackerV1.h"
@@ -57,6 +58,8 @@
 #include "AliTRDchamberTimeBin.h"
 
 ClassImp(AliTRDtrackerV1)
+ClassImp(AliTRDtrackerV1::AliTRDLeastSquare)
+ClassImp(AliTRDtrackerV1::AliTRDtrackFitterRieman)
 
 const  Float_t  AliTRDtrackerV1::fgkMinClustersInTrack =  0.5;  //
 const  Float_t  AliTRDtrackerV1::fgkLabelFraction      =  0.8;  //
@@ -79,10 +82,12 @@ TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = NULL;
 AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec) 
   :AliTracker()
   ,fkReconstructor(NULL)
+  ,fkRecoParam(NULL)
   ,fGeom(NULL)
   ,fClusters(NULL)
   ,fTracklets(NULL)
   ,fTracks(NULL)
+  ,fTracksESD(NULL)
   ,fSieveSeeding(0)
 {
   //
@@ -112,13 +117,6 @@ AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec)
     fR[ily] = glb[0]+ AliTRDgeometry::AnodePos()-.5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick();
   }
 
-  // initialize calibration values
-  AliTRDcalibDB *trd = NULL;
-  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);
   
@@ -126,6 +124,8 @@ AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec)
   memset(fTrackQuality, 0, kMaxTracksStack*sizeof(Double_t));
   memset(fSeedLayer, 0, kMaxTracksStack*sizeof(Int_t));
   memset(fSeedTB, 0, kNSeedPlanes*sizeof(AliTRDchamberTimeBin*));
+  fTracksESD = new TClonesArray("AliESDtrack", 2*kMaxTracksStack);
+  fTracksESD->SetOwner();
 }
 
 //____________________________________________________________________
@@ -139,6 +139,7 @@ AliTRDtrackerV1::~AliTRDtrackerV1()
   if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = NULL;
   if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = NULL;
   for(Int_t isl =0; isl<kNSeedPlanes; isl++) if(fSeedTB[isl]) delete fSeedTB[isl];
+  if(fTracksESD){ fTracksESD->Delete(); delete fTracksESD; }
   if(fTracks) {fTracks->Delete(); delete fTracks;}
   if(fTracklets) {fTracklets->Delete(); delete fTracklets;}
   if(fClusters) {
@@ -165,7 +166,7 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
   //    See AliTRDtrackerV1::Clusters2TracksSM() for details.
   //
 
-  if(!fkReconstructor->GetRecoParam() ){
+  if(!fkRecoParam){
     AliError("Reconstruction configuration not initialized. Call first AliTRDReconstructor::SetRecoParam().");
     return 0;
   }
@@ -177,7 +178,7 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
     //AliInfo(Form("Processing supermodule %i ...", ism));
     ntracks += Clusters2TracksSM(ism, esd);
   }
-  AliInfo(Form("Number of found tracks : %d", ntracks));
+  AliInfo(Form("Number of tracks: !TRDin[%d]", ntracks));
   return ntracks;
 }
 
@@ -269,11 +270,17 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
 // 5. Propagation to TOF. If track propagation fails the AliESDtrack::kTRDStop is set.
 //  
 
+  if(!fClusters || !fClusters->GetEntriesFast()){ 
+    AliInfo("No TRD clusters");
+    return 0;
+  }
   AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance(); // Calibration monitor
-  if (!calibra) AliInfo("Could not get Calibra instance\n");
-  
+  if (!calibra) AliInfo("Could not get Calibra instance");
+  if (!fgNTimeBins) fgNTimeBins = fkReconstructor->GetNTimeBins(); 
+
   // Define scalers
   Int_t nFound   = 0, // number of tracks found
+        nBacked  = 0, // number of tracks backed up for refit
         nSeeds   = 0, // total number of ESD seeds
         nTRDseeds= 0, // number of seeds in the TRD acceptance
         nTPCseeds= 0; // number of TPC seeds
@@ -286,7 +293,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   // (covariance in the yz plane)
   if(nSeeds){  
     quality = new Float_t[nSeeds];
-    index   = new Int_t[nSeeds];
+    index   = new Int_t[4*nSeeds];
     for (Int_t iSeed = nSeeds; iSeed--;) {
       AliESDtrack *seed = event->GetTrack(iSeed);
       Double_t covariance[15];
@@ -311,6 +318,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
     if ((status & AliESDtrack::kTRDout) != 0) continue;
 
     // Propagate to the entrance in the TRD mother volume
+    track.~AliTRDtrackV1();
     new(&track) AliTRDtrackV1(*seed);
     if(AliTRDgeometry::GetXtrdBeg() > (fgkMaxStep + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), fgkMaxStep)){ 
       seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
@@ -324,18 +332,18 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
       seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
       continue;
     }
-
     nTPCseeds++;
-
+    AliDebug(2, Form("TRD propagate TPC seed[%d] = %d.", iSeed, index[iSeed]));
     // store track status at TRD entrance
     seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
 
     // prepare track and do propagation in the TRD
     track.SetReconstructor(fkReconstructor);
     track.SetKink(Bool_t(seed->GetKinkIndex(0)));
+    track.SetPrimary(status & AliESDtrack::kTPCin);
     expectedClr = FollowBackProlongation(track);
     // check if track entered the TRD fiducial volume
-    if(track.GetTrackLow()){ 
+    if(track.GetTrackIn()){ 
       seed->UpdateTrackParams(&track, AliESDtrack::kTRDin);
       nTRDseeds++;
     }
@@ -352,16 +360,14 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
       // update calibration references using this track
       if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
       // save calibration object
-      if (fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0)
+      if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::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);
-      }
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+      track.UpdateESDtrack(seed);
     }
 
     if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) {
@@ -381,7 +387,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
         // Full gold track
         if (track.GetChi2() / track.GetNumberOfClusters() < 5) {
           if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
-
+          nBacked++;
           isGold = kTRUE;
         }
   
@@ -389,13 +395,14 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
         if ((!isGold)  && (track.GetNCross() == 0) &&  (track.GetChi2() / track.GetNumberOfClusters()  < 7)) {
           //seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
           if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
-  
+          nBacked++;
           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);
+            nBacked++;
             isGold = kTRUE;
           }
         }
@@ -435,7 +442,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
         seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
         continue;
       }
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+      //seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
       // TODO obsolete - delete
       seed->SetTRDQuality(track.StatusForTOF()); 
     }
@@ -445,7 +452,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   if(quality) delete [] quality;
 
   AliInfo(Form("Number of seeds: TPCout[%d] TRDin[%d]", nTPCseeds, nTRDseeds));
-  AliInfo(Form("Number of tracks: TRDout[%d]", nFound));
+  AliInfo(Form("Number of tracks: TRDout[%d] TRDbackup[%d]", nFound, nBacked));
 
   // run stand alone tracking
   if (fkReconstructor->IsSeeding()) Clusters2Tracks(event);
@@ -469,11 +476,16 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
   Int_t   found    = 0; // contor for updated TRD tracks
   
   
+  if(!fClusters || !fClusters->GetEntriesFast()){ 
+    AliInfo("No TRD clusters");
+    return 0;
+  }
   AliTRDtrackV1 track;
   for (Int_t itrack = 0; itrack < event->GetNumberOfTracks(); itrack++) {
     AliESDtrack *seed = event->GetTrack(itrack);
-    new(&track) AliTRDtrackV1(*seed);
+    ULong_t status = seed->GetStatus();
 
+    new(&track) AliTRDtrackV1(*seed);
     if (track.GetX() < 270.0) {
       seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
       continue;
@@ -481,7 +493,6 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
 
     // 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)) continue;
     if(!(status & AliESDtrack::kTRDin)) continue;
     nseed++; 
@@ -492,22 +503,22 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
     Bool_t kUPDATE = kFALSE;
     Double_t xTPC = 250.0;
     if(FollowProlongation(track)){     
-      // Prolongate to TPC
-      if (PropagateToX(track, xTPC, fgkMaxStep)) { //  -with update
-        seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
-        found++;
-        kUPDATE = kTRUE;
-      }
-
       // Update the friend track
-      if (fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){ 
+      if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ 
         TObject *o = NULL; Int_t ic = 0;
         AliTRDtrackV1 *calibTrack = NULL; 
         while((o = seed->GetCalibObject(ic++))){
           if(!(calibTrack = dynamic_cast<AliTRDtrackV1*>(o))) continue;
-          calibTrack->SetTrackHigh(track.GetTrackHigh());
+          calibTrack->SetTrackOut(&track);
         }
       }
+
+      // Prolongate to TPC
+      if (PropagateToX(track, xTPC, fgkMaxStep)) { //  -with update
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
+        found++;
+        kUPDATE = kTRUE;
+      }
     }
     
     // Prolongate to TPC without update
@@ -516,8 +527,8 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
       if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup);
     }
   }
-  AliInfo(Form("Number of loaded seeds: %d",nseed));
-  AliInfo(Form("Number of found tracks from loaded seeds: %d",found));
+  AliInfo(Form("Number of seeds: TRDout[%d]", nseed));
+  AliInfo(Form("Number of tracks: TRDrefit[%d]", found));
   
   return 0;
 }
@@ -549,14 +560,16 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
   // Debug level 2
   //
   
-  Bool_t kStoreIn = kTRUE;
   Int_t    nClustersExpected = 0;
   for (Int_t iplane = kNPlanes; iplane--;) {
-    Int_t   index   = 0;
+    Int_t   index(-1);
     AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
+    AliDebug(2, Form("Tracklet[%p] ly[%d] idx[%d]", (void*)tracklet, iplane, index));
     if(!tracklet) continue;
-    if(!tracklet->IsOK()) AliWarning("tracklet not OK");
-    
+    if(!tracklet->IsOK()){ 
+      AliDebug(1, Form("Tracklet Det[%d] !OK", tracklet->GetDetector()));
+      continue;
+    }
     Double_t x  = tracklet->GetX();//GetX0();
     // reject tracklets which are not considered for inward refit
     if(x > t.GetX()+fgkMaxStep) continue;
@@ -595,20 +608,19 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
       t.PropagateTo(x, xx0, xrho);
       if (!AdjustSector(&t)) break;
     }
-    if(kStoreIn){
-      t.SetTrackHigh(); 
-      kStoreIn = kFALSE;
-    }
 
     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)){ 
+    if (chi2 < 1e+10 && ((AliExternalTrackParam&)t).Update(p, cov)){ 
+      // Register info to track
+      t.SetNumberOfClusters();
+      t.UpdateChi2(chi2);
       nClustersExpected += tracklet->GetN();
     }
   }
 
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+  if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1){
     Int_t index;
     for(int iplane=0; iplane<AliTRDgeometry::kNlayer; iplane++){
       AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
@@ -616,17 +628,18 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
       t.SetTracklet(tracklet, index);
     }
 
-    Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
-    AliTRDtrackV1 track(t);
-    track.SetOwner();
-    cstreamer << "FollowProlongation"
-        << "EventNumber="      << eventNumber
-        << "ncl="                                      << nClustersExpected
-        << "track.="                   << &track
-        << "\n";
+    if(fkReconstructor->IsDebugStreaming()){
+      Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+      TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
+      AliTRDtrackV1 track(t);
+      track.SetOwner();
+      cstreamer << "FollowProlongation"
+          << "EventNumber="    << eventNumber
+          << "ncl="                                    << nClustersExpected
+          << "track.="                 << &track
+          << "\n";
+    }
   }
-
   return nClustersExpected;
 
 }
@@ -677,24 +690,53 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
   Double_t driftLength = .5*AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick();
   AliTRDtrackingChamber *chamber = NULL;
   
+  Int_t debugLevel = fkReconstructor->IsDebugStreaming() ? fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) : 0;
+  TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0;
+
+  Bool_t kStoreIn(kTRUE),     // toggel store track params. at TRD entry
+         kStandAlone(kFALSE), // toggle tracker awarness of stand alone seeding 
+         kUseTRD(fkRecoParam->IsOverPtThreshold(t.Pt()));// use TRD measurment to update Kalman
+
+  Int_t startLayer(0);
   AliTRDseedV1 tracklet, *ptrTracklet = NULL;
-  // in case of stand alone tracking we store all the pointers to the tracklets in a temporary array
+  // Special case for stand alone tracking
+  // - store all tracklets found by seeding
+  // - start propagation from first tracklet found
   AliTRDseedV1 *tracklets[kNPlanes];
   memset(tracklets, 0, sizeof(AliTRDseedV1 *) * kNPlanes);
-  for(Int_t ip = 0; ip < kNPlanes; ip++){
-    tracklets[ip] = t.GetTracklet(ip);
+  for(Int_t ip(kNPlanes); ip--;){
+    if(!(tracklets[ip] = t.GetTracklet(ip))) continue;
     t.UnsetTracklet(ip);
+    if(tracklets[ip]->IsOK()) startLayer=ip;
+    kStandAlone = kTRUE;
+    kUseTRD = kTRUE;
   } 
-  Bool_t kStoreIn = kTRUE, kPropagateIn = kTRUE;
+  AliDebug(4, Form("SA[%c] Start[%d]\n"
+    "  [0]idx[%d] traklet[%p]\n"
+    "  [1]idx[%d] traklet[%p]\n"
+    "  [2]idx[%d] traklet[%p]\n"
+    "  [3]idx[%d] traklet[%p]\n"
+    "  [4]idx[%d] traklet[%p]\n"
+    "  [5]idx[%d] traklet[%p]"
+    , kStandAlone?'y':'n', startLayer
+    , t.GetTrackletIndex(0), (void*)tracklets[0]
+    , t.GetTrackletIndex(1), (void*)tracklets[1]
+    , t.GetTrackletIndex(2), (void*)tracklets[2]
+    , t.GetTrackletIndex(3), (void*)tracklets[3]
+    , t.GetTrackletIndex(4), (void*)tracklets[4]
+    , t.GetTrackletIndex(5), (void*)tracklets[5]));
 
   // Loop through the TRD layers
   TGeoHMatrix *matrix = NULL;
   Double_t x, y, z;
-  for (Int_t ily=0, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) {
+  for (Int_t ily=startLayer, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) {
+    AliDebug(2, Form("Propagate to x[%d] = %7.2f", ily, fR[ily]));
+
     // rough estimate of the entry point
     if (!t.GetProlongation(fR[ily], y, z)){
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kProlongation);
+      AliDebug(4, Form("Failed Rough Prolongation to ly[%d] x[%7.2f] y[%7.2f] z[%7.2f]", ily, fR[ily], y, z));
       break;
     }
 
@@ -704,26 +746,31 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     stk = fGeom->GetStack(z, ily);
     det = stk>=0 ? AliTRDgeometry::GetDetector(ily, stk, sm) : -1;
     matrix = det>=0 ? fGeom->GetClusterMatrix(det) : NULL;
+    AliDebug(3, Form("Propagate to det[%3d]", det));
 
     // check if supermodule/chamber is installed
     if( !fGeom->GetSMstatus(sm) ||
         stk<0. ||
         fGeom->IsHole(ily, stk, sm) ||
         !matrix ){ 
+      AliDebug(4, Form("Missing Geometry ly[%d]. Guess radial position", ily));
       // propagate to the default radial position
       if(fR[ily] > (fgkMaxStep + t.GetX()) && !PropagateToX(t, fR[ily], fgkMaxStep)){
         n=-1; 
         t.SetStatus(AliTRDtrackV1::kPropagation);
+        AliDebug(4, "Failed Propagation [Missing Geometry]");
         break;
       }
       if(!AdjustSector(&t)){
         n=-1; 
         t.SetStatus(AliTRDtrackV1::kAdjustSector);
+        AliDebug(4, "Failed Adjust Sector [Missing Geometry]");
         break;
       }
       if(TMath::Abs(t.GetSnp()) > fgkMaxSnp){
         n=-1; 
         t.SetStatus(AliTRDtrackV1::kSnp);
+        AliDebug(4, "Failed Max Snp [Missing Geometry]");
         break;
       }
       t.SetStatus(AliTRDtrackV1::kGeometry, ily);
@@ -740,16 +787,19 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)){
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kPropagation);
+      AliDebug(4, Form("Failed Initial Propagation to x[%7.2f]", x));
       break;
     }
     if(!AdjustSector(&t)){
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      AliDebug(4, "Failed Adjust Sector Start");
       break;
     }
     if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kSnp);
+      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
       break;
     }
     Bool_t doRecalculate = kFALSE;
@@ -765,6 +815,7 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
       det = AliTRDgeometry::GetDetector(ily, stk, sm);
       if(!(matrix = fGeom->GetClusterMatrix(det))){ 
         t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+        AliDebug(4, Form("Failed Geometry Matrix ly[%d]", ily));
         continue;
       }
       matrix->LocalToMaster(loc, glb);
@@ -775,163 +826,191 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     if (!t.GetProlongation(x+fgkMaxStep, y, z)) {
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kProlongation);
+      AliDebug(4, Form("Failed Prolongation to x[%7.2f] y[%7.2f] z[%7.2f]", x+fgkMaxStep, y, z));
       break;
     }
     if(fGeom->IsOnBoundary(det, y, z, .5)){ 
       t.SetStatus(AliTRDtrackV1::kBoundary, ily);
+      AliDebug(4, "Failed Track on Boundary");
       continue;
     }
     // mark track as entering the FIDUCIAL volume of TRD
     if(kStoreIn){
-      t.SetTrackLow(); 
+      t.SetTrackIn(); 
       kStoreIn = kFALSE;
     }
 
     ptrTracklet  = tracklets[ily];
     if(!ptrTracklet){ // BUILD TRACKLET
+      AliDebug(3, Form("Building tracklet det[%d]", det));
       // check data in supermodule
       if(!fTrSec[sm].GetNChambers()){ 
         t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, "Failed NoClusters");
         continue;
       }
       if(fTrSec[sm].GetX(ily) < 1.){ 
         t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, "Failed NoX");
         continue;
       }
       
       // check data in chamber
       if(!(chamber = fTrSec[sm].GetChamber(stk, ily))){ 
         t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, "Failed No Detector");
         continue;
       }
-      if(chamber->GetNClusters() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){ 
+      if(chamber->GetNClusters() < fgNTimeBins*fkRecoParam ->GetFindableClusters()){ 
         t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, "Failed Not Enough Clusters in Detector");
         continue;
       }      
       // build tracklet
+      tracklet.~AliTRDseedV1();
       ptrTracklet = new(&tracklet) AliTRDseedV1(det);
       ptrTracklet->SetReconstructor(fkReconstructor);
       ptrTracklet->SetKink(t.IsKink());
+      ptrTracklet->SetPrimary(t.IsPrimary());
       ptrTracklet->SetPadPlane(fGeom->GetPadPlane(ily, stk));
       ptrTracklet->SetX0(glb[0]+driftLength);
-      if(!tracklet.Init(&t)){
+      if(!ptrTracklet->Init(&t)){
         n=-1; 
         t.SetStatus(AliTRDtrackV1::kTrackletInit);
+        AliDebug(4, "Failed Tracklet Init");
         break;
       }
-      if(!tracklet.AttachClusters(chamber, kTRUE)){   
+      if(!ptrTracklet->AttachClusters(chamber, kTRUE)){
         t.SetStatus(AliTRDtrackV1::kNoAttach, ily);
+        if(debugLevel>3){
+          AliTRDseedV1 trackletCp(*ptrTracklet);
+          UChar_t status(t.GetStatusTRD(ily));
+          (*cstreamer)   << "FollowBackProlongation2"
+          <<"status="    << status
+          <<"tracklet.=" << &trackletCp
+          << "\n";
+        }
+        AliDebug(4, "Failed Attach Clusters");
         continue;
       }
-      if(tracklet.GetN() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){
+      AliDebug(3, Form("Number of Clusters in Tracklet: %d", ptrTracklet->GetN()));
+      if(ptrTracklet->GetN() < fgNTimeBins*fkRecoParam->GetFindableClusters()){
         t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily);
+        if(debugLevel>3){
+          AliTRDseedV1 trackletCp(*ptrTracklet);
+          UChar_t status(t.GetStatusTRD(ily));
+          (*cstreamer)   << "FollowBackProlongation2"
+          <<"status="    << status
+          <<"tracklet.=" << &trackletCp
+          << "\n";
+        }
+        AliDebug(4, "Failed N Clusters Attached");
         continue;
       }
       ptrTracklet->UpdateUsed();
-    }
+    } else AliDebug(2, Form("Use external tracklet ly[%d]", ily));
     // 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)){
+
+    // fit tracklet 
+    // tilt correction options
+    // 0 : no correction
+    // 2 : pseudo tilt correction
+    if(!ptrTracklet->Fit(2)){
       t.SetStatus(AliTRDtrackV1::kNoFit, ily);
+      AliDebug(4, "Failed Tracklet Fit");
       continue;
     } 
     x = ptrTracklet->GetX(); //GetX0();
     if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)) {
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kPropagation);
+      AliDebug(4, Form("Failed Propagation to Tracklet x[%7.2f]", x));
       break;
     }
     if(!AdjustSector(&t)) {
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      AliDebug(4, "Failed Adjust Sector");
       break;
     }
     if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
       n=-1; 
       t.SetStatus(AliTRDtrackV1::kSnp);
+      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
       break;
     }
-    if(kPropagateIn){
-      t.SetTrackLow(); 
-      kPropagateIn = kFALSE;
-    }
     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(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 2){
-      Double_t ytrack = ptrTracklet->GetYref(0);
-      Double_t ztrack = ptrTracklet->GetZref(0);
-      Double_t ytracklet = ptrTracklet->GetYfit(0);
-      Double_t ztracklet = ptrTracklet->GetZfit(0);
-      Double_t phitrack = ptrTracklet->GetYref(1);
-      Double_t phitracklet = ptrTracklet->GetYfit(1);
-      Double_t thetatrack = ptrTracklet->GetZref(1);
-      Double_t thetatracklet = ptrTracklet->GetZfit(1);
-   
-      TTreeSRedirector &mystreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
-      mystreamer << "FollowBackProlongation1"
-        << "il="              << ily
-        << "x="               << x
-        << "ytrack="          << ytrack
-        << "ztrack="          << ztrack
-        << "ytracklet="       << ytracklet
-        << "ztracklet="       << ztracklet
-        << "phitrack="        << phitrack
-        << "thetatrack="      << thetatrack
-        << "phitracklet="     << phitracklet
-        << "thetatracklet="   << thetatracklet
-        << "chi2="            << chi2
-        << "\n";
-    }
     // update Kalman with the TRD measurement
     if(chi2>1e+10){ // TODO
       t.SetStatus(AliTRDtrackV1::kChi2, ily);
+      if(debugLevel > 2){
+        UChar_t status(t.GetStatusTRD());
+        AliTRDseedV1  trackletCp(*ptrTracklet);
+        AliTRDtrackV1 trackCp(t);
+        trackCp.SetOwner();
+        (*cstreamer) << "FollowBackProlongation1"
+            << "status="      << status
+            << "tracklet.="   << &trackletCp
+            << "track.="      << &trackCp
+            << "\n";
+      }
+      AliDebug(4, Form("Failed Chi2[%f]", chi2));
       continue; 
     }
-    if(!t.Update(p, cov, chi2)) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kUpdate);
-      break;
+    if(kUseTRD){
+      if(!((AliExternalTrackParam&)t).Update(p, cov)) {
+        n=-1; 
+        t.SetStatus(AliTRDtrackV1::kUpdate);
+        if(debugLevel > 2){
+          UChar_t status(t.GetStatusTRD());
+          AliTRDseedV1  trackletCp(*ptrTracklet);
+          AliTRDtrackV1 trackCp(t);
+          trackCp.SetOwner();
+          (*cstreamer) << "FollowBackProlongation1"
+              << "status="      << status
+              << "tracklet.="   << &trackletCp
+              << "track.="      << &trackCp
+              << "\n";
+        }
+        AliDebug(4, Form("Failed Track Update @ y[%7.2f] z[%7.2f] s2y[%f] s2z[%f] covyz[%f]", p[0], p[1], cov[0], cov[2], cov[1]));
+        break;
+      }
     }
+    if(!kStandAlone) ptrTracklet->UseClusters();
     // fill residuals ?!
     AliTracker::FillResiduals(&t, p, cov, ptrTracklet->GetVolumeId());
   
 
-    // load tracklet to the tracker
+    // register tracklet with the tracker and track
     ptrTracklet->Update(&t);
     ptrTracklet = SetTracklet(ptrTracklet);
-    t.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
+    Int_t index(fTracklets->GetEntriesFast()-1);
+    t.SetTracklet(ptrTracklet, index);
+    // Register info to track
+    t.SetNumberOfClusters();
+    t.UpdateChi2(chi2);
+
     n += ptrTracklet->GetN();
+    AliDebug(2, Form("Setting Tracklet[%d] @ Idx[%d]", ily, index));
 
     // Reset material budget if 2 consecutive gold
 //     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 = ptrTracklet->GetN() / Float_t(fgNTimeBins);
-    //Float_t ratio1 = Float_t(t.GetNumberOfClusters()+1) / Float_t(t.GetNExpected()+1);       
-    
-    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();
-    }
+    Int_t failed(0);
+    if(!kStandAlone && (failed = t.MakeBackupTrack())) AliDebug(2, Form("Failed backup on cut[%d]", failed));
+
   } // 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(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
-    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+  if(debugLevel > 1){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     AliTRDtrackV1 track(t);
     track.SetOwner();
-    cstreamer << "FollowBackProlongation"
+    (*cstreamer) << "FollowBackProlongation0"
         << "EventNumber=" << eventNumber
         << "ncl="         << n
         << "track.="      << &track
@@ -1055,7 +1134,7 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
     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);
+      if(!(cl = tracklets[ilr].GetClusters(itb))) continue;
       if(!cl->IsInChamber()) continue;
       x = cl->GetX();
       y = cl->GetY();
@@ -1080,9 +1159,11 @@ 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].SetC(curvature);
+    tracklets[ip].SetC(curvature, 1);
+
+  if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitTiltedRiemanConstraint: Chi2[%f] C[%5.2e] pt[%8.3f]\n", chi2track, curvature, GetBz()*kB2C/curvature);
 
-/*  if(fkReconstructor->GetStreamLevel() >= 5){
+/*  if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker()) >= 5){
     //Linear Model on z-direction
     Double_t xref = CalculateReferenceX(tracklets);            // Relative to the middle of the stack
     Double_t slope = fitter->GetParameter(2);
@@ -1186,7 +1267,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
       nPoints++;
     }
   }
-  fitter->Eval();
+  if (fitter->Eval()) return 1.e10;
   zfitter.Eval();
 
   Double_t offset = fitter->GetParameter(3);
@@ -1219,8 +1300,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
   Double_t b     =  fitter->GetParameter(1);
   Double_t c     =  fitter->GetParameter(2);
   Double_t curvature =  1.0 + b*b - c*a;
-  if (curvature > 0.0) 
-    curvature  =  a / TMath::Sqrt(curvature);
+  if (curvature > 0.0) curvature  =  a / TMath::Sqrt(curvature);
 
   Double_t chi2track = fitter->GetChisquare()/Double_t(nPoints);
 
@@ -1301,9 +1381,10 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
     tracklets[iLayer].SetCovRef(cov);
     tracklets[iLayer].SetChi2(chi2track);
   }
+  if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitTiltedRieman: Chi2[%f] C[%5.2e] pt[%8.3f]\n", chi2track, curvature, GetBz()*kB2C/curvature);
   
-/*  if(fkReconstructor->GetStreamLevel() >=5){
-    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+/*  if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >=5){
+    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
     Int_t eventNumber                  = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber      = AliTRDtrackerDebug::GetCandidateNumber();
     Double_t chi2z = CalculateChi2Z(tracklets, offset, slope, xref);
@@ -1461,6 +1542,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1
   }
 
   Double_t xref = CalculateReferenceX(tracklets);
+  if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitRiemanTilt:\nx0[(0)%6.2f (1)%6.2f (2)%6.2f (3)%6.2f (4)%6.2f (5)%6.2f] xref[%6.2f]", tracklets[0].GetX0(), tracklets[1].GetX0(), tracklets[2].GetX0(), tracklets[3].GetX0(), tracklets[4].GetX0(), tracklets[5].GetX0(), xref);
   Double_t x, y, z, t, tilt, dx, w, we;
   Double_t uvt[4];
   Int_t nPoints = 0;
@@ -1469,7 +1551,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1
     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;
+      //if (!tracklets[ipl].IsUsable(itb)) continue;
       x = cl->GetX();
       y = cl->GetY();
       z = cl->GetZ();
@@ -1533,6 +1615,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1
 
   // Calculate chi2 of the fit 
   Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints);
+  if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitRiemanTilt:x0[%6.2f] y0[%6.2f] R[%6.2f] chi2[%f]\n", x0, y0, radius, chi2);
 
   // Update the tracklets
   if(!track){
@@ -1569,7 +1652,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1
 
 
 //____________________________________________________________________
-Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, const AliTRDseedV1 * const tracklets, Bool_t up, Int_t np, AliTrackPoint *points)
+Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const 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"
@@ -1588,18 +1671,19 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, const AliTRDseedV1 * c
   //if(points) printf("First marker point @ x[%d] = %f\n", ip, points[ip].GetX());
 
 
-  AliTRDseedV1 tracklet, *ptrTracklet = NULL;
+  AliTRDseedV1 tracklet;
+  AliTRDseedV1 *ptrTracklet = NULL;
 
   //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 = const_cast<AliTRDseedV1 *>(&tracklets[iplane]))) continue;
+      if(!(ptrTracklet = &tracklets[iplane])) continue;
     }else{
       if(!(ptrTracklet  = track->GetTracklet(iplane))){ 
       /*AliTRDtrackerV1 *tracker = NULL;
-        if(!(tracker = dynamic_cast<AliTRDtrackerV1*>( AliTRDReconstructor::Tracker()))) continue;
+        if(!(tracker = dynamic_cast<AliTRDtrackerV1*>( AliTRDrecoParam:Tracker()))) continue;
         ptrTracklet = new(&tracklet) AliTRDseedV1(iplane);
         if(!tracker->MakeTracklet(ptrTracklet, track)) */
         continue;
@@ -1652,7 +1736,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, const AliTRDseedV1 * c
     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
+    if(TMath::Abs(xyz0[0] - xyz1[0]) < 1e-3 && TMath::Abs(xyz0[1] - xyz1[1]) < 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
@@ -1666,7 +1750,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, const AliTRDseedV1 * c
     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(chi2<1e+10) ((AliExternalTrackParam*)track)->Update(p, cov);
     if(!up) continue;
 
                //Reset material budget if 2 consecutive gold
@@ -1688,7 +1772,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, const AliTRDseedV1 * c
 }
 
 //_________________________________________________________________________
-Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
+Float_t AliTRDtrackerV1::CalculateChi2Z(const AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
 {
   //
   // Calculates the chi2-value of the track in z-Direction including tilting pad correction.
@@ -1762,7 +1846,7 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
     if (!t.PropagateTo(x, param[1], param[0]*param[4])) return 0;
 
     // Rotate the track if necessary
-    AdjustSector(&t);
+    if(!AdjustSector(&t)) return 0;
 
     // New track X-position
     xpos = t.GetX();
@@ -1775,7 +1859,7 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
 
 
 //_____________________________________________________________________________
-Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) const
+Bool_t AliTRDtrackerV1::ReadClusters(TTree *clusterTree)
 {
   //
   // Reads AliTRDclusters from the file. 
@@ -1789,15 +1873,15 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
   TBranch *branch = clusterTree->GetBranch("TRDcluster");
   if (!branch) {
     AliError("Can't get the branch !");
-    return 1;
+    return kFALSE;
   }
   branch->SetAddress(&clusterArray); 
   
   if(!fClusters){ 
-    Float_t nclusters =  fkReconstructor->GetRecoParam()->GetNClusters();
+    Float_t nclusters =  fkRecoParam->GetNClusters();
     if(fkReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
-    array = new TClonesArray("AliTRDcluster", Int_t(nclusters));
-    array->SetOwner(kTRUE);
+    fClusters = new TClonesArray("AliTRDcluster", Int_t(nclusters));
+    fClusters->SetOwner(kTRUE);
   }
   
   // Loop through all entries in the tree
@@ -1816,11 +1900,10 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
       new((*fClusters)[ncl++]) AliTRDcluster(*c);
       delete (clusterArray->RemoveAt(iCluster)); 
     }
-
   }
   delete clusterArray;
 
-  return 0;
+  return kTRUE;
 }
 
 //_____________________________________________________________________________
@@ -1830,10 +1913,12 @@ Int_t AliTRDtrackerV1::LoadClusters(TTree *cTree)
   // Fills clusters into TRD tracking sectors
   //
   
+  fkRecoParam = fkReconstructor->GetRecoParam(); // load reco param for this event
+
   if(!fkReconstructor->IsWritingClusters()){ 
     fClusters = AliTRDReconstructor::GetClusters();
   } else {
-    if (ReadClusters(fClusters, cTree)) {
+    if(!ReadClusters(cTree)) {
       AliError("Problem with reading the clusters !");
       return 1;
     }
@@ -1869,7 +1954,7 @@ Int_t AliTRDtrackerV1::LoadClusters(TClonesArray * const clusters)
   fClusters = clusters;
   SetClustersOwner();
 
-  //Int_t nin = 
+  fkRecoParam = fkReconstructor->GetRecoParam(); // load reco param for this event
   BuildTrackingContainers();  
 
   //Int_t ncl  = fClusters->GetEntriesFast();
@@ -1884,22 +1969,22 @@ Int_t AliTRDtrackerV1::BuildTrackingContainers()
 {
 // Building tracking containers for clusters
 
-  Int_t nin =0, icl = fClusters->GetEntriesFast();
-  while (icl--) {
-    AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(icl);
+  Int_t nin(0), ncl(fClusters->GetEntriesFast());
+  while (ncl--) {
+    AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(ncl);
     if(c->IsInChamber()) nin++;
+    if(fkReconstructor->IsHLT()) c->SetRPhiMethod(AliTRDcluster::kCOG);
     Int_t detector       = c->GetDetector();
     Int_t sector         = fGeom->GetSector(detector);
     Int_t stack          = fGeom->GetStack(detector);
     Int_t layer          = fGeom->GetLayer(detector);
     
-    fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, icl);
+    fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, ncl);
   }
 
-  const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
   for(int isector =0; isector<AliTRDgeometry::kNsector; isector++){ 
     if(!fTrSec[isector].GetNChambers()) continue;
-    fTrSec[isector].Init(fkReconstructor, cal);
+    fTrSec[isector].Init(fkReconstructor);
   }
 
   return nin;
@@ -1999,7 +2084,7 @@ AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *const track, Int_t p,
   // Detailed description
   //
   idx = track->GetTrackletIndex(p);
-  AliTRDseedV1 *tracklet = (idx==0xffff) ? NULL : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
+  AliTRDseedV1 *tracklet = (idx<0) ? NULL : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
 
   return tracklet;
 }
@@ -2074,10 +2159,6 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
   // 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 = NULL, *chamber = NULL;
@@ -2086,22 +2167,39 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
     nChambers = 0;
     for(int ilayer=0; ilayer<AliTRDgeometry::kNlayer; ilayer++){
       if(!(chamber = stack[ilayer])) continue;
-      if(chamber->GetNClusters() < fgNTimeBins * fkReconstructor->GetRecoParam() ->GetFindableClusters()) continue;
+      if(chamber->GetNClusters() < fgNTimeBins * fkRecoParam->GetFindableClusters()) continue;
       nChambers++;
       //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);
+    nTracks += Clusters2TracksStack(stack, fTracksESD);
+  }
+  if(nTracks) AliDebug(2, Form("Number of tracks: SM_%02d[%d]", sector, nTracks));
+
+  for(int itrack=0; itrack<nTracks; itrack++){
+    AliESDtrack *esdTrack((AliESDtrack*)(fTracksESD->operator[](itrack)));
+    Int_t id = esd->AddTrack(esdTrack);
+
+    // set ESD id to stand alone TRD tracks
+    if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ 
+      esdTrack=esd->GetTrack(id);
+      TObject *o(NULL); Int_t ic(0);
+      AliTRDtrackV1 *calibTrack(NULL); 
+      while((o = esdTrack->GetCalibObject(ic++))){
+        if(!(calibTrack = dynamic_cast<AliTRDtrackV1*>(o))) continue;
+        calibTrack->SetESDid(esdTrack->GetID());
+        break;
+      }
+    }
   }
-  //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]);
 
   // Reset Track and Candidate Number
   AliTRDtrackerDebug::SetCandidateNumber(0);
   AliTRDtrackerDebug::SetTrackNumber(0);
+
+  // delete ESD tracks in the array
+  fTracksESD->Delete();
   return nTracks;
 }
 
@@ -2134,7 +2232,6 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
   // 8. Build ESD track and register it to the output list
   //
 
-  const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
   AliTRDtrackingChamber *chamber = NULL;
   AliTRDtrackingChamber **ci = NULL;
   AliTRDseedV1 sseed[kMaxTracksStack*6]; // to be initialized
@@ -2153,7 +2250,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
 
   // Build initial seeding configurations
   Double_t quality = BuildSeedingConfigs(stack, configs);
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){
+  if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){
     AliInfo(Form("Plane config %d %d %d Quality %f"
     , configs[0], configs[1], configs[2], quality));
   }
@@ -2174,7 +2271,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
   do{
     // Loop over seeding configurations
     ntracks = 0; ntracks1 = 0;
-    for (Int_t iconf = 0; iconf<3; iconf++) {
+    for (Int_t iconf = 0; iconf<fkRecoParam->GetNumberOfSeedConfigs(); iconf++) {
       pars[0] = configs[iconf];
       pars[1] = ntracks;
       pars[2] = istack;
@@ -2182,13 +2279,19 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       //AliInfo(Form("Number of Tracks after iteration step %d: %d\n", iconf, ntracks));
       if(ntracks == kMaxTracksStack) break;
     }
-    if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
-    
+    AliDebug(2, Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
     if(!ntracks) break;
     
     // Sort the seeds according to their quality
-    Int_t sort[kMaxTracksStack];
+    Int_t sort[kMaxTracksStack+1];
     TMath::Sort(ntracks, fTrackQuality, sort, kTRUE);
+    if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1") > 2){
+      AliDebug(3, "Track candidates classification:");
+      for (Int_t it(0); it < ntracks; it++) {
+        Int_t jt(sort[it]);
+        printf("   %2d idx[%d] Quality[%e]\n", it, jt, fTrackQuality[jt]);
+      }
+    }
   
     // Initialize number of tracks so far and logic switches
     Int_t ntracks0 = esdTrackList->GetEntriesFast();
@@ -2201,18 +2304,13 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
     //AliInfo("Selecting track candidates ...");
     
     // Sieve clusters in decreasing order of track quality
-    Double_t trackParams[7];
-    //                 AliTRDseedV1 *lseed = NULL;
-    Int_t jSieve = 0, candidates;
+    Int_t jSieve(0), rejectedCandidates(0);
     do{
-      //AliInfo(Form("\t\tITER = %i ", jSieve));
-
       // Check track candidates
-      candidates = 0;
+      rejectedCandidates=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 ncl        = 0;
@@ -2221,79 +2319,79 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
         Int_t findable   = 0;
         for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) {
           Int_t jseed = kNPlanes*trackIndex+jLayer;
+          sseed[jseed].UpdateUsed();
           if(!sseed[jseed].IsOK()) continue;
+          // check if primary candidate
           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();
+          ncl   += sseed[jseed].GetN();
           nused += sseed[jseed].GetNUsed();
           nlayers++;
         }
 
         // Filter duplicated tracks
         if (nused > 30){
-          //printf("Skip %d nused %d\n", trackIndex, nused);
+          AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused));
           fakeTrack[trackIndex] = kTRUE;
           continue;
         }
-        if (Float_t(nused)/ncl >= .25){
-          //printf("Skip %d nused/ncl >= .25\n", trackIndex);
+        if (ncl>0 && Float_t(nused)/ncl >= .25){
+          AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d] used/ncl[%f]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused, Float_t(nused)/ncl));
           fakeTrack[trackIndex] = kTRUE;
           continue;
         }
 
+        AliDebug(4, Form("Candidate[%d] Quality[%e] Tracklets[%d] Findable[%d] Ncl[%d] Nused[%d]", trackIndex, fTrackQuality[trackIndex], nlayers, findable, ncl, nused));
+
         // Classify tracks
         Bool_t skip = kFALSE;
         switch(jSieve){
-          case 0:
-            if(nlayers < 6) {skip = kTRUE; break;}
+          case 0: // select 6 tracklets primary tracks, good quality
+            if(nlayers > findable || nlayers < kNPlanes) {skip = kTRUE; break;}
             if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
             break;
 
-          case 1:
+          case 1: // select shorter primary tracks, good quality
+            //if(findable<4){skip = kTRUE; break;}
             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;}
+          case 2: // select 6 tracklets secondary tracks
+            if(nlayers < kNPlanes) { skip = kTRUE; break;}
             if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;}
             break;
 
-          case 3:
+          case 3: // select shorter tracks, good quality
+            if (nlayers<4){skip = kTRUE; break;}
             if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
             break;
 
-          case 4:
-            if (nlayers == 3){skip = kTRUE; break;}
+          case 4: // select anything with at least 4 tracklets
+            if (nlayers<4){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);
+          rejectedCandidates++;
+          AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused));
           continue;
-        }
+        } else AliDebug(4, Form("ACCEPTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused));
+
         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(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+        AliTRDseedV1 *lseed =&sseed[trackIndex*kNPlanes];
+        AliTRDtrackV1 *track = MakeTrack(lseed);
+        if(!track){
+          AliDebug(1, "Track building failed.");
+          continue;
+        } else { 
+          if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1") > 1){
+            Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
+            AliDebug(2, Form("Track pt=%7.2fGeV/c SM[%2d] Done.", track->Pt(), fGeom->GetSector(chamber->GetDetector())));
+          }
+        }
+
+        if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1 && fkReconstructor->IsDebugStreaming()){
           //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];
@@ -2303,46 +2401,33 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
           Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
           Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
           Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::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
+              << "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]
+              << "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 (fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){
+        if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){
           AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
           calibTrack->SetOwner();
           esdTrack->AddCalibObject(calibTrack);
@@ -2352,7 +2437,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       }
 
       jSieve++;
-    } while(jSieve<5 && candidates); // end track candidates sieve
+    } while(jSieve<5 && rejectedCandidates); // end track candidates sieve
     if(!ntracks1) break;
 
     // increment counters
@@ -2367,10 +2452,10 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
     
     for(Int_t ip = 0; ip < kNPlanes; ip++){ 
       if(!(chamber = stack[ip])) continue;
-      chamber->Build(fGeom, cal);//Indices(fSieveSeeding);
+      chamber->Build(fGeom);//Indices(fSieveSeeding);
     }
 
-    if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){ 
+    if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::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
@@ -2425,7 +2510,7 @@ Double_t AliTRDtrackerV1::BuildSeedingConfigs(AliTRDtrackingChamber **stack, Int
   }
   
   TMath::Sort((Int_t)kNConfigs, tconfig, configs, kTRUE);
-  //   AliInfo(Form("q[%d] = %f", configs[0], tconfig[configs[0]]));
+  //   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]]));
   
@@ -2433,7 +2518,7 @@ Double_t AliTRDtrackerV1::BuildSeedingConfigs(AliTRDtrackingChamber **stack, Int
 }
 
 //____________________________________________________________________
-Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseedV1 * const sseed, const Int_t * const ipar)
+Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * const sseed, const Int_t * const ipar)
 {
 //
 // Seed tracklets and build candidate TRD tracks. The procedure is used during barrel tracking to account for tracks which are 
@@ -2497,7 +2582,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
 
   AliTRDtrackingChamber *chamber = NULL;
   AliTRDcluster *c[kNSeedPlanes] = {NULL, NULL, NULL, NULL}; // initilize seeding clusters
-  AliTRDseedV1 *cseed = const_cast<AliTRDseedV1 *>(&sseed[0]); // initialize tracklets for first track
+  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];
   // chi2 storage
@@ -2538,16 +2623,14 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
   for(int iLayer=0; iLayer<kNPlanes; iLayer++,cIter++){
     if(!(*cIter)) continue;
     if(!(matrix = fGeom->GetClusterMatrix((*cIter)->GetDetector()))){ 
-      continue;
       x0[iLayer] = fgkX0[iLayer];
+      continue;
     }
     matrix->LocalToMaster(loc, glb);
     x0[iLayer] = glb[0];
   }
 
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 2){
-    AliInfo(Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
-  }
+  AliDebug(2, Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
 
   // Build seeding layers
   ResetSeedTB();
@@ -2587,9 +2670,12 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
         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());
+
+               AliDebug(3, Form("Seeding clusters\n 0[%6.3f %6.3f %6.3f]\n 1[%6.3f %6.3f %6.3f]\n 2[%6.3f %6.3f %6.3f]\n 3[%6.3f %6.3f %6.3f].",
+          c[0]->GetX(), c[0]->GetY(), c[0]->GetZ(),
+          c[1]->GetX(), c[1]->GetY(), c[1]->GetZ(),
+          c[2]->GetX(), c[2]->GetY(), c[2]->GetZ(),
+          c[3]->GetX(), c[3]->GetY(), c[3]->GetZ()));
               
         for (Int_t il = 0; il < kNPlanes; il++) cseed[il].Reset();
       
@@ -2610,7 +2696,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
         }
       
         Bool_t isFake = kFALSE;
-        if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+        if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
           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;
@@ -2623,7 +2709,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
           Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
           Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
           AliRieman *rim = GetRiemanFitter();
-          TTreeSRedirector &cs0 = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+          TTreeSRedirector &cs0 = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
           cs0 << "MakeSeeds0"
               <<"EventNumber="         << eventNumber
               <<"CandidateNumber="     << candidateNumber
@@ -2653,13 +2739,13 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
               <<"RiemanFitter.="               << rim
               <<"\n";
         }
-        if(chi2[0] > fkReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
-          //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
+        if(chi2[0] > fkRecoParam->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
+          AliDebug(3, Form("Filter on chi2Z [%f].", chi2[0]));
           AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
           continue;
         }
-        if(chi2[1] > fkReconstructor->GetRecoParam() ->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
-          //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
+        if(chi2[1] > fkRecoParam->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
+          AliDebug(3, Form("Filter on chi2Y [%f].", chi2[1]));
           AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
           continue;
         }
@@ -2667,28 +2753,29 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
       
         // try attaching clusters to tracklets
         Int_t mlayers = 0; 
-       AliTRDcluster *cl = NULL;
+        AliTRDcluster *cl = NULL;
         for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
           Int_t jLayer = planes[iLayer];
-         Int_t nNotInChamber = 0;
+          Int_t nNotInChamber = 0;
           if(!cseed[jLayer].AttachClusters(stack[jLayer], kTRUE)) continue;
-         if(fkReconstructor->IsHLT()){ 
-           if(!cseed[jLayer].IsOK()) continue;
-         }else{
-           cseed[jLayer].Fit();
-           cseed[jLayer].UpdateUsed();
-           cseed[jLayer].ResetClusterIter();
-           while((cl = cseed[jLayer].NextCluster())){
-             if(!cl->IsInChamber()) nNotInChamber++;
-           }
-           //printf("clusters[%d], used[%d], not in chamber[%d]\n", cseed[jLayer].GetN(), cseed[jLayer].GetNUsed(), nNotInChamber);
-           if(cseed[jLayer].GetN() - (cseed[jLayer].GetNUsed() + nNotInChamber) < 5) continue; // checking for Cluster which are not in chamber is a much stronger restriction on real data
-         }
+          if(/*fkReconstructor->IsHLT()*/kFALSE){ 
+            cseed[jLayer].UpdateUsed();
+            if(!cseed[jLayer].IsOK()) continue;
+          }else{
+            cseed[jLayer].Fit();
+            cseed[jLayer].UpdateUsed();
+            cseed[jLayer].ResetClusterIter();
+            while((cl = cseed[jLayer].NextCluster())){
+              if(!cl->IsInChamber()) nNotInChamber++;
+            }
+            //printf("clusters[%d], used[%d], not in chamber[%d]\n", cseed[jLayer].GetN(), cseed[jLayer].GetNUsed(), nNotInChamber);
+            if(cseed[jLayer].GetN() - (cseed[jLayer].GetNUsed() + nNotInChamber) < 5) continue; // checking for Cluster which are not in chamber is a much stronger restriction on real data
+          }
           mlayers++;
         }
 
         if(mlayers < kNSeedPlanes){ 
-          //AliInfo(Form("Failed updating all seeds %d [%d].", mlayers, kNSeedPlanes));
+          AliDebug(2, Form("Found only %d tracklets out of %d. Skip.", mlayers, kNSeedPlanes));
           AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
           continue;
         }
@@ -2699,9 +2786,10 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
           for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
             Int_t jLayer = planesExt[iLayer];
             if(!(chamber = stack[jLayer])) continue;
-            cseed[jLayer].AttachClusters(chamber, kTRUE);
-            //cseed[jLayer].Fit();
+            if(!cseed[jLayer].AttachClusters(chamber, kTRUE)) continue;
+            cseed[jLayer].Fit();
           }
+          //FitTiltedRiemanConstraint(&cseed[0], GetZ());
           fTrackQuality[ntracks] = 1.; // dummy value
           ntracks++;
           if(ntracks == kMaxTracksStack) return ntracks;
@@ -2712,15 +2800,16 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
 
         // Update Seeds and calculate Likelihood
         // fit tracklets and cook likelihood
-        FitTiltedRieman(&cseed[0], kTRUE);
+        Double_t chi2Vals[4];
+        chi2Vals[0] = FitTiltedRieman(&cseed[0], kTRUE);
         for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
           Int_t jLayer = planes[iLayer];
-          cseed[jLayer].Fit(kTRUE);
+          cseed[jLayer].Fit(1);
         }
         Double_t like = CookLikelihood(&cseed[0], planes); // to be checked
       
-        if (TMath::Log(1.E-9 + like) < fkReconstructor->GetRecoParam() ->GetTrackLikelihood()){
-          //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+        if (TMath::Log(1.E-9 + like) < fkRecoParam->GetTrackLikelihood()){
+          AliDebug(3, Form("Filter on likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
           AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
           continue;
         }
@@ -2731,6 +2820,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
         fSeedLayer[ntracks]  = config;/*sLayer;*/
       
         // attach clusters to the extrapolation seeds
+        Int_t elayers(0);
         for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
           Int_t jLayer = planesExt[iLayer];
           if(!(chamber = stack[jLayer])) continue;
@@ -2740,16 +2830,17 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
           if ((jLayer == 5) && !(cseed[4].IsOK())) continue;
           AliTRDseedV1 pseed = cseed[jLayer];
           if(!pseed.AttachClusters(chamber, kTRUE)) continue;
-          pseed.Fit(kTRUE);
+          pseed.Fit(1);
           cseed[jLayer] = pseed;
-          FitTiltedRieman(cseed,  kTRUE);
-          cseed[jLayer].Fit(kTRUE);
+          chi2Vals[0] = FitTiltedRieman(cseed,  kTRUE);
+          cseed[jLayer].Fit(1);
+          elayers++;
         }
       
         // AliInfo("Extrapolation done.");
         // Debug Stream containing all the 6 tracklets
-        if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
-          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+        if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
+          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
           TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
           Int_t eventNumber            = AliTRDtrackerDebug::GetEventNumber();
           Int_t candidateNumber        = AliTRDtrackerDebug::GetCandidateNumber();
@@ -2766,32 +2857,24 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
               << "\n";
         }
               
-        if(fkReconstructor->HasImproveTracklets() && ImproveSeedQuality(stack, cseed) < 4){
-          AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-          continue;
+        if(fkRecoParam->HasImproveTracklets()){ 
+          if(!ImproveSeedQuality(stack, cseed, chi2Vals[0])){
+            AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+            AliDebug(3, "ImproveSeedQuality() failed.");
+          }
         }
-        //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], kTRUE);
-        if(fkReconstructor->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");
+        // do track fitting with vertex constraint
+        if(fkRecoParam->IsVertexConstrained()) chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ());
+        else chi2Vals[1] = -1.;
+        chi2Vals[2] = GetChi2Z(&cseed[0]);
+        chi2Vals[3] = GetChi2Phi(&cseed[0]);
+
+        // calculate track quality
+        fTrackQuality[ntracks] = CalculateTrackLikelihood(&chi2Vals[0]);
                   
-        if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
-          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+        if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
+          TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
           Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
           Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
           TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
@@ -2818,7 +2901,29 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
               << "FitterTC.="                  << fitterTC
               << "\n";
         }
-              
+        if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")){  
+          Double_t pt[]={0., 0.};
+          for(Int_t il(0); il<kNPlanes; il++){
+            if(!cseed[il].IsOK()) continue;
+            pt[0] = GetBz()*kB2C/cseed[il].GetC();
+            pt[1] = GetBz()*kB2C/cseed[il].GetC(1);
+            break;
+          }
+          AliDebug(2, Form("Candidate[%2d] pt[%7.3f %7.3f] Q[%e]\n"
+            "  [0] x[%6.2f] n[%2d] nu[%d] OK[%c]\n"
+            "  [1] x[%6.2f] n[%2d] nu[%d] OK[%c]\n"
+            "  [2] x[%6.2f] n[%2d] nu[%d] OK[%c]\n"
+            "  [3] x[%6.2f] n[%2d] nu[%d] OK[%c]\n"
+            "  [4] x[%6.2f] n[%2d] nu[%d] OK[%c]\n"
+            "  [5] x[%6.2f] n[%2d] nu[%d] OK[%c]"
+            , ntracks, pt[0], pt[1], fTrackQuality[ntracks]
+            ,cseed[0].GetX(), cseed[0].GetN(), cseed[0].GetNUsed(), cseed[0].IsOK()?'y':'n'
+            ,cseed[1].GetX(), cseed[1].GetN(), cseed[1].GetNUsed(), cseed[1].IsOK()?'y':'n'
+            ,cseed[2].GetX(), cseed[2].GetN(), cseed[2].GetNUsed(), cseed[2].IsOK()?'y':'n'
+            ,cseed[3].GetX(), cseed[3].GetN(), cseed[3].GetNUsed(), cseed[3].IsOK()?'y':'n'
+            ,cseed[4].GetX(), cseed[4].GetN(), cseed[4].GetNUsed(), cseed[4].IsOK()?'y':'n'
+            ,cseed[5].GetX(), cseed[5].GetN(), cseed[5].GetNUsed(), cseed[5].IsOK()?'y':'n'));
+        }
         ntracks++;
         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
         if(ntracks == kMaxTracksStack){
@@ -2834,7 +2939,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, const AliTRDseed
 }
 
 //_____________________________________________________________________________
-AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(const AliTRDseedV1 * const seeds, Double_t *params)
+AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const tracklet)
 {
 //
 // Build a TRD track out of tracklet candidates
@@ -2860,84 +2965,126 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(const AliTRDseedV1 * const seeds, Doub
 // offline case perform a full Kalman filter on the already found tracklets (see AliTRDtrackerV1::FollowBackProlongation() 
 // for details). Do also MC label calculation and PID if propagation successfully.
 
+  if(fkReconstructor->IsHLT()) FitTiltedRiemanConstraint(tracklet, 0);
   Double_t alpha = AliTRDgeometry::GetAlpha();
   Double_t shift = AliTRDgeometry::GetAlpha()/2.0;
-  Double_t c[15];
 
+  // find first good tracklet
+  Int_t idx(0); while(idx<kNPlanes && !tracklet[idx].IsOK()) idx++;
+  if(idx>2){ AliDebug(1, Form("Found suspect track start @ layer idx[%d]\n"
+    "  %c[0] x0[%f] n[%d] nu[%d] OK[%c]\n"
+    "  %c[1] x0[%f] n[%d] nu[%d] OK[%c]\n"
+    "  %c[2] x0[%f] n[%d] nu[%d] OK[%c]\n"
+    "  %c[3] x0[%f] n[%d] nu[%d] OK[%c]\n"
+    "  %c[4] x0[%f] n[%d] nu[%d] OK[%c]\n"
+    "  %c[5] x0[%f] n[%d] nu[%d] OK[%c]"
+    ,idx
+    ,idx==0?'*':' ', tracklet[0].GetX0(), tracklet[0].GetN(), tracklet[0].GetNUsed(), tracklet[0].IsOK()?'y':'n'
+    ,idx==1?'*':' ', tracklet[1].GetX0(), tracklet[1].GetN(), tracklet[1].GetNUsed(), tracklet[1].IsOK()?'y':'n'
+    ,idx==2?'*':' ', tracklet[2].GetX0(), tracklet[2].GetN(), tracklet[2].GetNUsed(), tracklet[2].IsOK()?'y':'n'
+    ,idx==3?'*':' ', tracklet[3].GetX0(), tracklet[3].GetN(), tracklet[3].GetNUsed(), tracklet[3].IsOK()?'y':'n'
+    ,idx==4?'*':' ', tracklet[4].GetX0(), tracklet[4].GetN(), tracklet[4].GetNUsed(), tracklet[4].IsOK()?'y':'n'
+    ,idx==5?'*':' ', tracklet[5].GetX0(), tracklet[5].GetN(), tracklet[5].GetNUsed(), tracklet[5].IsOK()?'y':'n'));
+    return NULL;
+  }
+
+  Double_t dx(5.);
+  Double_t x(tracklet[idx].GetX0() - dx);
+  // Build track parameters
+  Double_t params[] = {
+    tracklet[idx].GetYref(0) - dx*tracklet[idx].GetYref(1) // y
+   ,tracklet[idx].GetZref(0) - dx*tracklet[idx].GetZref(1) // z
+   ,TMath::Sin(TMath::ATan(tracklet[idx].GetYref(1)))      // snp
+   ,tracklet[idx].GetZref(1) / TMath::Sqrt(1. + tracklet[idx].GetYref(1) * tracklet[idx].GetYref(1))   // tgl
+   ,tracklet[idx].GetC(fkReconstructor->IsHLT()?1:0)                                   // curvature -> 1/pt
+  };
+  Int_t sector(fGeom->GetSector(tracklet[idx].GetDetector()));
+
+  Double_t c[15];
   c[ 0] = 0.2; // s^2_y
   c[ 1] = 0.0; c[ 2] = 2.0; // s^2_z
   c[ 3] = 0.0; c[ 4] = 0.0; c[ 5] = 0.02; // s^2_snp
   c[ 6] = 0.0; c[ 7] = 0.0; c[ 8] = 0.0;  c[ 9] = 0.1; // s^2_tgl
-  c[10] = 0.0; c[11] = 0.0; c[12] = 0.0;  c[13] = 0.0; c[14] = params[5]*params[5]*0.01; // s^2_1/pt
+  c[10] = 0.0; c[11] = 0.0; c[12] = 0.0;  c[13] = 0.0; c[14] = params[4]*params[4]*0.01; // s^2_1/pt
+
+  AliTRDtrackV1 track(tracklet, params, c, x, sector*alpha+shift);
 
-  AliTRDtrackV1 track(seeds, &params[1], c, params[0], params[6]*alpha+shift);
-  track.PropagateTo(params[0]-5.0);
   AliTRDseedV1 *ptrTracklet = NULL;
 
   // skip Kalman filter for HLT
-  if(fkReconstructor->IsHLT()){ 
+  if(/*fkReconstructor->IsHLT()*/kFALSE){ 
     for (Int_t jLayer = 0; jLayer < AliTRDgeometry::kNlayer; jLayer++) {
       track.UnsetTracklet(jLayer);
-      ptrTracklet = const_cast<AliTRDseedV1 *>(&seeds[jLayer]);
+      ptrTracklet = &tracklet[jLayer];
       if(!ptrTracklet->IsOK()) continue;
-      //if(TMath::Abs(ptrTracklet->GetYref(1) - ptrTracklet->GetYfit(1)) >= .2) continue; // check this condition with Marian
+      if(TMath::Abs(ptrTracklet->GetYref(1) - ptrTracklet->GetYfit(1)) >= .2) continue; // check this condition with Marian
       ptrTracklet = SetTracklet(ptrTracklet);
       ptrTracklet->UseClusters();
       track.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
     }
     AliTRDtrackV1 *ptrTrack = SetTrack(&track);
     ptrTrack->CookPID();
+    ptrTrack->CookLabel(.9);
     ptrTrack->SetReconstructor(fkReconstructor);
     return ptrTrack;
   }
 
+  // prevent the error message in AliTracker::MeanMaterialBudget: "start point out of geometry"
+  if(TMath::Abs(track.GetX()) + TMath::Abs(track.GetY()) + TMath::Abs(track.GetZ()) > 10000) return NULL;
+
   track.ResetCovariance(1);
   Int_t nc = TMath::Abs(FollowBackProlongation(track));
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 5){
+  if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()){
     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 = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+    track.GetExternalParameters(x, p);
+    TTreeSRedirector &cs = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
     cs << "MakeTrack"
     << "EventNumber="     << eventNumber
     << "CandidateNumber=" << candidateNumber
     << "nc="     << nc
-    << "X="      << params[0]
+    << "X="      << x
     << "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]
+    << "Yin="    << params[0]
+    << "Zin="    << params[1]
+    << "snpin="  << params[2]
+    << "tndin="  << params[3]
+    << "crvin="  << params[4]
     << "track.=" << &track
     << "\n";
   }
-  if (nc < 30) return NULL;
-
+  if (nc < 30){ 
+    UnsetTrackletsTrack(&track);
+    return NULL;
+  }
   AliTRDtrackV1 *ptrTrack = SetTrack(&track);
   ptrTrack->SetReconstructor(fkReconstructor);
   ptrTrack->CookLabel(.9);
-  
+  for(Int_t il(kNPlanes); il--;){
+    if(!(ptrTracklet = ptrTrack->GetTracklet(il))) continue;
+    ptrTracklet->UseClusters();
+  }
+
   // 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);
+  if(!calibra){
+    AliInfo("Could not get Calibra instance.");
+  } else if(calibra->GetHisto2d()){
+    calibra->UpdateHistogramsV1(ptrTrack);
   }
   return ptrTrack;
 }
 
 
 //____________________________________________________________________
-Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDseedV1 *cseed)
+Bool_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDseedV1 *cseed, Double_t &chi2)
 {
   //
   // Sort tracklets according to "quality" and try to "improve" the first 4 worst
@@ -2960,65 +3107,86 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
   
   // make a local working copy
   AliTRDtrackingChamber *chamber = NULL;
-  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;
+  AliTRDseedV1 bseed[AliTRDgeometry::kNlayer];
+
+  Float_t quality(1.e3), 
+          lQuality[AliTRDgeometry::kNlayer] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 1.e3};
+  Int_t rLayers(0);
+  for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;){ 
+    bseed[jLayer] = cseed[jLayer];
+    if(!bseed[jLayer].IsOK()) continue;
+    rLayers++;
+    lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE);
+    quality    += lQuality[jLayer];
+  }
+  quality /= rLayers;
+  AliDebug(2, Form("Start N[%d] Q[%f] chi2[%f]", rLayers, quality, chi2));
 
   for (Int_t iter = 0; iter < 4; iter++) {
-    Float_t sumquality = 0.0;
-    Float_t squality[6];
-    Int_t   sortindexes[6];
-
-    for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
-      squality[jLayer]  = bseed[jLayer].IsOK() ? bseed[jLayer].GetQuality(kTRUE) : 1000.;
-      sumquality += squality[jLayer];
-    }
-    if ((sumquality >= lastquality) || (chi2       >     lastchi2)) break;
-
-    nLayers = 0;
-    lastquality = sumquality;
-    lastchi2    = chi2;
-    if (iter > 0) for (Int_t jLayer = 0; jLayer < 6; jLayer++) cseed[jLayer] = bseed[jLayer];
-
-    TMath::Sort(6, squality, sortindexes, kFALSE);
-    for (Int_t jLayer = 5; jLayer > 1; jLayer--) {
-      Int_t bLayer = sortindexes[jLayer];
+    // Try better cluster set
+    Int_t nLayers(0); Float_t qualitynew(0.);
+    Int_t  indexes[4*AliTRDgeometry::kNlayer];
+    TMath::Sort(Int_t(AliTRDgeometry::kNlayer), lQuality, indexes, kFALSE);
+    for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) {
+      Int_t bLayer = indexes[jLayer];
+      bseed[bLayer].Reset("c");
       if(!(chamber = stack[bLayer])) continue;
-      bseed[bLayer].AttachClusters(chamber, kTRUE);
-      bseed[bLayer].Fit(kTRUE);
-      if(bseed[bLayer].IsOK()) nLayers++;
+      if(!bseed[bLayer].AttachClusters(chamber, kTRUE)) continue;
+      bseed[bLayer].Fit(1);
+      if(!bseed[bLayer].IsOK()) continue;
+      nLayers++;
+      lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE);
+      qualitynew    += lQuality[jLayer];
     }
-
-    chi2 = FitTiltedRieman(bseed, kTRUE);
-    if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 7){
+    if(rLayers > nLayers){
+      AliDebug(1, Form("Lost %d tracklets while improving.", rLayers-nLayers));
+      return iter>0?kTRUE:kFALSE;
+    } else rLayers=nLayers;
+    qualitynew /= rLayers;
+
+    if(qualitynew > quality){ 
+      AliDebug(4, Form("Quality[%f] worsen in iter[%d] to ref[%f].", qualitynew, iter, quality));
+      return iter>0?kTRUE:kFALSE;
+    } else quality = qualitynew;
+
+    // try improve track parameters
+    Float_t chi2new = FitTiltedRieman(bseed, kTRUE);
+    if(chi2new > chi2){ 
+      AliDebug(4, Form("Chi2[%f] worsen in iter[%d] to ref[%f].", chi2new, iter, chi2));
+      return iter>0?kTRUE:kFALSE;
+    } else chi2 = chi2new;
+
+    // store better tracklets
+    for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) cseed[jLayer]=bseed[jLayer];
+    AliDebug(2, Form("Iter[%d] Q[%f] chi2[%f]", iter, quality, chi2));
+
+
+    if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()){
       Int_t eventNumber                = AliTRDtrackerDebug::GetEventNumber();
       Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
       TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
-      TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+      TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::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.="                                                      << &cseed[0]
+        << "S1.="                                                      << &cseed[1]
+        << "S2.="                                                      << &cseed[2]
+        << "S3.="                                                      << &cseed[3]
+        << "S4.="                                                      << &cseed[4]
+        << "S5.="                                                      << &cseed[5]
+        << "FitterT.="                         << tiltedRieman
+        << "\n";
     }
   } // Loop: iter
-  // we are sure that at least 2 tracklets are OK !
-  return nLayers+2;
+
+  // we are sure that at least 4 tracklets are OK !
+  return kTRUE;
 }
 
 //_________________________________________________________________________
-Double_t AliTRDtrackerV1::CalculateTrackLikelihood(const AliTRDseedV1 *const tracklets, Double_t *chi2){
+Double_t AliTRDtrackerV1::CalculateTrackLikelihood(Double_t *chi2){
   //
   // Calculates the Track Likelihood value. This parameter serves as main quality criterion for 
   // the track selection
@@ -3036,26 +3204,42 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(const AliTRDseedV1 *const tra
   //
   // debug level 2
   //
-
-  Double_t chi2phi = 0, nLayers = 0;
-  for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
-    if(!tracklets[iLayer].IsOK()) continue;
-    chi2phi += tracklets[iLayer].GetChi2Phi();
-    nLayers++;
-  }
-  chi2phi /= Float_t (nLayers - 2.0);
   
-  Double_t likeChi2Z  = TMath::Exp(-chi2[2] * 0.14);                   // Chi2Z 
-  Double_t likeChi2TC = (fkReconstructor->HasVertexConstrained()) ? 
-                                                                                       TMath::Exp(-chi2[1] * 0.677) : 1;                       // Constrained Tilted Riemann
-  Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.0078);                 // Non-constrained Tilted Riemann
-  Double_t likeChi2Phi= TMath::Exp(-chi2phi * 3.23);//3.23
-  Double_t trackLikelihood     = likeChi2Z * likeChi2TR * likeChi2Phi;
-
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+  // Non-constrained Tilted Riemann
+  Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.0078);
+  // Constrained Tilted Riemann
+  Double_t likeChi2TC(1.);
+  if(chi2[1]>0.){
+    likeChi2TC = TMath::Exp(-chi2[1] * 0.677);
+    Double_t r = likeChi2TC/likeChi2TR;
+    if(r>1.e2){;}   // -> a primary track use TC
+    else if(r<1.e2) // -> a secondary track use TR
+      likeChi2TC =1.;
+    else{;}         // -> test not conclusive
+  }
+  // Chi2 only on Z direction
+  Double_t likeChi2Z  = TMath::Exp(-chi2[2] * 0.14);
+  // Chi2 angular resolution
+  Double_t likeChi2Phi= TMath::Exp(-chi2[3] * 3.23);
+
+  Double_t trackLikelihood     = likeChi2Z * likeChi2TR * likeChi2TC * likeChi2Phi;
+
+  AliDebug(2, Form("Likelihood [%e]\n"
+    "  Rieman : chi2[%f] likelihood[%6.2e]\n"
+    "  Vertex : chi2[%f] likelihood[%6.2e]\n"
+    "  Z      : chi2[%f] likelihood[%6.2e]\n"
+    "  Phi    : chi2[%f] likelihood[%6.2e]"
+    , trackLikelihood
+    , chi2[0], likeChi2TR
+    , chi2[1], likeChi2TC
+    , chi2[2], likeChi2Z
+    , chi2[3], likeChi2Phi
+  ));
+
+  if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
     cstreamer << "CalculateTrackLikelihood0"
         << "EventNumber="                      << eventNumber
         << "CandidateNumber="  << candidateNumber
@@ -3098,8 +3282,6 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4])
   //
 
   // ratio of the total number of clusters/track which are expected to be found by the tracker.
-  const AliTRDrecoParam *fRecoPars = fkReconstructor->GetRecoParam();
-  
        Double_t chi2y = GetChi2Y(&cseed[0]);
   Double_t chi2z = GetChi2Z(&cseed[0]);
 
@@ -3112,14 +3294,14 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4])
   }
   nclusters *= .25;
 
-  Double_t likea     = TMath::Exp(-sumda * fRecoPars->GetPhiSlope());
+  Double_t likea     = TMath::Exp(-sumda * fkRecoParam->GetPhiSlope());
   Double_t likechi2y  = 0.0000000001;
-  if (fkReconstructor->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());
+  if (fkReconstructor->IsCosmic() || chi2y < fkRecoParam->GetChi2YCut()) likechi2y += TMath::Exp(-TMath::Sqrt(chi2y) * fkRecoParam->GetChi2YSlope());
+  Double_t likechi2z = TMath::Exp(-chi2z * fkRecoParam->GetChi2ZSlope());
+  Double_t likeN     = TMath::Exp(-(fkRecoParam->GetNMeanClusters() - nclusters) / fkRecoParam->GetNSigmaClusters());
   Double_t like      = likea * likechi2y * likechi2z * likeN;
 
-  if(fkReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+  if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
     Int_t nTracklets = 0; Float_t meanNcls = 0;
@@ -3130,7 +3312,7 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4])
     }
     if(nTracklets) meanNcls /= nTracklets;
     // The Debug Stream contains the seed 
-    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+    TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
     cstreamer << "CookLikelihood"
         << "EventNumber="                      << eventNumber
         << "CandidateNumber=" << candidateNumber
@@ -3380,6 +3562,7 @@ void AliTRDtrackerV1::GetExtrapolationConfig(Int_t iconfig, Int_t planes[2])
 //____________________________________________________________________
 AliCluster* AliTRDtrackerV1::GetCluster(Int_t idx) const
 {
+  if(!fClusters) return NULL;
   Int_t ncls = fClusters->GetEntriesFast();
   return idx >= 0 && idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : NULL;
 }
@@ -3387,6 +3570,7 @@ AliCluster* AliTRDtrackerV1::GetCluster(Int_t idx) const
 //____________________________________________________________________
 AliTRDseedV1* AliTRDtrackerV1::GetTracklet(Int_t idx) const
 {
+  if(!fTracklets) return NULL;
   Int_t ntrklt = fTracklets->GetEntriesFast();
   return idx >= 0 && idx < ntrklt ? (AliTRDseedV1*)fTracklets->UncheckedAt(idx) : NULL;
 }
@@ -3394,6 +3578,7 @@ AliTRDseedV1* AliTRDtrackerV1::GetTracklet(Int_t idx) const
 //____________________________________________________________________
 AliKalmanTrack* AliTRDtrackerV1::GetTrack(Int_t idx) const
 {
+  if(!fTracks) return NULL;
   Int_t ntrk = fTracks->GetEntriesFast();
   return idx >= 0 && idx < ntrk ? (AliKalmanTrack*)fTracks->UncheckedAt(idx) : NULL;
 }
@@ -3503,6 +3688,21 @@ Float_t AliTRDtrackerV1::GetChi2Z(const AliTRDseedV1 *const tracklets) const
   return n ? chi2/n : 0.;
 }
 
+//_____________________________________________________________________________
+Float_t AliTRDtrackerV1::GetChi2Phi(const AliTRDseedV1 *const tracklets) const 
+{
+  //  Calculates normalized chi2 for angular resolution
+  // chi2 = Sum chi2 / n_tracklets
+
+  Double_t chi2 = 0; Int_t n = 0;
+  for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
+    if(!tracklets[iLayer].IsOK()) continue;
+    chi2 += tracklets[iLayer].GetChi2Phi();
+    n++;
+  }
+  return n ? chi2/n: 0.;
+}
+
 //____________________________________________________________________
 Float_t AliTRDtrackerV1::CalculateReferenceX(const AliTRDseedV1 *const tracklets){
        //
@@ -3585,6 +3785,18 @@ Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *const tracklets){
   return chi2;
 }
 
+//____________________________________________________________________
+void AliTRDtrackerV1::UnsetTrackletsTrack(const AliTRDtrackV1 * const track)
+{
+//  Remove tracklets from tracker list attached to "track"
+  Int_t idx(-1);
+  for(Int_t il(0); il<kNPlanes; il++){
+    if((idx = track->GetTrackletIndex(il)) < 0) continue;
+    delete (fTracklets->RemoveAt(idx));
+  }
+}
+
+
 ///////////////////////////////////////////////////////
 //                                                   //
 // Resources of class AliTRDLeastSquare              //
@@ -3593,9 +3805,26 @@ Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *const tracklets){
 
 //_____________________________________________________________________________
 AliTRDtrackerV1::AliTRDLeastSquare::AliTRDLeastSquare(){
-  //
-  // Constructor of the nested class AliTRDtrackFitterLeastSquare
-  //
+//
+// Constructor of the nested class AliTRDtrackFitterLeastSquare
+//
+// Fast solving linear regresion in 2D
+//         y=a + bx
+// The data members have the following meaning
+// fParams[0] : a
+// fParams[1] : b
+// 
+// fSums[0] : S
+// fSums[1] : Sx
+// fSums[2] : Sy
+// fSums[3] : Sxy
+// fSums[4] : Sxx
+// fSums[5] : Syy
+// 
+// fCovarianceMatrix[0] : s2a
+// fCovarianceMatrix[1] : s2b
+// fCovarianceMatrix[2] : cov(ab)
+
   memset(fParams, 0, sizeof(Double_t) * 2);
   memset(fSums, 0, sizeof(Double_t) * 6);
   memset(fCovarianceMatrix, 0, sizeof(Double_t) * 3);
@@ -3607,6 +3836,7 @@ void AliTRDtrackerV1::AliTRDLeastSquare::AddPoint(const Double_t *const x, Doubl
   //
   // Adding Point to the fitter
   //
+  
   Double_t weight = 1/(sigmaY > 1e-9 ? sigmaY : 1e-9);
   weight *= weight;
   const Double_t &xpt = *x;
@@ -3624,7 +3854,7 @@ void AliTRDtrackerV1::AliTRDLeastSquare::RemovePoint(const Double_t *const x, Do
   //
   // Remove Point from the sample
   //
-  
+
   Double_t weight = 1/(sigmaY > 1e-9 ? sigmaY : 1e-9);
   weight *= weight;
   const Double_t &xpt = *x; 
@@ -3637,27 +3867,35 @@ void AliTRDtrackerV1::AliTRDLeastSquare::RemovePoint(const Double_t *const x, Do
 }
 
 //_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
+Bool_t AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
   //
   // Evaluation of the fit:
   // Calculation of the parameters
   // Calculation of the covariance matrix
   //
   
-  Double_t denominator = fSums[0] * fSums[4] - fSums[1] *fSums[1];
-  if(denominator==0) return;
+  Double_t det = fSums[0] * fSums[4] - fSums[1] *fSums[1];
+  if(TMath::Abs(det)<1.e-30) return kFALSE;
 
   //   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;
+  fParams[0] = (fSums[2] * fSums[4] - fSums[1] * fSums[3])/det;
+  fParams[1] = (fSums[0] * fSums[3] - fSums[1] * fSums[2])/det;
   //   printf("fParams[0] = %f, fParams[1] = %f\n", fParams[0], fParams[1]);
   
   // Covariance matrix
-  fCovarianceMatrix[0] = fSums[4] / fSums[0] - fSums[1] * fSums[1] / (fSums[0] * fSums[0]);
+  Double_t den = fSums[0]*fSums[4] - fSums[1]*fSums[1];
+  fCovarianceMatrix[0] = fSums[4] / den;
+  fCovarianceMatrix[1] = fSums[0] / den;
+  fCovarianceMatrix[2] = -fSums[1] / den;
+/*  fCovarianceMatrix[0] = fSums[4] / fSums[0] - fSums[1] * fSums[1] / (fSums[0] * fSums[0]);
   fCovarianceMatrix[1] = fSums[5] / fSums[0] - fSums[2] * fSums[2] / (fSums[0] * fSums[0]);
-  fCovarianceMatrix[2] = fSums[3] / fSums[0] - fSums[1] * fSums[2] / (fSums[0] * fSums[0]);
+  fCovarianceMatrix[2] = fSums[3] / fSums[0] - fSums[1] * fSums[2] / (fSums[0] * fSums[0]);*/
+
+
+
+  return kTRUE;
 }
 
 //_____________________________________________________________________________