]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONTrackReconstructorK.cxx
Setting compilaton directory to current one
[u/mrichter/AliRoot.git] / MUON / AliMUONTrackReconstructorK.cxx
index af722e55d7bb770f491a82e2844a149dfedac9ff..db0b4bff1fa51365de00e0614fca914d908d921d 100644 (file)
@@ -46,6 +46,7 @@
 #include <Riostream.h>
 #include <TMath.h>
 #include <TMatrixD.h>
+#include <TClonesArray.h>
 
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackReconstructorK) // Class implementation in ROOT context
@@ -116,13 +117,21 @@ Bool_t AliMUONTrackReconstructorK::MakeTrackCandidates(AliMUONVClusterStore& clu
       
       // Remove track if no cluster found on a requested station
       // or abort tracking if there are too many candidates
-      if (!clusterFound && GetRecoParam()->RequestStation(7-istat)) {
-       fRecTracksPtr->Remove(track);
-       fNRecTracks--;
-      } else if (fNRecTracks > GetRecoParam()->GetMaxTrackCandidates()) {
-       AliError(Form("Too many track candidates (%d tracks). Abort tracking.", fNRecTracks));
-       delete segments;
-       return kFALSE;
+      if (GetRecoParam()->RequestStation(7-istat)) {
+       if (!clusterFound) {
+         fRecTracksPtr->Remove(track);
+         fNRecTracks--;
+       } else if (fNRecTracks > GetRecoParam()->GetMaxTrackCandidates()) {
+         AliError(Form("Too many track candidates (%d tracks). Stop tracking.", fNRecTracks));
+         delete segments;
+         return kFALSE;
+       }
+      } else {
+       if ((fNRecTracks + segments->GetEntriesFast() - iSegment - 1) > GetRecoParam()->GetMaxTrackCandidates()) {
+         AliError(Form("Too many track candidates (%d tracks). Stop tracking.", fNRecTracks + segments->GetEntriesFast() - iSegment - 1));
+         delete segments;
+         return kFALSE;
+       }
       }
       
     }
@@ -142,24 +151,17 @@ Bool_t AliMUONTrackReconstructorK::MakeTrackCandidates(AliMUONVClusterStore& clu
     // skip empty slots
     if(!track) continue;
     
-    // retrace tracks using Kalman filter
-    RetraceTrack(*track,kTRUE);
-    
-    // remove tracks with absolute bending momentum out of limits
-    if (GetRecoParam()->MakeTrackCandidatesFast() && AliMUONTrackExtrap::IsFieldON()) {
-      AliMUONTrackParam *trackParam = (AliMUONTrackParam*)track->GetTrackParamAtCluster()->First();
-      Double_t bendingMomentum = TMath::Abs(1. / trackParam->GetInverseBendingMomentum());
-      if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() || bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) {
-       fRecTracksPtr->Remove(track);
-       fNRecTracks--;
-      }
+    // retrace tracks using Kalman filter and remove the ones for which extrap failed or that are out of limits
+    if (!RetraceTrack(*track,kTRUE) || !IsAcceptable(*((AliMUONTrackParam*)track->GetTrackParamAtCluster()->First()))) {
+      fRecTracksPtr->Remove(track);
+      fNRecTracks--;
     }
     
   }
   
   // Keep only the best tracks if required
   if (!GetRecoParam()->TrackAllTracks()) RemoveDoubleTracks();
-  else if (GetRecoParam()->MakeTrackCandidatesFast() && AliMUONTrackExtrap::IsFieldON()) fRecTracksPtr->Compress();
+  else fRecTracksPtr->Compress();
   
   AliDebug(1,Form("Number of good candidates = %d",fNRecTracks));
   
@@ -223,8 +225,8 @@ Bool_t AliMUONTrackReconstructorK::MakeMoreTrackCandidates(AliMUONVClusterStore&
        }
        
        // abort tracking if there are too many candidates
-       if (fNRecTracks > GetRecoParam()->GetMaxTrackCandidates()) {
-         AliError(Form("Too many track candidates (%d tracks). Abort tracking.", fNRecTracks));
+       if ((fNRecTracks + segments->GetEntriesFast() - iSegment - 1) > GetRecoParam()->GetMaxTrackCandidates()) {
+         AliError(Form("Too many track candidates (%d tracks). Stop tracking.", fNRecTracks + segments->GetEntriesFast() - iSegment - 1));
          delete segments;
          return kFALSE;
        }
@@ -244,17 +246,10 @@ Bool_t AliMUONTrackReconstructorK::MakeMoreTrackCandidates(AliMUONVClusterStore&
     // skip empty slots
     if(!track) continue;
     
-    // retrace tracks using Kalman filter
-    RetraceTrack(*track,kTRUE);
-    
-    // remove tracks with absolute bending momentum out of limits
-    if (AliMUONTrackExtrap::IsFieldON()) {
-      AliMUONTrackParam *trackParam = (AliMUONTrackParam*)track->GetTrackParamAtCluster()->First();
-      Double_t bendingMomentum = TMath::Abs(1. / trackParam->GetInverseBendingMomentum());
-      if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() || bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) {
-       fRecTracksPtr->Remove(track);
-       fNRecTracks--;
-      }
+    // retrace tracks using Kalman filter and remove the ones for which extrap failed or that are out of limits
+    if (!RetraceTrack(*track,kTRUE) || !IsAcceptable(*((AliMUONTrackParam*)track->GetTrackParamAtCluster()->First()))) {
+      fRecTracksPtr->Remove(track);
+      fNRecTracks--;
     }
     
   }
@@ -270,9 +265,10 @@ Bool_t AliMUONTrackReconstructorK::MakeMoreTrackCandidates(AliMUONVClusterStore&
 }
 
   //__________________________________________________________________________
-void AliMUONTrackReconstructorK::RetraceTrack(AliMUONTrack &trackCandidate, Bool_t resetSeed)
+Bool_t AliMUONTrackReconstructorK::RetraceTrack(AliMUONTrack &trackCandidate, Bool_t resetSeed)
 {
   /// Re-run the kalman filter from the most downstream cluster to the most uptream one
+  /// Return kFALSE in case of failure (i.e. extrapolation problem)
   AliDebug(1,"Enter RetraceTrack");
   
   AliMUONTrackParam* lastTrackParam = (AliMUONTrackParam*) trackCandidate.GetTrackParamAtCluster()->Last();
@@ -342,14 +338,15 @@ void AliMUONTrackReconstructorK::RetraceTrack(AliMUONTrack &trackCandidate, Bool
   }
   
   // Redo the tracking
-  RetracePartialTrack(trackCandidate, lastTrackParam);
+  return RetracePartialTrack(trackCandidate, lastTrackParam);
   
 }
 
   //__________________________________________________________________________
-void AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidate, const AliMUONTrackParam* startingTrackParam)
+Bool_t AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidate, const AliMUONTrackParam* startingTrackParam)
 {
   /// Re-run the kalman filter from the cluster attached to startingTrackParam to the most uptream cluster
+  /// Return kFALSE in case of failure (i.e. extrapolation problem)
   AliDebug(1,"Enter RetracePartialTrack");
   
   // Printout for debuging
@@ -361,6 +358,7 @@ void AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidat
   trackCandidate.SetGlobalChi2(startingTrackParam->GetTrackChi2());
   
   // loop over attached clusters until the first one and recompute track parameters and covariances using kalman filter
+  Bool_t extrapStatus = kTRUE;
   Int_t expectedChamber = startingTrackParam->GetClusterPtr()->GetChamberId() - 1;
   Int_t currentChamber;
   Double_t addChi2TrackAtCluster;
@@ -373,7 +371,7 @@ void AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidat
     trackParamAtCluster->SetCovariances(startingTrackParam->GetCovariances());
     
     // add MCS effect
-    AliMUONTrackExtrap::AddMCSEffect(trackParamAtCluster,AliMUONConstants::ChamberThicknessInX0(),1.);
+    AliMUONTrackExtrap::AddMCSEffect(trackParamAtCluster,AliMUONConstants::ChamberThicknessInX0(expectedChamber+1),-1.);
     
     // reset propagator for smoother
     if (GetRecoParam()->UseSmoother()) trackParamAtCluster->ResetPropagator();
@@ -382,16 +380,16 @@ void AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidat
     currentChamber = trackParamAtCluster->GetClusterPtr()->GetChamberId();
     while (currentChamber < expectedChamber) {
       // extrapolation to the missing chamber (update the propagator)
-      AliMUONTrackExtrap::ExtrapToZCov(trackParamAtCluster, AliMUONConstants::DefaultChamberZ(expectedChamber),
-                                      GetRecoParam()->UseSmoother());
+      if (!AliMUONTrackExtrap::ExtrapToZCov(trackParamAtCluster, AliMUONConstants::DefaultChamberZ(expectedChamber),
+                                           GetRecoParam()->UseSmoother())) extrapStatus = kFALSE;
       // add MCS effect
-      AliMUONTrackExtrap::AddMCSEffect(trackParamAtCluster,AliMUONConstants::ChamberThicknessInX0(),1.);
+      AliMUONTrackExtrap::AddMCSEffect(trackParamAtCluster,AliMUONConstants::ChamberThicknessInX0(expectedChamber),-1.);
       expectedChamber--;
     }
     
     // extrapolation to the plane of the cluster attached to the current trackParamAtCluster (update the propagator)
-    AliMUONTrackExtrap::ExtrapToZCov(trackParamAtCluster, trackParamAtCluster->GetClusterPtr()->GetZ(),
-                                    GetRecoParam()->UseSmoother());
+    if (!AliMUONTrackExtrap::ExtrapToZCov(trackParamAtCluster, trackParamAtCluster->GetClusterPtr()->GetZ(),
+                                         GetRecoParam()->UseSmoother())) extrapStatus = kFALSE;
     
     if (GetRecoParam()->UseSmoother()) {
       // save extrapolated parameters for smoother
@@ -419,6 +417,10 @@ void AliMUONTrackReconstructorK::RetracePartialTrack(AliMUONTrack &trackCandidat
     cout << "RetracePartialTrack: track chi2 after re-tracking: " << trackCandidate.GetGlobalChi2() << endl;
   }
   
+  // set global chi2 to max value in case of problem during track extrapolation
+  if (!extrapStatus) trackCandidate.SetGlobalChi2(2.*AliMUONTrack::MaxChi2());
+  return extrapStatus;
+  
 }
 
   //__________________________________________________________________________
@@ -471,9 +473,16 @@ Bool_t AliMUONTrackReconstructorK::FollowTracks(AliMUONVClusterStore& clusterSto
       }
       
       // abort tracking if there are too many candidates
-      if (fNRecTracks > GetRecoParam()->GetMaxTrackCandidates()) {
-       AliError(Form("Too many track candidates (%d tracks). Abort tracking.", fNRecTracks));
-       return kFALSE;
+      if (GetRecoParam()->RequestStation(station)) {
+       if (fNRecTracks > GetRecoParam()->GetMaxTrackCandidates()) {
+         AliError(Form("Too many track candidates (%d tracks). Stop tracking.", fNRecTracks));
+         return kFALSE;
+       }
+      } else {
+       if ((fNRecTracks + currentNRecTracks - iRecTrack - 1) > GetRecoParam()->GetMaxTrackCandidates()) {
+         AliError(Form("Too many track candidates (%d tracks). Stop tracking.", fNRecTracks + currentNRecTracks - iRecTrack - 1));
+         return kFALSE;
+       }
       }
       
     }
@@ -501,12 +510,11 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInChamber(AliMUONTrack &trackCandi
   /// return kTRUE if new cluster(s) have been found (otherwise return kFALSE)
   AliDebug(1,Form("Enter FollowTrackInChamber(1..) %d", nextChamber+1));
   
-  Double_t bendingMomentum;
   Double_t chi2OfCluster;
   Double_t maxChi2OfCluster = 2. * GetRecoParam()->GetSigmaCutForTracking() *
                                   GetRecoParam()->GetSigmaCutForTracking(); // 2 because 2 quantities in chi2
   Double_t addChi2TrackAtCluster;
-  Double_t bestAddChi2TrackAtCluster = 1.e10;
+  Double_t bestAddChi2TrackAtCluster = AliMUONTrack::MaxChi2();
   Bool_t foundOneCluster = kFALSE;
   AliMUONTrack *newTrack = 0x0;
   AliMUONVCluster *cluster;
@@ -526,25 +534,25 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInChamber(AliMUONTrack &trackCandi
   }
   
   // Add MCS effect
-  AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(),1.);
+  Int_t currentChamber = extrapTrackParamAtCh.GetClusterPtr()->GetChamberId();
+  AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(currentChamber),-1.);
   
   // reset propagator for smoother
   if (GetRecoParam()->UseSmoother()) extrapTrackParamAtCh.ResetPropagator();
   
   // Add MCS in the missing chamber(s) if any
