]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDtrackerV1.cxx
Introduce an enumerator for PID methods
[u/mrichter/AliRoot.git] / TRD / AliTRDtrackerV1.cxx
index 2ad36db4ab14c2ede3dba746a32f75ea8df18796..c30d66e53c907a8b550dac17df591a686a2d6c3a 100644 (file)
@@ -1,18 +1,18 @@
 
 /**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
+* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+*                                                                        *
+* Author: The ALICE Off-line Project.                                    *
+* Contributors are mentioned in the code where appropriate.              *
+*                                                                        *
+* Permission to use, copy, modify and distribute this software and its   *
+* documentation strictly for non-commercial purposes is hereby granted   *
+* without fee, provided that the above copyright notice appears in all   *
+* copies and that both the copyright notice and this permission notice   *
+* appear in the supporting documentation. The authors make no claims     *
+* about the suitability of this software for any purpose. It is          *
+* provided "as is" without express or implied warranty.                  *
+**************************************************************************/
 
 /* $Id$ */
 
@@ -94,11 +94,17 @@ AliTRDtrackerV1::AliTRDtrackerV1()
   if (!AliTRDcalibDB::Instance()) {
     AliFatal("Could not get calibration object");
   }
-  fgNTimeBins = AliTRDcalibDB::Instance()->GetNumberOfTimeBins();
+  if(!fgNTimeBins) fgNTimeBins = AliTRDcalibDB::Instance()->GetNumberOfTimeBins();
 
-  for (Int_t isector = 0; isector < AliTRDgeometry::kNsect; isector++) new(&fTrSec[isector]) AliTRDtrackingSector(fGeom, isector);
+  for (Int_t isector = 0; isector < AliTRDgeometry::kNsector; isector++) new(&fTrSec[isector]) AliTRDtrackingSector(fGeom, isector);
+
+  if (!AliTRDReconstructor::RecoParam()){
+       AliWarning("RecoParams not set in AliTRDReconstructor. Setting to default LowFluxParam.");
+    AliTRDReconstructor::SetRecoParam(AliTRDrecoParam::GetLowFluxParam());
+  }
   
-  if(AliTRDReconstructor::StreamLevel() > 1){
+
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
     TDirectory *savedir = gDirectory; 
     fgDebugStreamer    = new TTreeSRedirector("TRD.TrackerDebug.root");
     savedir->cd();
@@ -111,7 +117,7 @@ AliTRDtrackerV1::~AliTRDtrackerV1()
   //
   // Destructor
   //
-       
+  
   if(fgDebugStreamer) delete fgDebugStreamer;
   if(fgRieman) delete fgRieman;
   if(fgTiltedRieman) delete fgTiltedRieman;
@@ -144,10 +150,10 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
     AliError("Reconstruction configuration not initialized. Call first AliTRDReconstructor::SetRecoParam().");
     return 0;
   }
-       
+  
   //AliInfo("Start Track Finder ...");
   Int_t ntracks = 0;
-  for(int ism=0; ism<AliTRDgeometry::kNsect; ism++){
+  for(int ism=0; ism<AliTRDgeometry::kNsector; ism++){
     // for(int ism=1; ism<2; ism++){
     //AliInfo(Form("Processing supermodule %i ...", ism));
     ntracks += Clusters2TracksSM(ism, esd);
@@ -161,16 +167,16 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd)
 Bool_t AliTRDtrackerV1::GetTrackPoint(Int_t index, AliTrackPoint &p) const
 {
   //AliInfo(Form("Asking for tracklet %d", index));
-       
-  if(index<0) return kFALSE;
+  
+  if(index<0 || index == 0xffff) return kFALSE;
   AliTRDseedV1 *tracklet = 0x0; 
   if(!(tracklet = (AliTRDseedV1*)fTracklets->UncheckedAt(index))) return kFALSE;
-       
+  
   // get detector for this tracklet
   AliTRDcluster *cl = 0x0;
   Int_t ic = 0; do; while(!(cl = tracklet->GetClusters(ic++)));         
   Int_t  idet     = cl->GetDetector();
-               
+    
   Double_t local[3];
   local[0] = tracklet->GetX0(); 
   local[1] = tracklet->GetYfit(0);
@@ -178,11 +184,11 @@ Bool_t AliTRDtrackerV1::GetTrackPoint(Int_t index, AliTrackPoint &p) const
   Double_t global[3];
   fGeom->RotateBack(idet, local, global);
   p.SetXYZ(global[0],global[1],global[2]);
-       
-       
+  
+  
   // setting volume id
   AliGeomManager::ELayerID iLayer = AliGeomManager::kTRD1;
-  switch (fGeom->GetPlane(idet)) {
+  switch (fGeom->GetLayer(idet)) {
   case 0:
     iLayer = AliGeomManager::kTRD1;
     break;
@@ -202,10 +208,10 @@ Bool_t AliTRDtrackerV1::GetTrackPoint(Int_t index, AliTrackPoint &p) const
     iLayer = AliGeomManager::kTRD6;
     break;
   };
-  Int_t    modId = fGeom->GetSector(idet) * fGeom->Ncham() + fGeom->GetChamber(idet);
+  Int_t    modId = fGeom->GetSector(idet) * fGeom->Nstack() + fGeom->GetStack(idet);
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer, modId);
   p.SetVolumeID(volid);
-               
+    
   return kTRUE;
 }
 
@@ -222,14 +228,14 @@ TLinearFitter* AliTRDtrackerV1::GetTiltedRiemanFitterConstraint()
   if(!fgTiltedRiemanConstrained) fgTiltedRiemanConstrained = new TLinearFitter(2, "hyp2");
   return fgTiltedRiemanConstrained;
 }
-       
+  
 //____________________________________________________________________ 
 AliRieman* AliTRDtrackerV1::GetRiemanFitter()
 {
-  if(!fgRieman) fgRieman = new AliRieman(AliTRDtrackingChamber::kNTimeBins * AliTRDgeometry::kNplan);
+  if(!fgRieman) fgRieman = new AliRieman(AliTRDtrackingChamber::kNTimeBins * AliTRDgeometry::kNlayer);
   return fgRieman;
 }
