]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONReconstructor.cxx
Check we get everything from OCDB even before starting, and correctly deleting calibr...
[u/mrichter/AliRoot.git] / MUON / AliMUONReconstructor.cxx
index c32ab8bafbb43724d4324aefff151b15831edb0d..6c01d109252edca75399a868c52190bb5aff119f 100644 (file)
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
 /* $Id$ */
 
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// class for MUON reconstruction                                             //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-#include <TParticle.h>
-#include <TArrayF.h>
+//-----------------------------
+// Class AliMUONReconstructor  
+//-----------------------------
+// Class for the 
+// MUON track reconstruction
 
-#include "AliRunLoader.h"
-#include "AliHeader.h"
-#include "AliGenEventHeader.h"
-#include "AliESD.h"
+#include "AliMUONReconstructor.h"
 
-#include "AliMUONData.h"
-#include "AliMUONEventReconstructor.h"
+#include "AliMUONConstants.h"
+#include "AliMUONCalibrationData.h"
+#include "AliMUONClusterFinderAZ.h"
 #include "AliMUONClusterReconstructor.h"
-#include "AliMUONTriggerDecision.h"
-#include "AliMUONClusterFinderVS.h"
+#include "AliMUONData.h"
+#include "AliMUONDigitCalibrator.h"
+#include "AliMUONEventRecoCombi.h" 
+#include "AliMUONDigitMaker.h"
 #include "AliMUONTrack.h"
 #include "AliMUONTrackParam.h"
+#include "AliMUONTrackExtrap.h"
+#include "AliMUONTracker.h"
+#include "AliMUONVTrackReconstructor.h"
+#include "AliMUONTrackReconstructor.h"
+#include "AliMUONTrackReconstructorK.h"
 #include "AliMUONTriggerTrack.h"
+#include "AliMUONTriggerCircuit.h"
+#include "AliMUONTriggerCrateStore.h"
+#include "AliMUONSegFactory.h"
+#include "AliMUONSegmentation.h"
+#include "AliMUONPreClusterFinder.h"
+#include "AliMUONClusterFinderCOG.h"
+#include "AliMUONClusterFinderSimpleFit.h"
+#include "AliMUONClusterFinderMLEM.h"
+
+#include "AliESD.h"
 #include "AliESDMuonTrack.h"
-#include "AliMUONReconstructor.h"
+#include "AliLog.h"
+#include "AliRawReader.h"
+#include "AliRunLoader.h"
+#include "AliCDBManager.h"
 
+#include "TTask.h"
+#include "TStopwatch.h"
+
+/// \cond CLASSIMP
 ClassImp(AliMUONReconstructor)
+/// \endcond
+
 //_____________________________________________________________________________
 AliMUONReconstructor::AliMUONReconstructor()
-  : AliReconstructor()
+  : AliReconstructor(), 
+    fDigitMaker(new AliMUONDigitMaker()), 
+    fCalibrationData(0x0),
+    fCrateManager(new AliMUONTriggerCrateStore()),
+    fTriggerCircuit(new TClonesArray("AliMUONTriggerCircuit", 234)),
+    fTransformer(new AliMUONGeometryTransformer(kTRUE)),
+    fSegmentation(0x0),
+    fMUONData(new AliMUONData(0x0,"MUON","MUON"))
 {
+/// Default constructor
+
+    AliDebug(1,"");
+    // Crate manager
+    fCrateManager->ReadFromFile();
+
+    // set to digit maker
+    fDigitMaker->SetCrateManager(fCrateManager);
+
+    // transformater
+    fTransformer->ReadGeometryData("volpath.dat", "geometry.root");
+    
+    // create segmentation and pass it to EventRecoCombi
+    AliMUONSegFactory factory(fTransformer);
+    fSegmentation = factory.CreateSegmentation();
+    AliMUONEventRecoCombi::Instance(fSegmentation); 
+
+    // trigger circuit
+    for (Int_t i = 0; i < AliMUONConstants::NTriggerCircuit(); i++)  {
+      AliMUONTriggerCircuit* c = new AliMUONTriggerCircuit();
+      c->SetTransformer(fTransformer);
+      c->Init(i,*fCrateManager);
+      TClonesArray& circuit = *fTriggerCircuit;
+      new(circuit[circuit.GetEntriesFast()])AliMUONTriggerCircuit(*c);
+      delete c;
+    }
+
+  
 }
