X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCseed.h;h=0b17ced2f9b601929e1f3e0486bd9876ef4ebb24;hb=30cdc1783f9669381a8046501737c5dda150bad1;hp=1eb805317706dd04aa9f870ea8fdeeaf5744576c;hpb=465c437ba393c3f5760ddcf54dd3ee3941ce7996;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCseed.h b/TPC/AliTPCseed.h
index 1eb80531770..0b17ced2f9b 100644
--- a/TPC/AliTPCseed.h
+++ b/TPC/AliTPCseed.h
@@ -25,7 +25,8 @@ class AliTPCParam;
 class AliTPCseed;
 class AliTPCclusterMI;
 class AliTPCTrackerPoint;
-class AliESD;   
+class AliESD;
+class AliTPCCalPad;
 class TClonesArray;
 
 class AliTPCseed : public AliTPCtrack {
@@ -38,6 +39,8 @@ class AliTPCseed : public AliTPCtrack {
      AliTPCseed(Double_t xr, Double_t alpha, const Double_t xx[5], 
                 const Double_t cc[15], Int_t i);   
      AliTPCseed &operator = (const AliTPCseed & param);  
+     static Int_t  RefitTrack(AliTPCseed* seed, AliExternalTrackParam * in, AliExternalTrackParam * out);
+     Bool_t RefitTrack(AliTPCseed* seed, Bool_t out);
      Int_t Compare(const TObject *o) const;
      void Reset(Bool_t all = kTRUE);
      Int_t GetProlongation(Double_t xr, Double_t &y, Double_t & z) const;
@@ -72,10 +75,8 @@ class AliTPCseed : public AliTPCtrack {
      void SetErrorZ2(Float_t sz2){fErrorZ2=sz2;}
      Float_t  CookdEdx(Double_t low=0.05, Double_t up=0.70, Int_t i1=0, Int_t i2=159, Bool_t onlyused = kFALSE);
      Float_t  CookShape(Int_t type);
+     //  Float_t CookShape2(Int_t type,Bool_t withQ);
      void CookPID();
-     Double_t Bethe(Double_t bg);     // return bethe-bloch
-     Double_t BetheMass(Double_t mass=0.1057);     // return bethe-bloch
-     //     void CookdEdx2(Double_t low=0.05, Double_t up=0.70);
      Bool_t IsActive() const { return !(fRemoval);}
      void Desactivate(Int_t reason){ fRemoval = reason;} 
      AliTPCclusterMI* GetClusterPointer(Int_t i) const {return fClusterPointer[i];}
@@ -123,6 +124,10 @@ class AliTPCseed : public AliTPCtrack {
      Bool_t GetInDead() const {return fInDead;}
      Float_t GetErrorY2() const {return fErrorY2;}
      Float_t GetErrorZ2() const {return fErrorZ2;}
+  Float_t GetCMeanSigmaY2p30() const {return fCMeanSigmaY2p30;}
+  Float_t GetCMeanSigmaZ2p30() const {return fCMeanSigmaZ2p30;}
+  Float_t GetCMeanSigmaY2p30R() const {return fCMeanSigmaY2p30R;}
+  Float_t GetCMeanSigmaZ2p30R() const {return fCMeanSigmaZ2p30R;}
      //
      //
      void SetClusterMapBit(int ibit, Bool_t state);
@@ -132,8 +137,17 @@ class AliTPCseed : public AliTPCtrack {
      const TBits& GetClusterMap() const { return fClusterMap; };
      const TBits& GetSharedMap() const { return fSharedMap; };
 
-     Float_t  CookdEdxNorm(Double_t low=0.05, Double_t up=0.70, Int_t type=0, Int_t i1=0, Int_t i2=159);
+  Float_t  CookdEdxNorm(Double_t low=0.05, Double_t up=0.70, Int_t type=0, Int_t i1=0, Int_t i2=159, Bool_t shapeNorm=kTRUE, Int_t posNorm=0, Int_t padNorm=0,Int_t returnVal=0);
 
+  Float_t  CookdEdxAnalytical(Double_t low=0.05, Double_t up=0.70, Int_t type=0, Int_t i1=0, Int_t i2=159, Int_t returnVal=0, Int_t rowThres = 2);
+
+ static   void GetError(AliTPCclusterMI* cluster, AliExternalTrackParam * param, 
+			 Double_t& erry, Double_t &errz);
+ static   void GetShape(AliTPCclusterMI* cluster, AliExternalTrackParam * param, 
+			 Double_t& rmsy, Double_t &rmsz);
+  static   Double_t GetQCorrGeom(Float_t ty, Float_t tz);
+  static   Double_t GetQCorrShape(Int_t ipad, Int_t type,Float_t z, Float_t ty, Float_t tz, Float_t q, Float_t thr);
+  
  private:
      //     AliTPCseed & operator = (const AliTPCseed &)
      //  {::Fatal("= operator","Not Implemented\n");return *this;}
@@ -146,6 +160,10 @@ class AliTPCseed : public AliTPCtrack {
      Int_t fRelativeSector;      // index of current relative sector
      Float_t fCurrentSigmaY2;    //!expected current cluster sigma Y
      Float_t fCurrentSigmaZ2;    //!expected current cluster sigma Z
+     Float_t fCMeanSigmaY2p30;   //! current mean sigma Y2 - mean30%
+     Float_t fCMeanSigmaZ2p30;   //! current mean sigma Z2 - mean30%
+     Float_t fCMeanSigmaY2p30R;   //! current relative mean sigma Y2 - mean30%
+     Float_t fCMeanSigmaZ2p30R;   //! current relative mean sigma Z2 - mean30%
      Float_t fErrorY2;           //!sigma of current cluster 
      Float_t fErrorZ2;           //!sigma of current cluster    
      AliTPCclusterMI * fCurrentCluster; //!pointer to the current cluster for prolongation