]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - TRD/AliTRDtrackerV1.cxx
fix typo
[u/mrichter/AliRoot.git] / TRD / AliTRDtrackerV1.cxx
index babfdc660d2558ec944cb1c3dad7469c0a9efca3..e01cfdcaf9d622ea4cb33e21476faffe60b36aa8 100644 (file)
@@ -61,11 +61,7 @@ ClassImp(AliTRDtrackerV1)
 ClassImp(AliTRDtrackerV1::AliTRDLeastSquare)
 ClassImp(AliTRDtrackerV1::AliTRDtrackFitterRieman)
 
-const  Float_t  AliTRDtrackerV1::fgkMinClustersInTrack =  0.5;  //
-const  Float_t  AliTRDtrackerV1::fgkLabelFraction      =  0.8;  //
-const  Double_t AliTRDtrackerV1::fgkMaxChi2            = 12.0;  //
-const  Double_t AliTRDtrackerV1::fgkMaxSnp             =  0.95; // Maximum local sine of the azimuthal angle
-const  Double_t AliTRDtrackerV1::fgkMaxStep            =  2.0;  // Maximal step size in propagation 
+AliTRDtrackerV1::ETRDtrackerV1BetheBloch AliTRDtrackerV1::fgBB = AliTRDtrackerV1::kGeant;
 Double_t AliTRDtrackerV1::fgTopologicQA[kNConfigs] = {
   0.5112, 0.5112, 0.5112, 0.0786, 0.0786,
   0.0786, 0.0786, 0.0579, 0.0579, 0.0474,
@@ -73,13 +69,15 @@ Double_t AliTRDtrackerV1::fgTopologicQA[kNConfigs] = {
 };  
 const Double_t AliTRDtrackerV1::fgkX0[kNPlanes]    = {
   300.2, 312.8, 325.4, 338.0, 350.6, 363.2};
+// Number of Time Bins/chamber should be also stored independently by the traker
+// (also in AliTRDReconstructor) in oder to be able to run HLT. Fix TODO
 Int_t AliTRDtrackerV1::fgNTimeBins = 0;
 AliRieman* AliTRDtrackerV1::fgRieman = NULL;
 TLinearFitter* AliTRDtrackerV1::fgTiltedRieman = NULL;
 TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = NULL;
 
 //____________________________________________________________________
-AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec) 
+AliTRDtrackerV1::AliTRDtrackerV1(const AliTRDReconstructor *rec) 
   :AliTracker()
   ,fkReconstructor(NULL)
   ,fkRecoParam(NULL)
@@ -89,6 +87,7 @@ AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec)
   ,fTracks(NULL)
   ,fTracksESD(NULL)
   ,fSieveSeeding(0)
+  ,fEventInFile(-1)
 {
   //
   // Default constructor.
@@ -279,180 +278,237 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event)
   if (!fgNTimeBins) fgNTimeBins = fkReconstructor->GetNTimeBins(); 
 
   // Define scalers
-  Int_t nFound   = 0, // number of tracks found
-        nBacked  = 0, // number of tracks backed up for refit
-        nSeeds   = 0, // total number of ESD seeds
-        nTRDseeds= 0, // number of seeds in the TRD acceptance
-        nTPCseeds= 0; // number of TPC seeds
+  const Int_t nSeeders(2);
+  Int_t nFound[nSeeders]  = {0},   // number of tracks found
+        nBacked    = 0,            // number of tracks backed up for refit
+        nSeeds     = 0,            // total number of ESD seeds
+        nTRDseeds  = 0,            // number of seeds in the TRD acceptance
+        nSeeder[nSeeders]= {0},    // number of ITS/TPC potential seeds
+        nGoodSeeds[nSeeders]= {0}; // number of ITS/TPC found seeds
   Float_t foundMin = 20.0;
