X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONTrackHitPattern.cxx;h=d886eb74bb29f836dabb65f9bec12d7d470c7e74;hb=60935290fbf931695e754078c2e98eecf663e6a3;hp=6ce3d0c3c1a00960dd882520e98f34b8a81bf0f4;hpb=9b1e069f5674d9167ba9e4a84bcbeeead92e2549;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONTrackHitPattern.cxx b/MUON/AliMUONTrackHitPattern.cxx
index 6ce3d0c3c1a..d886eb74bb2 100644
--- a/MUON/AliMUONTrackHitPattern.cxx
+++ b/MUON/AliMUONTrackHitPattern.cxx
@@ -23,14 +23,7 @@
 /// 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:
 /// * ExecuteValidation
 ///
@@ -65,6 +58,7 @@
 
 #include "AliLog.h"
 #include "AliTracker.h"
+#include "AliESDMuonTrack.h"
 
 #include <Riostream.h>
 #include <TArrayS.h>
@@ -75,6 +69,7 @@
 #include <TDirectory.h>
 #include <TFile.h>
 #include <TSystem.h>
+#include <TVector2.h>
 
 #include <cassert>
 
@@ -155,9 +150,20 @@ void AliMUONTrackHitPattern::ExecuteValidation(const AliMUONVTrackStore& trackSt
   //
 
   AliMUONDigitStoreV1 digitStore;
-  TriggerDigits(triggerStore,digitStore);
+  fkDigitMaker.TriggerToDigitsStore(triggerStore,digitStore);
 
+  // Get the hit pattern for all trigger tracks
+  AliMUONTriggerTrack* triggerTrack;
+  TIter itTriggerTrack(triggerTrackStore.CreateIterator());
+  while ( ( triggerTrack = static_cast<AliMUONTriggerTrack*>(itTriggerTrack() ) ) ){
+    UShort_t pattern = GetHitPattern(triggerTrack, digitStore);
+    triggerTrack->SetHitsPatternInTrigCh(pattern);
+    AliDebug(1, Form("Hit pattern: hits 0x%x  slat %2i  board %3i  effFlag %i",
+		     pattern & 0xFF, AliESDMuonTrack::GetSlatOrInfo(pattern),
+		     triggerTrack->GetLoTrgNum(), AliESDMuonTrack::GetEffFlag(pattern)));
+  }
 
+  // Match tracker tracks with trigger tracks.
   TIter itTrack(trackStore.CreateIterator());
   AliMUONTrack* track;
 
@@ -172,7 +178,13 @@ void AliMUONTrackHitPattern::ExecuteValidation(const AliMUONVTrackStore& trackSt
 
     AliMUONTriggerTrack *matchedTriggerTrack = MatchTriggerTrack(track, trackParam, triggerTrackStore, triggerStore);
 
-    UShort_t pattern = GetHitPattern(trackParam, matchedTriggerTrack, digitStore);
+    // Copy trigger tracks hit pattern if there is matching,
+    // otherwise calculate the hit pattern directly from tracker track:
+    // the obtained pattern is good for check, but not good for efficiency determination.
+    UShort_t pattern = matchedTriggerTrack ?
+      matchedTriggerTrack->GetHitsPatternInTrigCh() : 
+      GetHitPattern(&trackParam, digitStore);
+
     track->SetHitsPatternInTrigCh(pattern);
   }
 }
