Error in last commit. still has TGeant3 depenance.

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

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index 8a766ec46b7af117be7dc3fba87d929f164975cb..d3fa37d81beff41fd3dfc2f5c810f3cbd5d46d85 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -30,7 +30,7 @@
 #include "AliITSrecoV2.h"
 
 class AliESDtrack;
-class AliITSStrLine;
+class AliStrLine;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {
@@ -42,6 +42,7 @@ public:
   Int_t Propagate(Double_t alpha, Double_t xr);
   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;}
@@ -64,9 +65,7 @@ public:
   Double_t GetSnp()  const {return fP2;}
   Double_t GetTgl()  const {return fP3;}
   Double_t GetC()    const {return fP4;}
-  Double_t Get1Pt() const {
-      return (TMath::Sign(1e-9,fP4) + fP4)*GetLocalConvConst();
-  }
+  Double_t Get1Pt() const;
   Double_t GetD(Double_t x=0, Double_t y=0) const;
   Double_t GetZat(Double_t x=0) const;
 
@@ -77,9 +76,12 @@ 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, AliITSStrLine *line);
+  void ApproximateHelixWithLine(Double_t xk, AliStrLine *line);
   Double_t GetPredictedChi2(const AliCluster *cluster) const;
-   Int_t Invariant() const;
+  Int_t Invariant() const;
+
+  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;
@@ -101,11 +103,11 @@ protected:
   Double_t fC30, fC31, fC32, fC33;       // track
   Double_t fC40, fC41, fC42, fC43, fC44; // parameters 
 
-  UInt_t fIndex[kMaxLayer]; // indices of associated clusters 
-  Float_t fdEdxSample[4];   // array of dE/dx samples b.b.
+  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,4)   //ITS reconstructed track
+  AliESDtrack *fESDtrack;    //! pointer to the connected ESD track
+  ClassDef(AliITStrackV2,5)  //ITS reconstructed track
 };
 
 inline 
@@ -114,7 +116,8 @@ void AliITStrackV2::GetExternalParameters(Double_t& xr, Double_t x[5]) const {
   // This function return external ITS track representation
   //---------------------------------------------------------------------
      xr=fX;          
-     x[0]=GetY(); x[1]=GetZ(); x[2]=GetSnp(); x[3]=GetTgl(); x[4]=Get1Pt();
+     x[0]=GetY(); x[1]=GetZ(); x[2]=GetSnp(); x[3]=GetTgl();
+     x[4]=(TMath::Sign(1e-9,fP4) + fP4)*GetLocalConvConst();
 }
 
 inline