-  
-  Float_t *quality = NULL;
-  Int_t   *index   = NULL;
+  const Char_t *seeder[] = {"ITS", "TPC"};
+  Float_t *quality[nSeeders] = {0};
+  Int_t   *index[nSeeders]   = {0},
+          *idxESD[nSeeders] = {0};    // esd index of track
+  fEventInFile  = event->GetEventNumberInFile();
   nSeeds   = event->GetNumberOfTracks();
   // Sort tracks according to quality 
   // (covariance in the yz plane)
   if(nSeeds){  
-    quality = new Float_t[nSeeds];
-    index   = new Int_t[nSeeds];
-    for (Int_t iSeed = nSeeds; iSeed--;) {
+    // first check TPC seeds
+    quality[1] = new Float_t[nSeeds]; memset(quality[1], 0, nSeeds*sizeof(Float_t));
+    idxESD[1]  = new Int_t[nSeeds];
+    for (Int_t iSeed(nSeeds); iSeed--;) {
       AliESDtrack *seed = event->GetTrack(iSeed);
+      if(!(seed->GetStatus()&AliESDtrack::kTPCout)) continue;
       Double_t covariance[15];
       seed->GetExternalCovariance(covariance);
-      quality[iSeed] = covariance[0] + covariance[2];
+      idxESD[1][nSeeder[1]]  = iSeed;
+      quality[1][nSeeder[1]] = covariance[0] + covariance[2];
+      nSeeder[1]++;
     }
-    TMath::Sort(nSeeds, quality, index,kFALSE);
+    index[1]  = new Int_t[4*nSeeder[1]];
+    TMath::Sort(nSeeder[1], quality[1], index[1], kFALSE);
+    // second check rest of tracks for ITS seeds
+    quality[0] = new Float_t[nSeeds]; memset(quality[0], 0, nSeeds*sizeof(Float_t));
+    idxESD[0]  = new Int_t[nSeeds];
+    for (Int_t iSeed(nSeeds); iSeed--;) {
+      AliESDtrack *seed = event->GetTrack(iSeed);
+      if((seed->GetStatus()&AliESDtrack::kTPCout)) continue;
+      Double_t covariance[15];
+      seed->GetExternalCovariance(covariance);
+      idxESD[0][nSeeder[0]]  = iSeed;
+      quality[0][nSeeder[0]] = covariance[0] + covariance[2];
+      nSeeder[0]++;
+    }
+    index[0]  = new Int_t[4*nSeeder[0]];
+    TMath::Sort(nSeeder[0], quality[0], index[0], kFALSE);
   }
-  
+
   // Propagate all seeds
   Int_t   expectedClr;
   AliTRDtrackV1 track;
-  for (Int_t iSeed = 0; iSeed < nSeeds; iSeed++) {
-  
-    // Get the seeds in sorted sequence
-    AliESDtrack *seed = event->GetTrack(index[iSeed]);
-    Float_t p4  = seed->GetC(seed->GetBz());
-  
-    // Check the seed status
-    ULong_t status = seed->GetStatus();
-    if ((status & AliESDtrack::kTPCout) == 0) continue;
-    if ((status & AliESDtrack::kTRDout) != 0) continue;
-
-    // Propagate to the entrance in the TRD mother volume
-    new(&track) AliTRDtrackV1(*seed);
-    if(AliTRDgeometry::GetXtrdBeg() > (fgkMaxStep + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), fgkMaxStep)){ 
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-      continue;
-    }    
-    if(!AdjustSector(&track)){
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-      continue;
-    }
-    if(TMath::Abs(track.GetSnp()) > fgkMaxSnp) {
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-      continue;
-    }
-
-    nTPCseeds++;
-
-    // store track status at TRD entrance
-    seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
+  for(Int_t iSeeder(nSeeders); iSeeder--;){
+    for (Int_t iSeed = 0; iSeed < nSeeder[iSeeder]; iSeed++) {
+      Int_t currentIndexESD = idxESD[iSeeder][index[iSeeder][iSeed]];
+      // Get the seeds in sorted sequence
+      AliESDtrack *seed = event->GetTrack(currentIndexESD);
+      Float_t p4  = seed->GetC(seed->GetBz());
+
+      // Check the seed status
+      ULong_t status(seed->GetStatus()); Bool_t kTPC(kTRUE);
+      if ((status & AliESDtrack::kTRDout) != 0) continue;
+      if (status & AliESDtrack::kTPCout){
+        AliDebug(2, Form("Found TPC seed @ idx[%4d] Sxy=%f[cm].", currentIndexESD, TMath::Sqrt(quality[iSeeder][index[iSeeder][iSeed]])));
+        // set steering parameters for TPC
+        //fkRecoParam->SetTrackParam(kTPC);
+      } else {
+        if (status & AliESDtrack::kITSout){
+          // rotate
+          Float_t  globalToTracking = AliTRDgeometry::GetAlpha()*(Int_t(seed->GetAlpha()/AliTRDgeometry::GetAlpha()) + (seed->GetAlpha()>0. ? 0.5 : -0.5));
+          AliDebug(2, Form("Found ITS seed @ idx[%4d]  Sxy=%f[cm] alpha=%7.2f[deg] g2T=%7.2f[deg]", currentIndexESD, TMath::Sqrt(quality[iSeeder][index[iSeeder][iSeed]]), seed->GetAlpha()*TMath::RadToDeg(), globalToTracking*TMath::RadToDeg()));
+          if(!seed->Rotate(globalToTracking)){
+            AliDebug(1, Form("ITS seed @ idx[%4d] failed rotation of alpha=%7.2f[deg] g2T=%7.2f[deg].", currentIndexESD, seed->GetAlpha()*TMath::RadToDeg(), globalToTracking*TMath::RadToDeg()));
+            continue;
+          }
+          kTPC=kFALSE;
+          // set steering parameters for ITS
+          //fkRecoParam->SetTrackParam(kITS);
+        } else {
+          AliDebug(1, Form("Bad seed[%4d] ITSin[%c] ITSout[%c] TPCin[%c] TPCout[%c].", currentIndexESD,
+            (status&AliESDtrack::kITSin)?'y':'n', (status&AliESDtrack::kITSout)?'y':'n', (status&AliESDtrack::kTPCin)?'y':'n', (status&AliESDtrack::kTPCout)?'y':'n'));
+          continue;
+        }
+      }
 
-    // prepare track and do propagation in the TRD
-    track.SetReconstructor(fkReconstructor);
-    track.SetKink(Bool_t(seed->GetKinkIndex(0)));
-    track.SetPrimary(status & AliESDtrack::kTPCin);
-    expectedClr = FollowBackProlongation(track);
-    // check if track entered the TRD fiducial volume
-    if(track.GetTrackIn()){ 
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDin);
-      nTRDseeds++;
-    }
-    // check if track was stopped in the TRD
-    if (expectedClr<0){      
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-      continue;
-    }
+      // Propagate to the entrance in the TRD mother volume
+      track.~AliTRDtrackV1();
+      new(&track) AliTRDtrackV1(*seed);
+      if(AliTRDgeometry::GetXtrdBeg() > (AliTRDReconstructor::GetMaxStep() + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), AliTRDReconstructor::GetMaxStep())){
+        //seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
+      }
+      if(!AdjustSector(&track)){
+        //seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
+      }
+      if(TMath::Abs(track.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) {
+        //seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+        continue;
+      }
+      AliDebug(2, Form("Propagate %s seed[%4d] ESDidx[%4d].", seeder[iSeeder], iSeed, currentIndexESD));
+      nGoodSeeds[iSeeder]++;
+      // store track status at TRD entrance
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
 
-    if(expectedClr){
-      nFound++;  
-      // computes PID for track
-      track.CookPID();
-      // update calibration references using this track
-      if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
+      // prepare track and do propagation in the TRD
+      track.SetReconstructor(fkReconstructor);
+      track.SetKink(Bool_t(seed->GetKinkIndex(0)));
+      track.SetPrimary(status & AliESDtrack::kTPCin);
+      track.SetNonTPCseeded(!kTPC);
+      expectedClr = FollowBackProlongation(track);
       // save calibration object
-      if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0) { 
+      if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0) {
         AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
         calibTrack->SetOwner();
         seed->AddCalibObject(calibTrack);
       }
-      //update ESD track
-      seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-      track.UpdateESDtrack(seed);
-    }
+  //    printf("track idx[%4d] nCl[%3d] TrkIn[%p]\n", index[iSeed], expectedClr, (void*)track.GetTrackIn());
+
+      // check if track entered the TRD fiducial volume
+      if(!track.GetTrackIn()){
+        AliDebug(2, Form("TRD missed by %s seed[%4d] ESDidx[%4d].", seeder[iSeeder], iSeed, currentIndexESD));
+        continue;
+      }
+      seed->UpdateTrackParams(&track, AliESDtrack::kTRDin);
+      nTRDseeds++;
 
-    if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) {
+      // check if track was stopped in the TRD
+      if(expectedClr==-999){
+        AliDebug(1, Form("Track @ idx[%4d] failed prolongation due to track error [%d]", currentIndexESD, track.GetStatusTRD()));
+        continue;
+      } else if(expectedClr==0){
+        AliDebug(1, Form("Track @ idx[%4d] failed prolongation due to layer error [%d %d %d %d %d %d]", currentIndexESD,
+          track.GetStatusTRD(0), track.GetStatusTRD(1), track.GetStatusTRD(2), track.GetStatusTRD(3), track.GetStatusTRD(4), track.GetStatusTRD(5)));
+        continue;
+      } else {
+        AliDebug(2, Form("Track @ idx[%4d] #cl[%3d]", currentIndexESD, track.GetNumberOfClusters()));
+        nFound[kTPC]++;
+        // compute PID
+        track.CookPID();
+        //compute MC label
+        track.CookLabel(1. - AliTRDReconstructor::GetLabelFraction());
+        // update calibration references using this track
+        if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
+        //update ESD track
+        seed->UpdateTrackParams(&track, expectedClr>0?AliESDtrack::kTRDout:AliESDtrack::kTRDStop);
+        seed->SetTRDBudget(track.GetBudget(0));
+        track.UpdateESDtrack(seed);
+        if(expectedClr<0) continue;
+      }
 
       // Make backup for back propagation
-      Int_t foundClr = track.GetNumberOfClusters();
-      if (foundClr >= foundMin) {
-        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);
-          nBacked++;
-          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);
-          nBacked++;
-          isGold = kTRUE;
-        }
-        
-        if ((!isGold) && (track.GetBackupTrack())) {
-          if ((track.GetBackupTrack()->GetNumberOfClusters() > foundMin) && ((track.GetBackupTrack()->GetChi2()/(track.GetBackupTrack()->GetNumberOfClusters()+1)) < 7)) {
-            seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+      if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) || (track.Pt() > 0.8)) {
+        Int_t foundClr = track.GetNumberOfClusters();
+        if (foundClr >= foundMin) {
+          //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);
             nBacked++;
             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);
+            nBacked++;
+            isGold = kTRUE;
+          }
+
+          if ((!isGold) && (track.GetBackupTrack())) {
+            if ((track.GetBackupTrack()->GetNumberOfClusters() > foundMin) && ((track.GetBackupTrack()->GetChi2()/(track.GetBackupTrack()->GetNumberOfClusters()+1)) < 7)) {
+              seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup);
+              nBacked++;
+              isGold = kTRUE;
+            }
+          }
         }
       }
