Macro for trend of SDD calibration updated to skip obselete OCDB files from LE run

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

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index c5b88070cd9e54cbc489a66539d59bbe5728d75d..f3c8501269c1e61df6f9ecb72fda32c68130cee1 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -13,20 +13,22 @@
 #include <AliKalmanTrack.h>
 #include "AliITSRecoParam.h"
 #include "AliITSgeomTGeo.h"
+#include "AliESDtrack.h"
 
 /* $Id$ */
 
-class AliESDtrack;
 class AliESDVertex;
+class AliTracker;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {
 public:
   AliITStrackV2();
-  AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE) throw (const Char_t *);
+  AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE);
   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,18 +38,19 @@ 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]);
-
+  Bool_t ImproveKalman(Double_t xyz[3],Double_t ers[3], const Double_t* xlMS, const Double_t* x2X0MS, Int_t nMS);
   void SetdEdx(Double_t dedx) {fdEdx=dedx;}
   void SetSampledEdx(Float_t q, Int_t i);
   Float_t GetSampledEdx(Int_t i) const {return fdEdxSample[i];}
@@ -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());
@@ -79,6 +86,8 @@ public:
   Int_t GetModuleIndex(Int_t ilayer) const {return fModule[ilayer];}
   void  SetModuleIndexInfo(Int_t ilayer,Int_t idet,Int_t status=1,Float_t xloc=0,Float_t zloc=0);
   Bool_t GetModuleIndexInfo(Int_t ilayer,Int_t &idet,Int_t &status,Float_t &xloc,Float_t &zloc) const;
+  void    SetSharedWeight(Int_t ilayer,Float_t w) {fSharedWeight[ilayer]=w;}
+  Float_t GetSharedWeight(Int_t ilayer) const {return fSharedWeight[ilayer];}
   Bool_t Invariant() const;
 
   void  SetExtraCluster(Int_t ilayer, Int_t idx) {fIndex[AliITSgeomTGeo::kNLayers+ilayer]=idx;}
@@ -88,7 +97,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
@@ -98,11 +109,14 @@ protected:
 
   Int_t fModule[2*AliITSgeomTGeo::kNLayers]; // indices of crossed modules: 
                                              // see SetModuleIndexInfo()
+
+  Float_t fSharedWeight[AliITSgeomTGeo::kNLayers]; // probability of sharing
+
   AliESDtrack *fESDtrack;    //! pointer to the connected ESD track
 
 private:
   AliITStrackV2 &operator=(const AliITStrackV2 &tr);
-  ClassDef(AliITStrackV2,7)  //ITS reconstructed track
+  ClassDef(AliITStrackV2,9)  //ITS reconstructed track
 };
 
 inline void AliITStrackV2::SetSampledEdx(Float_t q, Int_t i) {