speed optimization

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

diff --git a/ITS/AliITStrackerSA.h b/ITS/AliITStrackerSA.h
index 46bd8f0116f30393735a878596d8281e9a9653d2..41480f58da827417c6b3424bb435b17a6f11298b 100644 (file)
--- a/ITS/AliITStrackerSA.h
+++ b/ITS/AliITStrackerSA.h
@@ -31,21 +31,23 @@ class AliITStrackerSA : public AliITStrackerV2 {
   AliITStrackerSA(AliITSgeom *geom,AliITSVertexer *vertexer);
   AliITStrackerSA(AliITStrackerSA& tracker);
   virtual ~AliITStrackerSA();  
-  virtual Int_t Clusters2Tracks(AliESD *event){Int_t rc = AliITStrackerV2::Clusters2Tracks(event); if(!rc)rc=FindTracks(event); return rc;}
+  virtual Int_t Clusters2Tracks(AliESD *event){Int_t rc = AliITStrackerV2::Clusters2Tracks(event); if(!rc) rc=FindTracks(event); return rc;}
   Int_t FindTracks(AliESD* event);
   void  FindTracks(TTree *out,Int_t evnumber=0);
   AliITStrackV2* FitTrack(AliITStrackSA* tr,Double_t* primaryVertex,
                           Double_t *errorprimvert);
 
   AliITStrackV2* FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const;
-  Int_t LoadClusters(TTree *cf) {Int_t rc=AliITStrackerV2::LoadClusters(cf); SetClusterTree(cf); return rc;}
+  Int_t LoadClusters(TTree *cf) {Int_t rc=AliITStrackerV2::LoadClusters(cf); SetClusterTree(cf);SetSixPoints(kTRUE); return rc;}
   void SetVertex(AliESDVertex *vtx){fVert = vtx;}
   void SetClusterTree(TTree * itscl){fITSclusters = itscl;}
   void SetSixPoints(Bool_t sp = kTRUE){fSixPoints = sp;}
   Bool_t GetSixPoints() const {return fSixPoints;}
   void SetWindowSizes(Int_t n=46, Double_t *phi=0, Double_t *lam=0);
-  void UseFoundTracksV2(Int_t evnum,TTree* treev2, TTree* clustertree);
-  void UseFoundTracksV2(Int_t evnum,AliESD *event, TTree* clustertree);
+  void UseFoundTracksV2(Int_t evnum,TTree* treev2);
+  void UseFoundTracksV2(AliESD *event);
+
+  enum {kSAflag=0x8000}; //flag to mark clusters used in the SA tracker
 
  protected:
 
@@ -56,12 +58,8 @@ class AliITStrackerSA : public AliITStrackerV2 {
   AliITStrackerSA& operator=(const AliITStrackerSA& /* trkr */);
   //Initialization
   void Init();
-  Int_t     GetFlagLoadedClusters() const {return fFlagLoad;}
-   
-  void     ResetForFinding();
-  void     SetFlagLoadedClusters(Int_t d) {fFlagLoad=d;}
-
-  void     UpdatePoints();
+  void ResetForFinding();
+  void UpdatePoints();
 
   static Double_t Curvature(Double_t x1,Double_t y1,Double_t x2,Double_t y2,
                      Double_t x3,Double_t y3);
@@ -81,14 +79,13 @@ class AliITStrackerSA : public AliITStrackerV2 {
               Int_t gl17, Int_t gl18, Int_t numberofpoints=6);
  
   Int_t SearchClusters(Int_t layer,Double_t phiwindow,Double_t lambdawindow, 
-                       AliITStrackSA* trs,Double_t zvertex,Int_t flagp, AliITSclusterTable* table); 
+                       AliITStrackSA* trs,Double_t zvertex,Int_t flagp); 
  
-
   Double_t fPhiEstimate; //Estimation of phi angle on next layer
-  Double_t fPoint1[2];   //! coord. of 1-st point to evaluate the curvature
-  Double_t fPoint2[2];   //! coord. of 2-nd point to evaluate the curvature
-  Double_t fPoint3[2];   //! coord. of 3-rd point to evaluate the curvature
-  Double_t fPointc[2];   //! current point coord (for curvature eval.)
+  Float_t fPoint1[2];   //! coord. of 1-st point to evaluate the curvature
+  Float_t fPoint2[2];   //! coord. of 2-nd point to evaluate the curvature
+  Float_t fPoint3[2];   //! coord. of 3-rd point to evaluate the curvature
+  Float_t fPointc[2];   //! current point coord (for curvature eval.)
   Double_t fLambdac;    //! current value of the Lambda angle in the window
   Double_t fPhic;       //! current value of the Phi angle in the window
   Float_t fCoef1;       //! param. of the equation of the circ. approx a layer
@@ -100,8 +97,8 @@ class AliITStrackerSA : public AliITStrackerV2 {
   AliESDVertex *fVert;        //! primary vertex
   AliITSVertexer *fVertexer;  //! vertexer 
   AliITSgeom *fGeom;          //! ITS geometry
+  TObjArray *fListOfTracks;   //! container for found tracks 
   TTree *fITSclusters;        //! pointer to ITS tree of clusters
-  Int_t fFlagLoad;            //  flag for loaded clusters (1==already loaded)
   Bool_t fSixPoints;          // If true 6/6 points are required (default). 5/6 otherwise
   AliITSclusterTable* fTable; //  table with clusters
   ClassDef(AliITStrackerSA,1)