@@ -319,68 +331,47 @@ AliMUONTrackHitPattern::MatchTriggerTrack(AliMUONTrack* track,
 
 
 //______________________________________________________________________________
-UShort_t AliMUONTrackHitPattern::GetHitPattern(AliMUONTrackParam &trackParam,
-					       AliMUONTriggerTrack* matchedTriggerTrack,
+UShort_t AliMUONTrackHitPattern::GetHitPattern(AliMUONTriggerTrack* matchedTriggerTrack,
 					       AliMUONVDigitStore& digitStore) const
 {
   //
-  /// Get hit pattern on trigger chambers for the current track
+  /// Get hit pattern on trigger chambers for the current trigger 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;
+  PerformTrigTrackMatch(pattern, matchedTriggerTrack, digitStore);
+  return pattern;
+}
 
 
-  // Calculate hit pattern from tracker track propagation
-  // if hit pattern from trigger track failed
+//______________________________________________________________________________
+UShort_t AliMUONTrackHitPattern::GetHitPattern(AliMUONTrackParam* trackParam,
+					       AliMUONVDigitStore& digitStore) const
+{
+  //
+  /// Get hit pattern on trigger chambers for the current tracker track
+  //
+  UShort_t pattern = 0;
+  Bool_t isMatch[2];
+  const Int_t kNTrackingCh = AliMUONConstants::NTrackingCh();
 
   for(Int_t ch=0; ch<4; ++ch)
   {
     Int_t iChamber = kNTrackingCh+ch;
-    AliMUONTrackExtrap::ExtrapToZCov(&trackParam, AliMUONConstants::DefaultChamberZ(iChamber));
-    FindPadMatchingTrack(digitStore, trackParam, isMatch, iChamber);
+    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);
+      if(isMatch[cath]) AliESDMuonTrack::SetFiredChamber(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];
-}
 
+  // pattern obtained by propagation of tracker track
+  // when it does not match the trigger.
+  AliESDMuonTrack::AddEffInfo(pattern, AliESDMuonTrack::kTrackerTrackPattern);
 
-//______________________________________________________________________________
-void AliMUONTrackHitPattern::AddEffInfo(UShort_t& pattern, Int_t slat, Int_t effType) const
-{
-  //
-  /// Set info on efficiency calculation
-  //
-  pattern += effType << 8;
-  pattern += slat << 10;
+  return pattern;
 }
 
-
 //______________________________________________________________________________
 void 
 AliMUONTrackHitPattern::ApplyMCSCorrections(AliMUONTrackParam& trackParam) const
@@ -399,44 +390,6 @@ AliMUONTrackHitPattern::ApplyMCSCorrections(AliMUONTrackParam& trackParam) const
 }
 
 
-//______________________________________________________________________________
-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();
-    fkDigitMaker.TriggerDigits(nBoard, xyPattern, digitStore);
-  }
-  return kTRUE;
-}
-
-
 //______________________________________________________________________________
 void 
 AliMUONTrackHitPattern::FindPadMatchingTrack(const AliMUONVDigitStore& digitStore,
@@ -470,11 +423,12 @@ AliMUONTrackHitPattern::FindPadMatchingTrack(const AliMUONVDigitStore& digitStor
       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();
+      AliMpPad pad = seg->PadByIndices(ix,iy,kTRUE);
+      Float_t xlocal1 = pad.GetPositionX();
+      Float_t ylocal1 = pad.GetPositionY();
+      Float_t dpx = pad.GetDimensionX();
+      Float_t dpy = pad.GetDimensionY();
+
       fkTransformer.Local2Global(currDetElemId, xlocal1, ylocal1, 0, xpad, ypad, zpad);
       Float_t matchDist = MinDistanceFromPad(xpad, ypad, zpad, dpx, dpy, trackParam);
       if(matchDist>minMatchDist[cathode])continue;
@@ -570,11 +524,12 @@ Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(const AliMUONVDigitStore& digi
 	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();
+	AliMpPad pad = seg->PadByIndices(ix,iy,kTRUE);
+	Float_t xlocal1 = pad.GetPositionX();
+	Float_t ylocal1 = pad.GetPositionY();
+	Float_t dpx = pad.GetDimensionX();
+	Float_t dpy = pad.GetDimensionY();
+
 	fkTransformer.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)
@@ -594,26 +549,28 @@ Int_t AliMUONTrackHitPattern::FindPadMatchingTrig(const AliMUONVDigitStore& digi
 	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();
+	    nboard[cathode][loc] = pad.GetLocalBoardId(loc);
 	}
 	for(Int_t loc=pad.GetNofLocations(); loc<fgkNlocations; loc++){
 	    nboard[cathode][loc]=-1;
 	}
     }
 
-    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;
     }
+
+    // If track matches many pads, it is not good for effciency determination.
+    // However we still want to calculate the hit pattern.
+    for(Int_t cath=0; cath<fgkNcathodes; cath++){
+      if(padsInCheckArea[cath]>2) {
+	AliDebug(1, Form("padsInCheckArea[%i] = %i\n",cath,padsInCheckArea[cath]));
+	return -500;
+      }
+    }
+
     return trigDigitBendPlane;
 }
 
