by Rongrong: continued extrapolation fine tunning

diff --git a/EMCAL/AliEMCALReconstructor.cxx b/EMCAL/AliEMCALReconstructor.cxx
index 84c14a3e1040a4548ff0b71ef9fc92de1366a24a..feaaecd4a7ef0ae25727b79414a17c803e516e1f 100644 (file)
--- a/EMCAL/AliEMCALReconstructor.cxx
+++ b/EMCAL/AliEMCALReconstructor.cxx
@@ -1,4 +1,5 @@
 /**************************************************************************
+#/eliza17/alice/esdfiles/data/2011/LHC11a/000146805/ESDs/pass2_without_SDD/11000146805038.550/root_archive.zip#AliESDs.root
  * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  *                                                                        *
  * Author: The ALICE Off-line Project.                                    *
@@ -716,9 +717,8 @@ Bool_t AliEMCALReconstructor::CalculateResidual(AliESDtrack *track, AliESDCaloCl
   Double_t alpha =  ((int)(vec.Phi()*TMath::RadToDeg()/20)+0.5)*20*TMath::DegToRad();
   //Rotate to proper local coordinate
   vec.RotateZ(-alpha); 
-  trkParamTmp.Rotate(alpha); 
   //extrapolation is done here
-  if(!AliTrackerBase::PropagateTrackToBxByBz(&trkParamTmp, vec.X(), track->GetMass(), GetRecParam()->GetExtrapolateStep(), kFALSE, 0.8, -1)) 
+  if(!AliTrackerBase::PropagateTrackToBxByBz(&trkParamTmp, vec.X(), track->GetMass(), GetRecParam()->GetExtrapolateStep(), kTRUE, 0.8, -1)) 
     return kFALSE; 
 
   //Calculate the residuals
@@ -726,13 +726,8 @@ Bool_t AliEMCALReconstructor::CalculateResidual(AliESDtrack *track, AliESDCaloCl
    
   TVector3 clsPosVec(clsPos[0],clsPos[1],clsPos[2]);
   TVector3 trkPosVec(trkPos[0],trkPos[1],trkPos[2]);
-      
-  Double_t clsPhi = clsPosVec.Phi();
-  if(clsPhi<0) clsPhi+=2*TMath::Pi();
-  Double_t trkPhi = trkPosVec.Phi();
-  if(trkPhi<0) trkPhi+=2*TMath::Pi();
 
-  dPhi = clsPhi-trkPhi;
+  dPhi = clsPosVec.DeltaPhi(trkPosVec);
   dEta = clsPosVec.Eta()-trkPosVec.Eta();
 
   return kTRUE;

diff --git a/EMCAL/AliEMCALTracker.cxx b/EMCAL/AliEMCALTracker.cxx
index 5113a6fc4db08dc1769313ccc72303c9d580a09a..a4056683aa64c0111e6bc23641d1c1e76b970c7f 100644 (file)
--- a/EMCAL/AliEMCALTracker.cxx
+++ b/EMCAL/AliEMCALTracker.cxx
@@ -293,7 +293,7 @@ Int_t AliEMCALTracker::LoadTracks(AliESDEvent *esd)
 
       //Loose geometric cut
       Double_t phi = esdTrack->Phi()*TMath::RadToDeg();
-      if(TMath::Abs(esdTrack->Eta())>1 || phi <= 60 || phi >= 200 ) continue;
+      if(TMath::Abs(esdTrack->Eta())>0.8 || phi <= 20 || phi >= 240 ) continue;
 
       fTracks->AddLast(esdTrack);
     }
@@ -413,21 +413,15 @@ Int_t AliEMCALTracker::FindMatchedCluster(AliESDtrack *track)
       Double_t alpha =  ((int)(vec.Phi()*TMath::RadToDeg()/20)+0.5)*20*TMath::DegToRad();
       //Rotate to proper local coordinate
       vec.RotateZ(-alpha); 
-      trkParamTmp.Rotate(alpha); 
       //extrapolation is done here
-      if(!AliTrackerBase::PropagateTrackToBxByBz(&trkParamTmp, vec.X(), track->GetMass(), fStep, kFALSE, 0.8, -1)) continue; 
+      if(!AliTrackerBase::PropagateTrackToBxByBz(&trkParamTmp, vec.X(), track->GetMass(), fStep, kTRUE, 0.8, -1)) continue; 
 
       //Calculate the residuals
       trkParamTmp.GetXYZ(trkPos);        
       TVector3 clsPosVec(cluster->X(),cluster->Y(),cluster->Z());
       TVector3 trkPosVec(trkPos[0],trkPos[1],trkPos[2]);
-      
-      Double_t clsPhi = clsPosVec.Phi();
-      if(clsPhi<0) clsPhi+=2*TMath::Pi();
-      Double_t trkPhi = trkPosVec.Phi();
-      if(trkPhi<0) trkPhi+=2*TMath::Pi();
 
-      Double_t tmpPhi = clsPhi-trkPhi;
+      Double_t tmpPhi = clsPosVec.DeltaPhi(trkPosVec);
       Double_t tmpEta = clsPosVec.Eta()-trkPosVec.Eta();
   
       if(TMath::Abs(tmpPhi)<TMath::Abs(maxPhi) && TMath::Abs(tmpEta)<TMath::Abs(maxEta))