+
 //_____________________________________________________________________________
 AliMUONReconstructor::~AliMUONReconstructor()
 {
+/// Destructor
+
+  AliDebug(1,"");
+  delete fCalibrationData;
+  delete fDigitMaker;
+  delete fCrateManager;
+  delete fTriggerCircuit;
+  delete fTransformer;
+  delete fSegmentation;
+  delete fMUONData;
+}
+
+//_____________________________________________________________________________
+TTask* 
+AliMUONReconstructor::GetCalibrationTask() const
+{
+/// Create the calibration task(s). 
+  
+  //const AliRun* run = fRunLoader->GetAliRun();
+  //Int_t runNumber = run->GetRunNumber();     
+  Int_t runNumber = AliCDBManager::Instance()->GetRun();
+  AliInfo("Calibration will occur.");
+  fCalibrationData = new AliMUONCalibrationData(runNumber);
+  if ( !fCalibrationData->IsValid() )
+    {
+      AliError("Could not retrieve calibrations !");
+      delete fCalibrationData;
+      fCalibrationData = 0x0;
+      return 0x0;
+    }    
+  // Check that we get all the calibrations we'll need
+  if ( !fCalibrationData->Pedestals() ||
+       !fCalibrationData->Gains() ||
+       !fCalibrationData->HV() )
+  {
+    AliFatal("Could not access all required calibration data");
+  }
+  TTask* calibration = new TTask("MUONCalibrator","MUON Digit calibrator");
+  
+  TString opt(GetOption());
+  opt.ToUpper();
+  Bool_t statusMap(kTRUE);
+  
+  if ( strstr(opt,"NOSTATUSMAP") )
+  {
+    AliWarning("Disconnecting status map : SHOULD BE USED FOR DEBUG ONLY. NOT FOR PRODUCTION !!!");
+    statusMap = kFALSE; 
+  }
+  calibration->Add(new AliMUONDigitCalibrator(fMUONData,fCalibrationData,statusMap));
+  return calibration;
+}
+
+//_____________________________________________________________________________
+AliMUONClusterReconstructor*
+AliMUONReconstructor::CreateClusterReconstructor() const
+{
+/// Create cluster reconstructor
+
+  AliMUONVClusterFinder* clusterFinder(0x0);
+  
+  TString opt(GetOption());
+  opt.ToUpper();
+  
+  if ( strstr(opt,"PRECLUSTER") )
+  {
+    clusterFinder = new AliMUONPreClusterFinder;
+  }  
+  else if ( strstr(opt,"COG") )
+  {
+    clusterFinder = new AliMUONClusterFinderCOG;
+  }  
+  else if ( strstr(opt,"SIMPLEFIT") )
+  {
+    clusterFinder = new AliMUONClusterFinderSimpleFit;
+  }
+  else if ( strstr(opt,"MLEM:DRAW") )
+  {
+    clusterFinder = new AliMUONClusterFinderMLEM(kTRUE);
+  }
+  else if ( strstr(opt,"MLEM") )
+  {
+    clusterFinder = new AliMUONClusterFinderMLEM(kFALSE);
+  } 
+  
+  if ( clusterFinder) 
+  {
+    AliInfo(Form("Will use %s for clusterizing",clusterFinder->ClassName()));
+  }
+  
+  AliMUONClusterReconstructor* clusterReco = 
+    new AliMUONClusterReconstructor(fMUONData,clusterFinder,fTransformer);
+  return clusterReco;
 }