-    }
-    
-    // Propagation to the TOF
-    if(!(seed->GetStatus()&AliESDtrack::kTRDStop)) {
-      Int_t sm = track.GetSector();
-      // default value in case we have problems with the geometry.
-      Double_t xtof  = 371.; 
-      //Calculate radial position of the beginning of the TOF
-      //mother volume. In order to avoid mixing of the TRD 
-      //and TOF modules some hard values are needed. This are:
-      //1. The path to the TOF module.
-      //2. The width of the TOF (29.05 cm)
-      //(with the help of Annalisa de Caro Mar-17-2009)
-      if(gGeoManager){
-        gGeoManager->cd(Form("/ALIC_1/B077_1/BSEGMO%d_1/BTOF%d_1", sm, sm));
-        TGeoHMatrix *m = NULL;
-        Double_t loc[]={0., 0., -.5*29.05}, glob[3];
-        
-        if((m=gGeoManager->GetCurrentMatrix())){
-          m->LocalToMaster(loc, glob);
-          xtof = TMath::Sqrt(glob[0]*glob[0]+glob[1]*glob[1]);
+
+      // Propagation to the TOF
+      if(!(seed->GetStatus()&AliESDtrack::kTRDStop)) {
+        Int_t sm = track.GetSector();
+        // default value in case we have problems with the geometry.
+        Double_t xtof  = 371.;
+        //Calculate radial position of the beginning of the TOF
+        //mother volume. In order to avoid mixing of the TRD
+        //and TOF modules some hard values are needed. This are:
+        //1. The path to the TOF module.
+        //2. The width of the TOF (29.05 cm)
+        //(with the help of Annalisa de Caro Mar-17-2009)
+        if(gGeoManager){
+          gGeoManager->cd(Form("/ALIC_1/B077_1/BSEGMO%d_1/BTOF%d_1", sm, sm));
+          TGeoHMatrix *m = NULL;
+          Double_t loc[]={0., 0., -.5*29.05}, glob[3];
+
+          if((m=gGeoManager->GetCurrentMatrix())){
+            m->LocalToMaster(loc, glob);
+            xtof = TMath::Sqrt(glob[0]*glob[0]+glob[1]*glob[1]);
+          }
         }
+        if(xtof > (AliTRDReconstructor::GetMaxStep() + track.GetX()) && !PropagateToX(track, xtof, AliTRDReconstructor::GetMaxStep())){
+          seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+          continue;
+        }
+        if(!AdjustSector(&track)){
+          seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+          continue;
+        }
+        if(TMath::Abs(track.GetSnp()) > AliTRDReconstructor::GetMaxSnp()){
+          seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
+          continue;
+        }
+        //seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
+        // TODO obsolete - delete
+        seed->SetTRDQuality(track.StatusForTOF());
       }
-      if(xtof > (fgkMaxStep + track.GetX()) && !PropagateToX(track, xtof, fgkMaxStep)){ 
-        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-        continue;
-      }
-      if(!AdjustSector(&track)){ 
-        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-        continue;
-      }
-      if(TMath::Abs(track.GetSnp()) > fgkMaxSnp){ 
-        seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
-        continue;
-      }
-      //seed->UpdateTrackParams(&track, AliESDtrack::kTRDout);
-      // TODO obsolete - delete
-      seed->SetTRDQuality(track.StatusForTOF()); 
     }
-    seed->SetTRDBudget(track.GetBudget(0));
+    if(index[iSeeder]) delete [] index[iSeeder];
+    if(idxESD[iSeeder]) delete [] idxESD[iSeeder];
+    if(quality[iSeeder]) delete [] quality[iSeeder];
   }
-  if(index) delete [] index;
-  if(quality) delete [] quality;
 
-  AliInfo(Form("Number of seeds: TPCout[%d] TRDin[%d]", nTPCseeds, nTRDseeds));
-  AliInfo(Form("Number of tracks: TRDout[%d] TRDbackup[%d]", nFound, nBacked));
+  AliInfo(Form("Number of seeds: ITSout[%4d] TPCout[%4d] TRDin[%4d]", nGoodSeeds[0], nGoodSeeds[1], nTRDseeds));
+  AliInfo(Form("Number of tracks: TRDout[%4d = %4d + %4d] TRDbackup[%4d]", nFound[0]+nFound[1], nFound[0], nFound[1], nBacked));
 
   // run stand alone tracking
   if (fkReconstructor->IsSeeding()) Clusters2Tracks(event);
@@ -501,7 +557,7 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
 
     // do the propagation and processing
     Bool_t kUPDATE = kFALSE;
-    Double_t xTPC = 250.0;
+    Double_t xToGo = (status & AliESDtrack::kTPCout)?250.0:80.0;
     if(FollowProlongation(track)){     
       // Update the friend track
       if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ 
@@ -514,7 +570,7 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
       }
 
       // Prolongate to TPC
-      if (PropagateToX(track, xTPC, fgkMaxStep)) { //  -with update
+      if (PropagateToX(track, xToGo, AliTRDReconstructor::GetMaxStep())) { //  -with update
         seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
         found++;
         kUPDATE = kTRUE;
@@ -524,7 +580,7 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event)
     // Prolongate to TPC without update
     if(!kUPDATE) {
       AliTRDtrackV1 tt(*seed);
-      if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup);
+      if (PropagateToX(tt, xToGo, AliTRDReconstructor::GetMaxStep())) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup);
     }
   }
   AliInfo(Form("Number of seeds: TRDout[%d]", nseed));