-       
+  
 //_____________________________________________________________________________
 Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) 
 {
@@ -248,14 +254,14 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   
   Int_t   found    = 0;     // number of tracks found
   Float_t foundMin = 20.0;
-       
+  
   Int_t    nSeed   = event->GetNumberOfTracks();
   if(!nSeed){
     // run stand alone tracking
-    if (AliTRDReconstructor::SeedingOn()) Clusters2Tracks(event);
+    if (AliTRDReconstructor::RecoParam()->SeedingOn()) Clusters2Tracks(event);
     return 0;
   }
-       
+  
   Float_t *quality = new Float_t[nSeed];
   Int_t   *index   = new Int_t[nSeed];
   for (Int_t iSeed = 0; iSeed < nSeed; iSeed++) {
@@ -266,25 +272,25 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   }
   // Sort tracks according to covariance of local Y and Z
   TMath::Sort(nSeed,quality,index,kFALSE);
-       
+  
   // Backpropagate all seeds
   Int_t   expectedClr;
   AliTRDtrackV1 track;
   for (Int_t iSeed = 0; iSeed < nSeed; iSeed++) {
-       
+  
     // Get the seeds in sorted sequence
     AliESDtrack *seed = event->GetTrack(index[iSeed]);
-       
+  
     // Check the seed status
     ULong_t status = seed->GetStatus();
     if ((status & AliESDtrack::kTPCout) == 0) continue;
     if ((status & AliESDtrack::kTRDout) != 0) continue;
-       
+  
     // Do the back prolongation
-    Int_t   lbl         = seed->GetLabel();
     new(&track) AliTRDtrackV1(*seed);
     //track->Print();
-    track.SetSeedLabel(lbl);
+    //Int_t   lbl         = seed->GetLabel();
+    //track.SetSeedLabel(lbl);
     seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup); // Make backup
     Float_t p4          = track.GetC();
     if((expectedClr = FollowBackProlongation(track))){
@@ -292,127 +298,136 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
       track.CookPID();
       // update calibration references using this track
       if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
+      // save calibration object
+      if ((track.GetNumberOfClusters() > 15) && (track.GetNumberOfClusters() > 0.5*expectedClr)) {
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+  
+        track.UpdateESDtrack(seed);
+        
+        // Add TRD track to ESDfriendTrack
+        if (AliTRDReconstructor::RecoParam()->GetStreamLevel() > 0 /*&& quality TODO*/){ 
+          AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
+          calibTrack->SetOwner();
+          seed->AddCalibObject(calibTrack);
+        }
+      }
     }
 
-    if ((TMath::Abs(track.GetC() - p4) / TMath::Abs(p4) < 0.2) ||
-       (track.Pt() > 0.8)) {
+    if ((TMath::Abs(track.GetC() - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) {
       //
       // Make backup for back propagation
       //
       Int_t foundClr = track.GetNumberOfClusters();
       if (foundClr >= foundMin) {
-       //AliInfo(Form("Making backup track ncls [%d]...", foundClr));
-       track.CookdEdx();
-       track.CookdEdxTimBin(seed->GetID());
-       track.CookLabel(1. - fgkLabelFraction);
-       if(track.GetBackupTrack()) UseClusters(track.GetBackupTrack());
-                               
-
-       // Sign only gold tracks
-       if (track.GetChi2() / track.GetNumberOfClusters() < 4) {
-         if ((seed->GetKinkIndex(0)      ==   0) &&
-             (track.Pt()                <  1.5)) UseClusters(&track);
-       }
-       Bool_t isGold = kFALSE;
-       
-       // Full gold track
-       if (track.GetChi2() / track.GetNumberOfClusters() < 5) {
-         if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
-
-         isGold = kTRUE;
-       }
-       
-       // Almost gold track
-       if ((!isGold)  && (track.GetNCross() == 0) &&
-           (track.GetChi2() / track.GetNumberOfClusters()  < 7)) {
-         //seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
-         if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
-                                       
-         isGold = kTRUE;
-       }
-                               
-       if ((!isGold) && (track.GetBackupTrack())) {
-         if ((track.GetBackupTrack()->GetNumberOfClusters() > foundMin) && ((track.GetBackupTrack()->GetChi2()/(track.GetBackupTrack()->GetNumberOfClusters()+1)) < 7)) {
-           seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
-           isGold = kTRUE;
-         }
-       }
-       
-       //if ((track->StatusForTOF() > 0) && (track->GetNCross() == 0) && (Float_t(track->GetNumberOfClusters()) / Float_t(track->GetNExpected())  > 0.4)) {
-       //seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
-       //}
+        //AliInfo(Form("Making backup track ncls [%d]...", foundClr));
+        //track.CookdEdx();
+        //track.CookdEdxTimBin(seed->GetID());
+        track.CookLabel(1. - fgkLabelFraction);
+        if(track.GetBackupTrack()) UseClusters(track.GetBackupTrack());
+        
+
+        // Sign only gold tracks
+        if (track.GetChi2() / track.GetNumberOfClusters() < 4) {
+          if ((seed->GetKinkIndex(0)      ==   0) && (track.Pt() <  1.5)) UseClusters(&track);
+        }
+        Bool_t isGold = kFALSE;
+  
+        // Full gold track
+        if (track.GetChi2() / track.GetNumberOfClusters() < 5) {
+          if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+
+          isGold = kTRUE;
+        }
+  
+        // Almost gold track
+        if ((!isGold)  && (track.GetNCross() == 0) &&  (track.GetChi2() / track.GetNumberOfClusters()  < 7)) {
+          //seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup);
+          if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+  
+          isGold = kTRUE;
+        }
+        
+        if ((!isGold) && (track.GetBackupTrack())) {
+          if ((track.GetBackupTrack()->GetNumberOfClusters() > foundMin) && ((track.GetBackupTrack()->GetChi2()/(track.GetBackupTrack()->GetNumberOfClusters()+1)) < 7)) {
+            seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+            isGold = kTRUE;
+          }
+        }
+  
+        //if ((track->StatusForTOF() > 0) && (track->GetNCross() == 0) && (Float_t(track->GetNumberOfClusters()) / Float_t(track->GetNExpected())  > 0.4)) {
+        //seed->UpdateTrackParams(track->GetBackupTrack(), AliESDtrack::kTRDbackup);
+        //}
       }
     }
-
+    
     // Propagation to the TOF (I.Belikov)
-    if (track.GetStop() == kFALSE) {
+    if (track.IsStopped() == kFALSE) {
       Double_t xtof  = 371.0;
       Double_t xTOF0 = 370.0;
-               
+    
       Double_t c2    = track.GetSnp() + track.GetC() * (xtof - track.GetX());
       if (TMath::Abs(c2) >= 0.99) continue;
-                       
+      
       PropagateToX(track, xTOF0, fgkMaxStep);
-       
+  
       // Energy losses taken to the account - check one more time
       c2 = track.GetSnp() + track.GetC() * (xtof - track.GetX());
       if (TMath::Abs(c2) >= 0.99) continue;
-                       
+      
       //if (!PropagateToX(*track,xTOF0,fgkMaxStep)) {
       //       fHBackfit->Fill(7);
       //delete track;
       //       continue;
       //}
-       
+  
       Double_t ymax = xtof * TMath::Tan(0.5 * AliTRDgeometry::GetAlpha());
       Double_t y;
       track.GetYAt(xtof,GetBz(),y);
       if (y >  ymax) {
-       if (!track.Rotate( AliTRDgeometry::GetAlpha())) continue;
+        if (!track.Rotate( AliTRDgeometry::GetAlpha())) continue;      
       }else if (y < -ymax) {
-       if (!track.Rotate(-AliTRDgeometry::GetAlpha())) continue;
+        if (!track.Rotate(-AliTRDgeometry::GetAlpha())) continue;
       }
-                                       
+          
       if (track.PropagateTo(xtof)) {
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-       track.UpdateESDtrack(seed);
-                               
-       // Add TRD track to ESDfriendTrack
-       if (AliTRDReconstructor::StreamLevel() > 0 /*&& quality TODO*/){ 
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
-         calibTrack->SetOwner();
-         seed->AddCalibObject(calibTrack);
-       }
-       found++;
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+        track.UpdateESDtrack(seed);
+        
+        // Add TRD track to ESDfriendTrack
+//                             if (AliTRDReconstructor::RecoParam()->GetStreamLevel() > 0 /*&& quality TODO*/){ 
+//                                     AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
+//                                     calibTrack->SetOwner();
+//                                     seed->AddCalibObject(calibTrack);
+//                             }
+        found++;
       }
     } else {                   
-      if ((track.GetNumberOfClusters() >              15) &&
-         (track.GetNumberOfClusters() > 0.5*expectedClr)) {
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-       
-       track.UpdateESDtrack(seed);
-                               
-       // Add TRD track to ESDfriendTrack
-       if (AliTRDReconstructor::StreamLevel() > 0 /*&& quality TODO*/){ 
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
-         calibTrack->SetOwner();
-         seed->AddCalibObject(calibTrack);
-       }
-       found++;
+      if ((track.GetNumberOfClusters() > 15) && (track.GetNumberOfClusters() > 0.5*expectedClr)) {
+        seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+  
+        track.UpdateESDtrack(seed);
+        
+        // Add TRD track to ESDfriendTrack
+//                             if (AliTRDReconstructor::RecoParam()->GetStreamLevel() > 0 /*&& quality TODO*/){ 
+//                                     AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
+//                                     calibTrack->SetOwner();
+//                                     seed->AddCalibObject(calibTrack);
+//                             }
+        found++;
       }
     }
-       
+  
     seed->SetTRDQuality(track.StatusForTOF());
     seed->SetTRDBudget(track.GetBudget(0));
   }
-       
+  
 
   AliInfo(Form("Number of seeds: %d", nSeed));
   AliInfo(Form("Number of back propagated TRD tracks: %d", found));
-                       
+      
   delete [] index;
   delete [] quality;
-       
+  
   return 0;
 }
 
@@ -455,12 +470,12 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
     if(FollowProlongation(track)){     
       // Prolongate to TPC
       if (PropagateToX(track, xTPC, fgkMaxStep)) { //  -with update
-       seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
-       found++;
-       kUPDATE = kTRUE;
+  seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
+  found++;
+  kUPDATE = kTRUE;
       }
     }   
-               
+    
     // Prolongate to TPC without update
     if(!kUPDATE) {
       AliTRDtrackV1 tt(*seed);
@@ -508,17 +523,17 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
     AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
     if(!tracklet) continue;
     if(!tracklet->IsOK()) AliWarning("tracklet not OK");
-               
+    
     Double_t x  = tracklet->GetX0();
     // reject tracklets which are not considered for inward refit
     if(x > t.GetX()+fgkMaxStep) continue;
 
     // append tracklet to track
-    t.SetTracklet(tracklet, iplane, index);
-               
+    t.SetTracklet(tracklet, index);
+    
     if (x < (t.GetX()-fgkMaxStep) && !PropagateToX(t, x+fgkMaxStep, fgkMaxStep)) break;
     if (!AdjustSector(&t)) break;
-     
+    
     // Start global position
     Double_t xyz0[3];
     t.GetXYZ(xyz0);
@@ -530,7 +545,7 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
     xyz1[0] =  x * TMath::Cos(alpha) - y * TMath::Sin(alpha);
     xyz1[1] =  x * TMath::Sin(alpha) + y * TMath::Cos(alpha);
     xyz1[2] =  z;
-                               
+        
     // Get material budget
     Double_t param[7];
     AliTracker::MeanMaterialBudget(xyz0, xyz1, param);
@@ -540,28 +555,28 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
     // Propagate and update            
     t.PropagateTo(x, xx0, xrho);
     if (!AdjustSector(&t)) break;
-         
+    
     Double_t maxChi2 = t.GetPredictedChi2(tracklet);
     if (maxChi2 < 1e+10 && t.Update(tracklet, maxChi2)){ 
       nClustersExpected += tracklet->GetN();
     }
   }
 
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
     Int_t index;
     for(int iplane=0; iplane<6; iplane++){
       AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
       if(!tracklet) continue;
-      t.SetTracklet(tracklet, iplane, index);
+      t.SetTracklet(tracklet, index);
     }
 
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     TTreeSRedirector &cstreamer = *fgDebugStreamer;
     cstreamer << "FollowProlongation"
-             << "EventNumber=" << eventNumber
-             << "ncl="                                 << nClustersExpected
-             << "track.="                      << &t
-             << "\n";
+        << "EventNumber="      << eventNumber
+        << "ncl="                                      << nClustersExpected
+        //<< "track.="                 << &t
+        << "\n";
   }
 
   return nClustersExpected;
@@ -599,48 +614,54 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
   Double_t clength = AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick();
   AliTRDtrackingChamber *chamber = 0x0;
   
-  // Loop through the TRD planes
-  for (Int_t iplane = 0; iplane < AliTRDgeometry::Nplan(); iplane++) {
+  AliTRDseedV1 tracklet, *ptrTracklet = 0x0;
+
+  // Loop through the TRD layers
+  for (Int_t ilayer = 0; ilayer < AliTRDgeometry::Nlayer(); ilayer++) {
     // BUILD TRACKLET IF NOT ALREADY BUILT
     Double_t x = 0., y, z, alpha;
-    AliTRDseedV1 tracklet(*t.GetTracklet(iplane));
-    if(!tracklet.IsOK()){
+    ptrTracklet  = t.GetTracklet(ilayer);
+    if(!ptrTracklet){
+      ptrTracklet = new(&tracklet) AliTRDseedV1(ilayer);
       alpha = t.GetAlpha();
-      Int_t sector = Int_t(alpha/AliTRDgeometry::GetAlpha() + (alpha>0. ? 0 : AliTRDgeometry::kNsect));
+      Int_t sector = Int_t(alpha/AliTRDgeometry::GetAlpha() + (alpha>0. ? 0 : AliTRDgeometry::kNsector));
 
       if(!fTrSec[sector].GetNChambers()) continue;
-               
-      if((x = fTrSec[sector].GetX(iplane)) < 1.) continue;
-               
+      
+      if((x = fTrSec[sector].GetX(ilayer)) < 1.) continue;
+    
       if (!t.GetProlongation(x, y, z)) break;
-      Int_t stack = fGeom->GetChamber(z, iplane);
+      Int_t stack = fGeom->GetStack(z, ilayer);
       Int_t nCandidates = stack >= 0 ? 1 : 2;
       z -= stack >= 0 ? 0. : 4.; 
-                       
+      
       for(int icham=0; icham<nCandidates; icham++, z+=8){
-       if((stack = fGeom->GetChamber(z, iplane)) < 0) continue;
-                       
-       if(!(chamber = fTrSec[sector].GetChamber(stack, iplane))) continue;
-                       
-       if(chamber->GetNClusters() < fgNTimeBins*AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
-                       
-       x = chamber->GetX();
-                       
-       AliTRDpadPlane *pp = fGeom->GetPadPlane(iplane, stack);
-       tracklet.SetTilt(TMath::Tan(-TMath::DegToRad()*pp->GetTiltingAngle()));
-       tracklet.SetPadLength(pp->GetLengthIPad());
-       tracklet.SetPlane(iplane);
-       tracklet.SetX0(x);
-       tracklet.Init(&t);
-       if(!tracklet.AttachClustersIter(chamber, 1000.)) continue;
-       tracklet.Init(&t);
-               
-       if(tracklet.GetN() < fgNTimeBins * AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
-                       
-       break;
+        if((stack = fGeom->GetStack(z, ilayer)) < 0) continue;
+      
+        if(!(chamber = fTrSec[sector].GetChamber(stack, ilayer))) continue;
+      
+        if(chamber->GetNClusters() < fgNTimeBins*AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
+      
+        x = chamber->GetX();
+      
+        AliTRDpadPlane *pp = fGeom->GetPadPlane(ilayer, stack);
+        tracklet.SetTilt(TMath::Tan(-TMath::DegToRad()*pp->GetTiltingAngle()));
+        tracklet.SetPadLength(pp->GetLengthIPad());
+        tracklet.SetPlane(ilayer);
+        tracklet.SetX0(x);
+        if(!tracklet.Init(&t)){
+          t.SetStopped(kTRUE);
+          return nClustersExpected;
+        }
+        if(!tracklet.AttachClustersIter(chamber, 1000.)) continue;
+        tracklet.Init(&t);
+        
+        if(tracklet.GetN() < fgNTimeBins * AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
+      
+        break;
       }
     }
-    if(!tracklet.IsOK()){
+    if(!ptrTracklet->IsOK()){
       if(x < 1.) continue; //temporary
       if(!PropagateToX(t, x-fgkMaxStep, fgkMaxStep)) break;
       if(!AdjustSector(&t)) break;
@@ -653,18 +674,18 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     if (x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x-fgkMaxStep, fgkMaxStep)) break;
     if (!AdjustSector(&t)) break;
     if (TMath::Abs(t.GetSnp()) > fgkMaxSnp) break;
-               
+    
     // load tracklet to the tracker and the track
-    Int_t index = SetTracklet(&tracklet);
-    t.SetTracklet(&tracklet, iplane, index);
-   
-   
+    ptrTracklet = SetTracklet(ptrTracklet);
+    t.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
+  
+  
     // Calculate the mean material budget along the path inside the chamber
     //Calculate global entry and exit positions of the track in chamber (only track prolongation)
     Double_t xyz0[3]; // entry point 
     t.GetXYZ(xyz0);
     alpha = t.GetAlpha();
-    x = tracklet.GetX0();
+    x = ptrTracklet->GetX0();
     if (!t.GetProlongation(x, y, z)) break;
     Double_t xyz1[3]; // exit point
     xyz1[0] =  x * TMath::Cos(alpha) - y * TMath::Sin(alpha); 
@@ -675,21 +696,22 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     // The mean propagation parameters
     Double_t xrho = param[0]*param[4]; // density*length
     Double_t xx0  = param[1]; // radiation length
-               
+    
     // Propagate and update track
     t.PropagateTo(x, xx0, xrho);
     if (!AdjustSector(&t)) break;
-    Double_t maxChi2 = t.GetPredictedChi2(&tracklet);
-    if (maxChi2<1e+10 && t.Update(&tracklet, maxChi2)){ 
-      nClustersExpected += tracklet.GetN();
+    Double_t maxChi2 = t.GetPredictedChi2(ptrTracklet);
+    if (maxChi2<1e+10 && t.Update(ptrTracklet, maxChi2)){ 
+      nClustersExpected += ptrTracklet->GetN();
+      //t.SetTracklet(&tracklet, index);
     }
     // Reset material budget if 2 consecutive gold
-    if(iplane>0 && tracklet.GetN() + t.GetTracklet(iplane-1)->GetN() > 20) t.SetBudget(2, 0.);
+    if(ilayer>0 && t.GetTracklet(ilayer-1) && ptrTracklet->GetN() + t.GetTracklet(ilayer-1)->GetN() > 20) t.SetBudget(2, 0.);
 
     // Make backup of the track until is gold
     // TO DO update quality check of the track.
     // consider comparison with fTimeBinsRange
-    Float_t ratio0 = tracklet.GetN() / Float_t(fgNTimeBins);
+    Float_t ratio0 = ptrTracklet->GetN() / Float_t(fgNTimeBins);
     //Float_t ratio1 = Float_t(t.GetNumberOfClusters()+1) / Float_t(t.GetNExpected()+1);       
     //printf("tracklet.GetChi2() %f     [< 18.0]\n", tracklet.GetChi2()); 
     //printf("ratio0    %f              [>   0.8]\n", ratio0);
@@ -706,19 +728,21 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
         (t.GetNCross()           ==    0) && 
         (TMath::Abs(t.GetSnp())  <  0.85) &&
         (t.GetNumberOfClusters() >    20)) t.MakeBackupTrack();
-               
-  } // end planes loop
+    
+  } // end layers loop
 
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
     TTreeSRedirector &cstreamer = *fgDebugStreamer;
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+    //AliTRDtrackV1 *debugTrack = new AliTRDtrackV1(t);
+    //debugTrack->SetOwner();
     cstreamer << "FollowBackProlongation"
-             << "EventNumber="                 << eventNumber
-             << "ncl="                                                 << nClustersExpected
-             << "track.="                                      << &t
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "ncl="                                                      << nClustersExpected
+        //<< "track.="                                 << debugTrack
+        << "\n";
   }
-       
+  
   return nClustersExpected;
 }
 
@@ -754,7 +778,7 @@ Float_t AliTRDtrackerV1::FitRieman(AliTRDseedV1 *tracklets, Double_t *chi2, Int_
   for(Int_t il = 0; il < maxLayers; il++){
     // Reference positions
     tracklets[ppl[il]].Init(fitter);
-               
+    
     // chi2
     if((!tracklets[ppl[il]].IsOK()) && (!planes)) continue;
     chi2[0] += tracklets[ppl[il]].GetChi2Y();
@@ -782,8 +806,8 @@ void AliTRDtrackerV1::FitRieman(AliTRDcluster **seedcl, Double_t chi2[2])
   for(Int_t i = 0; i < 4; i++)
     fitter->AddPoint(seedcl[i]->GetX(), seedcl[i]->GetY(), seedcl[i]->GetZ(), 1, 10);
   fitter->Update();
-       
-       
+  
+  
   // Update the seed and calculated the chi2 value
   chi2[0] = 0; chi2[1] = 0;
   for(Int_t ipl = 0; ipl < kNSeedPlanes; ipl++){
@@ -827,19 +851,19 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
   fitter->StoreData(kTRUE);
   fitter->ClearPoints();
   AliTRDcluster *cl = 0x0;
-       
+  
   Float_t x, y, z, w, t, error, tilt;
   Double_t uvt[2];
   Int_t nPoints = 0;
-  for(Int_t ipl = 0; ipl < AliTRDgeometry::kNplan; ipl++){
-    if(!tracklets[ipl].IsOK()) continue;
+  for(Int_t ilr = 0; ilr < AliTRDgeometry::kNlayer; ilr++){
+    if(!tracklets[ilr].IsOK()) continue;
     for(Int_t itb = 0; itb < fgNTimeBins; itb++){
-      if(!tracklets[ipl].IsUsable(itb)) continue;
-      cl = tracklets[ipl].GetClusters(itb);
+      if(!tracklets[ilr].IsUsable(itb)) continue;
+      cl = tracklets[ilr].GetClusters(itb);
       x = cl->GetX();
       y = cl->GetY();
       z = cl->GetZ();
-      tilt = tracklets[ipl].GetTilt();
+      tilt = tracklets[ilr].GetTilt();
       // Transformation
       t = 1./(x * x + y * y);
       uvt[0] = 2. * x * t;
@@ -861,7 +885,7 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
   for(Int_t ip = 0; ip < AliTRDtrackerV1::kNPlanes; ip++)
     tracklets[ip].SetCC(curvature);
 
-  if(AliTRDReconstructor::StreamLevel() >= 5){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 5){
     //Linear Model on z-direction
     Double_t xref = CalculateReferenceX(tracklets);            // Relative to the middle of the stack
     Double_t slope = fitter->GetParameter(2);
@@ -871,13 +895,13 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
     TTreeSRedirector &treeStreamer = *fgDebugStreamer;
     treeStreamer << "FitTiltedRiemanConstraint"
-                << "EventNumber="              << eventNumber
-                << "CandidateNumber="  << candidateNumber
-                << "Curvature="                                << curvature
-                << "Chi2Track="                                << chi2track
-                << "Chi2Z="                                            << chi2Z
-                << "zref="                                             << zref
-                << "\n";
+    << "EventNumber="          << eventNumber
+    << "CandidateNumber="      << candidateNumber
+    << "Curvature="                            << curvature
+    << "Chi2Track="                            << chi2track
+    << "Chi2Z="                                                << chi2Z
+    << "zref="                                         << zref
+    << "\n";
   }
   return chi2track;
 }
@@ -1018,9 +1042,9 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
     Double_t x0 = -b / a;
     if (-c * a + b * b + 1 > 0) {
       if (1.0/(curvature * curvature) - (x - x0) * (x - x0) > 0.0) {
-       Double_t yderiv = (x - x0) / TMath::Sqrt(1.0/(curvature * curvature) - (x - x0) * (x - x0));
-       if (a < 0) yderiv *= -1.0;
-       dy = yderiv;
+  Double_t yderiv = (x - x0) / TMath::Sqrt(1.0/(curvature * curvature) - (x - x0) * (x - x0));
+  if (a < 0) yderiv *= -1.0;
+  dy = yderiv;
       }
     }
     z  = offset + slope * (x - xref);
@@ -1032,22 +1056,256 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
     tracklets[iLayer].SetC(curvature);
     tracklets[iLayer].SetChi2(chi2track);
   }
-       
-  if(AliTRDReconstructor::StreamLevel() >=5){
+  
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >=5){
     TTreeSRedirector &cstreamer = *fgDebugStreamer;
     Int_t eventNumber                  = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber      = AliTRDtrackerDebug::GetCandidateNumber();
     Double_t chi2z = CalculateChi2Z(tracklets, offset, slope, xref);
     cstreamer << "FitTiltedRieman0"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber="     << candidateNumber
-             << "xref="                                                << xref
-             << "Chi2Z="                                               << chi2z
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "xref="                                             << xref
+        << "Chi2Z="                                            << chi2z
+        << "\n";
   }
   return chi2track;
 }
 
+
+//____________________________________________________________________
+Double_t AliTRDtrackerV1::FitLine(AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t err, Int_t np, AliTrackPoint *points)
+{
+  AliTRDLeastSquare yfitter, zfitter;
+  AliTRDcluster *cl = 0x0;
+
+  AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+  if(!tracklets){
+    for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+      if(!(tracklet = track->GetTracklet(ipl))) continue;
+      if(!tracklet->IsOK()) continue;
+      new(&work[ipl]) AliTRDseedV1(*tracklet);
+    }
+    tracklets = &work[0];
+  }
+
+  Double_t xref = CalculateReferenceX(tracklets);
+  Double_t x, y, z, dx, ye, yr, tilt;
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      z = cl->GetZ();
+      dx = x - xref;
+      zfitter.AddPoint(&dx, z, static_cast<Double_t>(TMath::Sqrt(cl->GetSigmaZ2())));
+    }
+  }
+  zfitter.Eval();
+  Double_t z0    = zfitter.GetFunctionParameter(0);
+  Double_t dzdx  = zfitter.GetFunctionParameter(1);
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      y = cl->GetY();
+      z = cl->GetZ();
+      tilt = tracklets[ipl].GetTilt();
+      dx = x - xref;
+      yr = y + tilt*(z - z0 - dzdx*dx); 
+      // error definition changes for the different calls
+      ye = tilt*TMath::Sqrt(cl->GetSigmaZ2());
+      ye += err ? tracklets[ipl].GetSigmaY() : 0.2;
+      yfitter.AddPoint(&dx, yr, ye);
+    }
+  }
+  yfitter.Eval();
+  Double_t y0   = yfitter.GetFunctionParameter(0);
+  Double_t dydx = yfitter.GetFunctionParameter(1);
+  Double_t chi2 = 0.;//yfitter.GetChisquare()/Double_t(nPoints);
+
+  //update track points array
+  if(np && points){
+    Float_t xyz[3];
+    for(int ip=0; ip<np; ip++){
+      points[ip].GetXYZ(xyz);
+      xyz[1] = y0 + dydx * (xyz[0] - xref);
+      xyz[2] = z0 + dzdx * (xyz[0] - xref);
+      points[ip].SetXYZ(xyz);
+    }
+  }
+  return chi2;
+}
+
+
+//_________________________________________________________________________
+Double_t AliTRDtrackerV1::FitRiemanTilt(AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t sigError, Int_t np, AliTrackPoint *points)
+{
+  //
+  // Performs a Riemann fit taking tilting pad correction into account
+  // The equation of a Riemann circle, where the y position is substituted by the 
+  // measured y-position taking pad tilting into account, has to be transformed
+  // into a 4-dimensional hyperplane equation
+  // Riemann circle: (x-x0)^2 + (y-y0)^2 -R^2 = 0
+  // Measured y-Position: ymeas = y - tan(phiT)(zc - zt)
+  //          zc: center of the pad row
+  //          zt: z-position of the track
+  // The z-position of the track is assumed to be linear dependent on the x-position
+  // Transformed equation: a + b * u + c * t + d * v  + e * w - 2 * (ymeas + tan(phiT) * zc) * t = 0
+  // Transformation:       u = 2 * x * t
+  //                       v = 2 * tan(phiT) * t
+  //                       w = 2 * tan(phiT) * (x - xref) * t
+  //                       t = 1 / (x^2 + ymeas^2)
+  // Parameters:           a = -1/y0
+  //                       b = x0/y0
+  //                       c = (R^2 -x0^2 - y0^2)/y0
+  //                       d = offset
+  //                       e = dz/dx
+  // If the offset respectively the slope in z-position is impossible, the parameters are fixed using 
+  // results from the simple riemann fit. Afterwards the fit is redone.
+  // The curvature is calculated according to the formula:
+  //                       curv = a/(1 + b^2 + c*a) = 1/R
+  //
+  // Paramters:   - Array of tracklets (connected to the track candidate)
+  //              - Flag selecting the error definition
+  // Output:      - Chi2 values of the track (in Parameter list)
+  //
+  TLinearFitter *fitter = GetTiltedRiemanFitter();
+  fitter->StoreData(kTRUE);
+  fitter->ClearPoints();
+  AliTRDLeastSquare zfitter;
+  AliTRDcluster *cl = 0x0;
+
+  AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+  if(!tracklets){
+    for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+      if(!(tracklet = track->GetTracklet(ipl))) continue;
+      if(!tracklet->IsOK()) continue;
+      new(&work[ipl]) AliTRDseedV1(*tracklet);
+    }
+    tracklets = &work[0];
+  }
+
+  Double_t xref = CalculateReferenceX(tracklets);
+  Double_t x, y, z, t, tilt, dx, w, we;
+  Double_t uvt[4];
+  Int_t nPoints = 0;
+  // Containers for Least-square fitter
+  for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
+    if(!tracklets[ipl].IsOK()) continue;
+    for(Int_t itb = 0; itb < fgNTimeBins; itb++){
+      if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
+      if (!tracklets[ipl].IsUsable(itb)) continue;
+      x = cl->GetX();
+      y = cl->GetY();
+      z = cl->GetZ();
+      tilt = tracklets[ipl].GetTilt();
+      dx = x - xref;
+      // Transformation
+      t = 1./(x*x + y*y);
+      uvt[0] = 2. * x * t;
+      uvt[1] = t;
+      uvt[2] = 2. * tilt * t;
+      uvt[3] = 2. * tilt * dx * t;
+      w = 2. * (y + tilt*z) * t;
+      // error definition changes for the different calls
+      we = 2. * t;
+      we *= sigError ? tracklets[ipl].GetSigmaY() : 0.2;
+      fitter->AddPoint(uvt, w, we);
+      zfitter.AddPoint(&x, z, static_cast<Double_t>(TMath::Sqrt(cl->GetSigmaZ2())));
+      nPoints++;
+    }
+  }
+  fitter->Eval();
+  Double_t z0    = fitter->GetParameter(3);
+  Double_t dzdx  = fitter->GetParameter(4);
+
+
+  // Linear fitter  - not possible to make boundaries
+  // Do not accept non possible z and dzdx combinations
+  Bool_t accept = kTRUE;
+  Double_t zref = 0.0;
+  for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) {
+    if(!tracklets[iLayer].IsOK()) continue;
+    zref = z0 + dzdx * (tracklets[iLayer].GetX0() - xref);
+    if (TMath::Abs(tracklets[iLayer].GetZProb() - zref) > tracklets[iLayer].GetPadLength() * 0.5 + 1.0) 
+      accept = kFALSE;
+  }
+  if (!accept) {
+    zfitter.Eval();
+    Double_t dzmf      = zfitter.GetFunctionParameter(1);
+    Double_t zmf       = zfitter.GetFunctionValue(&xref);
+    fitter->FixParameter(3, zmf);
+    fitter->FixParameter(4, dzmf);
+    fitter->Eval();
+    fitter->ReleaseParameter(3);
+    fitter->ReleaseParameter(4);
+    z0   = fitter->GetParameter(3); // = zmf ?
+    dzdx = fitter->GetParameter(4); // = dzmf ?
+  }
+
+  // Calculate Curvature
+  Double_t a    =  fitter->GetParameter(0);
+  Double_t b    =  fitter->GetParameter(1);
+  Double_t c    =  fitter->GetParameter(2);
+  Double_t y0   = 1. / a;
+  Double_t x0   = -b * y0;
+  Double_t R    = TMath::Sqrt(y0*y0 + x0*x0 - c*y0);
+  Double_t C    =  1.0 + b*b - c*a;
+  if (C > 0.0) C  =  a / TMath::Sqrt(C);
+
+  // Calculate chi2 of the fit 
+  Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints);
+
+  // Update the tracklets
+  if(!track){
+    for(Int_t ip = 0; ip < kNPlanes; ip++) {
+      x = tracklets[ip].GetX0();
+      Double_t tmp = TMath::Sqrt(R*R-(x-x0)*(x-x0));  
+
+      // y:     R^2 = (x - x0)^2 + (y - y0)^2
+      //     =>   y = y0 +/- Sqrt(R^2 - (x - x0)^2)
+      tracklets[ip].SetYref(0, y0 - (y0>0.?1.:-1)*tmp);
+      //     => dy/dx = (x - x0)/Sqrt(R^2 - (x - x0)^2) 
+      tracklets[ip].SetYref(1, (x - x0) / tmp);
+      tracklets[ip].SetZref(0, z0 + dzdx * (x - xref));
+      tracklets[ip].SetZref(1, dzdx);
+      tracklets[ip].SetC(C);
+      tracklets[ip].SetChi2(chi2);
+    }
+  }
+
+  //update track points array
+  if(np && points){
+    Float_t xyz[3];
+    for(int ip=0; ip<np; ip++){
+      points[ip].GetXYZ(xyz);
+      xyz[1] = y0 - (y0>0.?1.:-1)*TMath::Sqrt(R*R-(xyz[0]-x0)*(xyz[0]-x0));
+      xyz[2] = z0 + dzdx * (xyz[0] - xref);
+      points[ip].SetXYZ(xyz);
+    }
+  }
+  
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >=5){
+    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    Int_t eventNumber                  = AliTRDtrackerDebug::GetEventNumber();
+    Int_t candidateNumber      = AliTRDtrackerDebug::GetCandidateNumber();
+    Double_t chi2z = CalculateChi2Z(tracklets, z0, dzdx, xref);
+    cstreamer << "FitRiemanTilt"
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "xref="                                             << xref
+        << "Chi2Z="                                            << chi2z
+        << "\n";
+  }
+  return chi2;
+}
+
+
+
 //_________________________________________________________________________
 Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
 {
@@ -1062,7 +1320,7 @@ Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset
   // Output:     - The Chi2 value of the track in z-Direction
   //
   Float_t chi2Z = 0, nLayers = 0;
-  for (Int_t iLayer = 0; iLayer < AliTRDgeometry::kNplan; iLayer++) {
+  for (Int_t iLayer = 0; iLayer < AliTRDgeometry::kNlayer; iLayer++) {
     if(!tracklets[iLayer].IsOK()) continue;
     Double_t z = offset + slope * (tracklets[iLayer].GetX0() - xref);
     chi2Z += TMath::Abs(tracklets[iLayer].GetMeanz() - z);
@@ -1178,7 +1436,7 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
       if(!(c = (AliTRDcluster *) clusterArray->UncheckedAt(iCluster))) continue;
       c->SetInChamber();
       new((*fClusters)[ncl++]) AliTRDcluster(*c);
-      clusterArray->RemoveAt(iCluster); 
+      delete (clusterArray->RemoveAt(iCluster)); 
     }
 
   }
@@ -1196,7 +1454,7 @@ Int_t AliTRDtrackerV1::LoadClusters(TTree *cTree)
   // differs from that of TRD sectors
   //
 
-       
+  
   if (ReadClusters(fClusters, cTree)) {
     AliError("Problem with reading the clusters !");
     return 1;
@@ -1213,14 +1471,14 @@ Int_t AliTRDtrackerV1::LoadClusters(TTree *cTree)
     if(c->IsInChamber()) nin++;
     Int_t detector       = c->GetDetector();
     Int_t sector         = fGeom->GetSector(detector);
-    Int_t stack          = fGeom->GetChamber(detector);
-    Int_t plane          = fGeom->GetPlane(detector);
-               
-    fTrSec[sector].GetChamber(stack, plane, kTRUE)->InsertCluster(c, icl);
+    Int_t stack          = fGeom->GetStack(detector);
+    Int_t layer          = fGeom->GetLayer(detector);
+    
+    fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, icl);
   }
   AliInfo(Form("Clusters %d in %6.2f %%", ncl, 100.*float(nin)/ncl));