-  Int_t currentChamber = extrapTrackParamAtCh.GetClusterPtr()->GetChamberId();
   while (currentChamber > nextChamber + 1) {
     // extrapolation to the missing chamber
     currentChamber--;
-    AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(currentChamber),
-                                    GetRecoParam()->UseSmoother());
+    if (!AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(currentChamber),
+                                         GetRecoParam()->UseSmoother())) return kFALSE;
     // add MCS effect
-    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(),1.);
+    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(currentChamber),-1.);
   }
   
   //Extrapolate trackCandidate to chamber
-  AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(nextChamber),
-                                  GetRecoParam()->UseSmoother());
+  if (!AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(nextChamber),
+                                       GetRecoParam()->UseSmoother())) return kFALSE;
   
   // Printout for debuging
   if ((AliLog::GetDebugLevel("MUON","AliMUONTrackReconstructorK") >= 2) || (AliLog::GetGlobalDebugLevel() >= 2)) {
@@ -591,12 +599,8 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInChamber(AliMUONTrack &trackCandi
       // Compute new track parameters including new cluster using kalman filter
       addChi2TrackAtCluster = RunKalmanFilter(extrapTrackParamAtCluster);
       
-      // skip track with absolute bending momentum out of limits
-      if (AliMUONTrackExtrap::IsFieldON()) {
-        bendingMomentum = TMath::Abs(1. / extrapTrackParamAtCluster.GetInverseBendingMomentum());
-        if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() ||
-           bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) continue;
-      }
+      // skip track out of limits
+      if (!IsAcceptable(extrapTrackParamAtCluster)) continue;
       
       // remember a cluster was found
       foundOneCluster = kTRUE;
@@ -679,14 +683,13 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
     ch2 = 2*nextStation+1;
   }
   
