Bug fix

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

diff --git a/MUON/AliMUONTrackK.h b/MUON/AliMUONTrackK.h
index faf296a894d120b6d65994a3745d86c5afeb5cd1..2c48aae133d2701a02d69cb4413c4682092a9660 100644 (file)
--- a/MUON/AliMUONTrackK.h
+++ b/MUON/AliMUONTrackK.h
@@ -10,19 +10,19 @@
 /// \class AliMUONTrackK
 /// \brief Kalman track in MUON arm of ALICE
 ///
-/// \author: Alexander Zinchenko, JINR Dubna
+/// \author Alexander Zinchenko, JINR Dubna
+
+class AliMUONEventRecoCombi;
+class AliMUONHitForRec;
+class AliMUONObjectPair;
+class AliMUONTrackReconstructorK;
+#include "AliMUONTrack.h" 
 
 class TArrayD;
 class TClonesArray;
 class TObjArray;
-#include <TMatrixDfwd.h>
-#include <TObject.h>
 
-class AliMUONEventRecoCombi;
-class AliMUONHitForRec;
-class AliMUONSegment;
-class AliMUONTrackReconstructor;
-#include "AliMUONTrack.h" 
+#include <TMatrixD.h>
 
 class AliMUONTrackK : public AliMUONTrack {
 
@@ -31,43 +31,40 @@ class AliMUONTrackK : public AliMUONTrack {
   AliMUONTrackK(); // Default constructor
   virtual ~AliMUONTrackK(); // Destructor
 
-  AliMUONTrackK(AliMUONTrackReconstructor *TrackReconstructor, TClonesArray *hitForRec); // Constructor
-  AliMUONTrackK(AliMUONSegment *segment); // Constructor from a segment
+  AliMUONTrackK(AliMUONTrackReconstructorK *TrackReconstructor, TClonesArray *hitForRec); // Constructor
+  AliMUONTrackK(AliMUONObjectPair *segment); // Constructor from a segment
 
   // Pointer to hits on track
-  TObjArray* GetTrackHits(void) const {return fTrackHits;} // ptr. to hits on track
-  Int_t GetNTrackHits(void) const {return fNmbTrackHits;} // hits on track
-  Double_t GetTrackQuality(void) const {return fChi2;} // track quality
-  TMatrixD* GetTrackParameters(void) const {return fTrackPar;} // track parameters
-  Double_t GetZ(void) const {return fPosition;} // Z-coordinate of track 
-  TMatrixD* GetCovariance(void) const {return fCovariance;} // covariance matrix
-  Int_t GetTrackDir(void) const {return fTrackDir;} // get track propagation direction
-  void SetTrackDir(Int_t iDir) {fTrackDir = iDir;} // set track propagation direction  
-  Bool_t GetBPFlag(void) const {return fBPFlag;} // get backpropagation flag
-  void SetBPFlag(Bool_t BPFlag) {fBPFlag = BPFlag;} // set backpropagation flag
-  Int_t GetRecover(void) const {return fRecover;} // return recover flag 
-  void SetRecover(Int_t iRecover) {fRecover = iRecover;} // set recover flag
-  AliMUONSegment* GetStartSegment(void) const {return fStartSegment;} // return seed segment
-  Bool_t KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, Double_t zDipole1, Double_t zDipole2); // Kalman filter
+  TObjArray* GetTrackHits(void) const {return fTrackHits;} ///< ptr. to hits on track
+  Int_t GetNTrackHits(void) const {return fNmbTrackHits;} ///< hits on track
+  Double_t GetTrackQuality(void) const {return fChi2;} ///< track quality
+  TMatrixD* GetTrackParameters(void) const {return fTrackPar;} ///< track parameters
+  Double_t GetZ(void) const {return fPosition;} ///< Z-coordinate of track 
+  TMatrixD* GetCovariance(void) const {return fCovariance;} ///< covariance matrix
+  Int_t GetTrackDir(void) const {return fTrackDir;} ///< get track propagation direction
+  void SetTrackDir(Int_t iDir) {fTrackDir = iDir;} ///< set track propagation direction  
+  Bool_t GetBPFlag(void) const {return fBPFlag;} ///< get backpropagation flag
+  void SetBPFlag(Bool_t BPFlag) {fBPFlag = BPFlag;} ///< set backpropagation flag
+  Int_t GetRecover(void) const {return fRecover;} ///< return recover flag 
+  void SetRecover(Int_t iRecover) {fRecover = iRecover;} ///< set recover flag
+  AliMUONObjectPair* GetStartSegment(void) const {return fStartSegment;} ///< return seed segment
+  Bool_t KalmanFilter(Int_t ichamBeg, Int_t ichamEnd, Bool_t Back, Double_t zDipole1, Double_t zDipole2); ///< Kalman filter
   void StartBack(void); // start backpropagator
   void SetTrackQuality(Int_t iChi2); // compute track quality or Chi2
   Bool_t KeepTrack(AliMUONTrackK* track0) const; // keep or discard track 
   void Kill(void); // kill track candidate
-  void Branson(void); // Branson correction
-  void GoToZ(Double_t zEnd); // propagate track to given Z
-  void GoToVertex(Int_t iflag); // propagate track to the vertex
   Bool_t Smooth(void); // apply smoother
   Double_t GetChi2PerPoint(Int_t iPoint) const; // return Chi2 at point
   void Print(FILE *lun) const; // print track information
-  void Print(const char* /*opt*/) const {return;} // print track information
+  void Print(const char* /*opt*/) const {return;} ///< print track information
   AliMUONHitForRec* GetHitLastOk(void); // get hit before the skipped one
   Int_t GetStation0(void); // return seed station number
-  Int_t DebugLevel(void) const {return fgDebug;} // return debug level
-  void SetDebugLevel(Int_t iDebug) {fgDebug = iDebug;} // set debug level
+  Int_t DebugLevel(void) const {return fgDebug;} ///< return debug level
+  void SetDebugLevel(Int_t iDebug) {fgDebug = iDebug;} ///< set debug level
   void FillMUONTrack(void); // set track parameters as for AliMUONTrack
   void SetTrackParam(AliMUONTrackParam *trackParam, TMatrixD *par, Double_t z); // fill AliMUONTrackParam object
 
-  // What is necessary for sorting TClonesArray's
+  /// What is necessary for sorting TClonesArray's
   Bool_t IsSortable() const { return kTRUE; }
   Int_t Compare(const TObject* trackK) const; // "Compare" function for sorting
 
@@ -75,7 +72,6 @@ class AliMUONTrackK : public AliMUONTrack {
 
  protected:
 
-  AliMUONTrackK (const AliMUONTrackK& source); // copy constructor
   AliMUONTrackK& operator=(const AliMUONTrackK& source); // assignment operator
 
  private:
@@ -83,11 +79,11 @@ class AliMUONTrackK : public AliMUONTrack {
   static Int_t fgDebug; ///< debug level
   static Int_t fgNOfPoints; ///< number of points in event
   //static AliMUON *fgMUON; ///< pointer to MUON module  
-  static AliMUONTrackReconstructor *fgTrackReconstructor; ///< pointer to event reconstructor
+  static AliMUONTrackReconstructorK *fgTrackReconstructor; ///< pointer to event reconstructor
   static TClonesArray *fgHitForRec; ///< pointer to hits
   static AliMUONEventRecoCombi *fgCombi; ///< pointer to combined cluster/track finder
 
-  AliMUONSegment *fStartSegment; ///< seed segment  
+  AliMUONObjectPair *fStartSegment; ///< seed segment  
   Double_t fPosition; ///< Z-coordinate of track
   Double_t fPositionNew; //!< Z-coordinate of track
   Double_t fChi2; ///< Chi2 of track
@@ -119,6 +115,7 @@ class AliMUONTrackK : public AliMUONTrack {
 
   // Functions
 
+  AliMUONTrackK (const AliMUONTrackK& source); ///< Not implemented copy constructor
   void EvalCovariance(Double_t dZ);
   void ParPropagation(Double_t zEnd);
   void WeightPropagation(Double_t zEnd, Bool_t smooth);
@@ -136,9 +133,10 @@ class AliMUONTrackK : public AliMUONTrack {
   void Outlier();
   void SortHits(Int_t iflag, TObjArray *array);
   void DropBranches(Int_t imax, TObjArray *hits);
-  void DropBranches(AliMUONSegment *segment);
+  void DropBranches(AliMUONObjectPair *segment);
   Bool_t ExistDouble(AliMUONHitForRec *hit);
   Bool_t ExistDouble(void);
+  void CheckBranches(TArrayD &branchChi2, Int_t nBranch);
 
   private:
    // Some constants