-       
-  for(int isector =0; isector<AliTRDgeometry::kNsect; isector++){ 
+  
+  for(int isector =0; isector<AliTRDgeometry::kNsector; isector++){ 
     if(!fTrSec[isector].GetNChambers()) continue;
     fTrSec[isector].Init();
   }
@@ -1240,7 +1498,7 @@ void AliTRDtrackerV1::UnloadClusters()
   if(fTracklets) fTracklets->Delete();
   if(fClusters) fClusters->Delete();
 
-  for (int i = 0; i < AliTRDgeometry::kNsect; i++) fTrSec[i].Clear();
+  for (int i = 0; i < AliTRDgeometry::kNsector; i++) fTrSec[i].Clear();
 
   // Increment the Event Number
   AliTRDtrackerDebug::SetEventNumber(AliTRDtrackerDebug::GetEventNumber()  + 1);
@@ -1288,13 +1546,13 @@ AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *track, Int_t p, Int_t
   // Detailed description
   //
   idx = track->GetTrackletIndex(p);
-  AliTRDseedV1 *tracklet = idx<0 ? 0x0 : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
+  AliTRDseedV1 *tracklet = (idx==0xffff) ? 0x0 : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
 
   return tracklet;
 }
 
 //____________________________________________________________________
-Int_t AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
+AliTRDseedV1* AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
 {
   // Add this tracklet to the list of tracklets stored in the tracker
   //
@@ -1309,14 +1567,38 @@ Int_t AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
   // and adds the new tracklet to the list.
   //
   if(!fTracklets){
-    fTracklets = new TClonesArray("AliTRDseedV1", AliTRDgeometry::Nsect()*kMaxTracksStack);
+    fTracklets = new TClonesArray("AliTRDseedV1", AliTRDgeometry::Nsector()*kMaxTracksStack);
     fTracklets->SetOwner(kTRUE);
   }
   Int_t nentries = fTracklets->GetEntriesFast();
-  new ((*fTracklets)[nentries]) AliTRDseedV1(*tracklet);
-  return nentries;
+  return new ((*fTracklets)[nentries]) AliTRDseedV1(*tracklet);
+}
+
+//____________________________________________________________________
+AliTRDtrackV1* AliTRDtrackerV1::SetTrack(AliTRDtrackV1 *track)
+{
+  // Add this track to the list of tracks stored in the tracker
+  //
+  // Parameters
+  //   - track : pointer to the track to be added to the list
+  //
+  // Output
+  //   - the pointer added
+  //
+  // Detailed description
+  // Build the tracks list if it is not yet created (late initialization)
+  // and adds the new track to the list.
+  //
+  if(!fTracks){
+    fTracks = new TClonesArray("AliTRDtrackV1", AliTRDgeometry::Nsector()*kMaxTracksStack);
+    fTracks->SetOwner(kTRUE);
+  }
+  Int_t nentries = fTracks->GetEntriesFast();
+  return new ((*fTracks)[nentries]) AliTRDtrackV1(*track);
 }
 
