Call Accept cluster after Propagate function (Marian)

diff --git a/TPC/AliTPCTracklet.cxx b/TPC/AliTPCTracklet.cxx
index cba3a1f0722ac3050adb498d5df07e6c96a3b11a..e8b77d51ff86bc7778b8f74aaf111350d1bc25b8 100755 (executable)
--- a/TPC/AliTPCTracklet.cxx
+++ b/TPC/AliTPCTracklet.cxx
@@ -324,13 +324,13 @@ void AliTPCTracklet::FitKalman(const AliTPCseed *seed,Int_t sector) {
   for (Int_t i=imin; i<=imax; i++){
     AliTPCclusterMI *c=track->GetClusterPointer(i);
     if (!c) continue;
-    if (RejectCluster(c,track)) continue;
     Double_t r[3]={c->GetX(),c->GetY(),c->GetZ()};
     Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
     if (!track->PropagateTo(r[0])) {
       isOK=kFALSE;
       break;
     }
+    if (RejectCluster(c,track)) continue;
     if ( !((static_cast<AliExternalTrackParam*>(track)->Update(&r[1],cov)))) isOK=kFALSE;
   }
   if (!isOK) { delete track; return;}
@@ -341,13 +341,13 @@ void AliTPCTracklet::FitKalman(const AliTPCseed *seed,Int_t sector) {
   for (Int_t i=imax; i>=imin; i--){
     AliTPCclusterMI *c=track->GetClusterPointer(i);
     if (!c) continue;
-    if (RejectCluster(c,track)) continue;
     Double_t r[3]={c->GetX(),c->GetY(),c->GetZ()};
     Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
     if (!track->PropagateTo(r[0])) {
       isOK=kFALSE;
       break;
     }
+    if (RejectCluster(c,track)) continue;
     if ( !((static_cast<AliExternalTrackParam*>(track)->Update(&r[1],cov)))) isOK=kFALSE;
   }
   if (!isOK) { delete track; return;}
@@ -358,13 +358,13 @@ void AliTPCTracklet::FitKalman(const AliTPCseed *seed,Int_t sector) {
   for (Int_t i=imin; i<=imax; i++){
     AliTPCclusterMI *c=track->GetClusterPointer(i);
     if (!c) continue;
-    if (RejectCluster(c,track)) continue;
     Double_t r[3]={c->GetX(),c->GetY(),c->GetZ()};
     Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
     if (!track->PropagateTo(r[0])) {
       isOK=kFALSE;
       break;
     }
+    if (RejectCluster(c,track)) continue;
     if ( !((static_cast<AliExternalTrackParam*>(track)->Update(&r[1],cov)))) isOK=kFALSE;
   }
   if (!isOK) { delete track; return;}

diff --git a/TPC/AliTPCcalibCalib.cxx b/TPC/AliTPCcalibCalib.cxx
index c9b760f0cd858b08cfaaee0eab8f2f10784003c1..b290fa546b2e2e95d0ad788a21115ecdb7f4165c 100644 (file)
--- a/TPC/AliTPCcalibCalib.cxx
+++ b/TPC/AliTPCcalibCalib.cxx
@@ -224,14 +224,13 @@ Bool_t  AliTPCcalibCalib::RefitTrack(AliESDtrack * track, AliTPCseed *seed){
 
     if (TMath::Abs(dalpha)>0.01)
       trackOut.Rotate(TMath::DegToRad()*(sector%18*20.+10.));
-    if (RejectCluster(cl,&trackOut)) continue;
     Double_t r[3]={cl->GetX(),cl->GetY(),cl->GetZ()};
     Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
     trackOut.GetXYZ(xyz);
     Double_t bz = AliTracker::GetBz(xyz);
     if (trackOut.PropagateTo(r[0],bz)) nclOut++;
+    if (RejectCluster(cl,&trackOut)) continue;
     trackOut.Update(&r[1],cov);    
-    
   }
   //
   // Refit in
@@ -245,13 +244,13 @@ Bool_t  AliTPCcalibCalib::RefitTrack(AliESDtrack * track, AliTPCseed *seed){
     Float_t dalpha = TMath::DegToRad()*(sector%18*20.+10.)-trackIn.GetAlpha();
     if (TMath::Abs(dalpha)>0.01)
       trackIn.Rotate(TMath::DegToRad()*(sector%18*20.+10.));
-    if (RejectCluster(cl,&trackIn)) continue;
     Double_t r[3]={cl->GetX(),cl->GetY(),cl->GetZ()};
     Double_t cov[3]={0.01,0.,0.01}; //TODO: correct error parametrisation
     trackOut.GetXYZ(xyz);
     Double_t bz = AliTracker::GetBz(xyz);
 
     if (trackIn.PropagateTo(r[0],bz)) nclIn++;
+    if (RejectCluster(cl,&trackIn)) continue;
     trackIn.Update(&r[1],cov);    
   }
   trackIn.Rotate(trackInOld->GetAlpha());