X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackHitPattern.cxx;h=57c59848b2e1b0ec96c43b1c4700e5a0c4fb70e0;hb=1afb990632992830c51016c8f066f86db9a90b4c;hp=97c96deac80e5d1941195ae0182c7b8c83cc4e32;hpb=7dc68cf49f56629ebaeb98000a28382de2edcb14;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTrackHitPattern.cxx b/MUON/AliMUONTrackHitPattern.cxx
index 97c96deac80..57c59848b2e 100644
--- a/MUON/AliMUONTrackHitPattern.cxx
+++ b/MUON/AliMUONTrackHitPattern.cxx
@@ -13,57 +13,71 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-////////////////////////////////////
-///
+/* $Id$ */
+
+
+//-----------------------------------------------------------------------------
 /// \class AliMUONTrackHitPattern
 ///
 /// This class propagates tracks to trigger chambers 
-/// searching for fired strips.
+/// searching for matching trigger tracks and fired strips.
 ///
 /// To each track, a hit pattern for trigger chambers is set.
 /// The hit pattern is a UShort_t with 8 bits used:
-///
+///                                                                      <pre>
 ///            1  1  0  1    1  1  0  1
 ///           |           |            |
 ///            ----------- ------------
 /// chamber:  11 12 13 14 | 11 12 13 14
 /// cathode:    bending   | non-bending
-///
+///                                                                      </pre>
 /// The main method is:
-/// * GetHitPattern
+/// * ExecuteValidation
 ///
 ///  \author Diego Stocco
-///
-////////////////////////////////////
+//-----------------------------------------------------------------------------
 
 
 #include "AliMUONTrackHitPattern.h"
-#include "AliMUONRecData.h"
-#include "AliMUONTrack.h"
-#include "AliMUONTrackParam.h"
-#include "AliMUONTrackExtrap.h"
+
 #include "AliMUONConstants.h"
+#include "AliMUONVDigit.h"
+#include "AliMUONDigitMaker.h"
+#include "AliMUONDigitStoreV1.h"
 #include "AliMUONGeometryTransformer.h"
-#include "AliMUONDigit.h"
 #include "AliMUONLocalTrigger.h"
-#include "AliMUONTriggerCrateStore.h"
 #include "AliMUONLocalTriggerBoard.h"
-#include "AliMUONTriggerCircuit.h"
-#include "AliMUONDigitMaker.h"
-
+#include "AliMUONRecoParam.h"
+#include "AliMUONTrack.h"
+#include "AliMUONTrackExtrap.h"
+#include "AliMUONTrackParam.h"
+#include "AliMUONVTrackStore.h"
+#include "AliMUONVTriggerStore.h"
 #include "AliMpPad.h"
-#include "AliMpVSegmentation.h"
 #include "AliMpSegmentation.h"
+#include "AliMpVSegmentation.h"
+#include "AliMpDEManager.h"
+#include "AliMUONReconstructor.h"
+#include "AliMUONTriggerTrack.h"
+#include "AliMUONVTriggerTrackStore.h"
+
+#include "AliMpConstants.h"
 
+#include "AliMagF.h"
 #include "AliLog.h"
 #include "AliTracker.h"
-#include "AliMagF.h"
 
 #include <Riostream.h>
+#include <TArrayS.h>
 #include <TClonesArray.h>
 #include <TMath.h>
 #include <TMatrixD.h>
-#include <TArrayS.h>
+#include <TROOT.h>
+#include <TDirectory.h>
+#include <TFile.h>
+#include <TSystem.h>
+
+#include <cassert>
 
 /// \cond CLASSIMP
 ClassImp(AliMUONTrackHitPattern) // Class implementation in ROOT context
@@ -71,99 +85,489 @@ ClassImp(AliMUONTrackHitPattern) // Class implementation in ROOT context
 
 
 //______________________________________________________________________________
-AliMUONTrackHitPattern::AliMUONTrackHitPattern(AliMUONRecData *data)
-    : TObject(),
-      fMUONData(data),
-      fTransformer(new AliMUONGeometryTransformer(kTRUE)),
-      fCrateManager(new AliMUONTriggerCrateStore()),
-      fDigitMaker(new AliMUONDigitMaker())
+AliMUONTrackHitPattern::AliMUONTrackHitPattern(const AliMUONRecoParam* recoParam,
+                                               const AliMUONGeometryTransformer& transformer,
+                                               const AliMUONDigitMaker& digitMaker)
+: TObject(),
+fRecoParam(recoParam),
+fTransformer(transformer),
+fDigitMaker(digitMaker),
+fDeltaZ(0.0),
+fTrigCovariance(0x0),
+fkMaxDistance(99999.)
 {
     /// Default constructor
+    InitMembers();
 
     // Set magnetic field
     const AliMagF* kField = AliTracker::GetFieldMap();
     if (!kField) AliFatal("No field available");
     AliMUONTrackExtrap::SetField(kField);
+}
 
-    // Geometry transformer
-    fTransformer->ReadGeometryData("volpath.dat", "geometry.root");
 
-    // Crate manager to retrieve local boards
-    fCrateManager->ReadFromFile();
+//______________________________________________________________________________
+AliMUONTrackHitPattern::~AliMUONTrackHitPattern(void)
+{
+  /// Destructor
+  delete fTrigCovariance;
+}
 
-    // set to digit maker
-    fDigitMaker->SetCrateManager(fCrateManager);
 