-  Double_t bendingMomentum;
   Double_t chi2OfCluster;
   Double_t maxChi2OfCluster = 2. * GetRecoParam()->GetSigmaCutForTracking() *
                                   GetRecoParam()->GetSigmaCutForTracking(); // 2 because 2 quantities in chi2
   Double_t addChi2TrackAtCluster1;
   Double_t addChi2TrackAtCluster2;
-  Double_t bestAddChi2TrackAtCluster1 = 1.e10;
-  Double_t bestAddChi2TrackAtCluster2 = 1.e10;
+  Double_t bestAddChi2TrackAtCluster1 = AliMUONTrack::MaxChi2();
+  Double_t bestAddChi2TrackAtCluster2 = AliMUONTrack::MaxChi2();
   Bool_t foundOneCluster = kFALSE;
   Bool_t foundTwoClusters = kFALSE;
   AliMUONTrack *newTrack = 0x0;
@@ -698,13 +701,7 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
   AliMUONTrackParam bestTrackParamAtCluster1;
   AliMUONTrackParam bestTrackParamAtCluster2;
   
-  Int_t nClusters = clusterStore.GetSize();
-  Bool_t *clusterCh1Used = new Bool_t[nClusters];
-  for (Int_t i = 0; i < nClusters; i++) clusterCh1Used[i] = kFALSE;
-  Int_t iCluster1;
-  
   // Get track parameters according to the propagation direction
