ALIROOT-5420 Changes for CDH v3

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

diff --git a/MUON/AliMUONTrack.h b/MUON/AliMUONTrack.h
index 3b176d00169056635325ee0aec66458e86ce6ecd..ce177113ef51eda6f594b994d4e4dcab992c1813 100644 (file)
--- a/MUON/AliMUONTrack.h
+++ b/MUON/AliMUONTrack.h
@@ -14,7 +14,7 @@
 /// Reconstructed track in ALICE dimuon spectrometer
 ////////////////////////////////////////////////////
 
-#include <TClonesArray.h>
+#include <TObjArray.h>
 #include <TMatrixD.h>
 
 class AliMUONVCluster;
@@ -32,7 +32,7 @@ class AliMUONTrack : public TObject
 
   void Reset();
   
-  TClonesArray* GetTrackParamAtCluster() const;
+  TObjArray*    GetTrackParamAtCluster() const;
   void          AddTrackParamAtCluster(const AliMUONTrackParam &trackParam, AliMUONVCluster &cluster, Bool_t copy = kFALSE); 
   void          RemoveTrackParamAtCluster(AliMUONTrackParam *trackParam);
   Bool_t        UpdateTrackParamAtCluster();
@@ -86,13 +86,12 @@ class AliMUONTrack : public TObject
   /// set the chi2 of trigger/track matching 
   void     SetChi2MatchTrigger(Double_t chi2MatchTrigger) {fChi2MatchTrigger = chi2MatchTrigger;}
 
-  Int_t ClustersInCommon(AliMUONTrack* track) const;
-  Int_t ClustersInCommonInSt345(AliMUONTrack* track) const;
+  Int_t ClustersInCommon(AliMUONTrack* track, Int_t stMin = 0, Int_t stMax = 4) const;
 
   Int_t    GetNDF() const;
   Double_t GetNormalizedChi2() const;
 
-  Int_t  FindCompatibleClusters(AliMUONTrack &track, Double_t sigma2Cut, Bool_t compatibleCluster[10]) const;
+  Int_t  FindCompatibleClusters(const AliMUONTrack &track, Double_t sigma2Cut, Bool_t compatibleCluster[10]) const;
   Bool_t Match(AliMUONTrack &track, Double_t sigma2Cut, Int_t &nMatchClusters) const;
   
   /// return pointer to track parameters at vertex (can be 0x0)
@@ -103,6 +102,10 @@ class AliMUONTrack : public TObject
   UShort_t GetHitsPatternInTrigCh() const {return fHitsPatternInTrigCh;}
   /// set word telling which trigger chambers where hit by track
   void     SetHitsPatternInTrigCh(UShort_t hitsPatternInTrigCh) {fHitsPatternInTrigCh = hitsPatternInTrigCh;}
+  /// set word telling which trigger chambers where hit by track (from tracker track extrapolation)
+  UInt_t GetHitsPatternInTrigChTrk() const {return fHitsPatternInTrigChTrk;}
+  /// set word telling which trigger chambers where hit by track (from tracker track extrapolation)
+  void     SetHitsPatternInTrigChTrk(UInt_t hitsPatternInTrigChTrk) {fHitsPatternInTrigChTrk = hitsPatternInTrigChTrk;}
 
   /// set local trigger information for the matched trigger track
   void  SetLocalTrigger(Int_t loCirc, Int_t loStripX, Int_t loStripY, Int_t loDev, Int_t loLpt, Int_t loHpt, UChar_t respWithoutChamber=0);
@@ -139,13 +142,18 @@ class AliMUONTrack : public TObject
   
   /// return the maximum chi2 above which the track can be considered as abnormal (due to extrapolation failure, ...)
   static Double_t MaxChi2() {return fgkMaxChi2;}
+  
+  /// set the flag which is kTRUE if that track shares cluster(s) with another
+  void   Connected(Bool_t flag = kTRUE) {fConnected = flag;}
+  /// return the flag which is kTRUE if that track shares cluster(s) with another
+  Bool_t IsConnected() const {return fConnected;}
 
 
  private:
   
   static const Double_t fgkMaxChi2; ///< maximum chi2 above which the track can be considered as abnormal
   
-  mutable TClonesArray* fTrackParamAtCluster; ///< Track parameters at cluster
+  mutable TObjArray* fTrackParamAtCluster; ///< Track parameters at cluster
   
   Bool_t   fFitWithVertex;   //!< kTRUE if using the vertex to constrain the fit, kFALSE if not
   Double_t fVertexErrXY2[2]; //!< Vertex resolution square used during the tracking procedure if required
@@ -172,17 +180,19 @@ class AliMUONTrack : public TObject
   AliMUONTrackParam* fTrackParamAtVertex; //!< Track parameters at vertex
   
   UShort_t fHitsPatternInTrigCh; ///< Word containing info on the hits left in trigger chambers
+  UInt_t fHitsPatternInTrigChTrk; ///< Word containing info on the hits left in trigger chambers (calculated from extrapolated tracker track)
 
   Int_t fLocalTrigger;    ///< packed local trigger information
   
+  Bool_t fConnected; ///< kTRUE if that track shares cluster(s) with another
   
   // methods
   Bool_t ComputeClusterWeights(TMatrixD& clusterWeightsNB, TMatrixD& clusterWeightsB,
-                              TMatrixD* mcsCovariances = 0, AliMUONVCluster* discardedCluster = 0) const;
+                              TMatrixD* mcsCovariances = 0, const AliMUONVCluster* discardedCluster = 0) const;
   void   ComputeMCSCovariances(TMatrixD& mcsCovariances) const;
   
   
-  ClassDef(AliMUONTrack, 9) // Reconstructed track in ALICE dimuon spectrometer
+  ClassDef(AliMUONTrack, 11) // Reconstructed track in ALICE dimuon spectrometer
 };
        
 #endif