+
+
 //____________________________________________________________________
 Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
 {
@@ -1338,29 +1620,29 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd)
   //    See AliTRDtrackerV1::Clusters2TracksStack() for details.
   // 3. Pack results in the ESD event.
   //
-       
+  
   // allocate space for esd tracks in this SM
   TClonesArray esdTrackList("AliESDtrack", 2*kMaxTracksStack);
   esdTrackList.SetOwner();
-       
+  
   Int_t nTracks   = 0;
   Int_t nChambers = 0;
   AliTRDtrackingChamber **stack = 0x0, *chamber = 0x0;
-  for(int istack = 0; istack<AliTRDgeometry::kNcham; istack++){
+  for(int istack = 0; istack<AliTRDgeometry::kNstack; istack++){
     if(!(stack = fTrSec[sector].GetStack(istack))) continue;
     nChambers = 0;
-    for(int iplane=0; iplane<AliTRDgeometry::kNplan; iplane++){
-      if(!(chamber = stack[iplane])) continue;
+    for(int ilayer=0; ilayer<AliTRDgeometry::kNlayer; ilayer++){
+      if(!(chamber = stack[ilayer])) continue;
       if(chamber->GetNClusters() < fgNTimeBins * AliTRDReconstructor::RecoParam()->GetFindableClusters()) continue;
       nChambers++;
-      //AliInfo(Form("sector %d stack %d plane %d clusters %d", sector, istack, iplane, chamber->GetNClusters()));
+      //AliInfo(Form("sector %d stack %d layer %d clusters %d", sector, istack, ilayer, chamber->GetNClusters()));
     }
     if(nChambers < 4) continue;
     //AliInfo(Form("Doing stack %d", istack));
     nTracks += Clusters2TracksStack(stack, &esdTrackList);
   }
   //AliInfo(Form("Found %d tracks in SM %d [%d]\n", nTracks, sector, esd->GetNumberOfTracks()));
-       
+  
   for(int itrack=0; itrack<nTracks; itrack++)
     esd->AddTrack((AliESDtrack*)esdTrackList[itrack]);
 
@@ -1399,9 +1681,6 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
   // 8. Build ESD track and register it to the output list
   //
 
-  AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
-  if (!calibra) AliInfo("Could not get Calibra instance\n");
-
   AliTRDtrackingChamber *chamber = 0x0;
   AliTRDseedV1 sseed[kMaxTracksStack*6]; // to be initialized
   Int_t pars[4]; // MakeSeeds parameters
@@ -1409,14 +1688,14 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
   //Double_t alpha = AliTRDgeometry::GetAlpha();
   //Double_t shift = .5 * alpha;
   Int_t configs[kNConfigs];
-       
+  
   // Build initial seeding configurations
   Double_t quality = BuildSeedingConfigs(stack, configs);
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
     AliInfo(Form("Plane config %d %d %d Quality %f"
-                , configs[0], configs[1], configs[2], quality));
+    , configs[0], configs[1], configs[2], quality));
   }
-       
+  
   // Initialize contors
   Int_t ntracks,      // number of TRD track candidates
     ntracks1,     // number of registered TRD tracks/iter
@@ -1431,14 +1710,14 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       ntracks = MakeSeeds(stack, &sseed[6*ntracks], pars);
       if(ntracks == kMaxTracksStack) break;
     }
-    if(AliTRDReconstructor::StreamLevel() > 1) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
-               
+    if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
+    
     if(!ntracks) break;
-               
+    
     // Sort the seeds according to their quality
     Int_t sort[kMaxTracksStack];
     TMath::Sort(ntracks, fTrackQuality, sort, kTRUE);
-       
+  
     // Initialize number of tracks so far and logic switches
     Int_t ntracks0 = esdTrackList->GetEntriesFast();
     Bool_t signedTrack[kMaxTracksStack];
@@ -1448,7 +1727,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       fakeTrack[i] = kFALSE;
     }
     //AliInfo("Selecting track candidates ...");
-               
+    
     // Sieve clusters in decreasing order of track quality
     Double_t trackParams[7];
     //                 AliTRDseedV1 *lseed = 0x0;
