Bug fix for loading the LUT for chambers 1 to 6. (Indra)

[u/mrichter/AliRoot.git] / MUON / AliMUONTracker.cxx

diff --git a/MUON/AliMUONTracker.cxx b/MUON/AliMUONTracker.cxx
index 6eb3821acf71bf0ddc6814e09a9a15728a2477ce..8f833d5b993301df10194122454e600249df7e21 100644 (file)
--- a/MUON/AliMUONTracker.cxx
+++ b/MUON/AliMUONTracker.cxx
@@ -54,6 +54,7 @@
 #include "AliMUONVClusterServer.h"
 #include "AliMUONVDigitStore.h"
 #include "AliMUONVTriggerStore.h"
+#include "AliMUONDigitMaker.h"
 #include <Riostream.h>
 #include <TRandom.h>
 #include <TTree.h>
@@ -91,7 +92,7 @@ fkRecoParam(recoParam)
   
   if (!fClusterServer)
   {
-    AliInfo("No cluster server given. Will use AliMUONLegacyClusterServer");
+    AliDebug(1,"No cluster server given. Will use AliMUONLegacyClusterServer");
     fIsOwnerOfClusterServer = kTRUE;
   }
   else
@@ -167,7 +168,7 @@ Int_t AliMUONTracker::LoadClusters(TTree* clustersTree)
     fInputClusterStore = AliMUONVClusterStore::Create(*clustersTree);
     if ( fInputClusterStore ) 
     {
-      AliInfo(Form("Created %s from cluster tree",fInputClusterStore->ClassName()));
+      AliDebug(1,Form("Created %s from cluster tree",fInputClusterStore->ClassName()));
       fInputClusterStore->Clear();
       fInputClusterStore->Connect(*clustersTree,kFALSE);
     }
@@ -190,7 +191,7 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd)
 {
   /// Performs the tracking and store the resulting tracks in the ESD
   AliDebug(1,"");
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
   
   if (!fTrackReco) 
   {
@@ -218,13 +219,11 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd)
     fTrackReco->EventReconstructTrigger(*fkTriggerCircuit,*fTriggerStore,*(TriggerTrackStore()));
   }
   
-  if ( ( GetRecoParam()->BypassSt4() || 
-                                GetRecoParam()->BypassSt5() ) && 
-                       TriggerTrackStore()->GetSize() > 5 ) 
+  if ( TriggerTrackStore()->GetSize() > GetRecoParam()->GetMaxTriggerTracks() ) 
   {
-    // Hard cut to reject shower events
+    // cut to reject shower events
     
-    AliCodeTimerAuto("MUON Shower events");
+    AliCodeTimerAuto("MUON Shower events",1);
 
     AliWarning(Form("Probably got a shower event (%d trigger tracks). Will not reconstruct tracks.",
                     TriggerTrackStore()->GetSize()));
@@ -256,7 +255,7 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent*
 {
   /// Fill the ESD from the trackStore
   AliDebug(1,"");
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
   
   // get ITS vertex
   Double_t vertex[3] = {0., 0., 0.};
@@ -314,8 +313,8 @@ void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent*
       if (matched) break;
     }
     if (matched) continue;
-    
-    AliMUONESDInterface::MUONToESD(*locTrg, esdTrack, ghostId);
+
+    AliMUONESDInterface::MUONToESD(*locTrg, esdTrack, ghostId, triggerTrack);
     
     esd->AddMuonTrack(&esdTrack);
     ghostId -= 1;
@@ -347,7 +346,7 @@ AliMUONVTrackReconstructor* AliMUONTracker::CreateTrackReconstructor(const AliMU
     return 0x0;
   }
   
-  AliInfoClass(Form("Will use %s for tracking",trackReco->ClassName()));
+  AliDebugClass(1,Form("Will use %s for tracking",trackReco->ClassName()));
   
   return trackReco;
 }