@@ -666,8 +623,8 @@ Int_t AliMUONTrackHitPattern::DetElemIdFromPos(Float_t x, Float_t y,
 	    ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode));
 	if (!seg) continue;
 
-	Float_t deltax = seg->Dimensions().X();
-	Float_t deltay = seg->Dimensions().Y();
+	Float_t deltax = seg->GetDimensionX();
+	Float_t deltay = seg->GetDimensionY();
 	Float_t xlocal1 =  -deltax;
 	Float_t ylocal1 =  -deltay;
 	Float_t xlocal2 =  +deltax;
@@ -723,10 +680,9 @@ void AliMUONTrackHitPattern::LocalBoardFromPos(Float_t x, Float_t y,
 	AliMpSegmentation::Instance()
           ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode));
     if (seg){
-	AliMpPad pad = seg->PadByPosition(pos,kFALSE);
+	AliMpPad pad = seg->PadByPosition(pos.X(),pos.Y(),kFALSE);
 	for (Int_t loc=0; loc<pad.GetNofLocations(); loc++){
-	    AliMpIntPair location = pad.GetLocation(loc);
-	    localBoard[loc] = location.GetFirst();
+	    localBoard[loc] = pad.GetLocalBoardId(loc);
 	}
     }
 }
@@ -823,22 +779,28 @@ Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern,
     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");
+      isClearEvent = kFALSE;
+
+      // track is rejected since the extrapolated track
+      // does not match a slat (border effects)
+      AliESDMuonTrack::AddEffInfo(pattern, AliESDMuonTrack::kTrackOutsideGeometry);
       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
+    //                               => Event not clear => Do not use for efficiency calculation
     if(triggeredDigits[currCh]<-100){
       isClearEvent = kFALSE;
+      // track is rejected since it matches many pads
+      AliESDMuonTrack::AddEffInfo(pattern, AliESDMuonTrack::kTrackMatchesManyPads);
       AliDebug(1, Form("Warning: track = %p (%i) matches many pads. Rejected!\n",(void *)matchedTrigTrack, detElemIdFromTrack));
-      break;
     }
 
     for(Int_t cath=0; cath<fgkNcathodes; cath++){
       if(!isMatch[cath]) continue;
-      SetBit(pattern, cath, currCh);
+      AliESDMuonTrack::SetFiredChamber(pattern, cath, currCh);
       digitPerTrack[cath]++;
       trigScheme[cath][currCh]++;
       slatThatTriggered[cath][currCh] = detElemIdFromTrack;
@@ -849,13 +811,18 @@ Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern,
   } // 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(digitPerTrack[cath]<3) {
+      isClearEvent = kFALSE;
+      // track is rejected since the number of associated
+      // digits found is less than 3.
+      AliESDMuonTrack::AddEffInfo(pattern, AliESDMuonTrack::kTrackMatchesFewPads);
+      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;
+  AliESDMuonTrack::EAliTriggerChPatternFlag goodForEff = AliESDMuonTrack::kBoardEff;
 
   Int_t ineffSlat = -1;
   Int_t ineffDetElId = -1;
@@ -873,7 +840,9 @@ Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern,
       isCurrChIneff = kTRUE;
     }
     if(currSlat!=firstSlat) {
-      AddEffInfo(pattern, 20, kChEff);
+      AliESDMuonTrack::AddEffInfo(pattern,
+				  AliESDMuonTrack::kCrossDifferentSlats,
+				  AliESDMuonTrack::kChEff); // track crosses different slats
       return kTRUE;
     }
     Bool_t atLeastOneLoc=kFALSE;
@@ -886,9 +855,9 @@ Bool_t AliMUONTrackHitPattern::PerformTrigTrackMatch(UShort_t &pattern,
 	break;
       }
     }
-    if(!atLeastOneLoc) goodForEff = kSlatEff;
+    if(!atLeastOneLoc) goodForEff = AliESDMuonTrack::kSlatEff;
   } // end chamber loop
   
-  AddEffInfo(pattern, firstSlat, goodForEff);
+  AliESDMuonTrack::AddEffInfo(pattern, firstSlat, goodForEff);
   return kTRUE;
 }