Updates received from Yermia

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

diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h
index a8562acab14fa90b4f59256a352d7505d34dfabf..0b5fbdf8cd6c99de60f56cfc1f4b29015ee81da8 100644 (file)
--- a/STEER/AliTracker.h
+++ b/STEER/AliTracker.h
@@ -11,26 +11,17 @@
 //       Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
 #include <TObject.h>
-#include <TClass.h>
-#include "AliKalmanTrack.h"
-#include "AliMagF.h"
-#include "AliLog.h"
 
+class AliMagF;
 class AliCluster;
 class TTree;
+class AliKalmanTrack;
 class AliESD;
 class AliTrackPoint;
 
 class AliTracker : public TObject {
 public:
-
-  enum {kTrackInward, kTrackBack, kTrackRefit} Propagation_t; //type of propagation
-  
   AliTracker();
-  AliTracker(const AliTracker &atr): TObject(atr)
-    {Fatal("Copy ctor","Not Implemented!\n");}
-  // AliTracker & operator=(const AliTracker &)
-  //  {Fatal("= op","Not Implemented\n");return *this;}
   virtual ~AliTracker(){}
   virtual Int_t Clusters2Tracks(AliESD *event)=0;
   virtual Int_t PropagateBack(AliESD *event)=0;
@@ -44,7 +35,6 @@ public:
   virtual Int_t LoadClusters(TTree *)=0;
   virtual void UnloadClusters()=0;
   virtual AliCluster *GetCluster(Int_t index) const=0;
-  //  virtual UShort_t GetVolumeID(Int_t index) {return 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; 
@@ -57,36 +47,34 @@ public:
 
   static void SetFieldMap(const AliMagF* map, Bool_t uni);
   static const AliMagF *GetFieldMap() {return fgkFieldMap;}
+  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:
-
   AliTracker & operator=(const AliTracker & atr);
 
-  static const AliMagF *fgkFieldMap; //field map
+  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,2) //abstract tracker
+  ClassDef(AliTracker,3) //abstract tracker
 };
 
-inline void AliTracker::SetFieldMap(const AliMagF* map, Bool_t uni) {
-  //--------------------------------------------------------------------
-  //This passes the field map to the reconstruction.
-  //--------------------------------------------------------------------
-  if (map==0) AliFatalClass("Can't access the field map !");
-  AliKalmanTrack::SetFieldMap(map);
-  if (uni) AliKalmanTrack::SetUniformFieldTracking();
-  fgkFieldMap=map;
-}
-
-
-
 #endif