-  
   if (nextStation==4) extrapTrackParamAtCh = *(AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->Last();
   else extrapTrackParamAtCh = *(AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->First();
   
@@ -716,25 +713,25 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
   }
   
   // Add MCS effect
-  AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(),1.);
+  Int_t currentChamber = extrapTrackParamAtCh.GetClusterPtr()->GetChamberId();
+  AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(currentChamber),-1.);
   
   // reset propagator for smoother
   if (GetRecoParam()->UseSmoother()) extrapTrackParamAtCh.ResetPropagator();
   
   // Add MCS in the missing chamber(s) if any
-  Int_t currentChamber = extrapTrackParamAtCh.GetClusterPtr()->GetChamberId();
   while (ch1 < ch2 && currentChamber > ch2 + 1) {
     // extrapolation to the missing chamber
     currentChamber--;
-    AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(currentChamber),
-                                    GetRecoParam()->UseSmoother());
+    if (!AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(currentChamber),
+                                         GetRecoParam()->UseSmoother())) return kFALSE;
     // add MCS effect
-    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(),1.);
+    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(currentChamber),-1.);
   }
   
   //Extrapolate trackCandidate to chamber "ch2"
-  AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(ch2),
-                                  GetRecoParam()->UseSmoother());
+  if (!AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(ch2),
+                                       GetRecoParam()->UseSmoother())) return kFALSE;
   
   // Printout for debuging
   if ((AliLog::GetDebugLevel("MUON","AliMUONTrackReconstructorK") >= 2) || (AliLog::GetGlobalDebugLevel() >= 2)) {
@@ -754,6 +751,11 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
     if (nextStation < 3) AskForNewClustersInStation(extrapTrackParamAtCh, clusterStore, nextStation);
   }
   
+  Int_t nClusters = clusterStore.GetSize();
+  Bool_t *clusterCh1Used = new Bool_t[nClusters];
+  for (Int_t i = 0; i < nClusters; i++) clusterCh1Used[i] = kFALSE;
+  Int_t iCluster1;
+  
   // Create iterators to loop over clusters in both chambers
   TIter nextInCh1(clusterStore.CreateChamberIterator(ch1,ch1));
   TIter nextInCh2(clusterStore.CreateChamberIterator(ch2,ch2));
@@ -782,12 +784,8 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
       // Compute new track parameters including "clusterCh2" using kalman filter
       addChi2TrackAtCluster2 = RunKalmanFilter(extrapTrackParamAtCluster2);
       
-      // skip track with absolute bending momentum out of limits
-      if (AliMUONTrackExtrap::IsFieldON()) {
-       bendingMomentum = TMath::Abs(1. / extrapTrackParamAtCluster2.GetInverseBendingMomentum());
-       if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() ||
-           bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) continue;
-      }
+      // skip track out of limits
+      if (!IsAcceptable(extrapTrackParamAtCluster2)) continue;
       
       // Printout for debuging
       if ((AliLog::GetDebugLevel("MUON","AliMUONTrackReconstructorK") >= 1) || (AliLog::GetGlobalDebugLevel() >= 1)) {
@@ -801,14 +799,14 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
       extrapTrackParam = extrapTrackParamAtCluster2;
       
       // add MCS effect
-      AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParam,AliMUONConstants::ChamberThicknessInX0(),1.);
+      AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParam,AliMUONConstants::ChamberThicknessInX0(ch2),-1.);
       
       // reset propagator for smoother
       if (GetRecoParam()->UseSmoother()) extrapTrackParam.ResetPropagator();
       
       //Extrapolate track parameters to chamber "ch1"
-      AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParam, AliMUONConstants::DefaultChamberZ(ch1),
-                                      GetRecoParam()->UseSmoother());
+      Bool_t normalExtrap = AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParam, AliMUONConstants::DefaultChamberZ(ch1),
+                                                            GetRecoParam()->UseSmoother());
       
       // reset cluster iterator of chamber 1
       nextInCh1.Reset();