-    for(Int_t ch=0; ch<4; ch++){
-	fTriggerDigitsList[ch].Clear();
-    }
+//______________________________________________________________________________
+void AliMUONTrackHitPattern::InitMembers()
+{
+  //
+  /// Initialize data members
+  //
+  fDeltaZ = TMath::Abs(AliMUONConstants::DefaultChamberZ(12) - AliMUONConstants::DefaultChamberZ(10));
+
+  const Double_t kTrigNonBendReso = AliMUONConstants::TriggerNonBendingReso();
+  const Double_t kTrigBendReso = AliMUONConstants::TriggerBendingReso();
+  const Double_t kTrigSlopeBendReso = 1.414 * AliMUONConstants::TriggerBendingReso()/fDeltaZ;
+  const Double_t kTrigCovSlopeBend = - kTrigBendReso * kTrigBendReso / fDeltaZ;
+
+  // Covariance matrix 3x3 (X,Y,slopeY) for trigger tracks
+  fTrigCovariance = new TMatrixD(3,3);
+  fTrigCovariance->Zero();
+  (*fTrigCovariance)(0,0) = kTrigNonBendReso * kTrigNonBendReso;
+  (*fTrigCovariance)(1,1) = kTrigBendReso * kTrigBendReso;
+  (*fTrigCovariance)(2,2) = kTrigSlopeBendReso * kTrigSlopeBendReso;
+  (*fTrigCovariance)(1,2) = (*fTrigCovariance)(2,1) = kTrigCovSlopeBend;
+}
+
+
+//_____________________________________________________________________________
+void AliMUONTrackHitPattern::CheckConstants() const
+{
+/// Check consistence of redefined constants 
+
+  assert(fgkNcathodes == AliMpConstants::NofCathodes());    
+  assert(fgkNchambers == AliMpConstants::NofTriggerChambers());    
+  assert(fgkNplanes == AliMpConstants::NofTriggerChambers() * fgkNcathodes);    
 }
 
 
 //______________________________________________________________________________
-AliMUONTrackHitPattern::~AliMUONTrackHitPattern(void)
+void AliMUONTrackHitPattern::ExecuteValidation(AliMUONVTrackStore& trackStore,
+					       const AliMUONVTriggerTrackStore& triggerTrackStore,
+					       const AliMUONVTriggerStore& triggerStore) const
 {
-/// Destructor
-    for(Int_t ch=0; ch<4; ch++){
-	fTriggerDigitsList[ch].Delete();
-    }
-    delete fCrateManager;
+  //
+  /// Main method:
+  /// Loops on reco tracks, extrapolates them to trigger chambers
+  /// and searches for matching trigger tracks and digits
+  //
+
+  AliMUONDigitStoreV1 digitStore;
+  TriggerDigits(triggerStore,digitStore);
+
+
+  TIter itTrack(trackStore.CreateIterator());
+  AliMUONTrack* track;
+
+  const Int_t kFirstTrigCh = AliMUONConstants::NTrackingCh();
+
+  while ( ( track = static_cast<AliMUONTrack*>(itTrack()) ) )
+  { 
+    AliMUONTrackParam trackParam(*((AliMUONTrackParam*) (track->GetTrackParamAtCluster()->Last())));
+
+    ApplyMCSCorrections(trackParam);
+    AliMUONTrackExtrap::ExtrapToZCov(&trackParam, AliMUONConstants::DefaultChamberZ(kFirstTrigCh)); // extrap to 1st trigger chamber
+
+    AliMUONTriggerTrack *matchedTriggerTrack = MatchTriggerTrack(track, trackParam, triggerTrackStore, triggerStore);
+
+    UShort_t pattern = GetHitPattern(trackParam, matchedTriggerTrack, digitStore);
+    track->SetHitsPatternInTrigCh(pattern);
+  }
 }
 
 
 //______________________________________________________________________________