@@ -1459,213 +1738,210 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
       // Check track candidates
       candidates = 0;
       for (Int_t itrack = 0; itrack < ntracks; itrack++) {
-       Int_t trackIndex = sort[itrack];
-       if (signedTrack[trackIndex] || fakeTrack[trackIndex]) continue;
-       
-                               
-       // Calculate track parameters from tracklets seeds
-       Int_t labelsall[1000];
-       Int_t nlabelsall = 0;
-       Int_t naccepted  = 0;
-       Int_t ncl        = 0;
-       Int_t nused      = 0;
-       Int_t nlayers    = 0;
-       Int_t findable   = 0;
-       for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+jLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         if (TMath::Abs(sseed[jseed].GetYref(0) / sseed[jseed].GetX0()) < 0.15) findable++;
-       
-         sseed[jseed].UpdateUsed();
-         ncl   += sseed[jseed].GetN2();
-         nused += sseed[jseed].GetNUsed();
-         nlayers++;
-       
-         // Cooking label
-         for (Int_t itime = 0; itime < fgNTimeBins; itime++) {
-           if(!sseed[jseed].IsUsable(itime)) continue;
-           naccepted++;
-           Int_t tindex = 0, ilab = 0;
-           while(ilab<3 && (tindex = sseed[jseed].GetClusters(itime)->GetLabel(ilab)) >= 0){
-             labelsall[nlabelsall++] = tindex;
-             ilab++;
-           }
-         }
-       }
-       // Filter duplicated tracks
-       if (nused > 30){
-         //printf("Skip %d nused %d\n", trackIndex, nused);
-         fakeTrack[trackIndex] = kTRUE;
-         continue;
-       }
-       if (Float_t(nused)/ncl >= .25){
-         //printf("Skip %d nused/ncl >= .25\n", trackIndex);
-         fakeTrack[trackIndex] = kTRUE;
-         continue;
-       }
-                               
-       // Classify tracks
-       Bool_t skip = kFALSE;
-       switch(jSieve){
-       case 0:
-         if(nlayers < 6) {skip = kTRUE; break;}
-         if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
-         break;
-       
-       case 1:
-         if(nlayers < findable){skip = kTRUE; break;}
-         if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;}
-         break;
-       
-       case 2:
-         if ((nlayers == findable) || (nlayers == 6)) { skip = kTRUE; break;}
-         if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;}
-         break;
-       
-       case 3:
-         if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
-         break;
-       
-       case 4:
-         if (nlayers == 3){skip = kTRUE; break;}
-         //if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) - nused/(nlayers-3.0) < -15.0){skip = kTRUE; break;}
-         break;
-       }
-       if(skip){
-         candidates++;
-         //printf("REJECTED : %d [%d] nlayers %d trackQuality = %e nused %d\n", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused);
-         continue;
-       }
-       signedTrack[trackIndex] = kTRUE;
-                                               
-
-       // Build track label - what happens if measured data ???
-       Int_t labels[1000];
-       Int_t outlab[1000];
-       Int_t nlab = 0;
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+iLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         for(int ilab=0; ilab<2; ilab++){
-           if(sseed[jseed].GetLabels(ilab) < 0) continue;
-           labels[nlab] = sseed[jseed].GetLabels(ilab);
-           nlab++;
-         }
-       }
-       Freq(nlab,labels,outlab,kFALSE);
-       Int_t   label     = outlab[0];
-       Int_t   frequency = outlab[1];
-       Freq(nlabelsall,labelsall,outlab,kFALSE);
-       Int_t   label1    = outlab[0];
-       Int_t   label2    = outlab[2];
-       Float_t fakeratio = (naccepted - outlab[1]) / Float_t(naccepted);
-       
-                               
-       // Sign clusters
-       AliTRDcluster *cl = 0x0; Int_t clusterIndex = -1;
-       for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
-         Int_t jseed = kNPlanes*trackIndex+jLayer;
-         if(!sseed[jseed].IsOK()) continue;
-         if(TMath::Abs(sseed[jseed].GetYfit(1) - sseed[jseed].GetYfit(1)) >= .2) continue; // check this condition with Marian
-         sseed[jseed].UseClusters();
-         if(!cl){
-           Int_t ic = 0;
-           while(!(cl = sseed[jseed].GetClusters(ic))) ic++;
-           clusterIndex =  sseed[jseed].GetIndexes(ic);
-         }
-       }
-       if(!cl) continue;
-
-                               
-       // Build track parameters
-       AliTRDseedV1 *lseed =&sseed[trackIndex*6];
-       Int_t idx = 0;
-       while(idx<3 && !lseed->IsOK()) {
-         idx++;
-         lseed++;
-       }
-       Double_t cR = lseed->GetC();
-       trackParams[1] = lseed->GetYref(0);
-       trackParams[2] = lseed->GetZref(0);
-       trackParams[3] = lseed->GetX0() * cR - TMath::Sin(TMath::ATan(lseed->GetYref(1)));
-       trackParams[4] = lseed->GetZref(1) / TMath::Sqrt(1. + lseed->GetYref(1) * lseed->GetYref(1));
-       trackParams[5] = cR;
-       trackParams[0] = lseed->GetX0();
-       Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
-       trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift;      // Supermodule*/
-
-       if(AliTRDReconstructor::StreamLevel() > 1){
-         AliInfo(Form("Track %d [%d] nlayers %d trackQuality = %e nused %d, yref = %3.3f", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused, trackParams[1]));
-                                       
-         Int_t nclusters = 0;
-         AliTRDseedV1 *dseed[6];
-         for(int is=0; is<6; is++){
-           dseed[is] = new AliTRDseedV1(sseed[trackIndex*6+is]);
-           dseed[is]->SetOwner();
-           nclusters += sseed[is].GetN2();
-         }
-         //Int_t eventNrInFile = esd->GetEventNumberInFile();
-         //AliInfo(Form("Number of clusters %d.", nclusters));
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         cstreamer << "Clusters2TracksStack"
-                   << "EventNumber="           << eventNumber
-                   << "TrackNumber="           << trackNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "Iter="                          << fSieveSeeding
-                   << "Like="                          << fTrackQuality[trackIndex]
-                   << "S0.="                           << dseed[0]
-                   << "S1.="                           << dseed[1]
-                   << "S2.="                           << dseed[2]
-                   << "S3.="                           << dseed[3]
-                   << "S4.="                           << dseed[4]
-                   << "S5.="                           << dseed[5]
-                   << "p0="                            << trackParams[0]
-                   << "p1="                            << trackParams[1]
-                   << "p2="                            << trackParams[2]
-                   << "p3="                            << trackParams[3]
-                   << "p4="                            << trackParams[4]
-                   << "p5="                            << trackParams[5]
-                   << "p6="                            << trackParams[6]
-                   << "Label="                         << label
-                   << "Label1="                        << label1
-                   << "Label2="                        << label2
-                   << "FakeRatio="                     << fakeratio
-                   << "Freq="                          << frequency
-                   << "Ncl="                           << ncl
-                   << "NLayers="                       << nlayers
-                   << "Findable="                      << findable
-
-                   << "NUsed="                         << nused
-                   << "\n";
-       }
-                       
-       AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
-       // computes PID for track
-       track->CookPID();
-       // update calibration references using this track
-       if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(track);
-
-       if(!track){
-         //AliWarning("Fail to build a TRD Track.");
-         continue;
-       }
-       //AliInfo("End of MakeTrack()");
-       AliESDtrack esdTrack;
-       esdTrack.UpdateTrackParams(track, AliESDtrack::kTRDout);
-       esdTrack.SetLabel(track->GetLabel());
-       // write ESD-friends if neccessary
-       if (AliTRDReconstructor::StreamLevel() > 0){
-         //printf("Creating Calibrations Object\n");
-         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
-         calibTrack->SetOwner();
-         esdTrack.AddCalibObject(calibTrack);
-       }
-       new ((*esdTrackList)[ntracks0++]) AliESDtrack(esdTrack);
-       ntracks1++;
-       AliTRDtrackerDebug::SetTrackNumber(AliTRDtrackerDebug::GetTrackNumber() + 1);
+  Int_t trackIndex = sort[itrack];
+  if (signedTrack[trackIndex] || fakeTrack[trackIndex]) continue;
+  
+        
+  // Calculate track parameters from tracklets seeds
+  Int_t labelsall[1000];
+  Int_t nlabelsall = 0;
+  Int_t naccepted  = 0;
+  Int_t ncl        = 0;
+  Int_t nused      = 0;
+  Int_t nlayers    = 0;
+  Int_t findable   = 0;
+  for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) {
+    Int_t jseed = kNPlanes*trackIndex+jLayer;
+    if(!sseed[jseed].IsOK()) continue;
+    if (TMath::Abs(sseed[jseed].GetYref(0) / sseed[jseed].GetX0()) < 0.15) findable++;
+  
+    sseed[jseed].UpdateUsed();
+    ncl   += sseed[jseed].GetN2();
+    nused += sseed[jseed].GetNUsed();
+    nlayers++;
+  
+    // Cooking label
+    for (Int_t itime = 0; itime < fgNTimeBins; itime++) {
+      if(!sseed[jseed].IsUsable(itime)) continue;
+      naccepted++;
+      Int_t tindex = 0, ilab = 0;
+      while(ilab<3 && (tindex = sseed[jseed].GetClusters(itime)->GetLabel(ilab)) >= 0){
+        labelsall[nlabelsall++] = tindex;
+        ilab++;
+      }
+    }
+  }
+  // Filter duplicated tracks
+  if (nused > 30){
+    //printf("Skip %d nused %d\n", trackIndex, nused);
+    fakeTrack[trackIndex] = kTRUE;
+    continue;
+  }
+  if (Float_t(nused)/ncl >= .25){
+    //printf("Skip %d nused/ncl >= .25\n", trackIndex);
+    fakeTrack[trackIndex] = kTRUE;
+    continue;
+  }
+        
+  // Classify tracks
+  Bool_t skip = kFALSE;
+  switch(jSieve){
+  case 0:
+    if(nlayers < 6) {skip = kTRUE; break;}
+    if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
+    break;
+  
+  case 1:
+    if(nlayers < findable){skip = kTRUE; break;}
+    if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;}
+    break;
+  
+  case 2:
+    if ((nlayers == findable) || (nlayers == 6)) { skip = kTRUE; break;}
+    if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;}
+    break;
+  
+  case 3:
+    if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;}
+    break;
+  
+  case 4:
+    if (nlayers == 3){skip = kTRUE; break;}
+    //if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) - nused/(nlayers-3.0) < -15.0){skip = kTRUE; break;}
+    break;
+  }
+  if(skip){
+    candidates++;
+    //printf("REJECTED : %d [%d] nlayers %d trackQuality = %e nused %d\n", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused);
+    continue;
+  }
+  signedTrack[trackIndex] = kTRUE;
+            
+
+  // Build track label - what happens if measured data ???
+  Int_t labels[1000];
+  Int_t outlab[1000];
+  Int_t nlab = 0;
+  for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
+    Int_t jseed = kNPlanes*trackIndex+iLayer;
+    if(!sseed[jseed].IsOK()) continue;
+    for(int ilab=0; ilab<2; ilab++){
+      if(sseed[jseed].GetLabels(ilab) < 0) continue;
+      labels[nlab] = sseed[jseed].GetLabels(ilab);
+      nlab++;
+    }
+  }
+  Freq(nlab,labels,outlab,kFALSE);
+  Int_t   label     = outlab[0];
+  Int_t   frequency = outlab[1];
+  Freq(nlabelsall,labelsall,outlab,kFALSE);
+  Int_t   label1    = outlab[0];
+  Int_t   label2    = outlab[2];
+  Float_t fakeratio = (naccepted - outlab[1]) / Float_t(naccepted);
+  
+        
+  // Sign clusters
+  AliTRDcluster *cl = 0x0; Int_t clusterIndex = -1;
+  for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
+    Int_t jseed = kNPlanes*trackIndex+jLayer;
+    if(!sseed[jseed].IsOK()) continue;
+    if(TMath::Abs(sseed[jseed].GetYfit(1) - sseed[jseed].GetYfit(1)) >= .2) continue; // check this condition with Marian
+    sseed[jseed].UseClusters();
+    if(!cl){
+      Int_t ic = 0;
+      while(!(cl = sseed[jseed].GetClusters(ic))) ic++;
+      clusterIndex =  sseed[jseed].GetIndexes(ic);
+    }
+  }
+  if(!cl) continue;
+
+        
+  // Build track parameters
+  AliTRDseedV1 *lseed =&sseed[trackIndex*6];
+  Int_t idx = 0;
+  while(idx<3 && !lseed->IsOK()) {
+    idx++;
+    lseed++;
+  }
+  Double_t cR = lseed->GetC();
+  Double_t x = lseed->GetX0() - 3.5;
+  trackParams[0] = x; //NEW AB
+  trackParams[1] = lseed->GetYat(x);//lseed->GetYref(0);
+  trackParams[2] = lseed->GetZat(x);//lseed->GetZref(0);
+  trackParams[3] = lseed->GetX0() * cR - TMath::Sin(TMath::ATan(lseed->GetYref(1)));
+  trackParams[4] = lseed->GetZref(1) / TMath::Sqrt(1. + lseed->GetYref(1) * lseed->GetYref(1));
+  trackParams[5] = cR;
+  Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
+  trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift;   // Supermodule*/
+
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
+    AliInfo(Form("Track %d [%d] nlayers %d trackQuality = %e nused %d, yref = %3.3f", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused, trackParams[1]));
+          
+    Int_t nclusters = 0;
+    AliTRDseedV1 *dseed[6];
+    for(int is=0; is<6; is++){
+      dseed[is] = new AliTRDseedV1(sseed[trackIndex*6+is]);
+      dseed[is]->SetOwner();
+      nclusters += sseed[is].GetN2();
+    }
+    //Int_t eventNrInFile = esd->GetEventNumberInFile();
+    //AliInfo(Form("Number of clusters %d.", nclusters));
+    Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+    Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
+    Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    cstreamer << "Clusters2TracksStack"
+        << "EventNumber="              << eventNumber
+        << "TrackNumber="              << trackNumber
+        << "CandidateNumber="  << candidateNumber
+        << "Iter="                             << fSieveSeeding
+        << "Like="                             << fTrackQuality[trackIndex]
+        << "S0.="                              << dseed[0]
+        << "S1.="                              << dseed[1]
+        << "S2.="                              << dseed[2]
+        << "S3.="                              << dseed[3]
+        << "S4.="                              << dseed[4]
+        << "S5.="                              << dseed[5]
+        << "p0="                               << trackParams[0]
+        << "p1="                               << trackParams[1]
+        << "p2="                               << trackParams[2]
+        << "p3="                               << trackParams[3]
+        << "p4="                               << trackParams[4]
+        << "p5="                               << trackParams[5]
+        << "p6="                               << trackParams[6]
+        << "Label="                            << label
+        << "Label1="                   << label1
+        << "Label2="                   << label2
+        << "FakeRatio="                        << fakeratio
+        << "Freq="                             << frequency
+        << "Ncl="                              << ncl
+        << "NLayers="                  << nlayers
+        << "Findable="                 << findable
+
+        << "NUsed="                            << nused
+        << "\n";
+  }
+      
+  AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
+  if(!track){
+    AliWarning("Fail to build a TRD Track.");
+    continue;
+  }
+  //AliInfo("End of MakeTrack()");
+  AliESDtrack esdTrack;
+  esdTrack.UpdateTrackParams(track, AliESDtrack::kTRDout);
+  esdTrack.SetLabel(track->GetLabel());
+  track->UpdateESDtrack(&esdTrack);
+  // write ESD-friends if neccessary
+  if (AliTRDReconstructor::RecoParam()->GetStreamLevel() > 0){
+    //printf("Creating Calibrations Object\n");
+    AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
+    calibTrack->SetOwner();
+    esdTrack.AddCalibObject(calibTrack);
+  }
+  new ((*esdTrackList)[ntracks0++]) AliESDtrack(esdTrack);
+  ntracks1++;
+  AliTRDtrackerDebug::SetTrackNumber(AliTRDtrackerDebug::GetTrackNumber() + 1);
       }
 
       jSieve++;
