I improved (by a factor 2.5) the speed of the MatchToMC method

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

diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h
index d2128bb44390b70488289f0c051e573a547a93b3..ca5c8d5ac8bb56f096ad9eaf2f5847e90166affd 100644 (file)
--- a/STEER/AliTracker.h
+++ b/STEER/AliTracker.h
@@ -10,18 +10,22 @@
 //   that is the base for AliTPCtracker, AliITStrackerV2 and AliTRDtracker
 //       Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
 //-------------------------------------------------------------------------
+
+#include <TGeoGlobalMagField.h>
 #include <TObject.h>
-#include <AliPlaneEff.h>
+
+#include "AliMagF.h"
+#include "AliRecoParam.h"
+#include "AliPlaneEff.h"
 
 class TTree;
-class AliMagF;
 class AliCluster;
-class AliKalmanTrack;
 class AliESDEvent;
 class AliESDtrack;
 class AliExternalTrackParam;
 class AliTrackPoint;
-
+class AliKalmanTrack;
+class AliEventInfo;
 class AliTracker : public TObject {
 public:
   AliTracker();
@@ -54,38 +58,37 @@ public:
   Double_t GetSigmaZ() const {return fSigmaZ;}
 
   static 
-  Double_t MeanMaterialBudget(Double_t *start,Double_t *end,Double_t *mparam);
+  Double_t MeanMaterialBudget(const Double_t *start, const Double_t *end, Double_t *mparam);
   static
   Bool_t PropagateTrackTo(AliExternalTrackParam *track, Double_t x, Double_t m,
         Double_t maxStep, Bool_t rotateTo=kTRUE, Double_t maxSnp=0.8);  
-
-  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;}
-
+  Bool_t PropagateTrackToBxByBz(AliExternalTrackParam *track, Double_t x, 
+         Double_t m,
+        Double_t maxStep, Bool_t rotateTo=kTRUE, Double_t maxSnp=0.8);  
+  //
+  static Double_t GetBz(const Double_t *r);
+  static void GetBxByBz(const Double_t r[3], Double_t b[3]);
+  static Double_t GetBz();
+  static Bool_t   UniformField();
+  //
   static void FillResiduals(const AliExternalTrackParam *t,
                           Double_t *p, Double_t *cov, 
                            UShort_t id, Bool_t updated=kTRUE);
-  static void SetFillResiduals(Bool_t flag=kTRUE) { fFillResiduals=flag; }
-  static void SetResidualsArray(TObjArray *arr) { fResiduals=arr; }
+  static void FillResiduals(const AliExternalTrackParam *t,
+                            const AliCluster *c, Bool_t updated=kTRUE);
+  static void SetFillResiduals(AliRecoParam::EventSpecie_t es, Bool_t flag=kTRUE) { fFillResiduals=flag; fEventSpecie = es ;}
+  static void SetResidualsArray(TObjArray **arr) { fResiduals=arr; }
+  static TObjArray ** GetResidualsArray() { return fResiduals; }
+
+  void                SetEventInfo(AliEventInfo *evInfo) {fEventInfo = evInfo;}
+  const AliEventInfo* GetEventInfo() const {return fEventInfo;}
 
 protected:
   AliTracker(const AliTracker &atr);
 private:
   AliTracker & operator=(const AliTracker & atr);
-
-  static Bool_t fgUniformField;       // uniform field flag
-  static const AliMagF *fgkFieldMap;  //! field map
-  static Double_t fgBz;               // Nominal Bz (kG)
-
   static Bool_t fFillResiduals;       // Fill residuals flag
-  static TObjArray *fResiduals;    //! Array of histograms with residuals
+  static TObjArray **fResiduals;    //! Array of histograms with residuals
 
   Double_t fX;  //X-coordinate of the primary vertex
   Double_t fY;  //Y-coordinate of the primary vertex
@@ -94,10 +97,18 @@ private:
   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,4) //abstract tracker
+  
+  static AliRecoParam::EventSpecie_t fEventSpecie ; //! event specie, see AliRecoParam
+  AliEventInfo*                      fEventInfo;    //! pointer to the event info object
+  
+  ClassDef(AliTracker,5) //abstract tracker
 };
 
-#endif
-
+//__________________________________________________________________________
+inline Bool_t AliTracker::UniformField()
+{
+  AliMagF* fld = (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
+  return fld ? fld->IsUniform():kTRUE;
+}
 
+#endif