-void AliMUONTrackHitPattern::GetHitPattern(TClonesArray *recTracksPtr)
+AliMUONTriggerTrack * 
+AliMUONTrackHitPattern::MatchTriggerTrack(AliMUONTrack* track,
+					  AliMUONTrackParam& trackParam,
+					  const AliMUONVTriggerTrackStore& triggerTrackStore,
+					  const AliMUONVTriggerStore& triggerStore) const
 {
-    //
-    /// Main method:
-    /// Loops on reco tracks, extrapolates them to trigger chambers
-    /// and searches for matching digits
-    //
+  //
+  /// Match track with trigger track
+  //
+
+  Int_t matchTrigger = 0;
+  Int_t loTrgNum(-1);
+  Double_t distTriggerTrack[3], sigma2[3];
+  Double_t chi2;
+  Double_t chi2MatchTrigger = 0., minChi2MatchTrigger = 999.;
+  Int_t doubleMatch = -1; // Check if track matches 2 trigger tracks
+  Double_t doubleChi2 = -1.;
+  AliMUONTriggerTrack* doubleTriggerTrack = 0x0;
+  AliMUONTriggerTrack* matchedTriggerTrack = 0x0;
     
-    const Int_t kMask[2][4]={{0x80, 0x40, 0x20, 0x10},
-			    {0x08, 0x04, 0x02, 0x01}};
-    Bool_t isMatch[2];
-    UShort_t pattern=0;
-    TriggerDigits();
-    Int_t nRecTracks = (Int_t)recTracksPtr->GetEntriesFast();
-    for(Int_t iTrack=0; iTrack<nRecTracks; iTrack++){
-	pattern = 0;
-	AliMUONTrack *muonTrack = (AliMUONTrack*) recTracksPtr->At(iTrack);
-	AliMUONTrackParam *trackParam = (AliMUONTrackParam*) ((muonTrack->GetTrackParamAtHit())->Last());
-	for(Int_t ch=0; ch<4; ch++){
-	    AliMUONTrackExtrap::ExtrapToZCov(trackParam, AliMUONConstants::DefaultChamberZ(10+ch));
-	    FindPadMatchingTrack(trackParam, isMatch, ch);
-	    for(Int_t cath=0; cath<2; cath++){
-		if(isMatch[cath]) pattern |= kMask[cath][ch];
-	    }
+  const TMatrixD& kParamCov = trackParam.GetCovariances();
+    
+  Double_t xTrack = trackParam.GetNonBendingCoor();
+  Double_t yTrack = trackParam.GetBendingCoor();
+  Double_t ySlopeTrack = trackParam.GetBendingSlope();
+
+  // Covariance matrix 3x3 (X,Y,slopeY) for tracker tracks
+  TMatrixD trackCov(3,3);
+  trackCov.Zero();
+  trackCov(0,0) = kParamCov(0,0);
+  trackCov(1,1) = kParamCov(2,2);
+  trackCov(2,2) = kParamCov(3,3);
+  trackCov(1,2) = kParamCov(2,3);
+  trackCov(2,1) = kParamCov(3,2);
+
+  TMatrixD sumCov(trackCov,TMatrixD::kPlus,*fTrigCovariance);
+
+  Bool_t isCovOK = kTRUE;
+
+  if (sumCov.Determinant() != 0) {
+    sumCov.Invert();
+  } else {
+    AliWarning(" Determinant = 0");
+    isCovOK = kFALSE;
+    sigma2[0] = kParamCov(0,0);
+    sigma2[1] = kParamCov(2,2);
+    sigma2[2] = kParamCov(3,3);
+    // sigma of distributions (trigger-track) X,Y,slopeY
+    const Double_t kDistSigma[3]={AliMUONConstants::TriggerNonBendingReso(),
+				  AliMUONConstants::TriggerBendingReso(),
+				  1.414 * AliMUONConstants::TriggerBendingReso()/fDeltaZ};
+    for (Int_t iVar = 0; iVar < 3; iVar++) sigma2[iVar] += kDistSigma[iVar] * kDistSigma[iVar];
+  }
+
+  AliMUONTriggerTrack *triggerTrack;
+  TIter itTriggerTrack(triggerTrackStore.CreateIterator());
+  while ( ( triggerTrack = static_cast<AliMUONTriggerTrack*>(itTriggerTrack() ) ) )
+  {
+    distTriggerTrack[0] = triggerTrack->GetX11() - xTrack;
+    distTriggerTrack[1] = triggerTrack->GetY11() - yTrack;
+    distTriggerTrack[2] = TMath::Tan(triggerTrack->GetThetay()) - ySlopeTrack;
+
+    if(isCovOK){
+      TMatrixD paramDiff(3,1);
+      for(Int_t iVar = 0; iVar < 3; iVar++)
+	paramDiff(iVar,0) = distTriggerTrack[iVar];
+	
+      TMatrixD tmp(sumCov,TMatrixD::kMult,paramDiff);
+      TMatrixD chi2M(paramDiff,TMatrixD::kTransposeMult,tmp);
+      chi2 = chi2M(0,0);
+    }
+    else {
+      chi2 = 0.;
+      for (Int_t iVar = 0; iVar < 3; iVar++) chi2 += distTriggerTrack[iVar]*distTriggerTrack[iVar]/sigma2[iVar];
+    }
+
+    chi2 /= 3.; // Normalized Chi2: 3 degrees of freedom (X,Y,slopeY)
+    if (chi2 < GetRecoParam()->GetMaxNormChi2MatchTrigger()) 
+    {
+      Bool_t isDoubleTrack = (TMath::Abs(chi2 - minChi2MatchTrigger)<1.);
+      if (chi2 < minChi2MatchTrigger && chi2 < GetRecoParam()->GetMaxNormChi2MatchTrigger()) 
+      {
+	if(isDoubleTrack)
+	{
+	  doubleMatch = loTrgNum;
+	  doubleChi2 = chi2MatchTrigger;
+	  doubleTriggerTrack = matchedTriggerTrack;
 	}
-	muonTrack->SetHitsPatternInTrigCh(pattern);
+	minChi2MatchTrigger = chi2;
+	chi2MatchTrigger = chi2;
+	loTrgNum = triggerTrack->GetLoTrgNum();
+	matchedTriggerTrack = triggerTrack;
+	AliMUONLocalTrigger* locTrg = triggerStore.FindLocal(loTrgNum);
+	matchTrigger = 1;
+	if(locTrg->LoLpt()>0) matchTrigger = 2;
+	if(locTrg->LoHpt()>0) matchTrigger = 3;
+      }
+      else if(isDoubleTrack) 
+      {
+	doubleMatch = triggerTrack->GetLoTrgNum();
+	doubleChi2 = chi2;
+      }
     }
-    return;
+  }
+  if(doubleMatch>=0)
+  { // If two trigger tracks match, select the one passing more trigger cuts
+    AliDebug(1, Form("Two candidates found: %i and %i",loTrgNum,doubleMatch));
+    AliMUONLocalTrigger* locTrg1 = triggerStore.FindLocal(doubleMatch);
+    if((locTrg1->LoLpt()>0 && matchTrigger<2) || (locTrg1->LoHpt() && matchTrigger<3))
+    {
+      if(locTrg1->LoHpt()>0) matchTrigger=3;
+      else matchTrigger = 2;
+      loTrgNum = doubleMatch;
+      chi2MatchTrigger = doubleChi2;
+      matchedTriggerTrack = doubleTriggerTrack;
+    }
+  }
+    
+  track->SetMatchTrigger(matchTrigger);
+  track->SetLoTrgNum(loTrgNum);
+  track->SetChi2MatchTrigger(chi2MatchTrigger);
+
+  AliMUONLocalTrigger* locTrg = static_cast<AliMUONLocalTrigger*>(triggerStore.FindLocal(loTrgNum));
+
+  if (locTrg)
+  {    
+    Int_t deviation = locTrg->GetDeviation(); 
+    track->SetLocalTrigger(locTrg->LoCircuit(),
+			   locTrg->LoStripX(),
+			   locTrg->LoStripY(),
+			   deviation,
+			   locTrg->LoLpt(),
+			   locTrg->LoHpt());
+  }
+
+  return matchedTriggerTrack;
+}
+
+
+//______________________________________________________________________________
+UShort_t AliMUONTrackHitPattern::GetHitPattern(AliMUONTrackParam &trackParam,
+					       AliMUONTriggerTrack* matchedTriggerTrack,
+					       AliMUONVDigitStore& digitStore) const
+{
+  //
+  /// Get hit pattern on trigger chambers for the current track
+  //
+  UShort_t pattern = 0;
+  Bool_t isMatch[2];
+  const Int_t kNTrackingCh = AliMUONConstants::NTrackingCh();
+
+  Bool_t patternFromTrigTrack = kFALSE;
+
+
+  // Calculate hit pattern from trigger track
+  if(matchedTriggerTrack){
+    patternFromTrigTrack = PerformTrigTrackMatch(pattern, matchedTriggerTrack, digitStore);
+  }
+
+  if(patternFromTrigTrack) return pattern;
+
+
+  // Calculate hit pattern from tracker track propagation
+  // if hit pattern from trigger track failed
+
+  for(Int_t ch=0; ch<4; ++ch)
+  {
+    Int_t iChamber = kNTrackingCh+ch;
+    AliMUONTrackExtrap::ExtrapToZCov(&trackParam, AliMUONConstants::DefaultChamberZ(iChamber));
+    FindPadMatchingTrack(digitStore, trackParam, isMatch, iChamber);
+    for(Int_t cath=0; cath<2; ++cath)
+    {
+      if(isMatch[cath]) SetBit(pattern, cath, ch);
+    }
+  }
+  return pattern;
+}
+
+
+//______________________________________________________________________________
+void AliMUONTrackHitPattern::SetBit(UShort_t& pattern, Int_t cathode, Int_t chamber) const
+{
+  //
+  /// Set hits pattern
+  //
+  const Int_t kMask[2][4]= {{0x80, 0x40, 0x20, 0x10},
+			    {0x08, 0x04, 0x02, 0x01}};
+  pattern |= kMask[cathode][chamber];
+}
+
+
+//______________________________________________________________________________
+void AliMUONTrackHitPattern::AddEffInfo(UShort_t& pattern, Int_t slat, Int_t effType) const
+{
+  //
+  /// Set info on efficiency calculation
+  //
+  pattern += effType << 8;
+  pattern += slat << 10;
+}
+
+
+//______________________________________________________________________________
+void 
+AliMUONTrackHitPattern::ApplyMCSCorrections(AliMUONTrackParam& trackParam) const
+{
+  //
+  /// Returns uncertainties on extrapolated position.
+  /// Takes into account Branson plane corrections in the iron wall.
+  //
+
+  const Float_t kZFilterOut = AliMUONConstants::MuonFilterZEnd();
+  const Float_t kFilterThickness = TMath::Abs(kZFilterOut-AliMUONConstants::MuonFilterZBeg()); // cm
+
+  AliMUONTrackExtrap::ExtrapToZCov(&trackParam, kZFilterOut); // Extrap to muon filter end
+  AliMUONTrackExtrap::AddMCSEffect(&trackParam, kFilterThickness, AliMUONConstants::MuonFilterX0()); // Add MCS effects
+  return;
 }
 
 
 //______________________________________________________________________________
-void AliMUONTrackHitPattern::FindPadMatchingTrack(AliMUONTrackParam *trackParam,
-						  Bool_t isMatch[2], Int_t iChamber)
+Bool_t 
+AliMUONTrackHitPattern::TriggerDigits(const AliMUONVTriggerStore& triggerStore,
+                                      AliMUONVDigitStore& digitStore) const
+{
+  //
+  /// make (S)Digit for trigger
+  //
+  
+  digitStore.Clear();
+  
+  AliMUONLocalTrigger* locTrg;
+  TIter next(triggerStore.CreateLocalIterator());
+  
+  while ( ( locTrg = static_cast<AliMUONLocalTrigger*>(next()) ) ) 
+  {
+    if (locTrg->IsNull()) continue;
+   
+    TArrayS xyPattern[2];
+    locTrg->GetXPattern(xyPattern[0]);
+    locTrg->GetYPattern(xyPattern[1]);
+
+    // do we need this ? (Ch.F.)
+//     for(Int_t cath=0; cath<2; ++cath)
+//     {
+//       for(Int_t ch=0; ch<4; ++ch)
+//       {
+//         if(xyPattern[cath][ch]==0) continue;
+//       }
+//     }
+    
+    Int_t nBoard = locTrg->LoCircuit();
+    fDigitMaker.TriggerDigits(nBoard, xyPattern, digitStore);
+  }
+  return kTRUE;
+}
+
+
+//______________________________________________________________________________
+void 
+AliMUONTrackHitPattern::FindPadMatchingTrack(AliMUONVDigitStore& digitStore,
+                                             const AliMUONTrackParam& trackParam,
+                                             Bool_t isMatch[2], Int_t iChamber) const
 {
     //
-    /// Given track position, searches for matching digits.
+    /// Given the tracker track position, searches for matching digits.
     //
 
     Float_t minMatchDist[2];
 
-    for(Int_t cath=0; cath<2; cath++){
-	isMatch[cath]=kFALSE;
-	minMatchDist[cath]=9999.;
+    for(Int_t cath=0; cath<2; ++cath)
+    {
+      isMatch[cath]=kFALSE;
+      minMatchDist[cath]=fkMaxDistance/10.;
     }
 
-    Int_t ndigits = (Int_t)fTriggerDigitsList[iChamber].GetEntries();
-    AliMUONDigit * mDigit = 0x0;
-    for(Int_t idigit=0; idigit<ndigits; idigit++) { // digit loop
-	mDigit = (AliMUONDigit*)fTriggerDigitsList[iChamber].At(idigit);
-	Int_t currDetElemId = mDigit->DetElemId();
+    TIter next(digitStore.CreateIterator());
+    AliMUONVDigit* mDigit;
+
+    while ( ( mDigit = static_cast<AliMUONVDigit*>(next()) ) )
+    {
+      Int_t currDetElemId = mDigit->DetElemId();
+      Int_t currCh = AliMpDEManager::GetChamberId(currDetElemId);
+      if(currCh!=iChamber) continue;
+      Int_t cathode = mDigit->Cathode();
+      Int_t ix = mDigit->PadX();
+      Int_t iy = mDigit->PadY();
+      Float_t xpad, ypad, zpad;
+      const AliMpVSegmentation* seg = AliMpSegmentation::Instance()
+        ->GetMpSegmentation(currDetElemId,AliMp::GetCathodType(cathode));
+      
+      AliMpPad pad = seg->PadByIndices(AliMpIntPair(ix,iy),kTRUE);
+      Float_t xlocal1 = pad.Position().X();
+      Float_t ylocal1 = pad.Position().Y();
+      Float_t dpx = pad.Dimensions().X();
+      Float_t dpy = pad.Dimensions().Y();
+      fTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad);
+      Float_t matchDist = MinDistanceFromPad(xpad, ypad, zpad, dpx, dpy, trackParam);
+      if(matchDist>minMatchDist[cathode])continue;
+      isMatch[cathode] = kTRUE;
+      if(isMatch[0] && isMatch[1]) break;
+      minMatchDist[cathode] = matchDist;
+    }
+}
+
+
+//______________________________________________________________________________
+Float_t 
+AliMUONTrackHitPattern::MinDistanceFromPad(Float_t xPad, Float_t yPad, Float_t zPad,
+                                           Float_t dpx, Float_t dpy, 
+                                           const AliMUONTrackParam& trackParam) const
+{
+    //
+    /// Decides if the digit belongs to the tracker track.
+    //
+
+    AliMUONTrackParam trackParamAtPadZ(trackParam);
+    AliMUONTrackExtrap::ExtrapToZCov(&trackParamAtPadZ, zPad);
+
+    Float_t xTrackAtPad = trackParamAtPadZ.GetNonBendingCoor();
+    Float_t yTrackAtPad = trackParamAtPadZ.GetBendingCoor();
+
+    const Float_t kNSigma = GetRecoParam()->GetSigmaCutForTrigger();
 
+    const TMatrixD& kCovParam = trackParamAtPadZ.GetCovariances();
+    
+    Float_t sigmaX = TMath::Sqrt(kCovParam(0,0));
+    Float_t sigmaY = TMath::Sqrt(kCovParam(2,2));
+
+    Float_t maxDistX = kNSigma * sigmaX; // in cm
+    Float_t maxDistY = kNSigma * sigmaY; // in cm
+
+    Float_t deltaX = TMath::Abs(xPad-xTrackAtPad)-dpx;
+    Float_t deltaY = TMath::Abs(yPad-yTrackAtPad)-dpy;
+
+    Float_t matchDist = fkMaxDistance;
+    if(deltaX<=maxDistX && deltaY<=maxDistY) matchDist = TMath::Max(deltaX, deltaY);
+
+    return matchDist;
+}
+
+
+//_____________________________________________________________________________
+Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(AliMUONVDigitStore& digitStore, Int_t &detElemId,
+						  Float_t coor[2], Bool_t isMatch[2],
+						  TArrayI nboard[2], TArrayF &zRealMatch, Float_t y11) const
+{
+    //
+    /// Check slat and board number of digit matching trigger track
+    //
+
+    enum {kBending, kNonBending};
+
+    Float_t minMatchDist[fgkNcathodes];
+    Int_t padsInCheckArea[fgkNcathodes];
+
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+	isMatch[cath] = kFALSE;
+	minMatchDist[cath] = fkMaxDistance/10.;
+	padsInCheckArea[cath] = 0;
+    }
+    Int_t iChamber = AliMpDEManager::GetChamberId(detElemId);
+    Int_t ch = iChamber-10;
+    Float_t oldDeltaZ = AliMUONConstants::DefaultChamberZ(iChamber) - AliMUONConstants::DefaultChamberZ(10);
+    Float_t y = coor[1];
+    Int_t iSlat = detElemId%100;
+    Int_t trigDigitBendPlane = -1;
+    Int_t foundDetElemId = detElemId;
+    Float_t foundZmatch=999.;
+    Float_t yCoorAtPadZ=999.;
+
+    TIter next(digitStore.CreateIterator());
+    AliMUONVDigit* mDigit;
+    Int_t idigit=0;
+    
+    while ( ( mDigit = static_cast<AliMUONVDigit*>(next()) ) )
+    {
+	idigit++;
+	Int_t currDetElemId = mDigit->DetElemId();
+	Int_t currCh = AliMpDEManager::GetChamberId(currDetElemId);
+	if(currCh!=iChamber) continue;
+	Int_t currSlat = currDetElemId%100;
+	Int_t slatDiff = TMath::Abs(currSlat-iSlat);
+	if(slatDiff>1 && slatDiff<17) continue; // Check neighbour slats
 	Int_t cathode = mDigit->Cathode();
 	Int_t ix = mDigit->PadX();
 	Int_t iy = mDigit->PadY();
@@ -176,137 +580,320 @@ void AliMUONTrackHitPattern::FindPadMatchingTrack(AliMUONTrackParam *trackParam,
 	Float_t ylocal1 = pad.Position().Y();
 	Float_t dpx = pad.Dimensions().X();
 	Float_t dpy = pad.Dimensions().Y();
-	fTransformer->Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad);
-	Float_t matchDist = MinDistanceFromPad(xpad, ypad, zpad, dpx, dpy, trackParam);
+	fTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad);
+	AliDebug(2, Form("\nDetElemId = %i  Cathode = %i  Pad = (%i,%i) = (%.2f,%.2f)  Dim = (%.2f,%.2f)  Track = (%.2f,%.2f)\n",currDetElemId,cathode,ix,iy,xpad,ypad,dpx,dpy,coor[0],coor[1]));
+	// searching track intersection with chambers (second approximation)
+	if(ch%2==1){
+	    //if(iChamber%2==1){
+	    Float_t deltaZ = zpad - zRealMatch[0];
+	    y = (coor[1]-y11)*deltaZ/oldDeltaZ + y11;
+	    if(TMath::Abs(y-coor[1])>0.1) AliDebug(3, Form("oldDeltaZ = %7.2f   newDeltaZ = %7.2f\toldY = %7.2f   new y = %7.2f\n",oldDeltaZ,deltaZ,coor[1],y));
+	}
+	Float_t matchDist = PadMatchTrack(xpad, ypad, dpx, dpy, coor[0], y);
+	if(matchDist<fkMaxDistance/2.) padsInCheckArea[cathode]++;
 	if(matchDist>minMatchDist[cathode])continue;
 	isMatch[cathode] = kTRUE;
 	minMatchDist[cathode] = matchDist;
+	foundDetElemId = currDetElemId;
+	foundZmatch=zpad;
+	yCoorAtPadZ=y;
+	if(cathode==kBending) trigDigitBendPlane = idigit;
+	for (Int_t loc=0; loc<pad.GetNofLocations(); loc++){
+	    AliMpIntPair location = pad.GetLocation(loc);
+	    nboard[cathode][loc] = location.GetFirst();
+	}
+	for(Int_t loc=pad.GetNofLocations(); loc<fgkNlocations; loc++){
+	    nboard[cathode][loc]=-1;
+	}
     }
 
-    return;
-}
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+	if(padsInCheckArea[cath]>2) {
+	  AliDebug(1, Form("padsInCheckArea[%i] = %i\n",cath,padsInCheckArea[cath]));
+	    return -500;
+	}
+    }
 
