Patch for the tracker

[u/mrichter/AliRoot.git] / TPC / AliTPCtracker.h

diff --git a/TPC/AliTPCtracker.h b/TPC/AliTPCtracker.h
index d2727a9a6e54b6631b9d63452538d8478053c78d..803add0527403cc72dcd46bbc3fd768ddf8dcf1f 100644 (file)
--- a/TPC/AliTPCtracker.h
+++ b/TPC/AliTPCtracker.h
@@ -14,7 +14,6 @@
 #include "AliTPCtrack.h"
 #include "AliTPCreco.h"
 #include "AliTPCcluster.h"
-#include "AliBarrelTrack.h"
 
 class TFile;
 class TTree;
@@ -22,14 +21,11 @@ class TBranch;
 class AliTPCParam;
 class TObjArray;
 class TClonesArray;
-class AliESD;
+class AliESDEvent;
 
 class AliTPCtracker : public AliTracker {
 public:
-   AliTPCtracker():AliTracker(),fkNIS(0),fkNOS(0) {
-      fInnerSec=fOuterSec=0; fSeeds=0; 
-      fParam = 0;
-   }
+   AliTPCtracker();
    AliTPCtracker(const AliTPCParam *par);
   ~AliTPCtracker();
 
@@ -39,12 +35,9 @@ public:
    void UnloadClusters();
 
    AliCluster *GetCluster(Int_t index) const;
-   Int_t Clusters2Tracks(TTree *in, TTree *out);
-   Int_t Clusters2Tracks(AliESD *event);
-   Int_t PropagateBack(TTree *in, TTree *out);
-   Int_t PropagateBack(AliESD *event);
-   Int_t RefitInward(TTree *inTracks, TTree *outTracks);
-   Int_t RefitInward(AliESD *event);
+   Int_t Clusters2Tracks(AliESDEvent *event);
+   Int_t PropagateBack(AliESDEvent *event);
+   Int_t RefitInward(AliESDEvent *event);
 
    virtual void  CookLabel(AliKalmanTrack *t,Float_t wrong) const; 
 
@@ -52,11 +45,9 @@ public:
 //**************** Internal tracker class ********************** 
    class AliTPCRow {
    public:
-     AliTPCRow() {
-       fN=0; 
-       fSize=kMaxClusterPerRow/8;
-       fClusterArray=new AliTPCcluster[fSize];
-     }
+     AliTPCRow():
+         fN(0), fSize(kMaxClusterPerRow/8),
+         fClusterArray(new AliTPCcluster[fSize]), fX(0) {}
      ~AliTPCRow() {delete[] fClusterArray;}
      void InsertCluster(const AliTPCcluster *c, Int_t sec, Int_t row);
      void ResetClusters() {fN=0; delete[] fClusterArray; fClusterArray=0;}
@@ -72,22 +63,22 @@ public:
      Double_t GetX() const {return fX;}
 
    private:
+     AliTPCRow(const AliTPCRow& r);            //dummy copy constructor
+     AliTPCRow &operator=(const AliTPCRow& r); //dummy assignment operator
      Int_t fN;                                          //number of clusters 
      const AliTPCcluster *fClusters[kMaxClusterPerRow]; //pointers to clusters
      Int_t fSize;                                 //size of array of clusters
      AliTPCcluster *fClusterArray;                      //array of clusters
      UInt_t fIndex[kMaxClusterPerRow];                  //indeces of clusters
      Double_t fX;                                 //X-coordinate of this row
-
-   private:
-     AliTPCRow(const AliTPCRow& r);            //dummy copy constructor
-     AliTPCRow &operator=(const AliTPCRow& r); //dummy assignment operator
    };
 
 //**************** Internal tracker class ********************** 
    class AliTPCSector {
    public:
-     AliTPCSector() { fN=0; fRow = 0; }
+     AliTPCSector(): 
+        fN(0),fRow(0),fAlpha(0),fAlphaShift(0),
+        fPadPitchWidth(0),f1PadPitchLength(0),f2PadPitchLength(0){}
     ~AliTPCSector() { delete[] fRow; }
      AliTPCRow& operator[](Int_t i) const { return *(fRow+i); }
      Int_t GetNRows() const { return fN; }
@@ -139,10 +130,9 @@ public:
    public:
      AliTPCseed():AliTPCtrack(){}
      AliTPCseed(const AliTPCtrack &t):AliTPCtrack(t){}
-     AliTPCseed(const AliKalmanTrack &t, Double_t a):AliTPCtrack(t,a){}
-     AliTPCseed(UInt_t index, const Double_t xx[5], 
-                const Double_t cc[15], Double_t xr, Double_t alpha): 
-                AliTPCtrack(index, xx, cc, xr, alpha) {}
+     AliTPCseed(Double_t xr, Double_t alpha, const Double_t xx[5], 
+                const Double_t cc[15], Int_t index): 
+                AliTPCtrack(xr, alpha, xx, cc, index) {}
      void SetSampledEdx(Float_t q, Int_t i) {
         Double_t s=GetSnp(), t=GetTgl();
         q *= TMath::Sqrt((1-s*s)/(1+t*t));
@@ -175,18 +165,7 @@ private:
    AliTPCParam *fParam;      //! TPC parameters for outer reference plane [SR, GSI, 18.02.2003]
    TObjArray *fSeeds;        //array of track seeds
 
-   // [SR, 01.04.2003]
-   void SetBarrelTree(const char *mode);
-   void StoreBarrelTrack(AliTPCtrack *ps, Int_t refPlane, Int_t isIn);
-
-   // [SR, 01.04.2003]
-   TFile *fBarrelFile;             // file with "barrel" tracks
-   TTree *fBarrelTree;             // tree with "barrel" tracks
-   TBranch *fBarrelBranch;
-   TClonesArray *fBarrelArray;
-   AliBarrelTrack *fBarrelTrack;
-
-  ClassDef(AliTPCtracker,1)   // Time Projection Chamber tracker
+  ClassDef(AliTPCtracker,2)   // Time Projection Chamber tracker
 };
 
 #endif