Updating geometry for new scintillaton modules

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

diff --git a/ITS/AliITStrackV2.h b/ITS/AliITStrackV2.h
index 81ea38b55e1f494581dd6cb72e534ab081adbd72..ff8cf011ae2d3ccbc06285a9a64813e2f5136a20 100644 (file)
--- a/ITS/AliITStrackV2.h
+++ b/ITS/AliITStrackV2.h
@@ -29,15 +29,16 @@
 
 #include "AliITSrecoV2.h"
 
-class AliTPCtrack;
+class AliESDtrack;
 
 //_____________________________________________________________________________
 class AliITStrackV2 : public AliKalmanTrack {
+  friend class AliITStrackerV2;
 public:
   AliITStrackV2();
-  AliITStrackV2(const AliTPCtrack& t) throw (const Char_t *);
+  AliITStrackV2(AliESDtrack& t,Bool_t c=kFALSE) throw (const Char_t *);
   AliITStrackV2(const AliITStrackV2& t);
-  Int_t PropagateToVertex(Double_t d=1.2e-3*3., Double_t x0=36.66);
+  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);
   Int_t PropagateTo(Double_t xr, Double_t d, Double_t x0=21.82);
@@ -49,21 +50,24 @@ public:
   void SetDetectorIndex(Int_t i) {SetLabel(i);}
   void ResetCovariance();
   void ResetClusters() { SetChi2(0.); SetNumberOfClusters(0); }
-  
-  void *operator new(size_t s,void *p) { return p; }
-  void *operator new(size_t s) { return ::operator new(s); }
+  void UpdateESDtrack(ULong_t flags);
+  void SetConstrainedESDtrack(Double_t chi2); 
   
   Int_t GetDetectorIndex() const {return GetLabel();}
   Double_t GetX()    const {return fX;}
   Double_t GetAlpha()const {return fAlpha;}
   Double_t GetdEdx() const {return fdEdx;}
+  Double_t GetPIDsignal() const {return GetdEdx();}
   Double_t GetY()    const {return fP0;}
   Double_t GetZ()    const {return fP1;}
   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 GetD(Double_t x=0, Double_t y=0) const;
+  Double_t GetZat(Double_t x=0) const;
+
   Double_t GetSigmaY2() const {return fC00;}
   Double_t GetSigmaZ2() const {return fC11;}
   Int_t Compare(const TObject *o) const;
@@ -74,7 +78,7 @@ public:
   Double_t GetPredictedChi2(const AliCluster *cluster) const;
   Int_t Invariant() const;
  
-private:
+protected:
   Double_t fX;              // X-coordinate of this track (reference plane)
   Double_t fAlpha;          // rotation angle
 
@@ -91,18 +95,25 @@ private:
   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,2)   //ITS reconstructed track
+  ClassDef(AliITStrackV2,3)   //ITS reconstructed track
 };
 
 inline 
 void AliITStrackV2::GetExternalParameters(Double_t& xr, Double_t x[5]) const {
   //---------------------------------------------------------------------
-  // This function return external TPC track representation
+  // This function return external ITS track representation
   //---------------------------------------------------------------------
      xr=fX;          
      x[0]=GetY(); x[1]=GetZ(); x[2]=GetSnp(); x[3]=GetTgl(); x[4]=Get1Pt();