+    if(isMatch[kBending] || isMatch[kNonBending]){
+	detElemId = foundDetElemId;
+	zRealMatch[ch] = foundZmatch;
+	coor[1] = yCoorAtPadZ;
+    }
+    return trigDigitBendPlane;
+}
 
-//______________________________________________________________________________
-Float_t AliMUONTrackHitPattern::MinDistanceFromPad(Float_t xPad, Float_t yPad, Float_t zPad,
-						   Float_t dpx, Float_t dpy, AliMUONTrackParam *trackParam)
+//_____________________________________________________________________________
+Float_t AliMUONTrackHitPattern::PadMatchTrack(Float_t xPad, Float_t yPad,
+						Float_t dpx, Float_t dpy, 
+						Float_t xTrackAtPad, Float_t yTrackAtPad) const
 {
     //
-    /// Decides if the digit belongs to the track.
+    /// Decides if the digit belongs to the trigger track.
     //
-    Float_t xTrackAtPad = trackParam->GetNonBendingCoor();
-    Float_t yTrackAtPad = trackParam->GetBendingCoor();
 
-    Float_t sigmaX, sigmaY, sigmaMS;
-    GetPosUncertainty(trackParam, zPad, sigmaX, sigmaY, sigmaMS);
+  Float_t maxDist = GetRecoParam()->GetStripCutForTrigger() * 2. * TMath::Min(dpx,dpy); // cm
+  if(maxDist<2.) maxDist = 2.;
+  Float_t maxDistCheckArea = GetRecoParam()->GetMaxStripAreaForTrigger() * 2. *  TMath::Min(dpx,dpy); // cm
 
-    Float_t maxDistX = 3.*(sigmaX + sigmaMS); // in cm
-    Float_t maxDistY = 3.*(sigmaY + sigmaMS); // in cm
+    Float_t matchDist = fkMaxDistance;
 
     Float_t deltaX = TMath::Abs(xPad-xTrackAtPad)-dpx;
     Float_t deltaY = TMath::Abs(yPad-yTrackAtPad)-dpy;
+    Float_t maxDistX = maxDist;
+    Float_t maxDistY = maxDist;
 
-    Float_t matchDist = 99999.;
     if(deltaX<=maxDistX && deltaY<=maxDistY) matchDist = TMath::Max(deltaX, deltaY);
+    else if(deltaX<=maxDistCheckArea && deltaY<=maxDistCheckArea) matchDist = fkMaxDistance/5.;
     return matchDist;
 }
 
 
