]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONTrack.cxx
Add new functionalities (Laurent)
[u/mrichter/AliRoot.git] / MUON / AliMUONTrack.cxx
index f1e32e0dd735eeee967378f9f78913debc0ad3d3..c1ffa44b893cb91c420d370c115572b71d2a7217 100644 (file)
 
 #include <Riostream.h>
 
+using std::setw;
+using std::endl;
+using std::cout;
+using std::streamsize;
+using std::setprecision;
 /// \cond CLASSIMP
 ClassImp(AliMUONTrack) // Class implementation in ROOT context
 /// \endcond
@@ -61,7 +66,9 @@ AliMUONTrack::AliMUONTrack()
     fTrackID(-1),
     fTrackParamAtVertex(0x0),
     fHitsPatternInTrigCh(0),
-    fLocalTrigger(0)
+    fHitsPatternInTrigChTrk(0),
+    fLocalTrigger(0),
+    fConnected(kFALSE)
 {
   /// Default constructor
   fVertexErrXY2[0] = 0.;
@@ -71,7 +78,7 @@ AliMUONTrack::AliMUONTrack()
   //__________________________________________________________________________
 AliMUONTrack::AliMUONTrack(AliMUONObjectPair *segment, Double_t bendingVertexDispersion)
   : TObject(),
-    fTrackParamAtCluster(new TClonesArray("AliMUONTrackParam",10)),
+    fTrackParamAtCluster(new TObjArray(20)),
     fFitWithVertex(kFALSE),
     fVertexErrXY2(),
     fFitWithMCS(kFALSE),
@@ -84,10 +91,14 @@ AliMUONTrack::AliMUONTrack(AliMUONObjectPair *segment, Double_t bendingVertexDis
     fTrackID(-1),
     fTrackParamAtVertex(0x0),
     fHitsPatternInTrigCh(0),
-    fLocalTrigger(0)
+    fHitsPatternInTrigChTrk(0),
+    fLocalTrigger(0),
+    fConnected(kFALSE)
 {
   /// Constructor from two clusters
   
+  fTrackParamAtCluster->SetOwner(kTRUE);
+  
   fVertexErrXY2[0] = 0.;
   fVertexErrXY2[1] = 0.;
   
@@ -192,18 +203,18 @@ AliMUONTrack::AliMUONTrack(const AliMUONTrack& track)
     fTrackID(track.fTrackID),
     fTrackParamAtVertex(0x0),
     fHitsPatternInTrigCh(track.fHitsPatternInTrigCh),
-    fLocalTrigger(track.fLocalTrigger)
+    fHitsPatternInTrigChTrk(track.fHitsPatternInTrigChTrk),
+    fLocalTrigger(track.fLocalTrigger),
+    fConnected(track.fConnected)
 {
   ///copy constructor
   
-  // necessary to make a copy of the objects and not only the pointers in TClonesArray.
+  // necessary to make a copy of the objects and not only the pointers in TObjArray.
   if (track.fTrackParamAtCluster) {
-    fTrackParamAtCluster = new TClonesArray("AliMUONTrackParam",10);
-    AliMUONTrackParam *trackParamAtCluster = (AliMUONTrackParam*) track.fTrackParamAtCluster->First();
-    while (trackParamAtCluster) {
-      new ((*fTrackParamAtCluster)[GetNClusters()]) AliMUONTrackParam(*trackParamAtCluster);
-      trackParamAtCluster = (AliMUONTrackParam*) track.fTrackParamAtCluster->After(trackParamAtCluster);
-    }
+    fTrackParamAtCluster = new TObjArray(track.fTrackParamAtCluster->GetSize());
+    fTrackParamAtCluster->SetOwner(kTRUE);
+    for (Int_t i = 0; i < track.GetNClusters(); i++)
+      fTrackParamAtCluster->AddLast(new AliMUONTrackParam(*static_cast<AliMUONTrackParam*>(track.fTrackParamAtCluster->UncheckedAt(i))));
   }
   
   // copy vertex resolution square used during the tracking procedure
@@ -233,14 +244,12 @@ AliMUONTrack & AliMUONTrack::operator=(const AliMUONTrack& track)
   // clear memory
   Clear();
   
-  // necessary to make a copy of the objects and not only the pointers in TClonesArray
+  // necessary to make a copy of the objects and not only the pointers in TObjArray
   if (track.fTrackParamAtCluster) {
-    fTrackParamAtCluster = new TClonesArray("AliMUONTrackParam",10);
-    AliMUONTrackParam *trackParamAtCluster = (AliMUONTrackParam*) track.fTrackParamAtCluster->First();
-    while (trackParamAtCluster) {
-      new ((*fTrackParamAtCluster)[GetNClusters()]) AliMUONTrackParam(*trackParamAtCluster);
-      trackParamAtCluster = (AliMUONTrackParam*) track.fTrackParamAtCluster->After(trackParamAtCluster);
-    }
+    fTrackParamAtCluster = new TObjArray(track.fTrackParamAtCluster->GetSize());
+    fTrackParamAtCluster->SetOwner(kTRUE);
+    for (Int_t i = 0; i < track.GetNClusters(); i++)
+      fTrackParamAtCluster->AddLast(new AliMUONTrackParam(*static_cast<AliMUONTrackParam*>(track.fTrackParamAtCluster->UncheckedAt(i))));
   }
   
   // copy cluster weights matrix if any
@@ -275,7 +284,9 @@ AliMUONTrack & AliMUONTrack::operator=(const AliMUONTrack& track)
   fChi2MatchTrigger   =  track.fChi2MatchTrigger;
   fTrackID            =  track.fTrackID; 
   fHitsPatternInTrigCh = track.fHitsPatternInTrigCh;
+  fHitsPatternInTrigChTrk = track.fHitsPatternInTrigChTrk;
   fLocalTrigger        = track.fLocalTrigger;
+  fConnected          =  track.fConnected;
 
   return *this;
 }
@@ -291,14 +302,10 @@ AliMUONTrack::~AliMUONTrack()
 }
 
   //__________________________________________________________________________
-void AliMUONTrack::Clear(Option_t* opt)
+void AliMUONTrack::Clear(Option_t* /*opt*/)
 {
   /// Clear arrays
-  if (opt && opt[0] == 'C' && fTrackParamAtCluster) fTrackParamAtCluster->Clear("C");
-  else {
-    delete fTrackParamAtCluster;
-    fTrackParamAtCluster = 0x0;
-  }
+  delete fTrackParamAtCluster; fTrackParamAtCluster = 0x0;
   delete fClusterWeightsNonBending; fClusterWeightsNonBending = 0x0;
   delete fClusterWeightsBending; fClusterWeightsBending = 0x0;
   delete fTrackParamAtVertex; fTrackParamAtVertex = 0x0;
@@ -319,7 +326,9 @@ void AliMUONTrack::Reset()
   fChi2MatchTrigger = 0.;
   fTrackID = -1;
   fHitsPatternInTrigCh = 0;
+  fHitsPatternInTrigChTrk = 0;
   fLocalTrigger = 0;
+  fConnected = kFALSE;
   delete fTrackParamAtCluster; fTrackParamAtCluster = 0x0;
   delete fClusterWeightsNonBending; fClusterWeightsNonBending = 0x0;
   delete fClusterWeightsBending; fClusterWeightsBending = 0x0;
@@ -327,10 +336,13 @@ void AliMUONTrack::Reset()
 }
 
   //__________________________________________________________________________
-TClonesArray* AliMUONTrack::GetTrackParamAtCluster() const
+TObjArray* AliMUONTrack::GetTrackParamAtCluster() const
 {
   /// return array of track parameters at cluster (create it if needed)
-  if (!fTrackParamAtCluster) fTrackParamAtCluster = new TClonesArray("AliMUONTrackParam",10);
+  if (!fTrackParamAtCluster) {
+    fTrackParamAtCluster = new TObjArray(20);
+    fTrackParamAtCluster->SetOwner(kTRUE);
+  }
   return fTrackParamAtCluster;
 }
 
@@ -349,14 +361,18 @@ void AliMUONTrack::AddTrackParamAtCluster(const AliMUONTrackParam &trackParam, A
   }
   
   // check whether track parameters are given at the correct cluster z position
-  if (cluster.GetZ() != trackParam.GetZ()) {
+  if (TMath::Abs(cluster.GetZ() - trackParam.GetZ())>1.e-5) {   // AU
     AliError("track parameters are given at a different z position than the one of the associated cluster");
     return;
   }
   
   // add parameters to the array of track parameters
-  if (!fTrackParamAtCluster) fTrackParamAtCluster = new TClonesArray("AliMUONTrackParam",10);
-  AliMUONTrackParam* trackParamAtCluster = new ((*fTrackParamAtCluster)[GetNClusters()]) AliMUONTrackParam(trackParam);
+  if (!fTrackParamAtCluster) {
+    fTrackParamAtCluster = new TObjArray(20);
+    fTrackParamAtCluster->SetOwner(kTRUE);
+  }
+  AliMUONTrackParam* trackParamAtCluster = new AliMUONTrackParam(trackParam);
+  fTrackParamAtCluster->AddLast(trackParamAtCluster);
   
   // link parameters with the associated cluster or its copy
   if (copy) {
@@ -371,13 +387,24 @@ void AliMUONTrack::AddTrackParamAtCluster(const AliMUONTrackParam &trackParam, A
   //__________________________________________________________________________
 void AliMUONTrack::RemoveTrackParamAtCluster(AliMUONTrackParam *trackParam)
 {
-  /// Remove trackParam from the array of TrackParamAtCluster
-  if (!fTrackParamAtCluster || !fTrackParamAtCluster->Remove(trackParam)) {
-    AliWarning("object to remove does not exist in array fTrackParamAtCluster");
-    return;
-  }
+  /// Remove trackParam from the array of TrackParamAtCluster and delete it since the array is owner
+  
+  if (fTrackParamAtCluster) {
+    
+    AliMUONTrackParam* trackParamAtCluster = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->Remove(trackParam));
+    
+    if (trackParamAtCluster) {
+      
+      // clean memory
+      delete trackParamAtCluster;
+      
+      // remove hole
+      fTrackParamAtCluster->Compress();
+      
+    } else AliWarning("object to remove does not exist in array fTrackParamAtCluster");
+    
+  } else AliWarning("array fTrackParamAtCluster does not exist");
   
-  fTrackParamAtCluster->Compress();
 }
 
   //__________________________________________________________________________
@@ -386,15 +413,17 @@ Bool_t AliMUONTrack::UpdateTrackParamAtCluster()
   /// Update track parameters at each attached cluster
   /// Return kFALSE in case of failure (i.e. extrapolation problem)
   
-  if (GetNClusters() == 0) {
+  Int_t nClusters = GetNClusters();
+  if (nClusters == 0) {
     AliWarning("no cluster attached to the track");
     return kFALSE;
   }
   
   Bool_t extrapStatus = kTRUE;
-  AliMUONTrackParam* startingTrackParam = (AliMUONTrackParam*) fTrackParamAtCluster->First();
-  AliMUONTrackParam* trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->After(startingTrackParam);
-  while (trackParamAtCluster) {
+  AliMUONTrackParam* startingTrackParam = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(0));
+  
+  for (Int_t i = 1; i < nClusters; i++) {
+    AliMUONTrackParam* trackParamAtCluster = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(i));
     
     // reset track parameters and their covariances
     trackParamAtCluster->SetParameters(startingTrackParam->GetParameters());
@@ -405,7 +434,6 @@ Bool_t AliMUONTrack::UpdateTrackParamAtCluster()
     
     // prepare next step
     startingTrackParam = trackParamAtCluster;
-    trackParamAtCluster = (AliMUONTrackParam*) (fTrackParamAtCluster->After(trackParamAtCluster));
   }
 
   // set global chi2 to max value in case of problem during track extrapolation
@@ -421,17 +449,19 @@ Bool_t AliMUONTrack::UpdateCovTrackParamAtCluster()
   /// Include effects of multiple scattering in chambers
   /// Return kFALSE in case of failure (i.e. extrapolation problem)
   
-  if (GetNClusters() == 0) {
+  Int_t nClusters = GetNClusters();
+  if (nClusters == 0) {
     AliWarning("no cluster attached to the track");
     return kFALSE;
   }
   
   Bool_t extrapStatus = kTRUE;
-  AliMUONTrackParam* startingTrackParam = (AliMUONTrackParam*) fTrackParamAtCluster->First();
-  AliMUONTrackParam* trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->After(startingTrackParam);
+  AliMUONTrackParam* startingTrackParam = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(0));
   Int_t expectedChamber = startingTrackParam->GetClusterPtr()->GetChamberId() + 1;
   Int_t currentChamber;
-  while (trackParamAtCluster) {
+  
+  for (Int_t i = 1; i < nClusters; i++) {
+    AliMUONTrackParam* trackParamAtCluster = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(i));
     
     // reset track parameters and their covariances
     trackParamAtCluster->SetParameters(startingTrackParam->GetParameters());
@@ -457,7 +487,6 @@ Bool_t AliMUONTrack::UpdateCovTrackParamAtCluster()
     // prepare next step
     expectedChamber = currentChamber + 1;
     startingTrackParam = trackParamAtCluster;
-    trackParamAtCluster = (AliMUONTrackParam*) (fTrackParamAtCluster->After(trackParamAtCluster));
   }
   
   // set global chi2 to max value in case of problem during track extrapolation
@@ -633,6 +662,7 @@ Bool_t AliMUONTrack::ComputeLocalChi2(Bool_t accountForMCS)
     if (globalChi2 < 0.) return kFALSE;
     
     // Loop over removable clusters and compute their local chi2
+    AliMUONTrackParam* trackParamAtCluster;
     AliMUONTrackParam* trackParamAtCluster1;
     AliMUONVCluster *cluster, *discardedCluster;
     Int_t iCluster1, iCluster2, iCurrentCluster1, iCurrentCluster2;
@@ -641,8 +671,8 @@ Bool_t AliMUONTrack::ComputeLocalChi2(Bool_t accountForMCS)
     Double_t *dX = new Double_t[nClusters-1];
     Double_t *dY = new Double_t[nClusters-1];
     Double_t globalChi2b;
-    AliMUONTrackParam* trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->First();
-    while (trackParamAtCluster) {
+    for (Int_t iCluster = 0; iCluster < nClusters ; iCluster++) { 
+      trackParamAtCluster = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(iCluster));
       
       discardedCluster = trackParamAtCluster->GetClusterPtr();
       
@@ -691,8 +721,6 @@ Bool_t AliMUONTrack::ComputeLocalChi2(Bool_t accountForMCS)
 
       // Set local chi2
       trackParamAtCluster->SetLocalChi2(globalChi2 - globalChi2b);
-      
-      trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->After(trackParamAtCluster);
     }
     
     delete [] dX;
@@ -700,10 +728,12 @@ Bool_t AliMUONTrack::ComputeLocalChi2(Bool_t accountForMCS)
     
   } else { // without multiple scattering effects
     
+    Int_t nClusters = GetNClusters();
+    AliMUONTrackParam* trackParamAtCluster;
     AliMUONVCluster *discardedCluster;
     Double_t dX, dY;
-    AliMUONTrackParam* trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->First();
-    while (trackParamAtCluster) {
+    for (Int_t iCluster = 0; iCluster < nClusters ; iCluster++) { 
+      trackParamAtCluster = static_cast<AliMUONTrackParam*>(fTrackParamAtCluster->UncheckedAt(iCluster));
       
       discardedCluster = trackParamAtCluster->GetClusterPtr();
       
@@ -713,8 +743,6 @@ Bool_t AliMUONTrack::ComputeLocalChi2(Bool_t accountForMCS)
       
       // Set local chi2
       trackParamAtCluster->SetLocalChi2(dX * dX / discardedCluster->GetErrX2() + dY * dY / discardedCluster->GetErrY2());
-    
-      trackParamAtCluster = (AliMUONTrackParam*) fTrackParamAtCluster->After(trackParamAtCluster);
     }
   
   }
@@ -821,7 +849,7 @@ Bool_t AliMUONTrack::ComputeClusterWeights(TMatrixD* mcsCovariances)
 
   //__________________________________________________________________________
 Bool_t AliMUONTrack::ComputeClusterWeights(TMatrixD& clusterWeightsNB, TMatrixD& clusterWeightsB,
-                                          TMatrixD* mcsCovariances, AliMUONVCluster* discardedCluster) const
+                                          TMatrixD* mcsCovariances, const AliMUONVCluster* discardedCluster) const
 {
   /// Compute the weight matrices, in non bending and bending direction,
   /// of the other attached clusters assuming the discarded one does not exist
@@ -1003,56 +1031,43 @@ void AliMUONTrack::ComputeMCSCovariances(TMatrixD& mcsCovariances) const
 }
 
   //__________________________________________________________________________
-Int_t AliMUONTrack::ClustersInCommon(AliMUONTrack* track) const
-{
-  /// Returns the number of clusters in common between the current track ("this")
-  /// and the track pointed to by "track".
-  if (!fTrackParamAtCluster || !this->fTrackParamAtCluster) return 0;
-  Int_t nCluster1 = this->GetNClusters();
-  Int_t nCluster2 = track->GetNClusters();
-  Int_t clustersInCommon = 0;
-  AliMUONTrackParam *trackParamAtCluster1, *trackParamAtCluster2;
-  // Loop over clusters of first track
-  for(Int_t iCluster1 = 0; iCluster1 < nCluster1; iCluster1++) {
-    trackParamAtCluster1 = (AliMUONTrackParam*) this->fTrackParamAtCluster->UncheckedAt(iCluster1);
-    // Loop over clusters of second track
-    for(Int_t iCluster2 = 0; iCluster2 < nCluster2; iCluster2++) {
-      trackParamAtCluster2 = (AliMUONTrackParam*) track->fTrackParamAtCluster->UncheckedAt(iCluster2);
-      // Increment "clustersInCommon" if both trackParamAtCluster1 & 2 point to the same cluster
-      if ((trackParamAtCluster1->GetClusterPtr()) == (trackParamAtCluster2->GetClusterPtr())) {
-       clustersInCommon++;
-       break;
-      }
-    }
-  }
-  return clustersInCommon;
-}
-
-  //__________________________________________________________________________
-Int_t AliMUONTrack::ClustersInCommonInSt345(AliMUONTrack* track) const
+Int_t AliMUONTrack::ClustersInCommon(AliMUONTrack* track, Int_t stMin, Int_t stMax) const
 {
-  /// Returns the number of clusters in common on stations 3, 4 and 5
+  /// Returns the number of clusters in common in stations [stMin, stMax]
   /// between the current track ("this") and the track pointed to by "track".
-  if (!fTrackParamAtCluster || !this->fTrackParamAtCluster) return 0;
-  Int_t nCluster1 = this->GetNClusters();
-  Int_t nCluster2 = track->GetNClusters();
+  
+  if (!track || !track->fTrackParamAtCluster || !this->fTrackParamAtCluster) return 0;
+  
+  Int_t chMin = 2 * stMin;
+  Int_t chMax = 2 * stMax + 1;
   Int_t clustersInCommon = 0;
-  AliMUONTrackParam *trackParamAtCluster1, *trackParamAtCluster2;
+  
   // Loop over clusters of first track
-  for(Int_t iCluster1 = 0; iCluster1 < nCluster1; iCluster1++) {
-    trackParamAtCluster1 = (AliMUONTrackParam*) this->fTrackParamAtCluster->UncheckedAt(iCluster1);
-    if (trackParamAtCluster1->GetClusterPtr()->GetChamberId() < 4) continue;
+  Int_t nCl1 = this->GetNClusters();
+  for(Int_t iCl1 = 0; iCl1 < nCl1; iCl1++) {
+    AliMUONVCluster* cl1 = ((AliMUONTrackParam*) this->fTrackParamAtCluster->UncheckedAt(iCl1))->GetClusterPtr();
+    
+    Int_t chCl1 = cl1->GetChamberId();
+    if (chCl1 < chMin || chCl1 > chMax) continue;
+    
     // Loop over clusters of second track
-    for(Int_t iCluster2 = 0; iCluster2 < nCluster2; iCluster2++) {
-      trackParamAtCluster2 = (AliMUONTrackParam*) track->fTrackParamAtCluster->UncheckedAt(iCluster2);
-      if (trackParamAtCluster2->GetClusterPtr()->GetChamberId() < 4) continue;
-      // Increment "clustersInCommon" if both trackParamAtCluster1 & 2 point to the same cluster
-      if ((trackParamAtCluster1->GetClusterPtr()) == (trackParamAtCluster2->GetClusterPtr())) {
+    Int_t nCl2 = track->GetNClusters();
+    for(Int_t iCl2 = 0; iCl2 < nCl2; iCl2++) {
+      AliMUONVCluster* cl2 = ((AliMUONTrackParam*) track->fTrackParamAtCluster->UncheckedAt(iCl2))->GetClusterPtr();
+      
+      Int_t chCl2 = cl2->GetChamberId();
+      if (chCl2 < chMin || chCl2 > chMax) continue;
+      
+      // Increment "clustersInCommon" if both clusters have the same ID
+      if (cl1->GetUniqueID() == cl2->GetUniqueID()) {
        clustersInCommon++;
        break;
       }
+      
     }
+    
   }
+  
   return clustersInCommon;
 }
 
@@ -1075,12 +1090,11 @@ Double_t AliMUONTrack::GetNormalizedChi2() const
 }
 
   //__________________________________________________________________________
-Int_t AliMUONTrack::FindCompatibleClusters(AliMUONTrack &track, Double_t sigmaCut, Bool_t compatibleCluster[10]) const
+Int_t AliMUONTrack::FindCompatibleClusters(const AliMUONTrack &track, Double_t sigmaCut, Bool_t compatibleCluster[10]) const
 {
   /// Try to match clusters from this track with clusters from the given track within the provided sigma cut:
   /// - Fill the array compatibleCluster[iCh] with kTRUE if a compatible cluster has been found in chamber iCh.
   /// - Return the number of clusters of "this" track matched with one cluster of the given track.
-  AliMUONTrackParam *trackParamAtCluster1, *trackParamAtCluster2;
   AliMUONVCluster *cluster1, *cluster2;
   Double_t chi2, dX, dY;
   Double_t chi2Max = sigmaCut * sigmaCut;
@@ -1092,19 +1106,14 @@ Int_t AliMUONTrack::FindCompatibleClusters(AliMUONTrack &track, Double_t sigmaCu
   if (!track.fTrackParamAtCluster || !this->fTrackParamAtCluster) return nMatchClusters;
   
   // Loop over clusters of first track
-  trackParamAtCluster1 = (AliMUONTrackParam*) this->fTrackParamAtCluster->First();
-  while (trackParamAtCluster1) {
-    
-    cluster1 = trackParamAtCluster1->GetClusterPtr();
+  Int_t nCl1 = this->GetNClusters();
+  for(Int_t iCl1 = 0; iCl1 < nCl1; iCl1++) {
+    cluster1 = static_cast<AliMUONTrackParam*>(this->fTrackParamAtCluster->UncheckedAt(iCl1))->GetClusterPtr();
     
     // Loop over clusters of second track
-    trackParamAtCluster2 = (AliMUONTrackParam*) track.fTrackParamAtCluster->First();
-    while (trackParamAtCluster2) {
-      
-      cluster2 = trackParamAtCluster2->GetClusterPtr();
-      
-      //prepare next step
-      trackParamAtCluster2 = (AliMUONTrackParam*) track.fTrackParamAtCluster->After(trackParamAtCluster2);
+    Int_t nCl2 = track.GetNClusters();
+    for(Int_t iCl2 = 0; iCl2 < nCl2; iCl2++) {
+      cluster2 = static_cast<AliMUONTrackParam*>(track.fTrackParamAtCluster->UncheckedAt(iCl2))->GetClusterPtr();
       
       // check DE Id
       if (cluster1->GetDetElemId() != cluster2->GetDetElemId()) continue;
@@ -1120,7 +1129,6 @@ Int_t AliMUONTrack::FindCompatibleClusters(AliMUONTrack &track, Double_t sigmaCu
       break;
     }
     
-    trackParamAtCluster1 = (AliMUONTrackParam*) this->fTrackParamAtCluster->After(trackParamAtCluster1);
   }
   
   return nMatchClusters;
@@ -1179,13 +1187,17 @@ void AliMUONTrack::Print(Option_t*) const
 {
   /// Printing Track information 
 
+  streamsize curW = cout.width();
+  streamsize curPrecision = cout.precision();
   cout << "<AliMUONTrack> No.Clusters=" << setw(2)   << GetNClusters() << 
       ", Match2Trig=" << setw(1) << GetMatchTrigger()  << 
       ", LoTrgNum=" << setw(3) << LoCircuit()  << 
     ", Chi2-tracking-trigger=" << setw(8) << setprecision(5) <<  GetChi2MatchTrigger();
-  cout << Form(" HitTriggerPattern %x",fHitsPatternInTrigCh);
+  cout << Form(" HitTriggerPattern trig %x  track %x",fHitsPatternInTrigCh, fHitsPatternInTrigChTrk);
   cout << Form(" MClabel=%d",fTrackID) << endl;
   if (fTrackParamAtCluster) fTrackParamAtCluster->First()->Print("FULL");
+  cout.width(curW);
+  cout.precision(curPrecision);
 }
 
 //__________________________________________________________________________