@@ -572,12 +628,14 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t)
     }
     Double_t x  = tracklet->GetX();//GetX0();
     // reject tracklets which are not considered for inward refit
-    if(x > t.GetX()+fgkMaxStep) continue;
-
+    if(x > t.GetX()+AliTRDReconstructor::GetMaxStep()){
+      AliDebug(2, Form("Reject x[%7.3f] > track[%7.3f]", x, t.GetX()+AliTRDReconstructor::GetMaxStep()));
+      continue;
+    }
     // append tracklet to track
     t.SetTracklet(tracklet, index);
     
-    if (x < (t.GetX()-fgkMaxStep) && !PropagateToX(t, x+fgkMaxStep, fgkMaxStep)) break;
+    if (x < (t.GetX()-AliTRDReconstructor::GetMaxStep()) && !PropagateToX(t, x+AliTRDReconstructor::GetMaxStep(), AliTRDReconstructor::GetMaxStep())) break;
     if (!AdjustSector(&t)) break;
     
     // Start global position
@@ -693,8 +751,7 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
   Int_t debugLevel = fkReconstructor->IsDebugStreaming() ? fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) : 0;
   TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0;
 
-  Bool_t kStoreIn(kTRUE),     //
-         kPropagateIn(kTRUE), //
+  Bool_t kStoreIn(kTRUE),     // toggel store track params. at TRD entry
          kStandAlone(kFALSE), // toggle tracker awarness of stand alone seeding 
          kUseTRD(fkRecoParam->IsOverPtThreshold(t.Pt()));// use TRD measurment to update Kalman
 
@@ -729,14 +786,14 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
 
   // Loop through the TRD layers
   TGeoHMatrix *matrix = NULL;
-  Double_t x, y, z;
+  Double_t x(0.), y(0.), z(0.);
   for (Int_t ily=startLayer, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) {
     AliDebug(2, Form("Propagate to x[%d] = %7.2f", ily, fR[ily]));
 
     // rough estimate of the entry point
     if (!t.GetProlongation(fR[ily], y, z)){
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kProlongation);
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kProlongation);
       AliDebug(4, Form("Failed Rough Prolongation to ly[%d] x[%7.2f] y[%7.2f] z[%7.2f]", ily, fR[ily], y, z));
       break;
     }
@@ -747,7 +804,6 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     stk = fGeom->GetStack(z, ily);
     det = stk>=0 ? AliTRDgeometry::GetDetector(ily, stk, sm) : -1;
     matrix = det>=0 ? fGeom->GetClusterMatrix(det) : NULL;
-    AliDebug(3, Form("Propagate to det[%3d]", det));
 
     // check if supermodule/chamber is installed
     if( !fGeom->GetSMstatus(sm) ||
@@ -756,25 +812,25 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
         !matrix ){ 
       AliDebug(4, Form("Missing Geometry ly[%d]. Guess radial position", ily));
       // propagate to the default radial position
-      if(fR[ily] > (fgkMaxStep + t.GetX()) && !PropagateToX(t, fR[ily], fgkMaxStep)){
-        n=-1; 
-        t.SetStatus(AliTRDtrackV1::kPropagation);
+      if(fR[ily] > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, fR[ily], AliTRDReconstructor::GetMaxStep())){
+        n= n?-n:-999;
+        t.SetErrStat(AliTRDtrackV1::kPropagation);
         AliDebug(4, "Failed Propagation [Missing Geometry]");
         break;
       }
       if(!AdjustSector(&t)){
-        n=-1; 
-        t.SetStatus(AliTRDtrackV1::kAdjustSector);
+        n= n?-n:-999;
+        t.SetErrStat(AliTRDtrackV1::kAdjustSector);
         AliDebug(4, "Failed Adjust Sector [Missing Geometry]");
         break;
       }
-      if(TMath::Abs(t.GetSnp()) > fgkMaxSnp){
-        n=-1; 
-        t.SetStatus(AliTRDtrackV1::kSnp);
+      if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()){
+        n= n?-n:-999;
+        t.SetErrStat(AliTRDtrackV1::kSnp);
         AliDebug(4, "Failed Max Snp [Missing Geometry]");
         break;
       }
-      t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+      t.SetErrStat(AliTRDtrackV1::kGeometry, ily);
       continue;
     }
 
@@ -782,62 +838,65 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     Double_t loc[] = {AliTRDgeometry::AnodePos()- driftLength, 0., 0.};
     Double_t glb[] = {0., 0., 0.};
     matrix->LocalToMaster(loc, glb);
+    AliDebug(3, Form("Propagate to D%3d[%02d_%d_%d] x_anode[%7.2f] (%f %f)", det, sm, stk, ily, glb[0]+driftLength, glb[1], glb[2]));
 
     // Propagate to the radial distance of the current layer
-    x = glb[0] - fgkMaxStep;
-    if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)){
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kPropagation);
-      AliDebug(4, Form("Failed Initial Propagation to x[%7.2f]", x));
+    x = glb[0] - AliTRDReconstructor::GetMaxStep();
+    if(x > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, x, AliTRDReconstructor::GetMaxStep())){
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kPropagation);
+      AliDebug(4, Form("Failed Propagation to x[%7.2f]", x));
       break;
     }
     if(!AdjustSector(&t)){
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kAdjustSector);
       AliDebug(4, "Failed Adjust Sector Start");
       break;
     }
