Updates received from Yermia

[u/mrichter/AliRoot.git] / STEER / AliTracker.h

diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h
index 6defef12bd6f4ec68143e5ca7cf8b5f064cda3bf..0b5fbdf8cd6c99de60f56cfc1f4b29015ee81da8 100644 (file)
--- a/STEER/AliTracker.h
+++ b/STEER/AliTracker.h
@@ -11,19 +11,16 @@
 //       Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 #include <TObject.h>
-#include "TError.h"
 
-class AliKalmanTrack;
+class AliMagF;
 class AliCluster;
 class TTree;
+class AliKalmanTrack;
 class AliESD;
-class AliMagF;
+class AliTrackPoint;
 
 class AliTracker : public TObject {
 public:
-
-  enum {kTrackInward, kTrackBack, kTrackRefit} Propagation_t;
-  
   AliTracker();
   virtual ~AliTracker(){}
   virtual Int_t Clusters2Tracks(AliESD *event)=0;
@@ -33,12 +30,12 @@ public:
      fX=xyz[0]; fY=xyz[1]; fZ=xyz[2];
      if (ers) { fSigmaX=ers[0]; fSigmaY=ers[1]; fSigmaZ=ers[2]; } 
   }
-  void SetEventNumber(Int_t ev) { fEventN=ev; }
 
 //protected:
   virtual Int_t LoadClusters(TTree *)=0;
   virtual void UnloadClusters()=0;
   virtual AliCluster *GetCluster(Int_t index) const=0;
+  virtual Bool_t GetTrackPoint(Int_t /* index */ , AliTrackPoint& /* p */) const { return kFALSE;}
   virtual void  UseClusters(const AliKalmanTrack *t, Int_t from=0) const;
   virtual void  CookLabel(AliKalmanTrack *t,Float_t wrong) const; 
   Double_t GetX() const {return fX;}
@@ -47,29 +44,35 @@ public:
   Double_t GetSigmaX() const {return fSigmaX;}
   Double_t GetSigmaY() const {return fSigmaY;}
   Double_t GetSigmaZ() const {return fSigmaZ;}
-  Int_t GetEventNumber() const {return fEventN;}
 
-  static void SetFieldMap(const AliMagF* map);
+  static void SetFieldMap(const AliMagF* map, Bool_t uni);
   static const AliMagF *GetFieldMap() {return fgkFieldMap;}
-  
-  Int_t IsStoringBarrel() const {return fStoreBarrel;}
-  void  SetStoreBarrel(Int_t s) {fStoreBarrel = s;}
+  static Double_t GetBz(Float_t *r); 
+  static Double_t GetBz(Double_t *r) {
+    Float_t rr[]={r[0],r[1],r[2]};
+    return GetBz(rr);
+  }
+  static Double_t GetBz() {return fgBz;}
+  static Bool_t UniformField() {return fgUniformField;}
 
+protected:
+  AliTracker(const AliTracker &atr);
 private:
-  static const AliMagF *fgkFieldMap; //field map
-  Int_t fEventN;//event number
+  AliTracker & operator=(const AliTracker & atr);
 
-  Int_t fStoreBarrel;
+  static Bool_t fgUniformField;       // uniform field flag
+  static const AliMagF *fgkFieldMap;  // field map
+  static Double_t fgBz;               // Nominal Bz (kG)
 
   Double_t fX;  //X-coordinate of the primary vertex
   Double_t fY;  //Y-coordinate of the primary vertex
   Double_t fZ;  //Z-coordinate of the primary vertex
-
+ 
   Double_t fSigmaX; // error of the primary vertex position in X
   Double_t fSigmaY; // error of the primary vertex position in Y
   Double_t fSigmaZ; // error of the primary vertex position in Z
 
-  ClassDef(AliTracker,1) //abstract tracker
+  ClassDef(AliTracker,3) //abstract tracker
 };
 
 #endif