X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerV2.h;h=e49294df733c75dc9bdf07467fe2dfedb35c99f7;hb=f7f7391b7bdac48097d3d3e333abe2308a8dc08b;hp=da0ecaabbc5d5e6f5e20b2365dcb8f6ccf563d50;hpb=58eb48857003601c2700d5853e5c536ea0687378;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITStrackerV2.h b/ITS/AliITStrackerV2.h
index da0ecaabbc5..e49294df733 100644
--- a/ITS/AliITStrackerV2.h
+++ b/ITS/AliITStrackerV2.h
@@ -5,36 +5,40 @@
 
 //-------------------------------------------------------------------------
 //                          ITS tracker
-//     reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks
+//     reads AliITSRecPoint clusters and creates AliITStrackV2 tracks
 //           Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 #include "AliTracker.h"
-#include "AliITSrecoV2.h"
+#include "AliITSRecoParam.h"
 #include "AliITStrackV2.h"
+#include "AliITSgeomTGeo.h"
 
-class AliITSclusterV2;
-class AliESD;
-class AliITSgeom;
+
+class AliITSRecPoint;
+class AliESDEvent;
 class TTree;
 
 
 //-------------------------------------------------------------------------
 class AliITStrackerV2 : public AliTracker {
 public:
-  AliITStrackerV2():AliTracker(){}
-  AliITStrackerV2(const AliITSgeom *geom);
+  AliITStrackerV2();
+  AliITStrackerV2(const Char_t *geom);
+  ~AliITStrackerV2(){}
   AliCluster *GetCluster(Int_t index) const;
-  AliITSclusterV2 *GetClusterLayer(Int_t layn, Int_t ncl) const
-                        {return fgLayers[layn].GetCluster(ncl);}
-  Int_t GetNumberOfClustersLayer(Int_t layn) const 
-                        {return fgLayers[layn].GetNumberOfClusters();}
+  AliITSRecPoint *GetCluster(Int_t l, Int_t c) const {
+    return fgLayers[l].GetCluster(c);
+  }
+  Int_t GetNumberOfClustersLayer(Int_t n) const {
+     return fgLayers[n].GetNumberOfClusters();
+  }   
   Int_t LoadClusters(TTree *cf);
   void UnloadClusters();
-  Int_t Clusters2Tracks(TTree *in, TTree *out);
-  Int_t Clusters2Tracks(AliESD *event);
-  Int_t PropagateBack(AliESD *event);
-  Int_t RefitInward(AliESD *event);
-  Bool_t RefitAt(Double_t x, AliITStrackV2 *seed, const AliITStrackV2 *t);
+  Int_t Clusters2Tracks(AliESDEvent *event);
+  Int_t PropagateBack(AliESDEvent *event);
+  Int_t RefitInward(AliESDEvent *event);
+  Bool_t RefitAt(Double_t x, AliITStrackV2 *seed, 
+                 const AliITStrackV2 *t, Bool_t extra=kFALSE);
   void SetupFirstPass(Int_t *flags, Double_t *cuts=0);
   void SetupSecondPass(Int_t *flags, Double_t *cuts=0);
 
@@ -45,8 +49,8 @@ public:
 
   class AliITSdetector {
   public:
-    AliITSdetector(){}
-    AliITSdetector(Double_t r,Double_t phi) {fR=r; fPhi=phi;}
+    AliITSdetector():fR(0.),fPhi(0.){}
+    AliITSdetector(Double_t r,Double_t phi):fR(r),fPhi(phi){}
     Double_t GetR()   const {return fR;}
     Double_t GetPhi() const {return fPhi;}
   private:
@@ -56,42 +60,46 @@ public:
 
   class AliITSlayer {
   public:
+    enum {kNsector=5, kMaxClusterPerSector=AliITSRecoParam::fgkMaxClusterPerLayer/kNsector};
     AliITSlayer();
     AliITSlayer(Double_t r, Double_t p, Double_t z, Int_t nl, Int_t nd);
    ~AliITSlayer();
-    Int_t InsertCluster(AliITSclusterV2 *c);
+    Int_t InsertCluster(AliITSRecPoint *c);
     void ResetClusters();
-    void SelectClusters(Double_t zmi,Double_t zma,Double_t ymi,Double_t yma);
-    const AliITSclusterV2 *GetNextCluster(Int_t &ci);
+    Int_t SelectClusters(Float_t zmi, Float_t zma, Float_t ymi, Float_t yma);
+    const AliITSRecPoint *GetNextCluster(Int_t &ci);
     void ResetRoad();
     Double_t GetRoad() const {return fRoad;}
     Double_t GetR() const {return fR;}
-    AliITSclusterV2 *GetCluster(Int_t i) const {return fClusters[i];} 
+    AliITSRecPoint *GetCluster(Int_t i) const { return fClusters[i]; } 
     AliITSdetector &GetDetector(Int_t n) const { return fDetectors[n]; }
     Int_t FindDetectorIndex(Double_t phi, Double_t z) const;
     Double_t GetThickness(Double_t y, Double_t z, Double_t &x0) const;
-    Int_t InRoad() const ;
-    Int_t GetNumberOfClusters() const {return fN;}
     Int_t GetNladders() const {return fNladders;}
     Int_t GetNdetectors() const {return fNdetectors;}
+    Int_t GetNumberOfClusters() const;
   protected:
+    AliITSlayer(const AliITSlayer&);
+    AliITSlayer &operator=(const AliITSlayer &tr);  
     Double_t fR;                // mean radius of this layer
     Double_t fPhiOffset;        // offset of the first detector in Phi
     Int_t fNladders;            // number of ladders
     Double_t fZOffset;          // offset of the first detector in Z
     Int_t fNdetectors;          // detectors/ladder
     AliITSdetector *fDetectors; // array of detectors
-    Int_t fN;                   // number of clusters
-    AliITSclusterV2 *fClusters[kMaxClusterPerLayer]; // pointers to clusters
-    Double_t fZmax;      //    edges
-    Double_t fYmin;      //   of  the
-    Double_t fYmax;      //   "window"
-    Int_t fI;            // index of the current cluster within the "window"
-    Double_t fRoad;      // road defined by the cluster density
-    Int_t FindClusterIndex(Double_t z) const;
+
+    AliITSRecPoint *fClusters[AliITSRecoParam::fgkMaxClusterPerLayer]; // pointers to clusters
+    Int_t fN[kNsector];         // numbers of clusters sector by sector 
+
+    Int_t fIndex[AliITSRecoParam::fgkMaxClusterPerLayer]; // indexes of selected clusters 
+    Int_t fNsel;                       // number of selected clusters
+
+    Double_t fRoad;     // road defined by the cluster density
+    Int_t FindClusterIndex(Float_t z, Int_t s) const;
   };
 
 protected:
+  AliITStrackerV2(const AliITStrackerV2&);
   void CookLabel(AliKalmanTrack *t,Float_t wrong) const;
   Double_t GetEffectiveThickness(Double_t y, Double_t z) const;
   void  FollowProlongation();
@@ -105,16 +113,18 @@ protected:
      new(&fTrackToFollow) AliITStrackV2(t);
   }
   Int_t fI;                              // index of the current layer
-  static AliITSlayer fgLayers[kMaxLayer];// ITS layers
-  AliITStrackV2 fTracks[kMaxLayer];      // track estimations at the ITS layers
+  static AliITSlayer fgLayers[AliITSgeomTGeo::kNLayers];// ITS layers
+  AliITStrackV2 fTracks[AliITSgeomTGeo::kNLayers];      // track estimations at the ITS layers
   AliITStrackV2 fBestTrack;              // "best" track 
   AliITStrackV2 fTrackToFollow;          // followed track
   Int_t fPass;                           // current pass through the data 
   Int_t fConstraint[2];                  // constraint flags
 
-  Int_t fLayersNotToSkip[kMaxLayer];     // layer masks
+  Int_t fLayersNotToSkip[AliITSgeomTGeo::kNLayers];     // layer masks
   Int_t fLastLayerToTrackTo;             // the innermost layer to track to
 
+private:
+  AliITStrackerV2 &operator=(const AliITStrackerV2 &tr);  
   ClassDef(AliITStrackerV2,1)   //ITS tracker V2
 };