-    if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kSnp);
-      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
+    if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) {
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kSnp);
+      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), AliTRDReconstructor::GetMaxSnp()));
       break;
     }
     Bool_t doRecalculate = kFALSE;
     if(sm != t.GetSector()){
+      AliDebug(3, Form("Track crossed sectors %2d -> %2d", sm, t.GetSector()));
       sm = t.GetSector(); 
       doRecalculate = kTRUE;
     }
     if(stk != fGeom->GetStack(z, ily)){
+      AliDebug(3, Form("Track crossed stacks %d -> %d in sec[%02d]", stk, fGeom->GetStack(z, ily), sm));
       stk = fGeom->GetStack(z, ily);
       doRecalculate = kTRUE;
     }
     if(doRecalculate){
       det = AliTRDgeometry::GetDetector(ily, stk, sm);
       if(!(matrix = fGeom->GetClusterMatrix(det))){ 
-        t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+        t.SetErrStat(AliTRDtrackV1::kGeometry, ily);
         AliDebug(4, Form("Failed Geometry Matrix ly[%d]", ily));
         continue;
       }
       matrix->LocalToMaster(loc, glb);
-      x = glb[0] - fgkMaxStep;
+      x = glb[0] - AliTRDReconstructor::GetMaxStep();
     }
 
     // check if track is well inside fiducial volume 
-    if (!t.GetProlongation(x+fgkMaxStep, y, z)) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kProlongation);
-      AliDebug(4, Form("Failed Prolongation to x[%7.2f] y[%7.2f] z[%7.2f]", x+fgkMaxStep, y, z));
+    if (!t.GetProlongation(x+AliTRDReconstructor::GetMaxStep(), y, z)) {
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kProlongation);
+      AliDebug(4, Form("Failed Prolongation to x[%7.2f] y[%7.2f] z[%7.2f]", x+AliTRDReconstructor::GetMaxStep(), y, z));
       break;
     }
     if(fGeom->IsOnBoundary(det, y, z, .5)){ 
-      t.SetStatus(AliTRDtrackV1::kBoundary, ily);
+      t.SetErrStat(AliTRDtrackV1::kBoundary, ily);
       AliDebug(4, "Failed Track on Boundary");
       continue;
     }
     // mark track as entering the FIDUCIAL volume of TRD
     if(kStoreIn){
-      t.SetTrackIn(); 
+      t.SetTrackIn();
       kStoreIn = kFALSE;
     }
 
@@ -846,46 +905,51 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
       AliDebug(3, Form("Building tracklet det[%d]", det));
       // check data in supermodule
       if(!fTrSec[sm].GetNChambers()){ 
-        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
-        AliDebug(4, "Failed NoClusters");
+        t.SetErrStat(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, Form("Failed NoClusters in sec[%02d]", sm));
         continue;
       }
       if(fTrSec[sm].GetX(ily) < 1.){ 
-        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
-        AliDebug(4, "Failed NoX");
+        t.SetErrStat(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, Form("Failed NoX in sec[%02d]", sm));
         continue;
       }
       
       // check data in chamber
       if(!(chamber = fTrSec[sm].GetChamber(stk, ily))){ 
-        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
-        AliDebug(4, "Failed No Detector");
+        t.SetErrStat(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, Form("Failed No Data for D%03d[%02d_%d_%d]", AliTRDgeometry::GetDetector(ily, stk, sm), sm, stk, ily));
         continue;
       }
       if(chamber->GetNClusters() < fgNTimeBins*fkRecoParam ->GetFindableClusters()){ 
-        t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
-        AliDebug(4, "Failed Not Enough Clusters in Detector");
+        t.SetErrStat(AliTRDtrackV1::kNoClusters, ily);
+        AliDebug(4, Form("Failed Not Enough Clusters[%2d] for D%03d[%02d_%d_%d]", chamber->GetNClusters(), AliTRDgeometry::GetDetector(ily, stk, sm), sm, stk, ily));
         continue;
       }      
       // build tracklet
+      tracklet.~AliTRDseedV1();
       ptrTracklet = new(&tracklet) AliTRDseedV1(det);
       ptrTracklet->SetReconstructor(fkReconstructor);
       ptrTracklet->SetKink(t.IsKink());
       ptrTracklet->SetPrimary(t.IsPrimary());
       ptrTracklet->SetPadPlane(fGeom->GetPadPlane(ily, stk));
       ptrTracklet->SetX0(glb[0]+driftLength);