-//______________________________________________________________________________
-void AliMUONTrackHitPattern::GetPosUncertainty(AliMUONTrackParam *trackParam, Float_t zChamber, 
-					       Float_t &sigmaX, Float_t &sigmaY, Float_t &sigmaMS)
+//_____________________________________________________________________________
+Int_t AliMUONTrackHitPattern::DetElemIdFromPos(Float_t x, Float_t y, 
+						 Int_t chamber, Int_t cathode) const
 {
     //
-    /// Returns uncertainties on extrapolated position.
-    /// Takes into account Branson plane corrections in the iron wall.
+    /// Given the (x,y) position in the chamber,
+    /// it returns the corresponding slat
     //
 
-    const Float_t kAlpha = 0.1123; // GeV/c
-    
-    // Find a better way to get such parameters ???
-    const Float_t kZFilterIn = 1471.; // From STRUCT/SHILConst2.h
-    const Float_t kZFilterOut = kZFilterIn + 120.; // From STRUCT/SHILConst2.h
-    
-    const Float_t kZBranson = - (kZFilterIn + (kZFilterOut - kZFilterIn)*2./3. ); // - sign because distance are positive
-    Float_t zDistFromWall = TMath::Abs(zChamber - kZBranson);
-    Float_t zDistFromLastTrackCh = TMath::Abs(zChamber - AliMUONConstants::DefaultChamberZ(9));
-
-    TMatrixD *covParam = trackParam->GetCovariances();
-    
-    sigmaX = (*covParam)(0,0);
-    sigmaY = (*covParam)(2,2);
-
-    // If covariance matrix is not extrapolated, use "reasonable" errors
-    // (To be removed as soon as covariance matrix is correctly propagated).
-    if (sigmaX==0.)sigmaX = 0.003 * zDistFromLastTrackCh;
-    if (sigmaY==0.)sigmaY = 0.004 * zDistFromLastTrackCh;
-
-    Float_t p = trackParam->P();
-    Float_t thetaMS = kAlpha/p;
-    sigmaMS = zDistFromWall * TMath::Tan(thetaMS);
+    Int_t resultingDetElemId = -1;
+    AliMpDEIterator it;
+    Float_t minDist = 999.;
+    for ( it.First(chamber-1); ! it.IsDone(); it.Next() ){
+	Int_t detElemId = it.CurrentDEId();
+	Int_t ich = detElemId/100-10;
+	Float_t tolerance=0.2*((Float_t)ich);
+	Float_t currDist=9999.;
+
+	const AliMpVSegmentation* seg = 
+	    AliMpSegmentation::Instance()
+	    ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode));
+	if (!seg) continue;
+
+	Float_t deltax = seg->Dimensions().X();
+	Float_t deltay = seg->Dimensions().Y();
+	Float_t xlocal1 =  -deltax;
+	Float_t ylocal1 =  -deltay;
+	Float_t xlocal2 =  +deltax;
+	Float_t ylocal2 =  +deltay;
+	Float_t xg01, yg01, zg1, xg02, yg02, zg2;
+	fTransformer.Local2Global(detElemId, xlocal1, ylocal1, 0, xg01, yg01, zg1);
+	fTransformer.Local2Global(detElemId, xlocal2, ylocal2, 0, xg02, yg02, zg2);
+
+	Float_t xg1 = xg01, xg2 = xg02, yg1 = yg01, yg2 = yg02;
+
+	if(xg01>xg02){
+	    xg1 = xg02;
+	    xg2 = xg01;
+	}
+	if(yg01>yg02){
+	    yg1 = yg02;
+	    yg2 = yg01;
+	}
 