@@ -1679,17 +1955,17 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
     // Rebuild plane configurations and indices taking only unused clusters into account
     quality = BuildSeedingConfigs(stack, configs);
     if(quality < 1.E-7) break; //AliTRDReconstructor::RecoParam()->GetPlaneQualityThreshold()) break;
-               
+    
     for(Int_t ip = 0; ip < kNPlanes; ip++){ 
       if(!(chamber = stack[ip])) continue;
       chamber->Build(fGeom);//Indices(fSieveSeeding);
     }
 
-    if(AliTRDReconstructor::StreamLevel() > 1){ 
+    if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){ 
       AliInfo(Form("Sieve level %d Plane config %d %d %d Quality %f", fSieveSeeding, configs[0], configs[1], configs[2], quality));
     }
   } while(fSieveSeeding<10); // end stack clusters sieve
-       
+  
 
 
   //AliInfo(Form("Registered TRD tracks %d in stack %d.", ntracks2, pars[1]));
@@ -1738,12 +2014,12 @@ Double_t AliTRDtrackerV1::BuildSeedingConfigs(AliTRDtrackingChamber **stack, Int
     tconfig[iconf] = fgTopologicQA[iconf];
     for(int iplane=0; iplane<4; iplane++) tconfig[iconf] *= chamberQ[planes[iplane]]; 
   }
-       
+  
   TMath::Sort((Int_t)kNConfigs, tconfig, configs, kTRUE);
   //   AliInfo(Form("q[%d] = %f", configs[0], tconfig[configs[0]]));
   //   AliInfo(Form("q[%d] = %f", configs[1], tconfig[configs[1]]));
   //   AliInfo(Form("q[%d] = %f", configs[2], tconfig[configs[2]]));
-       
+  
   return tconfig[configs[0]];
 }
 
@@ -1812,15 +2088,15 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
 
   // this should be data member of AliTRDtrack
   Double_t seedQuality[kMaxTracksStack];
-       
+  
   // unpack control parameters
   Int_t config  = ipar[0];
   Int_t ntracks = ipar[1];
   Int_t planes[kNSeedPlanes]; GetSeedingConfig(config, planes);        
-       
+  
   // Init chambers geometry
   Int_t ic = 0; while(!(chamber = stack[ic])) ic++;
-  Int_t istack = fGeom->GetChamber(chamber->GetDetector());
+  Int_t istack = fGeom->GetStack(chamber->GetDetector());
   Double_t hL[kNPlanes];       // Tilting angle
   Float_t padlength[kNPlanes]; // pad lenghts
   AliTRDpadPlane *pp = 0x0;
@@ -1829,8 +2105,8 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
     hL[iplane]        = TMath::Tan(-TMath::DegToRad()*pp->GetTiltingAngle());
     padlength[iplane] = pp->GetLengthIPad();
   }
-       
-  if(AliTRDReconstructor::StreamLevel() > 1){
+  
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() > 1){
     AliInfo(Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
   }
 
@@ -1843,8 +2119,8 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
     //AliInfo(Form("seeding plane %d clusters %d", planes[isl], Int_t(*layer[isl])));
   }
   if(nlayers < 4) return 0;
-       
-       
+  
+  
   // Start finding seeds
   Double_t cond0[4], cond1[4], cond2[4];
   Int_t icl = 0;