-      if(!tracklet.Init(&t)){
-        n=-1; 
-        t.SetStatus(AliTRDtrackV1::kTrackletInit);
+      if(!ptrTracklet->Init(&t)){
+        n= n?-n:-999;
+        t.SetErrStat(AliTRDtrackV1::kTrackletInit);
         AliDebug(4, "Failed Tracklet Init");
         break;
       }
-      if(!tracklet.AttachClusters(chamber, kTRUE)){   
-        t.SetStatus(AliTRDtrackV1::kNoAttach, ily);
+      // Select attachment base on track to B field sign not only track charge which is buggy
+      // mark kFALSE same sign tracks and kTRUE opposite sign tracks
+      // A.Bercuci 3.11.2011
+      Float_t prod(t.GetBz()*t.Charge());
+      if(!ptrTracklet->AttachClusters(chamber, kTRUE, prod<0.?kTRUE:kFALSE, fEventInFile)){
+        t.SetErrStat(AliTRDtrackV1::kNoAttach, ily);
         if(debugLevel>3){
           AliTRDseedV1 trackletCp(*ptrTracklet);
           UChar_t status(t.GetStatusTRD(ily));
-          (*cstreamer)   << "FollowBackProlongation2"
+          (*cstreamer)   << "FollowBackProlongation4"
           <<"status="    << status
           <<"tracklet.=" << &trackletCp
           << "\n";
@@ -893,21 +957,28 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
         AliDebug(4, "Failed Attach Clusters");
         continue;
       }
-      AliDebug(3, Form("Number of Clusters in Tracklet: %d", tracklet.GetN()));
-      if(tracklet.GetN() < fgNTimeBins*fkRecoParam ->GetFindableClusters()){
-        t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily);
+      Int_t nClTracklet(ptrTracklet->GetN());
+      AliDebug(3, Form("Number of Clusters in Tracklet: %2d", nClTracklet));
+      if(nClTracklet < Int_t(fgNTimeBins*fkRecoParam->GetFindableClusters())){
+        t.SetErrStat(AliTRDtrackV1::kNoClustersTracklet, ily);
         if(debugLevel>3){
           AliTRDseedV1 trackletCp(*ptrTracklet);
           UChar_t status(t.GetStatusTRD(ily));
-          (*cstreamer)   << "FollowBackProlongation2"
+          (*cstreamer)   << "FollowBackProlongation4"
           <<"status="    << status
           <<"tracklet.=" << &trackletCp
           << "\n";
         }
-        AliDebug(4, "Failed N Clusters Attached");
+        AliDebug(4, Form("Attached clusters %2d<%2d (%4.1f%% of TB[%2d])", nClTracklet, Int_t(fgNTimeBins*fkRecoParam->GetFindableClusters()), 1.e2*fkRecoParam->GetFindableClusters(), fgNTimeBins));
         continue;
       }
       ptrTracklet->UpdateUsed();
+      // protect against reattaching clusters
+      if(Float_t(ptrTracklet->GetNUsed())/nClTracklet > .5/*fkRecoParam->GetUsedClustersLimit()*/){
+        t.SetErrStat(AliTRDtrackV1::kNoClustersTracklet, ily);
+        AliDebug(4, Form("Used clusters %2d[%4.1f%%] exceed limit [%4.1f%%]", nClTracklet, Float_t(ptrTracklet->GetNUsed())/nClTracklet, 1.e2*.5/*fkRecoParam->GetUsedClustersLimit()*/));
+        continue;
+      }
     } else AliDebug(2, Form("Use external tracklet ly[%d]", ily));
     // propagate track to the radial position of the tracklet
 
@@ -915,46 +986,44 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     // tilt correction options
     // 0 : no correction
     // 2 : pseudo tilt correction
-    if(!ptrTracklet->Fit(2)){
-      t.SetStatus(AliTRDtrackV1::kNoFit, ily);
+    if(!ptrTracklet->FitRobust(t.Charge()>0?kTRUE:kFALSE)){
+      t.SetErrStat(AliTRDtrackV1::kNoFit, ily);
       AliDebug(4, "Failed Tracklet Fit");
       continue;
     } 
     x = ptrTracklet->GetX(); //GetX0();
-    if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kPropagation);
+    if(x > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, x, AliTRDReconstructor::GetMaxStep())) {
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kPropagation);
       AliDebug(4, Form("Failed Propagation to Tracklet x[%7.2f]", x));
       break;
     }
     if(!AdjustSector(&t)) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kAdjustSector);
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kAdjustSector);
       AliDebug(4, "Failed Adjust Sector");
       break;
     }
-    if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
-      n=-1; 
-      t.SetStatus(AliTRDtrackV1::kSnp);
-      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
+    if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) {
+      n= n?-n:-999;
+      t.SetErrStat(AliTRDtrackV1::kSnp);
+      AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), AliTRDReconstructor::GetMaxSnp()));
       break;
     }
