X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackParam.h;h=1fa228611c1a1a90073dc81b8a3674ffad38c609;hb=0742685016164b4badfff3326341f1f29c07d4d8;hp=9dd8a7f0440014026b266e3c2f145d2dc50aa6ee;hpb=b709ac1340fe679ff5f6d2457102eb5f0af1a704;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTrackParam.h b/MUON/AliMUONTrackParam.h
index 9dd8a7f0440..1fa228611c1 100644
--- a/MUON/AliMUONTrackParam.h
+++ b/MUON/AliMUONTrackParam.h
@@ -17,8 +17,7 @@
 #include <TObject.h>
 #include <TMatrixD.h>
 
-class AliMUONHitForRec;
-class AliESDMuonTrack;
+class AliMUONVCluster;
 
 class AliMUONTrackParam : public TObject 
 {
@@ -29,14 +28,6 @@ class AliMUONTrackParam : public TObject
   AliMUONTrackParam(const AliMUONTrackParam& theMUONTrackParam);
   AliMUONTrackParam& operator=(const  AliMUONTrackParam& theMUONTrackParam);
 
-  void GetParamFrom(const AliESDMuonTrack& esdMuonTrack);
-  void SetParamFor(AliESDMuonTrack& esdMuonTrack) const;
-  void GetParamFromUncorrected(const AliESDMuonTrack& esdMuonTrack);
-  void SetParamForUncorrected(AliESDMuonTrack& esdMuonTrack) const;
-  
-  void GetCovFrom(const AliESDMuonTrack& esdMuonTrack);
-  void SetCovFor(AliESDMuonTrack& esdMuonTrack) const;
-
   // Get and Set methods for data
 	/// return Z coordinate (cm)
   Double_t GetZ() const {return fZ;}
@@ -104,33 +95,30 @@ class AliMUONTrackParam : public TObject
   const TMatrixD& GetSmoothCovariances() const;
   void            SetSmoothCovariances(const TMatrixD& covariances);
   
-  AliMUONHitForRec* GetHitForRecPtr() const;
-	/// set pointeur to associated HitForRec
-  void              SetHitForRecPtr(AliMUONHitForRec* hitForRec) {fHitForRecPtr = hitForRec;}
+        /// get pointeur to associated cluster
+  AliMUONVCluster* GetClusterPtr() const {return fClusterPtr;}
+  void             SetClusterPtr(AliMUONVCluster* cluster, Bool_t owner = kFALSE);
   
-  	/// return kTRUE if the associated hit can be removed from the track it belongs to
+  	/// return kTRUE if the associated cluster can be removed from the track it belongs to
   Bool_t IsRemovable() const {return fRemovable;}
-  	/// set the flag telling whether the associated hit can be removed from the track it belongs to or not
+  	/// set the flag telling whether the associated cluster can be removed from the track it belongs to or not
   void   SetRemovable(Bool_t removable) {fRemovable = removable;}
   
-	/// return kTRUE if the associated hit alone in its chamber
-  Bool_t IsAloneInChamber() const {return fAloneInChamber;}
-	/// set the flag telling whether the associated hi alone in its chamber or not
-  void   SetAloneInChamber(Bool_t aloneInChamber) {fAloneInChamber = aloneInChamber;}
-  
-  /// return the chi2 of the track when the associated HitForRec was attached
+  /// return the chi2 of the track when the associated cluster was attached
   Double_t GetTrackChi2() const {return fTrackChi2;}
-  	/// set the chi2 of the track when the associated HitForRec was attached
+  	/// set the chi2 of the track when the associated cluster was attached
   void     SetTrackChi2(Double_t chi2) {fTrackChi2 = chi2;}
-  	/// return the local chi2 of the associated HitForRec with respect to the track
+  	/// return the local chi2 of the associated cluster with respect to the track
   Double_t GetLocalChi2() const {return fLocalChi2;}
-  	/// set the local chi2 of the associated HitForRec with respect to the track
+  	/// set the local chi2 of the associated cluster with respect to the track
   void     SetLocalChi2(Double_t chi2) {fLocalChi2 = chi2;}
   
-	/// necessary for sorting TClonesArray of TrackHit's
+	/// necessary for sorting TClonesArray of AliMUONTrackParam
   Bool_t IsSortable () const {return kTRUE;}
   Int_t Compare(const TObject* trackParam) const;
 
+  Bool_t CompatibleTrackParam(const AliMUONTrackParam &trackParam, Double_t sigma2Cut, Double_t &normChi2) const;
+
   virtual void Print(Option_t* opt="") const;
  
   virtual void Clear(Option_t* opt="");
@@ -155,21 +143,20 @@ class AliMUONTrackParam : public TObject
   /// <X,InvP_yz> <SlopeX,InvP_yz> <Y,InvP_yz> <SlopeY,InvP_yz> <InvP_yz,InvP_yz>  </pre>
   mutable TMatrixD *fCovariances; ///< \brief Covariance matrix of track parameters 
   
-  mutable TMatrixD *fPropagator; //!< Jacobian used to extrapolate the track parameters and covariances to the actual z position
-  mutable TMatrixD *fExtrapParameters; //!< Track parameters extrapolated to the actual z position (not filtered by Kalman)
+  mutable TMatrixD *fPropagator;        //!< Jacobian used to extrapolate the track parameters and covariances to the actual z position
+  mutable TMatrixD *fExtrapParameters;  //!< Track parameters extrapolated to the actual z position (not filtered by Kalman)
   mutable TMatrixD *fExtrapCovariances; //!< Covariance matrix extrapolated to the actual z position (not filtered by Kalman)
   
-  mutable TMatrixD *fSmoothParameters; //!< Track parameters obtained using smoother
+  mutable TMatrixD *fSmoothParameters;  //!< Track parameters obtained using smoother
   mutable TMatrixD *fSmoothCovariances; //!< Covariance matrix obtained using smoother
   
-  AliMUONHitForRec *fHitForRecPtr; //!< Pointer to associated HitForRec if any
+  AliMUONVCluster *fClusterPtr; //!< Pointer to associated cluster if any
+  Bool_t           fOwnCluster; //!< Ownership of the associated cluster
   
-  Bool_t fRemovable; //!< kTRUE if the associated hit can be removed from the track it belongs to
+  Bool_t fRemovable; //!< kTRUE if the associated cluster can be removed from the track it belongs to
   
-  Bool_t fAloneInChamber; //!< kTRUE if the associated hit is alone in its chamber
-
-  Double_t fTrackChi2; //!< Chi2 of the track when the associated HitForRec was attached
-  Double_t fLocalChi2; //!< Local chi2 of the associated HitForRec with respect to the track
+  Double_t fTrackChi2; //!< Chi2 of the track when the associated cluster was attached
+  Double_t fLocalChi2; //!< Local chi2 of the associated cluster with respect to the track
   
   ClassDef(AliMUONTrackParam, 4) // Track parameters in ALICE dimuon spectrometer
 };