Reset the p_T dependent DCA cuts if an invalid/empty string is passed

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

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index 94afebd923fce89fcade35ecbf538c635cfe64f2..7840c10fafea9d0d9d4a8a8b90a49ccc81e6ca0d 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -13,11 +13,12 @@
 #include <AliKalmanTrack.h>
 #include "AliITSRecoParam.h"
 #include "AliITSgeomTGeo.h"
+#include "AliESDtrack.h"
 
 /* $Id$ */
 
-class AliESDtrack;
 class AliESDVertex;
+class AliTracker;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {
@@ -27,6 +28,7 @@ public:
   AliITStrackV2(const AliITStrackV2& t);
   ~AliITStrackV2(){fESDtrack=0;}
 
+  void   SetCheckInvariant(Bool_t check=kTRUE) {fCheckInvariant=check;}
   Bool_t CorrectForMeanMaterial(Double_t xOverX0, Double_t xTimesRho,
                                Bool_t anglecorr=kFALSE) {
     return AliExternalTrackParam::CorrectForMeanMaterial(xOverX0,xTimesRho,GetMass(),anglecorr);
@@ -36,15 +38,16 @@ public:
     return AliExternalTrackParam::CorrectForMaterial(d,x0,GetMass());
   }
   Bool_t PropagateTo(Double_t xr, Double_t d, Double_t x0=AliITSRecoParam::GetX0Air());
-  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho);
-  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep=1) {
-    Double_t dummy1,dummy2; return PropagateToTGeo(xToGo,nstep,dummy1,dummy2);
+  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep, Double_t &xOverX0, Double_t &xTimesRho, Bool_t addTime=kTRUE);
+  Bool_t PropagateToTGeo(Double_t xToGo, Int_t nstep=1, Bool_t addTime=kTRUE) {
+    Double_t dummy1,dummy2; return PropagateToTGeo(xToGo,nstep,dummy1,dummy2,addTime);
   }
   Double_t GetPredictedChi2(const AliCluster *cluster) const;
   Bool_t Update(const AliCluster *cl, Double_t chi2, Int_t i);
 
   Bool_t PropagateToVertex(const AliESDVertex *v,Double_t d=0.,Double_t x0=0.);
   Bool_t Propagate(Double_t alpha, Double_t xr);
+  Bool_t Propagate(Double_t xr) { return Propagate(GetAlpha(),xr); }
   Bool_t MeanBudgetToPrimVertex(Double_t xyz[3], Double_t step, Double_t &d) const;
   Bool_t Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]);
 
@@ -57,10 +60,14 @@ public:
   void UpdateESDtrack(ULong_t flags) const;
   
   AliESDtrack *GetESDtrack() const {return fESDtrack;}
+  virtual ULong_t  GetStatus() const {
+    if(fESDtrack){return fESDtrack->GetStatus();} 
+    else { AliWarning("null ESD track pointer - status 0"); return 0;} }
 
   Int_t GetDetectorIndex() const {return GetLabel();}
   Double_t GetdEdx() const {return fdEdx;}
   Double_t GetPIDsignal() const {return GetdEdx();}
+  using AliExternalTrackParam::GetC;
   Double_t GetC() const {return AliExternalTrackParam::GetC(GetBz());}
   Double_t GetD(Double_t x, Double_t y) const {
     return AliExternalTrackParam::GetD(x,y,GetBz());
@@ -88,7 +95,9 @@ public:
   Int_t GetExtraModule(Int_t ilayer) const {return fModule[AliITSgeomTGeo::kNLayers+ilayer];}
 
 protected:
-  Double_t GetBz() const ;
+
+  Bool_t fCheckInvariant;  // check the covariance matrix
+
   Double_t fdEdx;            // dE/dx
 
   static const Int_t fgkWARN; //! used for debugging purposes
@@ -102,7 +111,7 @@ protected:
 
 private:
   AliITStrackV2 &operator=(const AliITStrackV2 &tr);
-  ClassDef(AliITStrackV2,7)  //ITS reconstructed track
+  ClassDef(AliITStrackV2,8)  //ITS reconstructed track
 };
 
 inline void AliITStrackV2::SetSampledEdx(Float_t q, Int_t i) {
@@ -145,11 +154,22 @@ inline void  AliITStrackV2::SetModuleIndexInfo(Int_t ilayer,Int_t idet,Int_t sta
   Int_t xInt = Int_t(xloc*10.);
   Int_t zInt = Int_t(zloc*10.);
 
-  if(TMath::Abs(xloc*10.-(Float_t)xInt)>0.5)
-    if(zloc>0) { xInt++; } else { xInt--; }
-  if(TMath::Abs(zloc*10.-(Float_t)zInt)>0.5)
-    if(zloc>0) { zInt++; } else { zInt--; }
-
+  if(TMath::Abs(xloc*10.-(Float_t)xInt)>0.5){
+    if(zloc>0) { 
+      xInt++; 
+    } 
+    else { 
+      xInt--; 
+    }
+  }
+  if(TMath::Abs(zloc*10.-(Float_t)zInt)>0.5){
+    if(zloc>0) { 
+      zInt++; 
+    } 
+    else { 
+      zInt--; 
+    }
+  }
   Int_t signs=0;
   if(xInt>=0 && zInt>=0) signs=10000;
   if(xInt>=0 && zInt<0)  signs=20000;