Correction of the Z position of Q2 quadrupole from Chiara Oppedisano

[u/mrichter/AliRoot.git] / ITS / AliITStrackV2.cxx

diff --git a/ITS/AliITStrackV2.cxx b/ITS/AliITStrackV2.cxx
index 3f79c018ca50590840f1fbeb08feb2bc10428d53..1d2c3b64cf22218935a0c7d8b724de07360c498f 100644 (file)
--- a/ITS/AliITStrackV2.cxx
+++ b/ITS/AliITStrackV2.cxx
@@ -24,9 +24,11 @@
 #include <TMath.h>
 
 #include "AliCluster.h"
-#include "AliTracker.h"
 #include "AliESDtrack.h"
+#include "AliESDVertex.h"
+#include "AliITSReconstructor.h"
 #include "AliITStrackV2.h"
+#include "AliTracker.h"
 
 const Int_t AliITStrackV2::fgkWARN = 5;
 
@@ -149,7 +151,7 @@ GetGlobalXYZat(Double_t xloc, Double_t &x, Double_t &y, Double_t &z) const {
   //This function returns a track position in the global system
   //------------------------------------------------------------------
   Double_t r[3];
-  Bool_t rc=GetXYZAt(xloc, AliTracker::GetBz(), r);
+  Bool_t rc=GetXYZAt(xloc, GetBz(), r);
   x=r[0]; y=r[1]; z=r[2]; 
   return rc;
 }
@@ -188,7 +190,7 @@ Bool_t AliITStrackV2::PropagateTo(Double_t xk, Double_t d, Double_t x0) {
 }
 
 //____________________________________________________________________________
-Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho) {
+Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho, Bool_t addTime) {
   //-------------------------------------------------------------------
   //  Propagates the track to a reference plane x=xToGo in n steps.
   //  These n steps are only used to take into account the curvature.
@@ -217,7 +219,7 @@ Bool_t AliITStrackV2::PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOv
     }
   }
 
-  if (IsStartedTimeIntegral() && GetX()>startx) {
+  if (addTime && IsStartedTimeIntegral() && GetX()>startx) {
     Double_t l2 = ( (GetX()-startx)*(GetX()-startx) +
                    (GetY()-starty)*(GetY()-starty) +
                    (GetZ()-startz)*(GetZ()-startz) );
@@ -261,18 +263,31 @@ Bool_t AliITStrackV2::Invariant() const {
   //------------------------------------------------------------------
   Int_t n=GetNumberOfClusters();
 
+  // take into account the misalignment error
+  Float_t maxMisalErrY2=0,maxMisalErrZ2=0;
+  for (Int_t lay=0; lay<AliITSgeomTGeo::kNLayers; lay++) {
+    maxMisalErrY2 = TMath::Max(maxMisalErrY2,AliITSReconstructor::GetRecoParam()->GetClusterMisalErrorY(lay));
+    maxMisalErrZ2 = TMath::Max(maxMisalErrZ2,AliITSReconstructor::GetRecoParam()->GetClusterMisalErrorZ(lay));
+  }
+  maxMisalErrY2 *= maxMisalErrY2;
+  maxMisalErrZ2 *= maxMisalErrZ2;
+  // this is because when we reset before refitting, we multiply the
+  // matrix by 10
+  maxMisalErrY2 *= 10.; 
+  maxMisalErrZ2 *= 10.;
+
   Double_t sP2=GetParameter()[2];
   if (TMath::Abs(sP2) >= kAlmost1){
      if (n>fgkWARN) Warning("Invariant","fP2=%f\n",sP2);
      return kFALSE;
   }
   Double_t sC00=GetCovariance()[0];
-  if (sC00<=0 || sC00>9.) {
+  if (sC00<=0 || sC00>(9.+maxMisalErrY2)) {
      if (n>fgkWARN) Warning("Invariant","fC00=%f\n",sC00); 
      return kFALSE;
   }
   Double_t sC11=GetCovariance()[2];
-  if (sC11<=0 || sC11>9.) {
+  if (sC11<=0 || sC11>(9.+maxMisalErrZ2)) {
      if (n>fgkWARN) Warning("Invariant","fC11=%f\n",sC11); 
      return kFALSE;
   }
@@ -304,8 +319,9 @@ Bool_t AliITStrackV2::Propagate(Double_t alp,Double_t xk) {
   if (!AliExternalTrackParam::Propagate(alp,xk,bz)) return kFALSE;
 
   if (!Invariant()) {
-     AliWarning("Wrong invariant !");
-     return kFALSE;
+    Int_t n=GetNumberOfClusters();
+    if (n>fgkWARN) AliWarning("Wrong invariant !");
+    return kFALSE;
   }
 
   return kTRUE;
@@ -433,15 +449,6 @@ void AliITStrackV2::CookdEdx(Double_t low, Double_t up) {
   SetdEdx(dedx);
 }
 
-Double_t AliITStrackV2::GetBz() const {
-  //
-  // returns Bz component of the magnetic field (kG)
-  //
-  if (AliTracker::UniformField()) return AliTracker::GetBz();
-  Double_t r[3]; GetXYZ(r); 
-  return AliTracker::GetBz(r);
-}
-
 //____________________________________________________________________________
 Bool_t AliITStrackV2::
 GetPhiZat(Double_t r, Double_t &phi, Double_t &z) const {