-    return;
+	if(x>=xg1-tolerance && x<=xg2+tolerance && y>=yg1-tolerance && y<=yg2+tolerance){ // takes into account errors in extrapolation
+	    if(y<yg1) currDist = yg1-y;
+	    else if(y>yg2) currDist = y-yg2;
+	    if(currDist<minDist) {
+		resultingDetElemId = detElemId;
+		minDist=currDist;
+		continue;
+	    }
+	    resultingDetElemId = detElemId;
+	    break;
+	}
+    } // loop on detElemId
+    return resultingDetElemId;
 }
 
 
-//____________________________________________________________________
-Bool_t AliMUONTrackHitPattern::TriggerDigits()
+//_____________________________________________________________________________
+void AliMUONTrackHitPattern::LocalBoardFromPos(Float_t x, Float_t y,
+						 Int_t detElemId, Int_t cathode,
+						 Int_t localBoard[4]) const
 {
     //
-    /// make (S)Digit for trigger
+    /// Given the (x,y) position in the chamber,
+    /// it returns the corresponding local board
     //
 
+    for(Int_t loc=0; loc<fgkNlocations; loc++){
+	localBoard[loc]=-1;
+    }
+    Float_t xl, yl, zl;
+    fTransformer.Global2Local(detElemId, x, y, 0, xl, yl, zl);
+    TVector2 pos(xl,yl);
+    const AliMpVSegmentation* seg = 
+	AliMpSegmentation::Instance()
+          ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode));
+    if (seg){
+	AliMpPad pad = seg->PadByPosition(pos,kFALSE);
+	for (Int_t loc=0; loc<pad.GetNofLocations(); loc++){
+	    AliMpIntPair location = pad.GetLocation(loc);
+	    localBoard[loc] = location.GetFirst();
+	}
+    }
+}
 