@@ -816,7 +814,7 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
       
       // look for second candidates in chamber 1
       Bool_t foundSecondCluster = kFALSE;
-      while ( ( clusterCh1 = static_cast<AliMUONVCluster*>(nextInCh1()) ) ) {
+      if (normalExtrap) while ( ( clusterCh1 = static_cast<AliMUONVCluster*>(nextInCh1()) ) ) {
        iCluster1++;
        
        // try to add the current cluster fast
@@ -840,12 +838,8 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
           // Compute new track parameters including "clusterCh1" using kalman filter
           addChi2TrackAtCluster1 = RunKalmanFilter(extrapTrackParamAtCluster1);
           
-         // skip track with absolute bending momentum out of limits
-         if (AliMUONTrackExtrap::IsFieldON()) {
-           bendingMomentum = TMath::Abs(1. / extrapTrackParamAtCluster1.GetInverseBendingMomentum());
-           if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() ||
-               bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) continue;
-         }
+         // skip track out of limits
+         if (!IsAcceptable(extrapTrackParamAtCluster1)) continue;
          
          // remember a second cluster was found
          foundSecondCluster = kTRUE;
@@ -920,11 +914,11 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
   if (GetRecoParam()->TrackAllTracks() || !foundTwoClusters) {
     
     // add MCS effect for next step
-    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(),1.);
+    AliMUONTrackExtrap::AddMCSEffect(&extrapTrackParamAtCh,AliMUONConstants::ChamberThicknessInX0(ch2),-1.);
     
     //Extrapolate trackCandidate to chamber "ch1"
-    AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(ch1),
-                                    GetRecoParam()->UseSmoother());
+    Bool_t normalExtrap = AliMUONTrackExtrap::ExtrapToZCov(&extrapTrackParamAtCh, AliMUONConstants::DefaultChamberZ(ch1),
+                                                          GetRecoParam()->UseSmoother());
     
     // Printout for debuging
     if ((AliLog::GetDebugLevel("MUON","AliMUONTrackReconstructorK") >= 2) || (AliLog::GetGlobalDebugLevel() >= 2)) {
@@ -943,7 +937,7 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
     iCluster1 = -1;
     
     // look for second candidates in chamber 1
-    while ( ( clusterCh1 = static_cast<AliMUONVCluster*>(nextInCh1()) ) ) {
+    if (normalExtrap) while ( ( clusterCh1 = static_cast<AliMUONVCluster*>(nextInCh1()) ) ) {
       iCluster1++;
       
       if (clusterCh1Used[iCluster1]) continue; // Skip clusters already used
@@ -970,12 +964,8 @@ Bool_t AliMUONTrackReconstructorK::FollowTrackInStation(AliMUONTrack &trackCandi
         // Compute new track parameters including "clusterCh1" using kalman filter
         addChi2TrackAtCluster1 = RunKalmanFilter(extrapTrackParamAtCluster1);
         
-       // skip track with absolute bending momentum out of limits
-       if (AliMUONTrackExtrap::IsFieldON()) {
-         bendingMomentum = TMath::Abs(1. / extrapTrackParamAtCluster1.GetInverseBendingMomentum());
-         if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() ||
-             bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) continue;
-       }
+       // skip track out of limits
+       if (!IsAcceptable(extrapTrackParamAtCluster1)) continue;
        
        // remember a cluster was found
        foundOneCluster = kTRUE;
@@ -1075,7 +1065,7 @@ Double_t AliMUONTrackReconstructorK::RunKalmanFilter(AliMUONTrackParam &trackPar
     paramWeight.Invert();
   } else {
     AliWarning(" Determinant = 0");
-    return 1.e10;
+    return 2.*AliMUONTrack::MaxChi2();
   }
   
   // Compute the new cluster weight (U)
@@ -1090,7 +1080,7 @@ Double_t AliMUONTrackReconstructorK::RunKalmanFilter(AliMUONTrackParam &trackPar
     newParamCov.Invert();
   } else {
     AliWarning(" Determinant = 0");
-    return 1.e10;
+    return 2.*AliMUONTrack::MaxChi2();
   }
   
   // Save the new parameters covariance matrix
@@ -1230,14 +1220,10 @@ Bool_t AliMUONTrackReconstructorK::RecoverTrack(AliMUONTrack &trackCandidate, Al
   trackCandidate.RemoveTrackParamAtCluster((AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->UncheckedAt(worstClusterNumber));
   
   // Re-calculate track parameters at the (new) first cluster
-  RetracePartialTrack(trackCandidate,(AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->UncheckedAt(1));
+  if (!RetracePartialTrack(trackCandidate,(AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->UncheckedAt(1))) return kFALSE;
   
-  // skip track with absolute bending momentum out of limits
-  if (AliMUONTrackExtrap::IsFieldON()) {
-    Double_t bendingMomentum = TMath::Abs(1. / ((AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->First())->GetInverseBendingMomentum());
-    if (bendingMomentum < GetRecoParam()->GetMinBendingMomentum() ||
-       bendingMomentum > GetRecoParam()->GetMaxBendingMomentum()) return kFALSE;
-  }
+  // skip track out of limits
+  if (!IsAcceptable(*((AliMUONTrackParam*)trackCandidate.GetTrackParamAtCluster()->First()))) return kFALSE;
   
   // Look for new cluster(s) in next station
   return FollowTrackInStation(trackCandidate, clusterStore, nextStation);
@@ -1255,17 +1241,20 @@ Bool_t AliMUONTrackReconstructorK::RunSmoother(AliMUONTrack &track)
   // Smoothed parameters and covariances at first cluster = filtered parameters and covariances
   previousTrackParam->SetSmoothParameters(previousTrackParam->GetParameters());
   previousTrackParam->SetSmoothCovariances(previousTrackParam->GetCovariances());
+
+  AliMUONTrackParam *currentTrackParam = (AliMUONTrackParam*) track.GetTrackParamAtCluster()->After(previousTrackParam);
   
-  // Compute local chi2 at first cluster
-  AliMUONVCluster *cluster = previousTrackParam->GetClusterPtr();
-  Double_t dX = cluster->GetX() - previousTrackParam->GetNonBendingCoor();
-  Double_t dY = cluster->GetY() - previousTrackParam->GetBendingCoor();
-  Double_t chi2 = dX * dX / cluster->GetErrX2() + dY * dY / cluster->GetErrY2();
+  // Save local chi2 at first cluster = last additional chi2 provided by Kalman
+  previousTrackParam->SetLocalChi2(previousTrackParam->GetTrackChi2() - currentTrackParam->GetTrackChi2());
   
-  // Save local chi2 at first cluster
-  previousTrackParam->SetLocalChi2(chi2);
+  // if the track contains only 2 clusters simply copy the filtered parameters
+  if (track.GetNClusters() == 2) {
+    currentTrackParam->SetSmoothParameters(currentTrackParam->GetParameters());
+    currentTrackParam->SetSmoothCovariances(currentTrackParam->GetCovariances());
+    currentTrackParam->SetLocalChi2(currentTrackParam->GetTrackChi2());
+    return kTRUE;
+  }
   
-  AliMUONTrackParam *currentTrackParam = (AliMUONTrackParam*) track.GetTrackParamAtCluster()->After(previousTrackParam);
   while (currentTrackParam) {
     
     // Get variables
@@ -1277,7 +1266,7 @@ Bool_t AliMUONTrackReconstructorK::RunSmoother(AliMUONTrack &track)
     const TMatrixD &filteredCovariances       = currentTrackParam->GetCovariances();        // C(k k)
     const TMatrixD &previousSmoothCovariances = previousTrackParam->GetSmoothCovariances(); // C(k+1 n)
     
-    // Compute smoother gain: A(k) = C(kk) * F(f)^t * (C(k+1 k))^-1
+    // Compute smoother gain: A(k) = C(kk) * F(k)^t * (C(k+1 k))^-1
     TMatrixD extrapWeight(extrapCovariances);
     if (extrapWeight.Determinant() != 0) {
       extrapWeight.Invert(); // (C(k+1 k))^-1
@@ -1285,8 +1274,8 @@ Bool_t AliMUONTrackReconstructorK::RunSmoother(AliMUONTrack &track)
       AliWarning(" Determinant = 0");
       return kFALSE;
     }
-    TMatrixD smootherGain(filteredCovariances,TMatrixD::kMultTranspose,propagator); // C(kk) * F(f)^t
-    smootherGain *= extrapWeight; // C(kk) * F(f)^t * (C(k+1 k))^-1
+    TMatrixD smootherGain(filteredCovariances,TMatrixD::kMultTranspose,propagator); // C(kk) * F(k)^t
+    smootherGain *= extrapWeight; // C(kk) * F(k)^t * (C(k+1 k))^-1
     
     // Compute smoothed parameters: X(k n) = X(k k) + A(k) * (X(k+1 n) - X(k+1 k))
     TMatrixD tmpParam(previousSmoothParameters,TMatrixD::kMinus,extrapParameters); // X(k+1 n) - X(k+1 k)
@@ -1306,7 +1295,7 @@ Bool_t AliMUONTrackReconstructorK::RunSmoother(AliMUONTrack &track)
     currentTrackParam->SetSmoothCovariances(smoothCovariances);
     
     // Compute smoothed residual: r(k n) = cluster - X(k n)
-    cluster = currentTrackParam->GetClusterPtr();
+    AliMUONVCluster* cluster = currentTrackParam->GetClusterPtr();
     TMatrixD smoothResidual(2,1);
     smoothResidual.Zero();
     smoothResidual(0,0) = cluster->GetX() - smoothParameters(0,0);
@@ -1346,7 +1335,8 @@ Bool_t AliMUONTrackReconstructorK::ComplementTracks(const AliMUONVClusterStore&
   /// Complete tracks by adding missing clusters (if there is an overlap between
   /// two detection elements, the track may have two clusters in the same chamber).
   /// Recompute track parameters and covariances at each clusters.
-  /// Return kTRUE if one or more tracks have been complemented.
+  /// Remove tracks getting abnormal (i.e. extrapolation failed...) after being complemented.
+  /// Return kTRUE if one or more tracks have been complemented or removed.
   AliDebug(1,"Enter ComplementTracks");
   
   Int_t chamberId, detElemId;
@@ -1356,6 +1346,7 @@ Bool_t AliMUONTrackReconstructorK::ComplementTracks(const AliMUONVClusterStore&
   Bool_t foundOneCluster, trackModified, hasChanged = kFALSE;
   AliMUONVCluster *cluster;
   AliMUONTrackParam *trackParam, *previousTrackParam, *nextTrackParam, trackParamAtCluster, bestTrackParamAtCluster;
+  AliMUONTrack *nextTrack;
   
   AliMUONTrack *track = (AliMUONTrack*) fRecTracksPtr->First();
   while (track) {
@@ -1365,7 +1356,7 @@ Bool_t AliMUONTrackReconstructorK::ComplementTracks(const AliMUONVClusterStore&
     previousTrackParam = trackParam;
     while (trackParam) {
       foundOneCluster = kFALSE;
-      bestAddChi2TrackAtCluster = 1.e10;
+      bestAddChi2TrackAtCluster = AliMUONTrack::MaxChi2();
       chamberId = trackParam->GetClusterPtr()->GetChamberId();
       detElemId = trackParam->GetClusterPtr()->GetDetElemId();
       
@@ -1431,10 +1422,17 @@ Bool_t AliMUONTrackReconstructorK::ComplementTracks(const AliMUONVClusterStore&
       trackParam = nextTrackParam;
     }
     
+    // prepare next track
+    nextTrack = (AliMUONTrack*) fRecTracksPtr->After(track);
+    
     // re-compute track parameters using kalman filter if needed
-    if (trackModified) RetraceTrack(*track,kTRUE);
+    if (trackModified && !RetraceTrack(*track,kTRUE)) {
+      AliWarning("track modified but problem occur during refitting --> remove track");
+      fRecTracksPtr->Remove(track);
+      fNRecTracks--;
+    }
     
-    track = (AliMUONTrack*) fRecTracksPtr->After(track);
+    track = nextTrack;
   }
   
   return hasChanged;
@@ -1447,10 +1445,12 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
   /// Improve the given track by removing removable clusters with local chi2 highter than the defined cut
   /// Removable clusters are identified by the method AliMUONTrack::TagRemovableClusters()
   /// Recompute track parameters and covariances at the remaining clusters
+  /// and if something goes wrong (i.e. extrapolation failed...) set track chi2 to max value
   AliDebug(1,"Enter ImproveTrack");
   
   Double_t localChi2, worstLocalChi2;
-  AliMUONTrackParam *trackParamAtCluster, *worstTrackParamAtCluster, *nextTrackParam;
+  AliMUONTrackParam *trackParamAtCluster, *worstTrackParamAtCluster, *nextTrackParam, *next2nextTrackParam;
+  Int_t nextChamber, next2nextChamber;
   Bool_t smoothed;
   Double_t sigmaCut2 = GetRecoParam()->GetSigmaCutForImprovement() *
                        GetRecoParam()->GetSigmaCutForImprovement();
@@ -1468,7 +1468,12 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
     if (!smoothed) {
       
       // Update track parameters and covariances
-      track.UpdateCovTrackParamAtCluster();
+      if (!track.UpdateCovTrackParamAtCluster()) {
+       AliWarning("unable to update track parameters and covariances --> stop improvement");
+       // restore the kalman parameters
+       RetraceTrack(track,kTRUE);
+       break;
+      }
       
       // Compute local chi2 of each clusters
       track.ComputeLocalChi2(kTRUE);
@@ -1476,7 +1481,7 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
     
     // Look for the cluster to remove
     worstTrackParamAtCluster = 0x0;
-    worstLocalChi2 = 0.;
+    worstLocalChi2 = -1.;
     trackParamAtCluster = (AliMUONTrackParam*)track.GetTrackParamAtCluster()->First();
     while (trackParamAtCluster) {
       
@@ -1496,12 +1501,6 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
       trackParamAtCluster = (AliMUONTrackParam*)track.GetTrackParamAtCluster()->After(trackParamAtCluster);
     }
     
-    // Check if worst cluster found
-    if (!worstTrackParamAtCluster) {
-      AliWarning("Bad local chi2 values?");
-      break;
-    }
-    
     // Check whether the worst chi2 is under requirement or not
     if (worstLocalChi2 < 2. * sigmaCut2) { // 2 because 2 quantities in chi2
       track.SetImproved(kTRUE);
@@ -1509,7 +1508,11 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
     }
     
     // if the worst cluster is not removable then stop improvement
-    if (!worstTrackParamAtCluster->IsRemovable()) break;
+    if (!worstTrackParamAtCluster->IsRemovable()) {
+      // restore the kalman parameters in case they have been lost
+      if (!smoothed) RetraceTrack(track,kTRUE);
+      break;
+    }
     
     // get track parameters at cluster next to the one to be removed
     nextTrackParam = (AliMUONTrackParam*) track.GetTrackParamAtCluster()->After(worstTrackParamAtCluster);
@@ -1520,9 +1523,29 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
     // Re-calculate track parameters
     // - from the cluster immediately downstream the one suppressed
     // - or from the begining - if parameters have been re-computed using the standard method (kalman parameters have been lost)
-    //                 - or if the removed cluster was the last one
-    if (smoothed && nextTrackParam) RetracePartialTrack(track,nextTrackParam);
-    else RetraceTrack(track,kTRUE);
+    //                        - or if the removed cluster was used to compute the tracking seed
+    Bool_t normalExtrap;
+    if (smoothed && nextTrackParam) {
+      
+      nextChamber = nextTrackParam->GetClusterPtr()->GetChamberId();
+      next2nextTrackParam = nextTrackParam;
+      do {
+       
+       next2nextChamber = next2nextTrackParam->GetClusterPtr()->GetChamberId();
+       next2nextTrackParam = (AliMUONTrackParam*) track.GetTrackParamAtCluster()->After(next2nextTrackParam);
+       
+      } while (next2nextTrackParam && (next2nextChamber == nextChamber));
+      
+      if (next2nextChamber == nextChamber) normalExtrap = RetraceTrack(track,kTRUE);
+      else normalExtrap = RetracePartialTrack(track,nextTrackParam);
+      
+    } else normalExtrap = RetraceTrack(track,kTRUE);
+    
+    // stop in case of extrapolation problem
+    if (!normalExtrap) {
+      AliWarning("track partially improved but problem occur during refitting --> stop improvement");
+      break;
+    }
     
     // Printout for debuging
     if ((AliLog::GetDebugLevel("MUON","AliMUONTrackReconstructorK") >= 1) || (AliLog::GetGlobalDebugLevel() >= 1)) {
@@ -1534,20 +1557,27 @@ void AliMUONTrackReconstructorK::ImproveTrack(AliMUONTrack &track)
 }
 
 //__________________________________________________________________________
-void AliMUONTrackReconstructorK::FinalizeTrack(AliMUONTrack &track)
+Bool_t AliMUONTrackReconstructorK::FinalizeTrack(AliMUONTrack &track)
 {
   /// Update track parameters and covariances at each attached cluster
   /// using smoother if required, if not already done
+  /// return kFALSE if the track cannot be extrapolated uo to the last chamber
   
   AliMUONTrackParam *trackParamAtCluster;
   Bool_t smoothed = kFALSE;
   
   // update track parameters (using smoother if required) if not already done
-  if (!track.IsImproved()) {
-    smoothed = kFALSE;
+  if (track.IsImproved()) smoothed = GetRecoParam()->UseSmoother();
+  else {
     if (GetRecoParam()->UseSmoother()) smoothed = RunSmoother(track);
-    if (!smoothed) track.UpdateCovTrackParamAtCluster();
-  } else smoothed = GetRecoParam()->UseSmoother();
+    if (!smoothed) {
+      if (track.UpdateCovTrackParamAtCluster()) track.ComputeLocalChi2(kTRUE);
+      else {
+       AliWarning("finalization failed due to extrapolation problem");
+       return kFALSE;
+      }
+    }
+  }
   
   // copy smoothed parameters and covariances if any
   if (smoothed) {
@@ -1563,6 +1593,8 @@ void AliMUONTrackReconstructorK::FinalizeTrack(AliMUONTrack &track)
     
   }
   
+  return kTRUE;
+  
 }
 
   //__________________________________________________________________________
@@ -1571,23 +1603,28 @@ Bool_t AliMUONTrackReconstructorK::RefitTrack(AliMUONTrack &track, Bool_t enable
   /// re-fit the given track
   AliDebug(1,"Enter RefitTrack");
   
-  // check validity of the track
-  if (track.GetNClusters() < 3) {
-    AliWarning("the track does not contain enough clusters --> unable to refit");
+  // check validity of the track (i.e. at least 2 chambers hit on stations 4 and 5)
+  if (!track.IsValid(0)) {
+    AliWarning("the track is not valid --> unable to refit");
     return kFALSE;
   }
   
   // re-compute track parameters and covariances using Kalman filter
-  RetraceTrack(track,kTRUE);
+  if (!RetraceTrack(track,kTRUE)) {
+    AliWarning("bad track refitting due to extrapolation failure");
+    return kFALSE;
+  }
   
   // Improve the reconstructed tracks if required
   track.SetImproved(kFALSE);
   if (enableImprovement && GetRecoParam()->ImproveTracks()) ImproveTrack(track);
   
   // Fill AliMUONTrack data members
-  FinalizeTrack(track);
-  
-  return kTRUE;
+  if (track.GetGlobalChi2() < AliMUONTrack::MaxChi2()) return FinalizeTrack(track);
+  else {
+    AliWarning("track not finalized due to extrapolation failure");
+    return kFALSE;
+  }
   
 }