Cleanup of includes (Ivana)

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

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index a6ca38bd07976678cb0d2a76154b02f22758e0c0..c416063d4a41a619a8aad431e1e2a2a5f00f7cf9 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -30,6 +30,7 @@
 #include "AliITSrecoV2.h"
 
 class AliESDtrack;
+class AliStrLine;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {
@@ -39,8 +40,9 @@ public:
   AliITStrackV2(const AliITStrackV2& t);
   Int_t PropagateToVertex(Double_t d=0., Double_t x0=0.);
   Int_t Propagate(Double_t alpha, Double_t xr);
-  Int_t CorrectForMaterial(Double_t d, Double_t x0=21.82);
+  virtual Int_t CorrectForMaterial(Double_t d, Double_t x0=21.82);
   Int_t PropagateTo(Double_t xr, Double_t d, Double_t x0=21.82);
+  Double_t PropagateToDCA(AliKalmanTrack *p, Double_t d=0., Double_t x0=0.); 
   Int_t Update(const AliCluster* cl,Double_t chi2,UInt_t i);
   Int_t Improve(Double_t x0,Double_t xyz[3],Double_t ers[3]);
   void SetdEdx(Double_t dedx) {fdEdx=dedx;}
@@ -49,24 +51,9 @@ public:
   void SetDetectorIndex(Int_t i) {SetLabel(i);}
   void ResetCovariance();
   void ResetClusters() { SetChi2(0.); SetNumberOfClusters(0); }
-  void UpdateESDtrack(ULong_t flags);
-  void SetConstrainedESDtrack(Double_t chi2); 
-
-  void SetReconstructed(Bool_t sr=kTRUE){fReconstructed = sr;}
-  Bool_t GetReconstructed() const {return fReconstructed;}
-  void SetChi2MIP(Int_t i,Float_t val){fChi2MIP[i]=val;}
-  Float_t GetChi2MIP(Int_t i) const {return fChi2MIP[i];}  
-  void IncrementNSkipped(){fNSkipped++;} // increment by 1 the # of skipped cls
-  Int_t GetNSkipped() const {return fNSkipped;}
-  void IncrementNUsed(){fNUsed++;} // increment by 1 the # of shared clusters
-  Int_t GetNUsed() const {return fNUsed;}
+  void UpdateESDtrack(ULong_t flags) const;
+  
   AliESDtrack *GetESDtrack() const {return fESDtrack;}
-  Double_t GetCov33() const {return fC33;} // cov. matrix el. 3,3
-  Double_t GetCov44() const {return fC44;} // cov. matrix el. 4,4
-  Float_t GetDy(Int_t i) const {return fDy[i];}
-  Float_t GetDz(Int_t i) const {return fDz[i];}
-  Float_t GetSigmaY(Int_t i) const {return fSigmaY[i];}
-  Float_t GetSigmaZ(Int_t i) const {return fSigmaZ[i];}
 
   Int_t GetDetectorIndex() const {return GetLabel();}
   Double_t GetX()    const {return fX;}
@@ -78,8 +65,9 @@ public:
   Double_t GetSnp()  const {return fP2;}
   Double_t GetTgl()  const {return fP3;}
   Double_t GetC()    const {return fP4;}
-  Double_t
-    Get1Pt() const { return (1e-9*TMath::Abs(fP4)/fP4 + fP4)*GetConvConst(); }
+  Double_t Get1Pt() const {
+      return (TMath::Sign(1e-9,fP4) + fP4)*GetLocalConvConst();
+  }
   Double_t GetD(Double_t x=0, Double_t y=0) const;
   Double_t GetZat(Double_t x=0) const;
 
@@ -90,14 +78,16 @@ public:
   void GetExternalCovariance(Double_t cov[15]) const ;
   Int_t GetClusterIndex(Int_t i) const {return fIndex[i];}
   Int_t GetGlobalXYZat(Double_t r,Double_t &x,Double_t &y,Double_t &z) const;
+  void ApproximateHelixWithLine(Double_t xk, AliStrLine *line);
   Double_t GetPredictedChi2(const AliCluster *cluster) const;
   Int_t Invariant() const;
- 
-  AliITStrackV2& operator=(const AliITStrackV2& /*t*/) {
-    Error("operator=","Assignment is not allowed !"); return *this;
-  }
 
+  void  SetExtraCluster(Int_t i, Int_t idx) {fIndex[kMaxLayer+i]=idx;}
+  Int_t GetExtraCluster(Int_t i) const {return fIndex[kMaxLayer+i];}
+ 
 protected:
+  void GetXYZ(Float_t r[3]) const;
+
   Double_t fX;              // X-coordinate of this track (reference plane)
   Double_t fAlpha;          // rotation angle
 
@@ -114,19 +104,12 @@ protected:
   Double_t fC20, fC21, fC22;             // of the
   Double_t fC30, fC31, fC32, fC33;       // track
   Double_t fC40, fC41, fC42, fC43, fC44; // parameters 
-  Int_t fNUsed;                          // number of shared clusters
-  Int_t fNSkipped;                       // number of skipped clusters
-  Bool_t fReconstructed;                 // reconstructed - accepted flag
-  Float_t fChi2MIP[6];                   // MIP chi squres 
-  UInt_t fIndex[kMaxLayer]; // indices of associated clusters 
-  Float_t fdEdxSample[4];   // array of dE/dx samples b.b.
-  Float_t fDy[6];           //dy in layer
-  Float_t fDz[6];           //dz in layer
-  Float_t fSigmaY[6];       //sigma y 
-  Float_t fSigmaZ[6];       //sigma z
-  AliESDtrack *fESDtrack;   //! pointer to the connected ESD track
-
-  ClassDef(AliITStrackV2,3)   //ITS reconstructed track
+
+  Int_t fIndex[2*kMaxLayer]; // indices of associated clusters 
+  Float_t fdEdxSample[4];    // array of dE/dx samples b.b.
+
+  AliESDtrack *fESDtrack;    //! pointer to the connected ESD track
+  ClassDef(AliITStrackV2,5)  //ITS reconstructed track
 };
 
 inline 
@@ -150,6 +133,15 @@ void AliITStrackV2::SetSampledEdx(Float_t q, Int_t i) {
   q *= TMath::Sqrt((1-s*s)/(1+t*t));
   fdEdxSample[i]=q;
 }
+
+inline void AliITStrackV2::GetXYZ(Float_t r[3]) const {
+  //---------------------------------------------------------------------
+  // Returns the position of the track in the global coord. system 
+  //---------------------------------------------------------------------
+  Double_t cs=TMath::Cos(fAlpha), sn=TMath::Sin(fAlpha);
+  r[0]=fX*cs - fP0*sn; r[1]=fX*sn + fP0*cs; r[2]=fP1;
+}
+
 #endif