+
 //_____________________________________________________________________________
 void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
 {
-//  AliLoader
-  AliLoader* loader = runLoader->GetLoader("MUONLoader");
-  Int_t nEvents = runLoader->GetNumberOfEvents();
+/// Reconstruct
+/// \todo add more
 
-// used local container for each method
-// passing fLoader as argument, could be avoided ???
-  AliMUONEventReconstructor* recoEvent = new AliMUONEventReconstructor(loader);
-  AliMUONData* dataEvent = recoEvent->GetMUONData();
+  AliLoader* loader = runLoader->GetLoader("MUONLoader");
+  Int_t nEvents     = runLoader->GetNumberOfEvents();
+  Int_t evtNumber   = runLoader->GetEventNumber();
 
-  AliMUONClusterReconstructor* recoCluster = new AliMUONClusterReconstructor(loader);
-  AliMUONData* dataCluster = recoCluster->GetMUONData();
+  fMUONData->SetLoader(loader);
 
-  AliMUONTriggerDecision* trigDec = new AliMUONTriggerDecision(loader);
-  AliMUONData* dataTrig = trigDec->GetMUONData();
+// passing loader as argument.
+  AliMUONVTrackReconstructor* recoEvent;
+  if (strstr(GetOption(),"Original")) recoEvent = new AliMUONTrackReconstructor(fMUONData);
+  else if (strstr(GetOption(),"Combi")) recoEvent = new AliMUONTrackReconstructorK(fMUONData,"Combi");
+  else recoEvent = new AliMUONTrackReconstructorK(fMUONData,"Kalman");
+  
+  recoEvent->SetTriggerCircuit(fTriggerCircuit);
 
+  AliMUONClusterReconstructor* recoCluster = CreateClusterReconstructor();
+  
+  AliMUONClusterFinderVS *recModel = recoCluster->GetRecoModel();
 
-  for (Int_t i = 0; i < 10; i++) {
-    AliMUONClusterFinderVS *recModel = new AliMUONClusterFinderVS();
-    recModel->SetGhostChi2Cut(10);
-    recoCluster->SetReconstructionModel(i,recModel);
-  } 
+  if (!strstr(GetOption(),"VS")) {
+    recModel = (AliMUONClusterFinderVS*) new AliMUONClusterFinderAZ();
+    recoCluster->SetRecoModel(recModel);
+  }
+  recModel->SetGhostChi2Cut(10);
+  recModel->SetEventNumber(evtNumber);
 
   loader->LoadDigits("READ");
   loader->LoadRecPoints("RECREATE");
   loader->LoadTracks("RECREATE");
   
+  TTask* calibration = GetCalibrationTask();
+  
+  Int_t chBeg = (strstr(GetOption(),"Combi") ? 6 : 0);
+
   //   Loop over events              
   for(Int_t ievent = 0; ievent < nEvents; ievent++) {
-    printf("Event %d\n",ievent);
+
+    AliDebug(1,Form("Event %d",ievent));
+    
     runLoader->GetEvent(ievent);
 
-    //----------------------- digit2cluster & Digits2Trigger -------------------
+    //----------------------- digit2cluster & Trigger2Trigger -------------------
     if (!loader->TreeR()) loader->MakeRecPointsContainer();
      
     // tracking branch
-    dataCluster->MakeBranch("RC");
-    dataCluster->SetTreeAddress("D,RC");
-    recoCluster->Digits2Clusters(); 
-    dataCluster->Fill("RC"); 
+    if (!strstr(GetOption(),"Combi")) {
+      fMUONData->MakeBranch("RC");
+      fMUONData->SetTreeAddress("D,RC");
+    } else {
+      fMUONData->SetTreeAddress("D");
+      fMUONData->SetTreeAddress("RCC");
+    }
+    // Important for avoiding a memory leak when reading digits ( to be investigated more in detail)
+    // In any case the reading of GLT is needed for the Trigger2Tigger method below
+    fMUONData->SetTreeAddress("GLT");
+
+    fMUONData->GetDigits();
+    
+    if ( calibration ) 
+    {
+      calibration->ExecuteTask();
+    }
+    
+    recoCluster->Digits2Clusters(chBeg); 
+    
+    if (strstr(GetOption(),"Combi")) {
+      // Combined cluster / track finder
+      AliMUONEventRecoCombi::Instance()->FillEvent(fMUONData, (AliMUONClusterFinderAZ*)recModel);
+      ((AliMUONClusterFinderAZ*) recModel)->SetReco(2); 
+    }
+    else fMUONData->Fill("RC"); 
 
     // trigger branch
-    dataTrig->MakeBranch("GLT");
-    dataTrig->SetTreeAddress("D,GLT");
-    trigDec->Digits2Trigger(); 
-    dataTrig->Fill("GLT");
+    fMUONData->MakeBranch("TC");
+    fMUONData->SetTreeAddress("TC");
+    recoCluster->Trigger2Trigger(); 
+    fMUONData->Fill("TC");
 
-    loader->WriteRecPoints("OVERWRITE");
+    //AZ loader->WriteRecPoints("OVERWRITE");
 
     //---------------------------- Track & TriggerTrack ---------------------
     if (!loader->TreeT()) loader->MakeTracksContainer();
 
     // trigger branch
-    dataEvent->MakeBranch("RL"); //trigger track
-    dataEvent->SetTreeAddress("RL");
+    fMUONData->MakeBranch("RL"); //trigger track
+    fMUONData->SetTreeAddress("RL");
     recoEvent->EventReconstructTrigger();
-    dataEvent->Fill("RL");
+    fMUONData->Fill("RL");
 
     // tracking branch
-    dataEvent->MakeBranch("RT"); //track
-    dataEvent->SetTreeAddress("RT");
+    fMUONData->MakeBranch("RT"); //track
+    fMUONData->SetTreeAddress("RT");
     recoEvent->EventReconstruct();
-    dataEvent->Fill("RT");
+    fMUONData->Fill("RT");
 
-    loader->WriteTracks("OVERWRITE");  
+    loader->WriteTracks("OVERWRITE"); 
   
-    //--------------------------- Resetting branches -----------------------
-    dataCluster->ResetDigits();
-    dataCluster->ResetRawClusters();
+    if (strstr(GetOption(),"Combi")) { 
+      // Combined cluster / track
+      ((AliMUONClusterFinderAZ*) recModel)->SetReco(1);
+      fMUONData->MakeBranch("RC");
+      fMUONData->SetTreeAddress("RC");
+      AliMUONEventRecoCombi::Instance()->FillRecP(fMUONData, (AliMUONTrackReconstructorK*)recoEvent); 
+      fMUONData->Fill("RC"); 
+    }
+    loader->WriteRecPoints("OVERWRITE"); 
 
-    dataTrig->ResetDigits();
-    dataTrig->ResetTrigger();
+    //--------------------------- Resetting branches -----------------------
+    fMUONData->ResetDigits();
+    fMUONData->ResetRawClusters();
+    fMUONData->ResetTrigger();
+    fMUONData->ResetRecTracks();  
+    fMUONData->ResetRecTriggerTracks();
 
-    dataEvent->ResetRawClusters();
-    dataEvent->ResetTrigger();
-    dataEvent->ResetRecTracks();
-    dataEvent->ResetRecTriggerTracks();
-  
   }
   loader->UnloadDigits();
   loader->UnloadRecPoints();
@@ -136,23 +326,156 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
 
   delete recoCluster;
   delete recoEvent;
-  delete trigDec;
+  delete calibration;
 }