-    Int_t nBoard;
-
-    TList digitList;
-
-    digitList.Clear();
-
-    AliMUONLocalTrigger *locTrg = 0x0;
-
-    fMUONData->SetTreeAddress("RC,TC");
-    fMUONData->GetTrigger();
-
-    TClonesArray *localTrigger = fMUONData->LocalTrigger();
-    Int_t nLocTrig = (Int_t) localTrigger->GetEntriesFast();
-
-    for(Int_t iLoc=0; iLoc<nLocTrig; iLoc++) {
-      locTrg = (AliMUONLocalTrigger*)localTrigger->UncheckedAt(iLoc);
-
-      TArrayS xyPattern[2];
-      xyPattern[0].Set(4);
-      xyPattern[1].Set(4);
-
-      xyPattern[0].AddAt(locTrg->GetX1Pattern(),0);
-      xyPattern[0].AddAt(locTrg->GetX2Pattern(),1);
-      xyPattern[0].AddAt(locTrg->GetX3Pattern(),2);
-      xyPattern[0].AddAt(locTrg->GetX4Pattern(),3);
-
-      xyPattern[1].AddAt(locTrg->GetY1Pattern(),0);
-      xyPattern[1].AddAt(locTrg->GetY2Pattern(),1);
-      xyPattern[1].AddAt(locTrg->GetY3Pattern(),2);
-      xyPattern[1].AddAt(locTrg->GetY4Pattern(),3);
 
-      for(Int_t cath=0; cath<2; cath++){
-	  for(Int_t ch=0; ch<4; ch++){
-	      if(xyPattern[cath][ch]==0) continue;
-	  }
+//_____________________________________________________________________________
+Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern,
+						     AliMUONTriggerTrack *matchedTrigTrack,
+						     AliMUONVDigitStore& digitStore) const
+{
+  //
+  /// It searches for matching digits around the trigger track.
+  //
+
+  enum {kBending, kNonBending};
+
+  Int_t chOrder[fgkNchambers] = {0,2,1,3};
+
+  TArrayF zRealMatch(fgkNchambers);
+  TArrayF correctFactor(fgkNcathodes);
+
+  Bool_t isMatch[fgkNcathodes];
+  for(Int_t cath=0; cath<fgkNcathodes; cath++){
+    isMatch[cath] = kFALSE;
+  }
+
+  TArrayF zMeanChamber(fgkNchambers);
+  for(Int_t ch=0; ch<fgkNchambers; ch++){
+    zMeanChamber[ch] = AliMUONConstants::DefaultChamberZ(10+ch);
+  }
+
+  TArrayI digitPerTrack(fgkNcathodes);
+
+  Float_t trackIntersectCh[fgkNchambers][fgkNcathodes];
+
+  TArrayI triggeredDigits;
+  triggeredDigits.Set(fgkNchambers);
+  triggeredDigits.Reset(-1);
+
+  TArrayI trigScheme[fgkNcathodes];
+  TArrayI slatThatTriggered[fgkNcathodes];
+  for(Int_t cath=0; cath<fgkNcathodes; cath++){
+    trigScheme[cath].Set(fgkNchambers);
+    slatThatTriggered[cath].Set(fgkNchambers);
+  }
+
+  Int_t boardThatTriggered[fgkNchambers][fgkNcathodes][fgkNlocations];
+  TArrayI nboard[fgkNcathodes];
+  for(Int_t cath=0; cath<fgkNcathodes; cath++){
+    nboard[cath].Set(fgkNlocations);
+  }
+  Int_t ineffBoard[fgkNlocations];
+  for(Int_t loc=0; loc<fgkNlocations; loc++){
+    ineffBoard[loc] = -1;
+  }
+
+  digitPerTrack.Reset();
+  for(Int_t ch=0; ch<fgkNchambers; ch++){
+    zRealMatch[ch] = zMeanChamber[ch];
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+      for(Int_t loc=0; loc<fgkNlocations; loc++){
+	boardThatTriggered[ch][cath][loc]=-1;
       }
+    }
+  }
 
-      nBoard    = locTrg->LoCircuit();
-      fDigitMaker->TriggerDigits(nBoard, xyPattern, digitList);
+  for(Int_t cath=0; cath<fgkNcathodes; cath++){
+    slatThatTriggered[cath].Reset(-1);
+    trigScheme[cath].Reset();
+  }
 
+  Bool_t isClearEvent = kTRUE;
 
-    } // loop on localTriggers
+  //Float_t x11 = matchedTrigTrack->GetX11();// x position (info from non-bending plane)
+  Float_t y11 = matchedTrigTrack->GetY11();// y position (info from bending plane)
+  Float_t thetaX = matchedTrigTrack->GetThetax();
+  Float_t thetaY = matchedTrigTrack->GetThetay();
 
