Changes for #90436: Misuse of TClonesArray containing AliESDMuonCluster

[u/mrichter/AliRoot.git] / MUON / AliMUONTrackExtrap.h

diff --git a/MUON/AliMUONTrackExtrap.h b/MUON/AliMUONTrackExtrap.h
index 0aa0f3d5b36c70c35ec58e58ff554fe3df48c550..809c4692a3f7b45518a8616dacec7a57006d18fa 100644 (file)
--- a/MUON/AliMUONTrackExtrap.h
+++ b/MUON/AliMUONTrackExtrap.h
@@ -28,20 +28,25 @@ class AliMUONTrackExtrap : public TObject
        /// Destructor
   virtual ~AliMUONTrackExtrap(){};
   
-       /// set field map
-  static void SetField(const AliMagF* magField) {fgkField = magField;}
+  static void SetField();
+  
+  /// return kTRUE if the field is switched ON
+  static Bool_t IsFieldON() {return fgFieldON;}
   
   static Double_t GetImpactParamFromBendingMomentum(Double_t bendingMomentum);
   static Double_t GetBendingMomentumFromImpactParam(Double_t impactParam);
   
-  // Linearly extrapolate track parameters and covariances
+  // Linearly extrapolate track parameters
   static void LinearExtrapToZ(AliMUONTrackParam* trackParam, Double_t zEnd);
   
+  // Linearly extrapolate track parameters and covariances
+  static void LinearExtrapToZCov(AliMUONTrackParam* trackParam, Double_t zEnd, Bool_t updatePropagator = kFALSE);
+  
   // Extrapolate track parameters in magnetic field
-  static void ExtrapToZ(AliMUONTrackParam *trackParam, Double_t zEnd);
+  static Bool_t ExtrapToZ(AliMUONTrackParam *trackParam, Double_t zEnd);
   
   // Extrapolate track parameters and covariances in magnetic field
-  static void ExtrapToZCov(AliMUONTrackParam* trackParam, Double_t zEnd, Bool_t updatePropagator = kFALSE);
+  static Bool_t ExtrapToZCov(AliMUONTrackParam* trackParam, Double_t zEnd, Bool_t updatePropagator = kFALSE);
   
   // Extrapolate track parameters to vertex, corrected for multiple scattering and energy loss effects
   // Add branson correction resolution and energy loss fluctuation to parameter covariances
@@ -68,11 +73,14 @@ class AliMUONTrackExtrap : public TObject
   static Double_t GetMCSAngle2(const AliMUONTrackParam& param, Double_t dZ, Double_t x0);
   static void     AddMCSEffect(AliMUONTrackParam *param, Double_t dZ, Double_t x0);
   
-  static void ExtrapOneStepRungekutta(Double_t charge, Double_t step, Double_t* vect, Double_t* vout);
+  static Bool_t ExtrapOneStepRungekutta(Double_t charge, Double_t step, const Double_t* vect, Double_t* vout);
   
   
  private:
-  static const AliMagF* fgkField;              //!< field map
+  static const Double_t fgkSimpleBPosition;     //!< position of the dipole
+  static const Double_t fgkSimpleBLength;       //!< length of the dipole
+  static       Double_t fgSimpleBValue;         //!< magnetic field value at the centre
+  static       Bool_t   fgFieldON;              //!< kTRUE if the field is switched ON
   static const Bool_t   fgkUseHelix;           //!< Tell whether to use Helix or not (default is Runge-Kutta)
   static const Int_t    fgkMaxStepNumber;      //!< Maximum number of steps for track extrapolation
   static const Double_t fgkHelixStepLength;    //!< Step lenght for track extrapolation (used in Helix)
@@ -85,8 +93,8 @@ class AliMUONTrackExtrap : public TObject
   /// Not implemented
   AliMUONTrackExtrap& operator=(const AliMUONTrackExtrap& trackExtrap);
 
-  static void ExtrapToZHelix(AliMUONTrackParam *trackParam, Double_t Z);
-  static void ExtrapToZRungekutta(AliMUONTrackParam *trackParam, Double_t Z);
+  static Bool_t ExtrapToZHelix(AliMUONTrackParam *trackParam, Double_t Z);
+  static Bool_t ExtrapToZRungekutta(AliMUONTrackParam *trackParam, Double_t Z);
   
   static void ConvertTrackParamForExtrap(AliMUONTrackParam* trackParam, Double_t forwardBackward, Double_t *v3);
   static void RecoverTrackParam(Double_t *v3, Double_t Charge, AliMUONTrackParam* trackParam);
@@ -96,7 +104,7 @@ class AliMUONTrackExtrap : public TObject
                              Double_t errXVtx, Double_t errYVtx,
                              Bool_t correctForMCS, Bool_t correctForEnergyLoss);
   
-  static void AddMCSEffectInAbsorber(AliMUONTrackParam* trackParam, Double_t pathLength, Double_t f0, Double_t f1, Double_t f2);
+  static void AddMCSEffectInAbsorber(AliMUONTrackParam* trackParam, Double_t signedPathLength, Double_t f0, Double_t f1, Double_t f2);
   static void CorrectMCSEffectInAbsorber(AliMUONTrackParam* param,
                                          Double_t xVtx, Double_t yVtx, Double_t zVtx,
                                          Double_t errXVtx, Double_t errYVtx,
@@ -106,16 +114,14 @@ class AliMUONTrackExtrap : public TObject
                                            Double_t &pathLength, Double_t &f0, Double_t &f1, Double_t &f2,
                                            Double_t &meanRho, Double_t &totalELoss, Double_t &sigmaELoss2);
   
-  static Double_t BetheBloch(Double_t pTotal, Double_t pathLength, Double_t rho, Double_t atomicA, Double_t atomicZ);
-  static Double_t EnergyLossFluctuation2(Double_t pTotal, Double_t pathLength, Double_t rho, Double_t atomicA, Double_t atomicZ);
+  static Double_t BetheBloch(Double_t pTotal, Double_t pathLength, Double_t rho, Double_t atomicZ, Double_t atomicZoverA);
+  static Double_t EnergyLossFluctuation2(Double_t pTotal, Double_t pathLength, Double_t rho, Double_t atomicZoverA);
   
   static void Cov2CovP(const TMatrixD &param, TMatrixD &cov);
   static void CovP2Cov(const TMatrixD &param, TMatrixD &cov);
   
-  static void ExtrapOneStepHelix(Double_t charge, Double_t step, Double_t *vect, Double_t *vout);
-  static void ExtrapOneStepHelix3(Double_t field, Double_t step, Double_t *vect, Double_t *vout);
-
-  static void GetField(Double_t *Position, Double_t *Field);
+  static void ExtrapOneStepHelix(Double_t charge, Double_t step, const Double_t *vect, Double_t *vout);
+  static void ExtrapOneStepHelix3(Double_t field, Double_t step, const Double_t *vect, Double_t *vout);
   
   ClassDef(AliMUONTrackExtrap, 0) // Tools for track extrapolation in ALICE dimuon spectrometer
 };