-    if(kPropagateIn){
-      t.SetTrackIn(); 
-      kPropagateIn = kFALSE;
-    }
+    // update parameters of track in.
+    if(!ily) t.SetTrackIn();
     Double_t cov[3]; ptrTracklet->GetCovAt(x, cov);
     Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()};
     Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov);
     // update Kalman with the TRD measurement
     if(chi2>1e+10){ // TODO
-      t.SetStatus(AliTRDtrackV1::kChi2, ily);
+      t.SetErrStat(AliTRDtrackV1::kChi2, ily);
       if(debugLevel > 2){
         UChar_t status(t.GetStatusTRD());
         AliTRDseedV1  trackletCp(*ptrTracklet);
         AliTRDtrackV1 trackCp(t);
         trackCp.SetOwner();
-        (*cstreamer) << "FollowBackProlongation1"
+        (*cstreamer) << "FollowBackProlongation3"
             << "status="      << status
             << "tracklet.="   << &trackletCp
             << "track.="      << &trackCp
@@ -965,14 +1034,14 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     }
     if(kUseTRD){
       if(!((AliExternalTrackParam&)t).Update(p, cov)) {
-        n=-1; 
-        t.SetStatus(AliTRDtrackV1::kUpdate);
+        n= n?-n:-999;
+        t.SetErrStat(AliTRDtrackV1::kUpdate);
         if(debugLevel > 2){
           UChar_t status(t.GetStatusTRD());
           AliTRDseedV1  trackletCp(*ptrTracklet);
           AliTRDtrackV1 trackCp(t);
           trackCp.SetOwner();
-          (*cstreamer) << "FollowBackProlongation1"
+          (*cstreamer) << "FollowBackProlongation3"
               << "status="      << status
               << "tracklet.="   << &trackletCp
               << "track.="      << &trackCp
@@ -987,8 +1056,11 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
     AliTracker::FillResiduals(&t, p, cov, ptrTracklet->GetVolumeId());
   
 
-    // load tracklet to the tracker
-    ptrTracklet->Update(&t);
+    // register tracklet with the tracker and track
+    // Save inside the tracklet the track parameters BEFORE track update.
+    // Commented out their overwriting AFTER track update
+    // A.Bercuci 3.11.2011
+    //ptrTracklet->Update(&t); 
     ptrTracklet = SetTracklet(ptrTracklet);
     Int_t index(fTracklets->GetEntriesFast()-1);
     t.SetTracklet(ptrTracklet, index);
@@ -1010,13 +1082,12 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t)
   //printf("clusters[%d] chi2[%f] x[%f] status[%d ", n, t.GetChi2(), t.GetX(), t.GetStatusTRD());
   //for(int i=0; i<6; i++) printf("%d ", t.GetStatusTRD(i)); printf("]\n");
 
-  if(debugLevel > 1){
-    Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+  if(n && debugLevel > 1){
+    //Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
     AliTRDtrackV1 track(t);
     track.SetOwner();
-    (*cstreamer) << "FollowBackProlongation0"
-        << "EventNumber=" << eventNumber
-        << "ncl="         << n
+    (*cstreamer) << "FollowBackProlongation2"
+        << "EventNumber=" << fEventInFile
         << "track.="      << &track
         << "\n";
   }
@@ -1138,7 +1209,7 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
     if(!tracklets[ilr].IsOK()) continue;
     for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){
       if(!tracklets[ilr].IsUsable(itb)) continue;
-      cl = tracklets[ilr].GetClusters(itb);
+      if(!(cl = tracklets[ilr].GetClusters(itb))) continue;
       if(!cl->IsInChamber()) continue;
       x = cl->GetX();
       y = cl->GetY();
@@ -1161,7 +1232,10 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub
   Double_t b = fitter->GetParameter(1);
   Double_t curvature = a/TMath::Sqrt(b*b + 1);
 
-  Float_t chi2track = fitter->GetChisquare()/Double_t(nPoints);
+  Float_t chi2track = 0.0;
+  if (nPoints > 0) {
+    chi2track = fitter->GetChisquare()/Double_t(nPoints);
+  }
   for(Int_t ip = 0; ip < AliTRDtrackerV1::kNPlanes; ip++)
     tracklets[ip].SetC(curvature, 1);
 
@@ -1271,7 +1345,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro
       nPoints++;
     }
   }
-  fitter->Eval();
+  if (fitter->Eval()) return 1.e10;
   zfitter.Eval();
 
   Double_t offset = fitter->GetParameter(3);
@@ -1675,7 +1749,8 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t
   //if(points) printf("First marker point @ x[%d] = %f\n", ip, points[ip].GetX());
 
 
-  AliTRDseedV1 tracklet, *ptrTracklet = NULL;
+  AliTRDseedV1 tracklet;
+  AliTRDseedV1 *ptrTracklet = NULL;
 
   //Loop through the TRD planes
   for (Int_t jplane = 0; jplane < kNPlanes; jplane++) {
@@ -1698,8 +1773,8 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t
 
     while(ip < np){
       //don't do anything if next marker is after next update point.
-      if((up?-1:1) * (points[ip].GetX() - x) - fgkMaxStep < 0) break;
-      if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.;
+      if((up?-1:1) * (points[ip].GetX() - x) - AliTRDReconstructor::GetMaxStep() < 0) break;
+      if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), AliTRDReconstructor::GetMaxStep())) return -1.;
       
       Double_t xyz[3]; // should also get the covariance
       track->GetXYZ(xyz);
@@ -1710,10 +1785,10 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t
     // printf("plane[%d] tracklet[%p] x[%f]\n", iplane, ptrTracklet, x);
 
     // Propagate closer to the next update point 
-    if(((up?-1:1) * (x - track->GetX()) + fgkMaxStep < 0) && !PropagateToX(*track, x + (up?-1:1)*fgkMaxStep, fgkMaxStep)) return -1.;
+    if(((up?-1:1) * (x - track->GetX()) + AliTRDReconstructor::GetMaxStep() < 0) && !PropagateToX(*track, x + (up?-1:1)*AliTRDReconstructor::GetMaxStep(), AliTRDReconstructor::GetMaxStep())) return -1.;
 
     if(!AdjustSector(track)) return -1;
-    if(TMath::Abs(track->GetSnp()) > fgkMaxSnp) return -1;
+    if(TMath::Abs(track->GetSnp()) > AliTRDReconstructor::GetMaxSnp()) return -1;
     
     //load tracklet to the tracker and the track
 /*    Int_t index;
@@ -1762,7 +1837,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t
 
   // extrapolation
   while(ip < np){
-    if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.;
+    if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), AliTRDReconstructor::GetMaxStep())) return -1.;
     
     Double_t xyz[3]; // should also get the covariance
     track->GetXYZ(xyz); 
@@ -1775,7 +1850,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t
 }
 
 //_________________________________________________________________________
-Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
+Float_t AliTRDtrackerV1::CalculateChi2Z(const AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref)
 {
   //
   // Calculates the chi2-value of the track in z-Direction including tilting pad correction.
@@ -1807,16 +1882,15 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
   // Returns 1 if track reaches the plane, and 0 otherwise 
   //
 
-  const Double_t kEpsilon = 0.00001;
-
   // Current track X-position
-  Double_t xpos = t.GetX();
+  Double_t xpos = t.GetX()/*,
+           mass = t.GetMass()*/;
 
   // Direction: inward or outward
   Double_t dir  = (xpos < xToGo) ? 1.0 : -1.0;
 
-  while (((xToGo - xpos) * dir) > kEpsilon) {
-
+  while (((xToGo - xpos) * dir) > AliTRDReconstructor::GetEpsilon()) {
+//    printf("to go %f\n", (xToGo - xpos) * dir);
     Double_t xyz0[3];
     Double_t xyz1[3];
     Double_t param[7];
@@ -1844,12 +1918,47 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
     // Calculate the mean material budget between start and
     // end point of this prolongation step
     if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param)<=0.) return 0;
-
+    
     // Propagate the track to the X-position after the next step
     if (!t.PropagateTo(x, param[1], param[0]*param[4])) return 0;
 
+/*    // Correct for mean material budget
+    Double_t dEdx(0.),
+             bg(t.GetP()/mass);
+    if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=3){
+      const char *pn[] = {"rho", "x/X0", "<A>", "<Z>", "L", "<Z/A>", "Nb"};
+      printf("D-AliTRDtrackerV1::PropagateTo(): x[%6.2f] bg[%6.2f]\n", xpos, bg);
+      printf("     param :: %s[%e] %s[%e] %s[%e] %s[%e] %s[%e] %s[%e] %s[%e]\n"
+          , pn[0], param[0]
+          , pn[1], param[1]
+          , pn[2], param[2]
+          , pn[3], param[3]
+          , pn[4], param[4]
+          , pn[5], param[5]
+          , pn[6], param[6]);
+    }  
+    switch(fgBB){
+    case kSolid:
+      dEdx = AliExternalTrackParam::BetheBlochSolid(bg);
+      break;
+    case kGas:
+      dEdx = AliExternalTrackParam::BetheBlochGas(bg);
+      break;
+    case kGeant:
+      { // mean exitation energy (GeV)
+        Double_t mee = ((param[3] < 13.) ? (12. * param[3] + 7.) : (9.76 * param[3] + 58.8 * TMath::Power(param[3],-0.19))) * 1.e-9;
+        Double_t mZA = param[5]>1.e-5?param[5]:(param[3]/param[2]);
+        if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=3) printf("D-AliTRDtrackerV1::PropagateTo(): Mee[%e] <Z/A>[%e]\n", mee, mZA);
+        // protect against failed calculation of rho in MeanMaterialBudget()
+        dEdx = AliExternalTrackParam::BetheBlochGeant(bg, param[0]>1.e-6?param[0]:2.33, 0.2, 3., mee, mZA);
+      }
+      break;
+    }
+    if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=2) printf("D-AliTRDtrackerV1::PropagateTo(): dEdx(bg=%e, m=%e)= %e[GeV/cm]\n", bg, mass, dEdx);
+    if (!t.CorrectForMeanMaterialdEdx(param[1], dir*param[0]*param[4], mass, dEdx)) return 0;
+*/
     // Rotate the track if necessary
-    AdjustSector(&t);
+    if(!AdjustSector(&t)) return 0;
 
     // New track X-position
     xpos = t.GetX();
@@ -1860,9 +1969,8 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m
 
 }
 