-    for (Int_t iEntry = 0; iEntry < digitList.GetEntries(); ++iEntry) {
-      AliMUONDigit* digit = (AliMUONDigit*)digitList.At(iEntry);
-      Int_t detElemId = digit->DetElemId();
-      Int_t iChamber  = detElemId/100 - 11; //FIXEME should be given by mapping
-      fTriggerDigitsList[iChamber].Add(digit);
+  for(Int_t ch=0; ch<fgkNchambers; ch++) { // chamber loop
+    Int_t currCh = chOrder[ch];
+    AliDebug(3, Form("zMeanChamber[%i] = %.2f\tzRealMatch[0] = %.2f\n",currCh,zMeanChamber[currCh],zRealMatch[0]));
 
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+      correctFactor[cath]=1.;
+    }
+    // calculate corrections to trigger track theta
+    if(ch>=1) correctFactor[kNonBending] = zMeanChamber[0]/zRealMatch[0];// corrects x position
+    if(ch>=2) correctFactor[kBending] = (zMeanChamber[2] - zMeanChamber[0]) / (zRealMatch[2] - zRealMatch[0]);// corrects y position
+
+    // searching track intersection with chambers (first approximation)
+    Float_t deltaZ = zMeanChamber[currCh] - zMeanChamber[0];
+    trackIntersectCh[currCh][0] = zMeanChamber[currCh] * TMath::Tan(thetaX) * correctFactor[kNonBending];// x position (info from non-bending plane) 
+    trackIntersectCh[currCh][1] = y11 + deltaZ * TMath::Tan(thetaY) * correctFactor[kBending];// y position (info from bending plane)
+    Int_t detElemIdFromTrack = DetElemIdFromPos(trackIntersectCh[currCh][0], trackIntersectCh[currCh][1], 11+currCh, 0);
+    if(detElemIdFromTrack<0) {
+      AliDebug(1, "Warning: trigger track outside trigger chamber\n");
+      continue;
+    }
+		
+    triggeredDigits[currCh] = FindPadMatchingTrig(digitStore, detElemIdFromTrack, trackIntersectCh[currCh], isMatch, nboard, zRealMatch, y11);
+
+    // if FindPadMatchingTrig = -500 => too many digits matching pad =>
+    //                               => Event not clear => Reject track
+    if(triggeredDigits[currCh]<-100){
+      isClearEvent = kFALSE;
+      AliDebug(1, Form("Warning: track = %p (%i) matches many pads. Rejected!\n",(void *)matchedTrigTrack, detElemIdFromTrack));
+      break;
     }
 
-    return kTRUE;
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+      if(!isMatch[cath]) continue;
+      SetBit(pattern, cath, currCh);
+      digitPerTrack[cath]++;
+      trigScheme[cath][currCh]++;
+      slatThatTriggered[cath][currCh] = detElemIdFromTrack;
+      for(Int_t loc=0; loc<fgkNlocations; loc++){
+	boardThatTriggered[currCh][cath][loc] = nboard[cath][loc];
+      }
+    }
+  } // end chamber loop
+
+  for(Int_t cath=0; cath<fgkNcathodes; cath++){
+    if(digitPerTrack[cath]<3) isClearEvent = kFALSE;
+    if(!isClearEvent) AliDebug(1, Form("Warning: found %i digits for trigger track cathode %i.\nRejecting event\n", digitPerTrack[cath],cath));
+  }
+
+  if(!isClearEvent) return kFALSE;
+
+  Int_t goodForEff = kBoardEff;
+
+  Int_t ineffSlat = -1;
+  Int_t ineffDetElId = -1;
+  Int_t firstSlat = slatThatTriggered[kBending][0]%100;
+  if(firstSlat<0) firstSlat = slatThatTriggered[kBending][1]%100;
+  Int_t firstBoard = boardThatTriggered[0][kBending][0];
+  if(firstBoard<0) firstBoard = boardThatTriggered[1][kBending][0];
+  for(Int_t ch=0; ch<fgkNchambers; ch++){
+    Bool_t isCurrChIneff = kFALSE;
+    Int_t currSlat = slatThatTriggered[kBending][ch]%100;
+    if(currSlat<0){
+      ineffDetElId = DetElemIdFromPos(trackIntersectCh[ch][0], trackIntersectCh[ch][1], 11+ch, kBending);
+      currSlat = ineffDetElId%100;
+      ineffSlat = currSlat;
+      isCurrChIneff = kTRUE;
+    }
+    if(currSlat!=firstSlat) {
+      AddEffInfo(pattern, 20, kChEff);
+      return kTRUE;
+    }
+    Bool_t atLeastOneLoc=kFALSE;
+    if(isCurrChIneff) LocalBoardFromPos(trackIntersectCh[ch][0], trackIntersectCh[ch][1], ineffDetElId, kBending, ineffBoard);
+    for(Int_t loc=0; loc<fgkNlocations; loc++){
+      Int_t currBoard = boardThatTriggered[ch][kBending][loc];
+      if(isCurrChIneff) currBoard = ineffBoard[loc];
+      if(currBoard==firstBoard){
+	atLeastOneLoc=kTRUE;
+	break;
+      }
+    }
+    if(!atLeastOneLoc) goodForEff = kSlatEff;
+  } // end chamber loop
+  
+  AddEffInfo(pattern, firstSlat, goodForEff);
+  return kTRUE;
 }