Corrections for gcc 4.0

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

diff --git a/ITS/AliITSTrackerV1.h b/ITS/AliITSTrackerV1.h
index 8588b4b421efdd6a7243bf571715ba19ab4f9a09..b1e8bc2ec6b989f37631bde90c00ddec72aa8c82 100644 (file)
--- a/ITS/AliITSTrackerV1.h
+++ b/ITS/AliITSTrackerV1.h
@@ -31,16 +31,17 @@ class TMatrix;
 class AliITSTrackV1;
 class AliITS;
 class AliITSRad;
-class AliITSgeoinfo;
 class TStopwatch;
 
 class AliITSTrackerV1 : public TObject {
  public:
-    AliITSTrackerV1(AliITS* IITTSS, Bool_t flag);
+    AliITSTrackerV1();
+    AliITSTrackerV1(AliITS* IITTSS, Int_t evnumber, Bool_t flag);
     AliITSTrackerV1(const AliITSTrackerV1 &cobj);
     ~AliITSTrackerV1();
-    AliITSTrackerV1 &operator=(AliITSTrackerV1 obj);
-    void DoTracking(Int_t evNumber, Int_t minTr, Int_t maxTr, TFile *file);
+    AliITSTrackerV1 &operator=(const AliITSTrackerV1 &obj);
+//  void DelMatrix(Int_t NumOfModules);
+    void DoTracking(Int_t evNumber, Int_t minTr, Int_t maxTr, TFile *file, Bool_t realmass=0);
     void RecursiveTracking(TList *trackITSlist);
     Int_t Intersection(AliITSTrackV1 &track, Int_t layer,Int_t &ladder,
                       Int_t &detector); 
@@ -55,14 +56,14 @@ class AliITSTrackerV1 : public TObject {
     AliITS* fITS;              //! pointer to AliITS
     AliITSTrackV1 *fresult;    // result is a pointer to the final best track
     Double_t fPtref;           // transvers momentum obtained from TPC tracking
-    Double_t fChi2max;         //  cluster with chi2>chi2max are cut. It is
-                               // pt dependend.  aggiunto il 31-7-2001
-    Double_t fepsphi;  //eps for definition window in phi aggiunto il 1-8-2001
-    Double_t fepsz;  //eps for definition window in z aggiunto il 1-8-2001
-    TObjArray  *frecPoints;    // pointer to RecPoints
+    Double_t fChi2max;         //  chi2 cut  
+    //Double_t fepsphi;  //eps for definition window in phi 
+   // Double_t fepsz;  //eps for definition window in z 
+    TClonesArray  *frecPoints;    // pointer to RecPoints
     Int_t **fvettid;           // flag vector of used clusters
     Bool_t fflagvert;          // a flag to impose or not the vertex constraint
     AliITSRad *frl;            // pointer to get the radiation lenght matrix
+///      To be put in a specific geometric class        
     Int_t fNlad[6];            // Number of ladders for a given layer
     Int_t fNdet[6];            // Number of detector for a given layer
     Double_t fAvrad[6];        // Average radius for a given layer
@@ -73,11 +74,19 @@ class AliITSTrackerV1 : public TObject {
     Double_t **fphimin;// Matrix of phimin for a given layer and a given ladder
     Double_t **fphimax;// Matrix of phimax for a given layer and a given ladder
     Double_t **fphidet; // azimuthal angle for a given layer and a given ladder
-    Double_t fFieldFactor;     // Magnetic filed factor 
-    //TStopwatch *fTimerKalman;         // timer for kalman filter
-    //TStopwatch *fTimerIntersection;   // timer for Intersection 
-
-    ClassDef(AliITSTrackerV1,1) //????
+        Int_t *fNRecPoints;        // pointer to the vector giving the number of recpoints for a given module
+        /*
+        Float_t **fRecCylR;        // pointer to the matrix giving the R cylindric cohordinate of a recpoint
+        Float_t **fRecCylPhi;      // pointer to the matrix giving the Phi cylindric cohordinate of a recpoint
+        Float_t **fRecCylZ;        // pointer to the matrix giving the Z cylindric cohordinate of a recpoint   
+        */
+        Double_t **fRecCylR;        // pointer to the matrix giving the R cylindric cohordinate of a recpoint
+        Double_t **fRecCylPhi;      // pointer to the matrix giving the Phi cylindric cohordinate of a recpoint
+        Double_t **fRecCylZ;        // pointer to the matrix giving the Z cylindric cohordinate of a recpoint            
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    Double_t fFieldFactor;     // Magnetic field factor 
+ 
+    ClassDef(AliITSTrackerV1,1)  
 };
 
 #endif