-
 //_____________________________________________________________________________
-Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) const
+Bool_t AliTRDtrackerV1::ReadClusters(TTree *clusterTree)
 {
   //
   // Reads AliTRDclusters from the file. 
@@ -1876,15 +1984,15 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
   TBranch *branch = clusterTree->GetBranch("TRDcluster");
   if (!branch) {
     AliError("Can't get the branch !");
-    return 1;
+    return kFALSE;
   }
   branch->SetAddress(&clusterArray); 
   
   if(!fClusters){ 
     Float_t nclusters =  fkRecoParam->GetNClusters();
     if(fkReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
-    array = new TClonesArray("AliTRDcluster", Int_t(nclusters));
-    array->SetOwner(kTRUE);
+    fClusters = new TClonesArray("AliTRDcluster", Int_t(nclusters));
+    fClusters->SetOwner(kTRUE);
   }
   
   // Loop through all entries in the tree
@@ -1903,11 +2011,10 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co
       new((*fClusters)[ncl++]) AliTRDcluster(*c);
       delete (clusterArray->RemoveAt(iCluster)); 
     }
-
   }
   delete clusterArray;
 
-  return 0;
+  return kTRUE;
 }
 
 //_____________________________________________________________________________
@@ -1922,7 +2029,7 @@ Int_t AliTRDtrackerV1::LoadClusters(TTree *cTree)
   if(!fkReconstructor->IsWritingClusters()){ 
     fClusters = AliTRDReconstructor::GetClusters();
   } else {
-    if (ReadClusters(fClusters, cTree)) {
+    if(!ReadClusters(cTree)) {
       AliError("Problem with reading the clusters !");
       return 1;
     }
@@ -2074,7 +2181,7 @@ Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *const track)
 
 
 //____________________________________________________________________
-AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *const track, Int_t p, Int_t &idx)
+AliTRDseedV1* AliTRDtrackerV1::GetTracklet(const AliTRDtrackV1 *const track, Int_t p, Int_t &idx)
 {
   // Find tracklet for TRD track <track>
   // Parameters
@@ -2287,7 +2394,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
     if(!ntracks) break;
     
     // Sort the seeds according to their quality
-    Int_t sort[kMaxTracksStack];
+    Int_t sort[kMaxTracksStack+1];
     TMath::Sort(ntracks, fTrackQuality, sort, kTRUE);
     if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1") > 2){
       AliDebug(3, "Track candidates classification:");
@@ -2355,7 +2462,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon
             break;
 
           case 1: // select shorter primary tracks, good quality
-            if(findable<4){skip = kTRUE; break;}
+            //if(findable<4){skip = kTRUE; break;}
             if(nlayers < findable){skip = kTRUE; break;}
             if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;}
             break;
@@ -2627,8 +2734,8 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c
   for(int iLayer=0; iLayer<kNPlanes; iLayer++,cIter++){
     if(!(*cIter)) continue;
     if(!(matrix = fGeom->GetClusterMatrix((*cIter)->GetDetector()))){ 
-      continue;
       x0[iLayer] = fgkX0[iLayer];
+      continue;
     }
     matrix->LocalToMaster(loc, glb);
     x0[iLayer] = glb[0];
@@ -3078,9 +3185,10 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const tracklet)
   ptrTrack->CookPID();
   // update calibration references using this track
   AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance();
-  if (!calibra){ 
-    AliInfo("Could not get Calibra instance\n");
-    if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(ptrTrack);
+  if(!calibra){
+    AliInfo("Could not get Calibra instance.");
+  } else if(calibra->GetHisto2d()){
+    calibra->UpdateHistogramsV1(ptrTrack);
   }
   return ptrTrack;
 }
@@ -3113,7 +3221,7 @@ Bool_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRD
   AliTRDseedV1 bseed[AliTRDgeometry::kNlayer];
 
   Float_t quality(1.e3), 
-          lQuality[] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 1.e3};
+          lQuality[AliTRDgeometry::kNlayer] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 1.e3};
   Int_t rLayers(0);
   for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;){ 
     bseed[jLayer] = cseed[jLayer];
@@ -3122,13 +3230,15 @@ Bool_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRD
     lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE);
     quality    += lQuality[jLayer];
   }
-  quality /= rLayers;
+  if (rLayers > 0) {
+    quality /= rLayers;
+  }
   AliDebug(2, Form("Start N[%d] Q[%f] chi2[%f]", rLayers, quality, chi2));
 
   for (Int_t iter = 0; iter < 4; iter++) {
     // Try better cluster set
     Int_t nLayers(0); Float_t qualitynew(0.);
-    Int_t  indexes[6];
+    Int_t  indexes[4*AliTRDgeometry::kNlayer];
     TMath::Sort(Int_t(AliTRDgeometry::kNlayer), lQuality, indexes, kFALSE);
     for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) {
       Int_t bLayer = indexes[jLayer];
@@ -3791,6 +3901,7 @@ Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *const tracklets){
 //____________________________________________________________________
 void AliTRDtrackerV1::UnsetTrackletsTrack(const AliTRDtrackV1 * const track)
 {
+//  Remove tracklets from tracker list attached to "track"
   Int_t idx(-1);
   for(Int_t il(0); il<kNPlanes; il++){
     if((idx = track->GetTrackletIndex(il)) < 0) continue;
@@ -3877,7 +3988,7 @@ Bool_t AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
   //
   
   Double_t det = fSums[0] * fSums[4] - fSums[1] *fSums[1];
-  if(det==0) return kFALSE;
+  if(TMath::Abs(det)<1.e-30) return kFALSE;
 
   //   for(Int_t isum = 0; isum < 5; isum++)
   //           printf("fSums[%d] = %f\n", isum, fSums[isum]);
@@ -4048,7 +4159,7 @@ Double_t AliTRDtrackerV1::AliTRDtrackFitterRieman::Eval(){
 }
 
 //_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(AliTRDseedV1 * const tracklet){
+void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(const AliTRDseedV1 * const tracklet){
   //
   // Does the transformations and updates the fitters
   // The following transformation is applied