Better starting value for estimate of covariance matrix (Maksym, Silvia)

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

diff --git a/MUON/AliMUONTracker.cxx b/MUON/AliMUONTracker.cxx
index 0ec3dc39017c698599006ab7572e29b65e57fbe1..5223dbc8734058000eab07af8cf09ac1d35bcc6a 100644 (file)
--- a/MUON/AliMUONTracker.cxx
+++ b/MUON/AliMUONTracker.cxx
@@ -22,11 +22,9 @@
 /// reconstruct tracks from recpoints
 ///
 /// Actual tracking is performed by some AliMUONVTrackReconstructor children
-/// Tracking modes (ORIGINAL, KALMAN) and associated options and parameters
-/// can be changed by using:
-/// AliMUONRecoParam *muonRecoParam = AliMUONRecoParam::GetLow(High)FluxParam();
-/// muonRecoParam->Set...(); // see methods in AliMUONRecoParam.h for details
-/// AliMUONReconstructor::SetRecoParam(muonRecoParam);
+/// Tracking modes (ORIGINAL, KALMAN) and associated options and parameters can be changed
+/// through the AliMUONRecoParam object set in the reconstruction macro or read from the CDB
+/// (see methods in AliMUONRecoParam.h file for details)
 ///
 /// \author Christian Finck and Laurent Aphecetche, SUBATECH Nantes
 //-----------------------------------------------------------------------------
@@ -53,10 +51,10 @@
 #include "AliMUONTriggerTrackStoreV1.h"
 #include "AliMUONTriggerTrack.h"
 #include "AliMUONLocalTrigger.h"
-#include "AliMUONVCluster.h"
 #include "AliMUONVClusterServer.h"
 #include "AliMUONVDigitStore.h"
 #include "AliMUONVTriggerStore.h"
+#include "AliMUONTriggerUtilities.h"
 #include <Riostream.h>
 #include <TRandom.h>
 #include <TTree.h>
@@ -69,38 +67,37 @@ ClassImp(AliMUONTracker)
 //_____________________________________________________________________________
 AliMUONTracker::AliMUONTracker(const AliMUONRecoParam* recoParam,
                                AliMUONVClusterServer* clusterServer,
-                               const AliMUONVDigitStore& digitStore,
-                               const AliMUONDigitMaker* digitMaker,
+                               AliMUONVDigitStore& digitStore,
                                const AliMUONGeometryTransformer* transformer,
-                               const AliMUONTriggerCircuit* triggerCircuit)
+                               const AliMUONTriggerCircuit* triggerCircuit,
+                               const AliMUONTriggerUtilities* triggerUtilities)
 : AliTracker(),
-fDigitMaker(digitMaker), // not owner
-fTransformer(transformer), // not owner
-fTriggerCircuit(triggerCircuit), // not owner
+fkTransformer(transformer), // not owner
+fkTriggerCircuit(triggerCircuit), // not owner
 fTrackHitPatternMaker(0x0),
 fTrackReco(0x0),
 fClusterStore(0x0),
 fTriggerStore(0x0),
 fClusterServer(clusterServer), 
 fIsOwnerOfClusterServer(kFALSE),
-fDigitStore(digitStore), // not owner
+fkDigitStore(digitStore), // not owner
 fInputClusterStore(0x0),
 fTriggerTrackStore(0x0),
-fRecoParam(recoParam)
+fkRecoParam(recoParam)
 {
   /// constructor
-  if (fTransformer && fDigitMaker)
-    fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fTransformer,*fDigitMaker);
+  if (fkTransformer)
+    fTrackHitPatternMaker = new AliMUONTrackHitPattern(recoParam,*fkTransformer,fkDigitStore,triggerUtilities);
   
   if (!fClusterServer)
   {
-    AliInfo("No cluster server given. Will use AliMUONLegacyClusterServer");
+    AliDebug(1,"No cluster server given. Will use AliMUONLegacyClusterServer");
     fIsOwnerOfClusterServer = kTRUE;
   }
   else
   {
-    TIter next(fDigitStore.CreateIterator());
-    fClusterServer->UseDigits(next);
+    TIter next(fkDigitStore.CreateIterator());
+    fClusterServer->UseDigits(next,&digitStore);
     
     SetupClusterServer(*fClusterServer);
   }
@@ -170,12 +167,12 @@ 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);
     }
     delete fClusterServer;
-    fClusterServer = new AliMUONLegacyClusterServer(*fTransformer,fInputClusterStore,
+    fClusterServer = new AliMUONLegacyClusterServer(*fkTransformer,fInputClusterStore,
                                                                                                                                                                                                                GetRecoParam()->BypassSt4(),
                                                                                                                                                                                                                GetRecoParam()->BypassSt5());
     SetupClusterServer(*fClusterServer);
@@ -193,7 +190,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) 
   {
@@ -215,19 +212,17 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd)
   }
 
   // Make trigger tracks
-  if ( fTriggerCircuit ) 
+  if ( fkTriggerCircuit ) 
   {
     TriggerTrackStore()->Clear();
-    fTrackReco->EventReconstructTrigger(*fTriggerCircuit,*fTriggerStore,*(TriggerTrackStore()));
+    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()));
@@ -255,16 +250,16 @@ Int_t AliMUONTracker::Clusters2Tracks(AliESDEvent* esd)
 }
 
 //_____________________________________________________________________________
-void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) const
+void AliMUONTracker::FillESD(const AliMUONVTrackStore& trackStore, AliESDEvent* esd) const
 {
   /// Fill the ESD from the trackStore
   AliDebug(1,"");
-  AliCodeTimerAuto("")
+  AliCodeTimerAuto("",0)
   
   // get ITS vertex
   Double_t vertex[3] = {0., 0., 0.};
   const AliESDVertex* esdVert = esd->GetVertex(); 
-  if (esdVert->GetNContributors()) {
+  if (esdVert->GetNContributors() > 0 || !strcmp(esdVert->GetTitle(),"vertexer: smearMC")) {
     esdVert->GetXYZ(vertex);
     AliDebug(1,Form("found vertex (%e,%e,%e)",vertex[0],vertex[1],vertex[2]));
   }
@@ -281,8 +276,8 @@ void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) c
       
       if (track->GetMatchTrigger() > 0) {
        locTrg = static_cast<AliMUONLocalTrigger*>(fTriggerStore->FindLocal(track->LoCircuit()));
-       AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fDigitStore, locTrg);
-      } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fDigitStore);
+       AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore, locTrg);
+      } else AliMUONESDInterface::MUONToESD(*track, esdTrack, vertex, &fkDigitStore);
       
       esd->AddMuonTrack(&esdTrack);
     }
@@ -317,8 +312,8 @@ void AliMUONTracker::FillESD(AliMUONVTrackStore& trackStore, AliESDEvent* esd) c
       if (matched) break;
     }
     if (matched) continue;
-    
-    AliMUONESDInterface::MUONToESD(*locTrg, esdTrack, ghostId);
+
+    AliMUONESDInterface::MUONToESD(*locTrg, esdTrack, ghostId, triggerTrack);
     
     esd->AddMuonTrack(&esdTrack);
     ghostId -= 1;
@@ -350,7 +345,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;
 }