@@ -1866,255 +2142,258 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss
 
       Int_t kcl = 0;
       while(kcl<mcl) {
-       c[1] = (*layer[1])[jndex[kcl++]];
-       if(!c[1]) continue;
-       layer[2]->BuildCond(c[1], cond2, 2, theta, phi);
-       c[2] = layer[2]->GetNearestCluster(cond2);
-       //printf("Found c[1] candidate 2 %p\n", c[2]);
-       if(!c[2]) continue;
-                               
-       //                              AliInfo("Seeding clusters found. Building seeds ...");
-       //                              for(Int_t i = 0; i < kNSeedPlanes; i++) printf("%i. coordinates: x = %6.3f, y = %6.3f, z = %6.3f\n", i, c[i]->GetX(), c[i]->GetY(), c[i]->GetZ());
-                               
-       for (Int_t il = 0; il < 6; il++) cseed[il].Reset();
-
-       FitRieman(c, chi2);
-
-       AliTRDseedV1 *tseed = 0x0;
-       for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
-         Int_t jLayer = planes[iLayer];
-         tseed = &cseed[jLayer];
-         tseed->SetPlane(jLayer);
-         tseed->SetTilt(hL[jLayer]);
-         tseed->SetPadLength(padlength[jLayer]);
-         tseed->SetX0(stack[jLayer]->GetX());
-         tseed->Init(GetRiemanFitter());
-       }
-
-       Bool_t isFake = kFALSE;
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-         if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-         if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
-
-         Double_t xpos[4];
-         for(Int_t l = 0; l < kNSeedPlanes; l++) xpos[l] = layer[l]->GetX();
-         Float_t yref[4];
-         for(int il=0; il<4; il++) yref[il] = cseed[planes[il]].GetYref(0);
-         Int_t ll = c[3]->GetLabel(0);
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         AliRieman *rim = GetRiemanFitter();
-         TTreeSRedirector &cs0 = *fgDebugStreamer;
-         cs0 << "MakeSeeds0"
-             <<"EventNumber="          << eventNumber
-             <<"CandidateNumber="      << candidateNumber
-             <<"isFake="                               << isFake
-             <<"config="                               << config
-             <<"label="                                << ll
-             <<"chi2z="                                << chi2[0]
-             <<"chi2y="                                << chi2[1]
-             <<"Y2exp="                                << cond2[0]     
-             <<"Z2exp="                                << cond2[1]
-             <<"X0="                                   << xpos[0] //layer[sLayer]->GetX()
-             <<"X1="                                   << xpos[1] //layer[sLayer + 1]->GetX()
-             <<"X2="                                   << xpos[2] //layer[sLayer + 2]->GetX()
-             <<"X3="                                   << xpos[3] //layer[sLayer + 3]->GetX()
-             <<"yref0="                                << yref[0]
-             <<"yref1="                                << yref[1]
-             <<"yref2="                                << yref[2]
-             <<"yref3="                                << yref[3]
-             <<"c0.="                          << c[0]
-             <<"c1.="                          << c[1]
-             <<"c2.="                          << c[2]
-             <<"c3.="                          << c[3]
-             <<"Seed0.="                               << &cseed[planes[0]]
-             <<"Seed1.="                               << &cseed[planes[1]]
-             <<"Seed2.="                               << &cseed[planes[2]]
-             <<"Seed3.="                               << &cseed[planes[3]]
-             <<"RiemanFitter.="                << rim
-             <<"\n";
-       }
-
-       if(chi2[0] > AliTRDReconstructor::RecoParam()->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
-         //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       if(chi2[1] > AliTRDReconstructor::RecoParam()->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
-         //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo("Passed chi2 filter.");
-
-       // try attaching clusters to tracklets
-       Int_t nUsedCl = 0;
-       Int_t nlayers = 0;
-       for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
-         Int_t jLayer = planes[iLayer];
-         if(!cseed[jLayer].AttachClustersIter(stack[jLayer], 5., kFALSE, c[iLayer])) continue;
-         nUsedCl += cseed[jLayer].GetNUsed();
-         if(nUsedCl > 25) break;
-         nlayers++;
-       }
-       if(nlayers < kNSeedPlanes){ 
-         //AliInfo(Form("Failed updating all seeds %d [%d].", nlayers, kNSeedPlanes));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       // fit tracklets and cook likelihood
-       FitTiltedRieman(&cseed[0], kTRUE);// Update Seeds and calculate Likelihood
-       chi2[0] = GetChi2Y(&cseed[0]);
-       chi2[1] = GetChi2Z(&cseed[0]);
-       //Chi2 definitions in testing stage
-       //chi2[0] = GetChi2YTest(&cseed[0]);
-       //chi2[1] = GetChi2ZTest(&cseed[0]);
-       Double_t like = CookLikelihood(&cseed[0], planes, chi2); // to be checked
-
-       if (TMath::Log(1.E-9 + like) < AliTRDReconstructor::RecoParam()->GetTrackLikelihood()){
-         //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo(Form("Passed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
-
-       // book preliminary results
-       seedQuality[ntracks] = like;
-       fSeedLayer[ntracks]  = config;/*sLayer;*/
-
-       // attach clusters to the extrapolation seeds
-       Int_t lextrap[2];
-       GetExtrapolationConfig(config, lextrap);
-       Int_t nusedf   = 0; // debug value
-       for(int iLayer=0; iLayer<2; iLayer++){
-         Int_t jLayer = lextrap[iLayer];
-         if(!(chamber = stack[jLayer])) continue;
-                                               
-         // prepare extrapolated seed
-         cseed[jLayer].Reset();
-         cseed[jLayer].SetPlane(jLayer);
-         cseed[jLayer].SetTilt(hL[jLayer]);
-         cseed[jLayer].SetX0(chamber->GetX());
-         cseed[jLayer].SetPadLength(padlength[jLayer]);
-
-         // fit extrapolated seed
-         if ((jLayer == 0) && !(cseed[1].IsOK())) continue;
-         if ((jLayer == 5) && !(cseed[4].IsOK())) continue;
-         AliTRDseedV1 tseed = cseed[jLayer];
-         if(!tseed.AttachClustersIter(chamber, 1000.)) continue;
-         cseed[jLayer] = tseed;
-         nusedf += cseed[jLayer].GetNUsed(); // debug value
-         FitTiltedRieman(cseed,  kTRUE);
-       }
-
-       // AliInfo("Extrapolation done.");
-       // Debug Stream containing all the 6 tracklets
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
-         Int_t eventNumber             = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         cstreamer << "MakeSeeds1"
-                   << "EventNumber="           << eventNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "S0.="                           << &cseed[0]
-                   << "S1.="                           << &cseed[1]
-                   << "S2.="                           << &cseed[2]
-                   << "S3.="                           << &cseed[3]
-                   << "S4.="                           << &cseed[4]
-                   << "S5.="                           << &cseed[5]
-                   << "FitterT.="                      << tiltedRieman
-                   << "\n";
-       }
-                               
-       if(ImproveSeedQuality(stack, cseed) < 4){
-         AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-         continue;
-       }
-       //AliInfo("Improve seed quality done.");
-
-       // fit full track and cook likelihoods
-       //                              Double_t curv = FitRieman(&cseed[0], chi2);
-       //                              Double_t chi2ZF = chi2[0] / TMath::Max((nlayers - 3.), 1.);
-       //                              Double_t chi2RF = chi2[1] / TMath::Max((nlayers - 3.), 1.);
-
-       // do the final track fitting (Once with vertex constraint and once without vertex constraint)
-       Double_t chi2Vals[3];
-       chi2Vals[0] = FitTiltedRieman(&cseed[0], kFALSE);
-       chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ());
-       chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((nlayers - 3.), 1.);
-       // Chi2 definitions in testing stage
-       //chi2Vals[2] = GetChi2ZTest(&cseed[0]);
-       fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]);
-       //AliInfo("Hyperplane fit done\n");
-
-       // finalize tracklets
-       Int_t labels[12];
-       Int_t outlab[24];
-       Int_t nlab = 0;
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         if (!cseed[iLayer].IsOK()) continue;
-
-         if (cseed[iLayer].GetLabels(0) >= 0) {
-           labels[nlab] = cseed[iLayer].GetLabels(0);
-           nlab++;
-         }
-
-         if (cseed[iLayer].GetLabels(1) >= 0) {
-           labels[nlab] = cseed[iLayer].GetLabels(1);
-           nlab++;
-         }
-       }
-       Freq(nlab,labels,outlab,kFALSE);
-       Int_t label     = outlab[0];
-       Int_t frequency = outlab[1];
-       for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
-         cseed[iLayer].SetFreq(frequency);
-         cseed[iLayer].SetChi2Z(chi2[1]);
-       }
-           
-       if(AliTRDReconstructor::StreamLevel() >= 2){
-         TTreeSRedirector &cstreamer = *fgDebugStreamer;
-         Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
-         Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
-         TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
-         TLinearFitter *fitterT = GetTiltedRiemanFitter();
-         cstreamer << "MakeSeeds2"
-                   << "EventNumber="           << eventNumber
-                   << "CandidateNumber="       << candidateNumber
-                   << "Chi2TR="                        << chi2Vals[0]
-                   << "Chi2TC="                        << chi2Vals[1]
-                   << "Nlayers="                       << nlayers
-                   << "NUsedS="                        << nUsedCl
-                   << "NUsed="                         << nusedf
-                   << "Like="                          << like
-                   << "S0.="                           << &cseed[0]
-                   << "S1.="                           << &cseed[1]
-                   << "S2.="                           << &cseed[2]
-                   << "S3.="                           << &cseed[3]
-                   << "S4.="                           << &cseed[4]
-                   << "S5.="                           << &cseed[5]
-                   << "Label="                         << label
-                   << "Freq="                          << frequency
-                   << "FitterT.="                      << fitterT
-                   << "FitterTC.="                     << fitterTC
-                   << "\n";
-       }
-                               
-       ntracks++;
-       AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
-       if(ntracks == kMaxTracksStack){
-         AliWarning(Form("Number of seeds reached maximum allowed (%d) in stack.", kMaxTracksStack));
-         for(int isl=0; isl<4; isl++) delete layer[isl];
-         return ntracks;
-       }
-       cseed += 6;
+  c[1] = (*layer[1])[jndex[kcl++]];
+  if(!c[1]) continue;
+  layer[2]->BuildCond(c[1], cond2, 2, theta, phi);
+  c[2] = layer[2]->GetNearestCluster(cond2);
+  //printf("Found c[1] candidate 2 %p\n", c[2]);
+  if(!c[2]) continue;
+        
+  //                           AliInfo("Seeding clusters found. Building seeds ...");
+  //                           for(Int_t i = 0; i < kNSeedPlanes; i++) printf("%i. coordinates: x = %6.3f, y = %6.3f, z = %6.3f\n", i, c[i]->GetX(), c[i]->GetY(), c[i]->GetZ());
+        
+  for (Int_t il = 0; il < 6; il++) cseed[il].Reset();
+
+  FitRieman(c, chi2);
+
+  AliTRDseedV1 *tseed = 0x0;
+  for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
+    Int_t jLayer = planes[iLayer];
+    tseed = &cseed[jLayer];
+    tseed->SetPlane(jLayer);
+    tseed->SetTilt(hL[jLayer]);
+    tseed->SetPadLength(padlength[jLayer]);
+    tseed->SetX0(stack[jLayer]->GetX());
+    tseed->Init(GetRiemanFitter());
+  }
+
+  Bool_t isFake = kFALSE;
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 2){
+    if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+    if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+    if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE;
+
+    Double_t xpos[4];
+    for(Int_t l = 0; l < kNSeedPlanes; l++) xpos[l] = layer[l]->GetX();
+    Float_t yref[4];
+    for(int il=0; il<4; il++) yref[il] = cseed[planes[il]].GetYref(0);
+    Int_t ll = c[3]->GetLabel(0);
+    Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+    Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+    AliRieman *rim = GetRiemanFitter();
+    TTreeSRedirector &cs0 = *fgDebugStreamer;
+    cs0 << "MakeSeeds0"
+        <<"EventNumber="               << eventNumber
+        <<"CandidateNumber="   << candidateNumber
+        <<"isFake="                            << isFake
+        <<"config="                            << config
+        <<"label="                             << ll
+        <<"chi2z="                             << chi2[0]
+        <<"chi2y="                             << chi2[1]
+        <<"Y2exp="                             << cond2[0]     
+        <<"Z2exp="                             << cond2[1]
+        <<"X0="                                        << xpos[0] //layer[sLayer]->GetX()
+        <<"X1="                                        << xpos[1] //layer[sLayer + 1]->GetX()
+        <<"X2="                                        << xpos[2] //layer[sLayer + 2]->GetX()
+        <<"X3="                                        << xpos[3] //layer[sLayer + 3]->GetX()
+        <<"yref0="                             << yref[0]
+        <<"yref1="                             << yref[1]
+        <<"yref2="                             << yref[2]
+        <<"yref3="                             << yref[3]
+        <<"c0.="                               << c[0]
+        <<"c1.="                               << c[1]
+        <<"c2.="                               << c[2]
+        <<"c3.="                               << c[3]
+        <<"Seed0.="                            << &cseed[planes[0]]
+        <<"Seed1.="                            << &cseed[planes[1]]
+        <<"Seed2.="                            << &cseed[planes[2]]
+        <<"Seed3.="                            << &cseed[planes[3]]
+        <<"RiemanFitter.="             << rim
+        <<"\n";
+  }
+
+  if(chi2[0] > AliTRDReconstructor::RecoParam()->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
+    //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
+    AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+    continue;
+  }
+  if(chi2[1] > AliTRDReconstructor::RecoParam()->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
+    //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
+    AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+    continue;
+  }
+  //AliInfo("Passed chi2 filter.");
+
+  // try attaching clusters to tracklets
+  Int_t nUsedCl = 0;
+  Int_t mlayers = 0;
+  for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
+    Int_t jLayer = planes[iLayer];
+    if(!cseed[jLayer].AttachClustersIter(stack[jLayer], 5., kFALSE, c[iLayer])) continue;
+    nUsedCl += cseed[jLayer].GetNUsed();
+    if(nUsedCl > 25) break;
+    mlayers++;
+  }
+  if(mlayers < kNSeedPlanes){ 
+    //AliInfo(Form("Failed updating all seeds %d [%d].", mlayers, kNSeedPlanes));
+    AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+    continue;
+  }
+  // fit tracklets and cook likelihood
+  FitTiltedRieman(&cseed[0], kTRUE);// Update Seeds and calculate Likelihood
+  chi2[0] = GetChi2Y(&cseed[0]);
+  chi2[1] = GetChi2Z(&cseed[0]);
+  //Chi2 definitions in testing stage
+  //chi2[0] = GetChi2YTest(&cseed[0]);
+  //chi2[1] = GetChi2ZTest(&cseed[0]);
+  Double_t like = CookLikelihood(&cseed[0], planes, chi2); // to be checked
+
+  if (TMath::Log(1.E-9 + like) < AliTRDReconstructor::RecoParam()->GetTrackLikelihood()){
+    //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+    AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+    continue;
+  }
+  //AliInfo(Form("Passed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+
+  // book preliminary results
+  seedQuality[ntracks] = like;
+  fSeedLayer[ntracks]  = config;/*sLayer;*/
+
+  // attach clusters to the extrapolation seeds
+  Int_t lextrap[2];
+  GetExtrapolationConfig(config, lextrap);
+  Int_t nusedf   = 0; // debug value
+  for(int iLayer=0; iLayer<2; iLayer++){
+    Int_t jLayer = lextrap[iLayer];
+    if(!(chamber = stack[jLayer])) continue;
+            
+    // prepare extrapolated seed
+    cseed[jLayer].Reset();
+    cseed[jLayer].SetPlane(jLayer);
+    cseed[jLayer].SetTilt(hL[jLayer]);
+    cseed[jLayer].SetX0(chamber->GetX());
+    cseed[jLayer].SetPadLength(padlength[jLayer]);
+
+    // fit extrapolated seed
+    if ((jLayer == 0) && !(cseed[1].IsOK())) continue;
+    if ((jLayer == 5) && !(cseed[4].IsOK())) continue;
+    AliTRDseedV1 pseed = cseed[jLayer];
+    if(!pseed.AttachClustersIter(chamber, 1000.)) continue;
+    cseed[jLayer] = pseed;
+    nusedf += cseed[jLayer].GetNUsed(); // debug value
+    FitTiltedRieman(cseed,  kTRUE);
+  }
+
+  // AliInfo("Extrapolation done.");
+  // Debug Stream containing all the 6 tracklets
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 2){
+    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
+    Int_t eventNumber          = AliTRDtrackerDebug::GetEventNumber();
+    Int_t candidateNumber      = AliTRDtrackerDebug::GetCandidateNumber();
+    cstreamer << "MakeSeeds1"
+        << "EventNumber="              << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "S0.="                              << &cseed[0]
+        << "S1.="                              << &cseed[1]
+        << "S2.="                              << &cseed[2]
+        << "S3.="                              << &cseed[3]
+        << "S4.="                              << &cseed[4]
+        << "S5.="                              << &cseed[5]
+        << "FitterT.="                 << tiltedRieman
+        << "\n";
+  }
+        
+  if(ImproveSeedQuality(stack, cseed) < 4){
+    AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+    continue;
+  }
+  //AliInfo("Improve seed quality done.");
+
+  // fit full track and cook likelihoods
+  //                           Double_t curv = FitRieman(&cseed[0], chi2);
+  //                           Double_t chi2ZF = chi2[0] / TMath::Max((mlayers - 3.), 1.);
+  //                           Double_t chi2RF = chi2[1] / TMath::Max((mlayers - 3.), 1.);
+
+  // do the final track fitting (Once with vertex constraint and once without vertex constraint)
+  Double_t chi2Vals[3];
+  chi2Vals[0] = FitTiltedRieman(&cseed[0], kFALSE);
+  if(AliTRDReconstructor::RecoParam()->IsVertexConstrained())
+       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");
+
+  // finalize tracklets
+  Int_t labels[12];
+  Int_t outlab[24];
+  Int_t nlab = 0;
+  for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
+    if (!cseed[iLayer].IsOK()) continue;
+
+    if (cseed[iLayer].GetLabels(0) >= 0) {
+      labels[nlab] = cseed[iLayer].GetLabels(0);
+      nlab++;
+    }
+
+    if (cseed[iLayer].GetLabels(1) >= 0) {
+      labels[nlab] = cseed[iLayer].GetLabels(1);
+      nlab++;
+    }
+  }
+  Freq(nlab,labels,outlab,kFALSE);
+  Int_t label     = outlab[0];
+  Int_t frequency = outlab[1];
+  for (Int_t iLayer = 0; iLayer < 6; iLayer++) {
+    cseed[iLayer].SetFreq(frequency);
+    cseed[iLayer].SetChi2Z(chi2[1]);
+  }
+      
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 2){
+    TTreeSRedirector &cstreamer = *fgDebugStreamer;
+    Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+    Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
+    TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
+    TLinearFitter *fitterT = GetTiltedRiemanFitter();
+    cstreamer << "MakeSeeds2"
+        << "EventNumber="              << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "Chi2TR="                   << chi2Vals[0]
+        << "Chi2TC="                   << chi2Vals[1]
+        << "Nlayers="                  << mlayers
+        << "NUsedS="                   << nUsedCl
+        << "NUsed="                            << nusedf
+        << "Like="                             << like
+        << "S0.="                              << &cseed[0]
+        << "S1.="                              << &cseed[1]
+        << "S2.="                              << &cseed[2]
+        << "S3.="                              << &cseed[3]
+        << "S4.="                              << &cseed[4]
+        << "S5.="                              << &cseed[5]
+        << "Label="                            << label
+        << "Freq="                             << frequency
+        << "FitterT.="                 << fitterT
+        << "FitterTC.="                        << fitterTC
+        << "\n";
+  }
+        
+  ntracks++;
+  AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
+  if(ntracks == kMaxTracksStack){
+    AliWarning(Form("Number of seeds reached maximum allowed (%d) in stack.", kMaxTracksStack));
+    for(int isl=0; isl<4; isl++) delete layer[isl];
+    return ntracks;
+  }
+  cseed += 6;
       }
     }
   }
   for(int isl=0; isl<4; isl++) delete layer[isl];