+
+//_____________________________________________________________________________
+void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, 
+                                       AliRawReader* rawReader) const
+{
+/// Recontruct
+/// \todo add more
+
+  //  AliLoader
+  AliLoader* loader = runLoader->GetLoader("MUONLoader");
+  Int_t evtNumber   = runLoader->GetEventNumber();
+  fMUONData->SetLoader(loader);
+
+  // passing loader as argument.
+  fDigitMaker->SetMUONData(fMUONData);
+
+  // disable trigger rawdata reading
+  if (strstr(GetOption(),"TriggerDisable"))
+      fDigitMaker->DisableTrigger();
+
+  AliMUONClusterReconstructor* recoCluster = CreateClusterReconstructor();
+
+  AliMUONClusterFinderVS *recModel = recoCluster->GetRecoModel();
+
+  if (!strstr(GetOption(),"VS")) 
+  {
+    recModel = (AliMUONClusterFinderVS*) new AliMUONClusterFinderAZ();
+    recoCluster->SetRecoModel(recModel);
+  }
+  recModel->SetGhostChi2Cut(10);
+  recModel->SetEventNumber(evtNumber);
+  
+  TTask* calibration = GetCalibrationTask();
+  
+  loader->LoadRecPoints("RECREATE");
+  // Digits are not stored on disk and created on flight from rawdata.
+  // In order to write digits on disk the following line should be uncommented
+  // loader->LoadDigits("RECREATE"); 
+
+  //   Loop over events  
+  Int_t iEvent = 0;
+           
+  TStopwatch totalTimer;
+  TStopwatch rawTimer;
+  TStopwatch calibTimer;
+  TStopwatch clusterTimer;
+  
+  rawTimer.Start(kTRUE); rawTimer.Stop();
+  calibTimer.Start(kTRUE); calibTimer.Stop();
+  clusterTimer.Start(kTRUE); clusterTimer.Stop();
+  
+  totalTimer.Start(kTRUE);
+  
+  while (rawReader->NextEvent()) 
+  {
+    AliDebug(1,Form("Event %d",iEvent));
+    
+    runLoader->GetEvent(iEvent++);
+    
+    //----------------------- raw2digits & raw2trigger-------------------
+    //  if (!loader->TreeD()) 
+    //  {
+    //    AliDebug(1,Form("Making Digit Container for event %d",iEvent));
+    //    loader->MakeDigitsContainer();
+    //  }
+    //  Digits are not stored on disk and created on flight from rawdata.
+    //  In order to write digits on disk the following lines should be uncommented
+    //  fMUONData->MakeBranch("D,GLT");
+    //  fMUONData->SetTreeAddress("D,GLT");
+    fMUONData->SetDataContainer("D, GLT");
+    rawTimer.Start(kFALSE);
+    fDigitMaker->Raw2Digits(rawReader);
+    rawTimer.Stop();
+    
+    if ( calibration )
+    {
+      calibTimer.Start(kFALSE);
+      calibration->ExecuteTask();
+      calibTimer.Stop();
+    }
+    // Digits are not stored on disk and created on flight from rawdata.
+    // In order to write digits on disk the following lines should be uncommented
+    // fMUONData->Fill("D,GLT");
+    // loader->WriteDigits("OVERWRITE");
+    //----------------------- digit2cluster & Trigger2Trigger -------------------
+    clusterTimer.Start(kFALSE);
+
+    if (!loader->TreeR()) loader->MakeRecPointsContainer();
+    
+    // tracking branch
+    fMUONData->MakeBranch("RC");
+    fMUONData->SetTreeAddress("RC");
+    recoCluster->Digits2Clusters(); 
+    fMUONData->Fill("RC"); 
+
+    // trigger branch
+    fMUONData->MakeBranch("TC");
+    fMUONData->SetTreeAddress("TC");
+    fMUONData->Fill("TC");
+    
+    loader->WriteRecPoints("OVERWRITE");
+
+    clusterTimer.Stop();
+    
+    
+    //--------------------------- Resetting branches -----------------------
+    fMUONData->ResetDigits();
+    fMUONData->ResetRawClusters();
+    fMUONData->ResetTrigger();
+  }
+  
+  totalTimer.Stop();
+  
+  loader->UnloadRecPoints();
+  loader->UnloadDigits();
+  
+  delete recoCluster;
+  delete calibration;
+  
+  AliInfo(Form("Execution time for converting RAW data to digits in MUON : R:%.2fs C:%.2fs",
+               rawTimer.RealTime(),rawTimer.CpuTime()));
+  AliInfo(Form("Execution time for calibrating MUON : R:%.2fs C:%.2fs",
+               calibTimer.RealTime(),calibTimer.CpuTime()));
+  AliInfo(Form("Execution time for clusterizing MUON : R:%.2fs C:%.2fs",
+               clusterTimer.RealTime(),clusterTimer.CpuTime()));
+  AliInfo(Form("Total Execution time for Reconstruct(from raw) MUON : R:%.2fs C:%.2fs",
+               totalTimer.RealTime(),totalTimer.CpuTime()));
+}
+
 //_____________________________________________________________________________
 void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 {
+/// Fill ESD
+/// \todo add more
+
   TClonesArray* recTracksArray = 0;
   TClonesArray* recTrigTracksArray = 0;
   
   AliLoader* loader = runLoader->GetLoader("MUONLoader");
   loader->LoadTracks("READ");
-  AliMUONData* muonData = new AliMUONData(loader,"MUON","MUON");
+  fMUONData->SetLoader(loader);
 
    // declaration  
-  Int_t iEvent, nPart;
-  Int_t nTrackHits, nPrimary;
+  Int_t iEvent;// nPart;
+  Int_t nTrackHits;// nPrimary;
   Double_t fitFmin;
-  TArrayF vertex(3);
 
   Double_t bendingSlope, nonBendingSlope, inverseBendingMomentum;
   Double_t xRec, yRec, zRec, chi2MatchTrigger;
@@ -160,45 +483,27 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 
   // setting pointer for tracks, triggertracks & trackparam at vertex
   AliMUONTrack* recTrack = 0;
-  AliMUONTrackParam* trackParam = 0;
+  AliMUONTrackParam trackParam;
   AliMUONTriggerTrack* recTriggerTrack = 0;
-  TParticle* particle = new TParticle();
-  AliGenEventHeader* header = 0;
+
   iEvent = runLoader->GetEventNumber(); 
   runLoader->GetEvent(iEvent);
 
-  // vertex calculation (maybe it exists already somewhere else)
-  vertex[0] = vertex[1] = vertex[2] = 0.;
-  nPrimary = 0;
-  if ( (header = runLoader->GetHeader()->GenEventHeader()) ) {
-    header->PrimaryVertex(vertex);
-  } else {
-    runLoader->LoadKinematics("READ");
-    runLoader->TreeK()->GetBranch("Particles")->SetAddress(&particle);
-    nPart = (Int_t)runLoader->TreeK()->GetEntries();
-    for(Int_t iPart = 0; iPart < nPart; iPart++) {
-      runLoader->TreeK()->GetEvent(iPart);
-      if (particle->GetFirstMother() == -1) {
-       vertex[0] += particle->Vx();
-       vertex[1] += particle->Vy();
-       vertex[2] += particle->Vz();
-       nPrimary++;
-      }
-      if (nPrimary) {
-       vertex[0] /= (double)nPrimary;
-       vertex[1] /= (double)nPrimary;
-       vertex[2] /= (double)nPrimary;
-      }
-    }
+  // Get vertex 
+  Double_t vertex[3] = {0};
+  const AliESDVertex *esdVert = esd->GetVertex(); 
+  if (esdVert->GetNContributors()) {
+    esdVert->GetXYZ(vertex);
+    AliDebug(1, "find vertex\n");
   }
   // setting ESD MUON class
   AliESDMuonTrack* theESDTrack = new  AliESDMuonTrack() ;
 
   //-------------------- trigger tracks-------------
   Long_t trigPat = 0;
-  muonData->SetTreeAddress("RL");
-  muonData->GetRecTriggerTracks();
-  recTrigTracksArray = muonData->RecTriggerTracks();
+  fMUONData->SetTreeAddress("RL");
+  fMUONData->GetRecTriggerTracks();
+  recTrigTracksArray = fMUONData->RecTriggerTracks();
 
   // ready global trigger pattern from first track
   if (recTrigTracksArray) 
@@ -208,9 +513,9 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
   //printf(">>> Event %d Number of Recconstructed tracks %d \n",iEvent, nrectracks);
  
   // -------------------- tracks-------------
-  muonData->SetTreeAddress("RT");
-  muonData->GetRecTracks();
-  recTracksArray = muonData->RecTracks();
+  fMUONData->SetTreeAddress("RT");
+  fMUONData->GetRecTracks();
+  recTracksArray = fMUONData->RecTracks();
         
   Int_t nRecTracks = 0;
   if (recTracksArray)
@@ -222,14 +527,23 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
     // reading info from tracks
     recTrack = (AliMUONTrack*) recTracksArray->At(iRecTracks);
 
-    trackParam = recTrack->GetTrackParamAtVertex();
-
-    bendingSlope            = trackParam->GetBendingSlope();
-    nonBendingSlope         = trackParam->GetNonBendingSlope();
-    inverseBendingMomentum = trackParam->GetInverseBendingMomentum();
-    xRec  = trackParam->GetNonBendingCoor();
-    yRec  = trackParam->GetBendingCoor();
-    zRec  = trackParam->GetZ();
+    trackParam = *((AliMUONTrackParam*) (recTrack->GetTrackParamAtHit())->First());
+   
+    // extrapolate to the vertex if required
+    //   if the vertex is not available, extrapolate to (0,0,0)
+    if (!strstr(GetOption(),"NoExtrapToVtx")) {
+      if (esdVert->GetNContributors())
+        AliMUONTrackExtrap::ExtrapToVertex(&trackParam, vertex[0],vertex[1],vertex[2]);
+      else
+        AliMUONTrackExtrap::ExtrapToVertex(&trackParam, 0.,0.,0.);
+    }
+    
+    bendingSlope            = trackParam.GetBendingSlope();
+    nonBendingSlope         = trackParam.GetNonBendingSlope();
+    inverseBendingMomentum  = trackParam.GetInverseBendingMomentum();
+    xRec  = trackParam.GetNonBendingCoor();
+    yRec  = trackParam.GetBendingCoor();
+    zRec  = trackParam.GetZ();
 
     nTrackHits       = recTrack->GetNTrackHits();
     fitFmin          = recTrack->GetFitFMin();
@@ -240,9 +554,9 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
     theESDTrack->SetInverseBendingMomentum(inverseBendingMomentum);
     theESDTrack->SetThetaX(TMath::ATan(nonBendingSlope));
     theESDTrack->SetThetaY(TMath::ATan(bendingSlope));
-    theESDTrack->SetZ(vertex[2]);
-    theESDTrack->SetBendingCoor(vertex[1]); // calculate vertex at ESD or Tracking level ?
-    theESDTrack->SetNonBendingCoor(vertex[0]);
+    theESDTrack->SetZ(zRec);
+    theESDTrack->SetBendingCoor(yRec); // calculate vertex at ESD or Tracking level ?
+    theESDTrack->SetNonBendingCoor(xRec);
     theESDTrack->SetChi2(fitFmin);
     theESDTrack->SetNHit(nTrackHits);
     theESDTrack->SetMatchTrigger(matchTrigger);
@@ -253,19 +567,41 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
       esd->AddMuonTrack(theESDTrack);
   } // end loop tracks
 
-  // add global trigger pattern
-  if (nRecTracks != 0)  
-    esd->SetTrigger(trigPat);
-
   // reset muondata
-  muonData->ResetRecTracks();
-  muonData->ResetRecTriggerTracks();
+  fMUONData->ResetRecTracks();
+  fMUONData->ResetRecTriggerTracks();
 
   //} // end loop on event  
   loader->UnloadTracks(); 
-  if (!header)
-    runLoader->UnloadKinematics();
+
   delete theESDTrack;
-  delete muonData;
-  // delete particle;
+}
+
+//_____________________________________________________________________________
+void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliRawReader* /*rawReader*/, AliESD* esd) const
+{
+/// Fill ESD
+/// \todo add more
+
+  // don't need rawReader ???
+  FillESD(runLoader, esd);
+}
+
+//_____________________________________________________________________________
+AliTracker* AliMUONReconstructor::CreateTracker(AliRunLoader* runLoader) const
+{
+  /// create tracker for MUON
+  /// go into the tracking framework finally (Ch.F)
+  AliLoader* loader = runLoader->GetLoader("MUONLoader");
+
+  fMUONData->SetLoader(loader);
+
+  AliMUONTracker* tracker = new AliMUONTracker();
+  tracker->SetMUONData(fMUONData);
+  tracker->SetTriggerCircuit(fTriggerCircuit);
+  tracker->SetOption(GetOption());
+
+  return tracker;
+
 }