- Adding handling of track info in digits.

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

diff --git a/MUON/AliMUONTrackK.h b/MUON/AliMUONTrackK.h
index c500d1244ce0f75e32758e4d87e2855e465b944b..5be2a5d91903a23ca24497ea4d8885f2fc7f709c 100644 (file)
--- a/MUON/AliMUONTrackK.h
+++ b/MUON/AliMUONTrackK.h
@@ -10,19 +10,18 @@
 /// \class AliMUONTrack
 /// \brief Kalman track in MUON arm of ALICE
 
-#include <TObject.h>
-#include "AliMUONTrack.h" //AZ
-
 class TArrayD;
-class TMatrixD;
-class AliMUONTrackReconstructor;
 class TClonesArray;
 class TObjArray;
-class AliMUONSegment;
-class AliMUON;
+#include <TMatrixDfwd.h>
+#include <TObject.h>
+
+class AliMUONEventRecoCombi;
 class AliMUONHitForRec;
+class AliMUONSegment;
+class AliMUONTrackReconstructor;
+#include "AliMUONTrack.h" 
 
-//AZ class AliMUONTrackK : public TObject {
 class AliMUONTrackK : public AliMUONTrack {
 
  public:
@@ -30,7 +29,6 @@ class AliMUONTrackK : public AliMUONTrack {
   AliMUONTrackK(); // Default constructor
   virtual ~AliMUONTrackK(); // Destructor
 
-  //AliMUONTrackK(const AliMUONTrackReconstructor *TrackReconstructor, const AliMUONHitForRec *hitForRec); // Constructor
   AliMUONTrackK(AliMUONTrackReconstructor *TrackReconstructor, TClonesArray *hitForRec); // Constructor
   AliMUONTrackK(AliMUONSegment *segment); // Constructor from a segment
 
@@ -82,9 +80,10 @@ 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 AliMUON *fgMUON; // pointer to MUON module  
   static AliMUONTrackReconstructor *fgTrackReconstructor; // pointer to event reconstructor
   static TClonesArray *fgHitForRec; // pointer to hits
+  static AliMUONEventRecoCombi *fgCombi; // pointer to combined cluster/track finder
 
   AliMUONSegment *fStartSegment; // seed segment  
   Double_t fPosition; // Z-coordinate of track
@@ -123,7 +122,7 @@ class AliMUONTrackK : public AliMUONTrack {
   void WeightPropagation(Double_t zEnd, Bool_t smooth);
   void MSThin(Int_t sign);
   void MSLine(Double_t dZ, Double_t X0);
-  Bool_t FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int_t iFB, AliMUONHitForRec *&hitAdd);
+  Bool_t FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int_t iFB, AliMUONHitForRec *&hitAdd, Int_t iz);
   void TryPoint(TMatrixD &point, const TMatrixD &pointWeight, TMatrixD &trackParTmp, Double_t &dChi2);
   void SetGeantParam(Double_t *VGeant3, Int_t iFB);
   void GetFromGeantParam(Double_t *VGeant3, Int_t iFB);