-       
+  
   return ntracks;
 }
 
@@ -2136,6 +2415,9 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 *seeds, Double_t *params)
   // To be discussed with Marian !!
   //
 
+  AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
+  if (!calibra) AliInfo("Could not get Calibra instance\n");
+
   Double_t alpha = AliTRDgeometry::GetAlpha();
   Double_t shift = AliTRDgeometry::GetAlpha()/2.0;
   Double_t c[15];
@@ -2146,21 +2428,20 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 *seeds, Double_t *params)
   c[ 6] = 0.0; c[ 7] = 0.0; c[ 8] = 0.0;  c[ 9] = 0.1;
   c[10] = 0.0; c[11] = 0.0; c[12] = 0.0;  c[13] = 0.0; c[14] = params[5]*params[5]*0.01;
 
-  AliTRDtrackV1 *track = new AliTRDtrackV1(seeds, &params[1], c, params[0], params[6]*alpha+shift);
-  track->PropagateTo(params[0]-5.0);
-  track->ResetCovariance(1);
-  Int_t nc = FollowBackProlongation(*track);
-  //AliInfo(Form("N clusters for track %d", nc));
-  if (nc < 30) {
-    delete track;
-    track = 0x0;
-  } else {
-    track->CookdEdx();
-    track->CookdEdxTimBin(-1);
-    track->CookLabel(.9);
-  }
-
-  return track;
+  AliTRDtrackV1 track(seeds, &params[1], c, params[0], params[6]*alpha+shift);
+  track.PropagateTo(params[0]-5.0);
+  track.ResetCovariance(1);
+  Int_t nc = FollowBackProlongation(track);
+  if (nc < 30) return 0x0;
+
+  AliTRDtrackV1 *ptrTrack = SetTrack(&track);
+  ptrTrack->CookLabel(.9);
+  // computes PID for track
+  ptrTrack->CookPID();
+  // update calibration references using this track
+  if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(ptrTrack);
+
+  return ptrTrack;
 }
 
 
@@ -2185,13 +2466,13 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
   //
   // debug level: 7
   //
-       
+  
   // make a local working copy
   AliTRDtrackingChamber *chamber = 0x0;
   AliTRDseedV1 bseed[6];
   Int_t nLayers = 0;
   for (Int_t jLayer = 0; jLayer < 6; jLayer++) bseed[jLayer] = cseed[jLayer];
-       
+  
   Float_t lastquality = 10000.0;
   Float_t lastchi2    = 10000.0;
   Float_t chi2        =  1000.0;
@@ -2221,26 +2502,26 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs
     }
 
     chi2 = FitTiltedRieman(bseed, kTRUE);
-    if(AliTRDReconstructor::StreamLevel() >= 7){
+    if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 7){
       Int_t eventNumber                = AliTRDtrackerDebug::GetEventNumber();
       Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
       TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
       TTreeSRedirector &cstreamer = *fgDebugStreamer;
       cstreamer << "ImproveSeedQuality"
-               << "EventNumber="               << eventNumber
-               << "CandidateNumber="   << candidateNumber
-               << "Iteration="                         << iter
-               << "S0.="                                                       << &bseed[0]
-               << "S1.="                                                       << &bseed[1]
-               << "S2.="                                                       << &bseed[2]
-               << "S3.="                                                       << &bseed[3]
-               << "S4.="                                                       << &bseed[4]
-               << "S5.="                                                       << &bseed[5]
-               << "FitterT.="                          << tiltedRieman
-               << "\n";
+    << "EventNumber="          << eventNumber
+    << "CandidateNumber="      << candidateNumber
+    << "Iteration="                            << iter
+    << "S0.="                                                  << &bseed[0]
+    << "S1.="                                                  << &bseed[1]
+    << "S2.="                                                  << &bseed[2]
+    << "S3.="                                                  << &bseed[3]
+    << "S4.="                                                  << &bseed[4]
+    << "S5.="                                                  << &bseed[5]
+    << "FitterT.="                             << tiltedRieman
+    << "\n";
     }
   } // Loop: iter
-       
+  
   // we are sure that at least 2 tracklets are OK !
   return nLayers+2;
 }
@@ -2272,26 +2553,27 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(AliTRDseedV1 *tracklets, Doub
     nLayers++;
   }
   sumdaf /= Float_t (nLayers - 2.0);
-       
+  
   Double_t likeChi2Z  = TMath::Exp(-chi2[2] * 0.14);                   // Chi2Z 
-  Double_t likeChi2TC = TMath::Exp(-chi2[1] * 0.677);                  // Constrained Tilted Riemann
+  Double_t likeChi2TC = (AliTRDReconstructor::RecoParam()->IsVertexConstrained()) ? 
+                                                                                       TMath::Exp(-chi2[1] * 0.677) : 1;                       // Constrained Tilted Riemann
   Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.78);                   // Non-constrained Tilted Riemann
   Double_t likeAF     = TMath::Exp(-sumdaf * 3.23);
   Double_t trackLikelihood     = likeChi2Z * likeChi2TR * likeAF;
 
-  if(AliTRDReconstructor::StreamLevel() >= 2){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 2){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
     TTreeSRedirector &cstreamer = *fgDebugStreamer;
     cstreamer << "CalculateTrackLikelihood0"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber="     << candidateNumber
-             << "LikeChi2Z="                           << likeChi2Z
-             << "LikeChi2TR="                  << likeChi2TR
-             << "LikeChi2TC="                  << likeChi2TC
-             << "LikeAF="                                      << likeAF
-             << "TrackLikelihood=" << trackLikelihood
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber="  << candidateNumber
+        << "LikeChi2Z="                                << likeChi2Z
+        << "LikeChi2TR="                       << likeChi2TR
+        << "LikeChi2TC="                       << likeChi2TC
+        << "LikeAF="                                   << likeAF
+        << "TrackLikelihood=" << trackLikelihood
+        << "\n";
   }
 
   return trackLikelihood;
@@ -2299,7 +2581,7 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(AliTRDseedV1 *tracklets, Doub
 
 //____________________________________________________________________
 Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]
-                                        , Double_t *chi2)
+          , Double_t *chi2)
 {
   //
   // Calculate the probability of this track candidate.
@@ -2324,11 +2606,11 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]
   // The distributions for each type of probabilities are given below as of
   // (date). They have to be checked to assure consistency of estimation.
   //
+
   // ratio of the total number of clusters/track which are expected to be found by the tracker.
   Float_t fgFindable = AliTRDReconstructor::RecoParam()->GetFindableClusters();
 
-       
+  
   Int_t nclusters = 0;
   Double_t sumda = 0.;
   for(UChar_t ilayer = 0; ilayer < 4; ilayer++){
@@ -2342,34 +2624,34 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]
   Double_t likechi2z = TMath::Exp(-chi2[1] * 0.088) / TMath::Exp(-chi2[1] * 0.019);
   Int_t enc = Int_t(fgFindable*4.*fgNTimeBins);        // Expected Number Of Clusters, normally 72
   Double_t likeN     = TMath::Exp(-(enc - nclusters) * 0.19);
-       
+  
   Double_t like      = likea * likechi2y * likechi2z * likeN;
 
   //   AliInfo(Form("sumda(%f) chi2[0](%f) chi2[1](%f) likea(%f) likechi2y(%f) likechi2z(%f) nclusters(%d) likeN(%f)", sumda, chi2[0], chi2[1], likea, likechi2y, likechi2z, nclusters, likeN));
-  if(AliTRDReconstructor::StreamLevel() >= 2){
+  if(AliTRDReconstructor::RecoParam()->GetStreamLevel() >= 2){
     Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
     // The Debug Stream contains the seed 
     TTreeSRedirector &cstreamer = *fgDebugStreamer;
     cstreamer << "CookLikelihood"
-             << "EventNumber="                 << eventNumber
-             << "CandidateNumber=" << candidateNumber
-             << "tracklet0.="                  << &cseed[0]
-             << "tracklet1.="                  << &cseed[1]
-             << "tracklet2.="                  << &cseed[2]
-             << "tracklet3.="                  << &cseed[3]
-             << "tracklet4.="                  << &cseed[4]
-             << "tracklet5.="                  << &cseed[5]
-             << "sumda="                                               << sumda
-             << "chi0="                                                << chi2[0]
-             << "chi1="                                                << chi2[1]
-             << "likea="                                               << likea
-             << "likechi2y="                           << likechi2y
-             << "likechi2z="                           << likechi2z
-             << "nclusters="                           << nclusters
-             << "likeN="                                               << likeN
-             << "like="                                                << like
-             << "\n";
+        << "EventNumber="                      << eventNumber
+        << "CandidateNumber=" << candidateNumber
+        << "tracklet0.="                       << &cseed[0]
+        << "tracklet1.="                       << &cseed[1]
+        << "tracklet2.="                       << &cseed[2]
+        << "tracklet3.="                       << &cseed[3]
+        << "tracklet4.="                       << &cseed[4]
+        << "tracklet5.="                       << &cseed[5]
+        << "sumda="                                            << sumda
+        << "chi0="                                             << chi2[0]
+        << "chi1="                                             << chi2[1]
+        << "likea="                                            << likea
+        << "likechi2y="                                << likechi2y
+        << "likechi2z="                                << likechi2z
+        << "nclusters="                                << nclusters
+        << "likeN="                                            << likeN
+        << "like="                                             << like
+        << "\n";
   }
 
   return like;
@@ -2605,6 +2887,20 @@ AliCluster* AliTRDtrackerV1::GetCluster(Int_t idx) const
   return idx >= 0 || idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : 0x0;
 }
 
+//____________________________________________________________________
+AliTRDseedV1* AliTRDtrackerV1::GetTracklet(Int_t idx) const
+{
+  Int_t ntrklt = fTracklets->GetEntriesFast();
+  return idx >= 0 || idx < ntrklt ? (AliTRDseedV1*)fTracklets->UncheckedAt(idx) : 0x0;
+}
+
+//____________________________________________________________________
+AliKalmanTrack* AliTRDtrackerV1::GetTrack(Int_t idx) const
+{
+  Int_t ntrk = fTracks->GetEntriesFast();
+  return idx >= 0 || idx < ntrk ? (AliKalmanTrack*)fTracks->UncheckedAt(idx) : 0x0;
+}
+
 //____________________________________________________________________
 Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
   //
@@ -2637,9 +2933,9 @@ Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
     // Strategy avoids a division by 0;
     for(Int_t il = 5; il >= 0; il--){
       if(tracklets[il].IsOK()){
-       xpos[iok] = tracklets[il].GetX0();
-       iok++;
-       startIndex = il;
+  xpos[iok] = tracklets[il].GetX0();
+  iok++;
+  startIndex = il;
       }
       if(iok) idiff++; // to get the right difference;
       if(iok > 1) break;
@@ -2660,7 +2956,7 @@ Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
 
 //_____________________________________________________________________________
 Int_t AliTRDtrackerV1::Freq(Int_t n, const Int_t *inlist
-                           , Int_t *outlist, Bool_t down)
+          , Int_t *outlist, Bool_t down)
 {    
   //
   // Sort eleements according occurancy 
@@ -2678,7 +2974,7 @@ Int_t AliTRDtrackerV1::Freq(Int_t n, const Int_t *inlist
   }
 
   TMath::Sort(n,inlist,sindexS,down); 
+
   Int_t last     = inlist[sindexS[0]];
   Int_t val      = last;
   sindexF[0]     = 1;
@@ -2800,7 +3096,7 @@ void AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
   // Calculation of the parameters
   // Calculation of the covariance matrix
   //
-       
+  
   Double_t denominator = fSums[0] * fSums[4] - fSums[1] *fSums[1];
   //   for(Int_t isum = 0; isum < 5; isum++)
   //           printf("fSums[%d] = %f\n", isum, fSums[isum]);
@@ -2808,7 +3104,7 @@ void AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
   fParams[0] = (fSums[2] * fSums[4] - fSums[1] * fSums[3])/ denominator;
   fParams[1] = (fSums[0] * fSums[3] - fSums[1] * fSums[2]) / denominator;
   //   printf("fParams[0] = %f, fParams[1] = %f\n", fParams[0], fParams[1]);
-       
+  
   // Covariance matrix
   fCovarianceMatrix[0] = fSums[4] - fSums[1] * fSums[1] / fSums[0];
   fCovarianceMatrix[1] = fSums[5] - fSums[2] * fSums[2] / fSums[0];