]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONReconstructor.cxx
Reflecting changes in AliPreprocessor
[u/mrichter/AliRoot.git] / MUON / AliMUONReconstructor.cxx
index 2951114f96bb6b4fd6c936cecf9c470f8d6aaaa9..7bf15bebf075b005cc1bd3d1b2e9c5ef4d6f8117 100644 (file)
  **************************************************************************/
 /* $Id$ */
 
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-// class for MUON reconstruction                                             //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
+//-----------------------------
+// Class AliMUONReconstructor  
+//-----------------------------
+// Class for the 
+// MUON track reconstruction
 
 #include "AliMUONReconstructor.h"
 
-#include "AliESD.h"
-#include "AliESDMuonTrack.h"
-#include "AliGenEventHeader.h"
-#include "AliHeader.h"
-#include "AliLog.h"
-#include "AliMUON.h"
+#include "AliMUONConstants.h"
 #include "AliMUONCalibrationData.h"
 #include "AliMUONClusterFinderAZ.h"
-#include "AliMUONClusterFinderVS.h"
 #include "AliMUONClusterReconstructor.h"
 #include "AliMUONData.h"
 #include "AliMUONDigitCalibrator.h"
 #include "AliMUONEventRecoCombi.h" 
-#include "AliMUONRawReader.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 "AliLog.h"
 #include "AliRawReader.h"
-#include "AliRun.h"
 #include "AliRunLoader.h"
+#include "AliCDBManager.h"
+
 #include "TTask.h"
-#include <TArrayF.h>
-#include <TParticle.h>
 #include "TStopwatch.h"
 
+/// \cond CLASSIMP
 ClassImp(AliMUONReconstructor)
+/// \endcond
 
 //_____________________________________________________________________________
 AliMUONReconstructor::AliMUONReconstructor()
-  : AliReconstructor(), fCalibrationData(0x0)
+  : 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();
 
-//______________________________________________________________________________
-AliMUONReconstructor::AliMUONReconstructor(const AliMUONReconstructor& right) 
-  : AliReconstructor(right) 
-{  
-/// Protected copy constructor (not implemented)
+    // set to digit maker
+    fDigitMaker->SetCrateManager(fCrateManager);
 
-  AliFatal("Copy constructor not provided.");
+    // 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;
 }
 
-//______________________________________________________________________________
-AliMUONReconstructor& 
-AliMUONReconstructor::operator=(const AliMUONReconstructor& right)
-{
-/// Protected assignement operator (not implemented)
-
-  // check assignement to self
-  if (this == &right) return *this;
-
-  AliFatal("Assignement operator not provided.");
-    
-  return *this;  
-}    
-
 //_____________________________________________________________________________
 TTask* 
-AliMUONReconstructor::GetCalibrationTask(AliMUONData* data) const
+AliMUONReconstructor::GetCalibrationTask() const
 {
-  //
-  // Create the calibration task(s). 
-  //
-  
-  const AliRun* run = fRunLoader->GetAliRun();
+/// Create the calibration task(s). 
   
-  // Not really clean, but for the moment we must check whether the
-  // simulation has decalibrated the data or not...
-  const AliMUON* muon = static_cast<AliMUON*>(run->GetModule("MUON"));
-  if ( muon->DigitizerType().Contains("NewDigitizer") )
-  {
-    AliInfo("Calibration will occur.");
-    Int_t runNumber = run->GetRunNumber();     
-    fCalibrationData = new AliMUONCalibrationData(runNumber);
-    if ( !fCalibrationData->IsValid() )
+  //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;
     }    
-    TTask* calibration = new TTask("MUONCalibrator","MUON Digit calibrator");
-    calibration->Add(new AliMUONDigitCalibrator(data,fCalibrationData));
-    //FIXME: calibration->Add(something about dead channels should go here).
-    return calibration;
+  // 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");
   }
-  else
+  TTask* calibration = new TTask("MUONCalibrator","MUON Digit calibrator");
+  
+  TString opt(GetOption());
+  opt.ToUpper();
+  Bool_t statusMap(kTRUE);
+  
+  if ( strstr(opt,"NOSTATUSMAP") )
   {
-    AliInfo("Detected the usage of old digitizer (w/o decalibration). "
-            "Will not calibrate then.");
-    return 0x0;
+    AliWarning("Disconnecting status map : SHOULD BE USED FOR DEBUG ONLY. NOT FOR PRODUCTION !!!");
+    statusMap = kFALSE; 
   }
+  calibration->Add(new AliMUONDigitCalibrator(fMUONData,fCalibrationData,statusMap));
+  return calibration;
 }
 
 //_____________________________________________________________________________
-void
-AliMUONReconstructor::Init(AliRunLoader* runLoader)
+AliMUONClusterReconstructor*
+AliMUONReconstructor::CreateClusterReconstructor() const
 {
-  fRunLoader = runLoader;
+/// 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
+/// Reconstruct
+/// \todo add more
+
   AliLoader* loader = runLoader->GetLoader("MUONLoader");
-  Int_t nEvents = runLoader->GetNumberOfEvents();
+  Int_t nEvents     = runLoader->GetNumberOfEvents();
+  Int_t evtNumber   = runLoader->GetEventNumber();
 
-  AliMUONData* data = new AliMUONData(loader,"MUON","MUON");
+  fMUONData->SetLoader(loader);
 
 // passing loader as argument.
-  AliMUONTrackReconstructor* recoEvent = new AliMUONTrackReconstructor(loader, data);
-
-  if (strstr(GetOption(),"Original")) 
-    recoEvent->SetTrackMethod(1); // Original tracking
-  else if (strstr(GetOption(),"Combi")) 
-    recoEvent->SetTrackMethod(3); // Combined cluster / track
-  else
-    recoEvent->SetTrackMethod(2); // Kalman
+  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 = new AliMUONClusterReconstructor(data);
+  AliMUONClusterReconstructor* recoCluster = CreateClusterReconstructor();
   
   AliMUONClusterFinderVS *recModel = recoCluster->GetRecoModel();
 
@@ -160,14 +229,16 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
     recoCluster->SetRecoModel(recModel);
   }
   recModel->SetGhostChi2Cut(10);
+  recModel->SetEventNumber(evtNumber);
 
   loader->LoadDigits("READ");
   loader->LoadRecPoints("RECREATE");
   loader->LoadTracks("RECREATE");
   
-  TTask* calibration = GetCalibrationTask(data);
+  TTask* calibration = GetCalibrationTask();
   
-  Int_t chBeg = recoEvent->GetTrackMethod() == 3 ? 6 : 0; 
+  Int_t chBeg = (strstr(GetOption(),"Combi") ? 6 : 0);
+
   //   Loop over events              
   for(Int_t ievent = 0; ievent < nEvents; ievent++) {
 
@@ -179,18 +250,18 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
     if (!loader->TreeR()) loader->MakeRecPointsContainer();
      
     // tracking branch
-    if (recoEvent->GetTrackMethod() != 3) {
-      data->MakeBranch("RC");
-      data->SetTreeAddress("D,RC");
+    if (!strstr(GetOption(),"Combi")) {
+      fMUONData->MakeBranch("RC");
+      fMUONData->SetTreeAddress("D,RC");
     } else {
-      data->SetTreeAddress("D");
-      data->SetTreeAddress("RCC");
+      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
-    data->SetTreeAddress("GLT");
+    fMUONData->SetTreeAddress("GLT");
 
-    data->GetDigits();
+    fMUONData->GetDigits();
     
     if ( calibration ) 
     {
@@ -199,18 +270,18 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
     
     recoCluster->Digits2Clusters(chBeg); 
     
-    if (recoEvent->GetTrackMethod() == 3) {
+    if (strstr(GetOption(),"Combi")) {
       // Combined cluster / track finder
-      AliMUONEventRecoCombi::Instance()->FillEvent(data, (AliMUONClusterFinderAZ*)recModel);
+      AliMUONEventRecoCombi::Instance()->FillEvent(fMUONData, (AliMUONClusterFinderAZ*)recModel);
       ((AliMUONClusterFinderAZ*) recModel)->SetReco(2); 
     }
-    else data->Fill("RC"); 
+    else fMUONData->Fill("RC"); 
 
     // trigger branch
-    data->MakeBranch("TC");
-    data->SetTreeAddress("TC");
+    fMUONData->MakeBranch("TC");
+    fMUONData->SetTreeAddress("TC");
     recoCluster->Trigger2Trigger(); 
-    data->Fill("TC");
+    fMUONData->Fill("TC");
 
     //AZ loader->WriteRecPoints("OVERWRITE");
 
@@ -218,38 +289,35 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
     if (!loader->TreeT()) loader->MakeTracksContainer();
 
     // trigger branch
-    data->MakeBranch("RL"); //trigger track
-    data->SetTreeAddress("RL");
+    fMUONData->MakeBranch("RL"); //trigger track
+    fMUONData->SetTreeAddress("RL");
     recoEvent->EventReconstructTrigger();
-    data->Fill("RL");
+    fMUONData->Fill("RL");
 
     // tracking branch
-    data->MakeBranch("RT"); //track
-    data->SetTreeAddress("RT");
+    fMUONData->MakeBranch("RT"); //track
+    fMUONData->SetTreeAddress("RT");
     recoEvent->EventReconstruct();
-    data->Fill("RT");
+    fMUONData->Fill("RT");
 
     loader->WriteTracks("OVERWRITE"); 
   
-    if (recoEvent->GetTrackMethod() == 3) { 
+    if (strstr(GetOption(),"Combi")) { 
       // Combined cluster / track
       ((AliMUONClusterFinderAZ*) recModel)->SetReco(1);
-      data->MakeBranch("RC");
-      data->SetTreeAddress("RC");
-      AliMUONEventRecoCombi::Instance()->FillRecP(data, recoEvent); 
-      data->Fill("RC"); 
+      fMUONData->MakeBranch("RC");
+      fMUONData->SetTreeAddress("RC");
+      AliMUONEventRecoCombi::Instance()->FillRecP(fMUONData, (AliMUONTrackReconstructorK*)recoEvent); 
+      fMUONData->Fill("RC"); 
     }
     loader->WriteRecPoints("OVERWRITE"); 
 
     //--------------------------- Resetting branches -----------------------
-    data->ResetDigits();
-    data->ResetRawClusters();
-    data->ResetTrigger();
-
-    data->ResetRawClusters();
-    data->ResetTrigger();
-    data->ResetRecTracks();  
-    data->ResetRecTriggerTracks();
+    fMUONData->ResetDigits();
+    fMUONData->ResetRawClusters();
+    fMUONData->ResetTrigger();
+    fMUONData->ResetRecTracks();  
+    fMUONData->ResetRecTriggerTracks();
 
   }
   loader->UnloadDigits();
@@ -258,47 +326,49 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader) const
 
   delete recoCluster;
   delete recoEvent;
-  delete data;
   delete calibration;
 }
 
 //_____________________________________________________________________________
-void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* rawReader) const
+void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, 
+                                       AliRawReader* rawReader) const
 {
+/// Recontruct
+/// \todo add more
+
   //  AliLoader
   AliLoader* loader = runLoader->GetLoader("MUONLoader");
-  AliMUONData data(loader,"MUON","MUON");
+  Int_t evtNumber   = runLoader->GetEventNumber();
+  fMUONData->SetLoader(loader);
 
   // passing loader as argument.
-  AliMUONTrackReconstructor recoEvent(loader, &data);
+  fDigitMaker->SetMUONData(fMUONData);
 
-  AliMUONRawReader rawData(&data);
+  // disable trigger rawdata reading
+  if (strstr(GetOption(),"TriggerDisable"))
+      fDigitMaker->DisableTrigger();
 
-  AliMUONClusterReconstructor recoCluster(&data);
+  AliMUONClusterReconstructor* recoCluster = CreateClusterReconstructor();
+
+  AliMUONClusterFinderVS *recModel = recoCluster->GetRecoModel();
 
-  if (strstr(GetOption(),"Original")) 
-  {
-    recoEvent.SetTrackMethod(1); // Original tracking
-  }
-  else
-  {
-    recoEvent.SetTrackMethod(2); // Kalman
-  }
-  
-  AliMUONClusterFinderVS *recModel = recoCluster.GetRecoModel();
   if (!strstr(GetOption(),"VS")) 
   {
     recModel = (AliMUONClusterFinderVS*) new AliMUONClusterFinderAZ();
-    recoCluster.SetRecoModel(recModel);
+    recoCluster->SetRecoModel(recModel);
   }
   recModel->SetGhostChi2Cut(10);
-
-  TTask* calibration = GetCalibrationTask(&data);
+  recModel->SetEventNumber(evtNumber);
   
-  loader->LoadRecPoints("RECREATE");
-  loader->LoadTracks("RECREATE");
-  loader->LoadDigits("READ");
+  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;
            
@@ -306,12 +376,10 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
   TStopwatch rawTimer;
   TStopwatch calibTimer;
   TStopwatch clusterTimer;
-  TStopwatch trackingTimer;
   
   rawTimer.Start(kTRUE); rawTimer.Stop();
   calibTimer.Start(kTRUE); calibTimer.Stop();
   clusterTimer.Start(kTRUE); clusterTimer.Stop();
-  trackingTimer.Start(kTRUE); trackingTimer.Stop();
   
   totalTimer.Start(kTRUE);
   
@@ -320,17 +388,20 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
     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();
-    }
     
-    data.SetTreeAddress("D,GLT");
+    //----------------------- 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);
-    rawData.Raw2Digits(rawReader);
+    fDigitMaker->Raw2Digits(rawReader);
     rawTimer.Stop();
     
     if ( calibration )
@@ -339,73 +410,51 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
       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
-    data.MakeBranch("RC");
-    data.SetTreeAddress("RC");
-    recoCluster.Digits2Clusters(); 
-    data.Fill("RC"); 
+    fMUONData->MakeBranch("RC");
+    fMUONData->SetTreeAddress("RC");
+    recoCluster->Digits2Clusters(); 
+    fMUONData->Fill("RC"); 
 
     // trigger branch
-    data.MakeBranch("TC");
-    data.SetTreeAddress("TC");
-//    recoCluster.Trigger2Trigger(); 
-    data.Fill("TC");
+    fMUONData->MakeBranch("TC");
+    fMUONData->SetTreeAddress("TC");
+    fMUONData->Fill("TC");
     
     loader->WriteRecPoints("OVERWRITE");
 
     clusterTimer.Stop();
-
-    //---------------------------- Track & TriggerTrack ---------------------
-    trackingTimer.Start(kFALSE);
-    if (!loader->TreeT()) loader->MakeTracksContainer();
-
-    // trigger branch
-    data.MakeBranch("RL"); //trigger track
-    data.SetTreeAddress("RL");
-    recoEvent.EventReconstructTrigger();
-    data.Fill("RL");
-
-    // tracking branch
-    data.MakeBranch("RT"); //track
-    data.SetTreeAddress("RT");
-    recoEvent.EventReconstruct();
-    data.Fill("RT");
-
-    loader->WriteTracks("OVERWRITE");  
-    trackingTimer.Stop();
+    
     
     //--------------------------- Resetting branches -----------------------
-    data.ResetDigits();
-    data.ResetRawClusters();
-    data.ResetTrigger();
-
-    data.ResetRawClusters();
-    data.ResetTrigger();
-    data.ResetRecTracks();
-    data.ResetRecTriggerTracks();
-  
+    fMUONData->ResetDigits();
+    fMUONData->ResetRawClusters();
+    fMUONData->ResetTrigger();
   }
   
   totalTimer.Stop();
   
   loader->UnloadRecPoints();
-  loader->UnloadTracks();
   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("Execution time for tracking MUON : R:%.2fs C:%.2fs",
-               trackingTimer.RealTime(),trackingTimer.CpuTime()));
   AliInfo(Form("Total Execution time for Reconstruct(from raw) MUON : R:%.2fs C:%.2fs",
                totalTimer.RealTime(),totalTimer.CpuTime()));
 }
@@ -413,66 +462,47 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader, AliRawReader* ra
 //_____________________________________________________________________________
 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;
-  Double_t fitFmin;
-
-  Double_t bendingSlope, nonBendingSlope, inverseBendingMomentum;
-  Double_t xRec, yRec, zRec, chi2MatchTrigger;
+  Double_t fitFmin, chi2MatchTrigger;
+  Double_t xRec, yRec, zRec, bendingSlope, nonBendingSlope, inverseBendingMomentum;
+  Double_t xVtx, yVtx, zVtx, bendingSlopeAtVtx, nonBendingSlopeAtVtx, inverseBendingMomentumAtVtx;
   Bool_t matchTrigger;
 
   // setting pointer for tracks, triggertracks & trackparam at vertex
   AliMUONTrack* recTrack = 0;
-  AliMUONTrackParam* trackParam = 0;
+  AliMUONTrackParam trackParamAtVtx;
   AliMUONTriggerTrack* recTriggerTrack = 0;
-//   TParticle* particle = new TParticle();
-//   AliGenEventHeader* header = 0;
+
   iEvent = runLoader->GetEventNumber(); 
   runLoader->GetEvent(iEvent);
 
   // Get vertex 
   Double_t vertex[3] = {0};
   const AliESDVertex *esdVert = esd->GetVertex(); 
-  if (esdVert) esdVert->GetXYZ(vertex);
-  
-  //  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;
-//       }
-//     }
-//   }
+  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) 
@@ -482,9 +512,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)
@@ -495,29 +525,53 @@ void AliMUONReconstructor::FillESD(AliRunLoader* runLoader, AliESD* esd) const
 
     // reading info from tracks
     recTrack = (AliMUONTrack*) recTracksArray->At(iRecTracks);
-
-    trackParam = (AliMUONTrackParam*) (recTrack->GetTrackParamAtHit())->First();
-    trackParam->ExtrapToVertex(vertex[0],vertex[1],vertex[2]);
-
-    bendingSlope            = trackParam->GetBendingSlope();
-    nonBendingSlope         = trackParam->GetNonBendingSlope();
+    AliMUONTrackParam *trackParam = (AliMUONTrackParam*) (recTrack->GetTrackParamAtHit())->First();
+    trackParamAtVtx = *trackParam;
+   
+    // extrapolate to the vertex if available, else to (0,0,0)
+    if (esdVert->GetNContributors())
+      AliMUONTrackExtrap::ExtrapToVertex(&trackParamAtVtx, vertex[0],vertex[1],vertex[2]);
+    else
+      AliMUONTrackExtrap::ExtrapToVertex(&trackParamAtVtx, 0.,0.,0.);
+    
+    // Track parameters at first station
+    bendingSlope           = trackParam->GetBendingSlope();
+    nonBendingSlope        = trackParam->GetNonBendingSlope();
     inverseBendingMomentum = trackParam->GetInverseBendingMomentum();
-    xRec  = trackParam->GetNonBendingCoor();
-    yRec  = trackParam->GetBendingCoor();
-    zRec  = trackParam->GetZ();
-
+    xRec = trackParam->GetNonBendingCoor();
+    yRec = trackParam->GetBendingCoor();
+    zRec = trackParam->GetZ();
+    
+    // Track parameters at vertex
+    bendingSlopeAtVtx           = trackParamAtVtx.GetBendingSlope();
+    nonBendingSlopeAtVtx        = trackParamAtVtx.GetNonBendingSlope();
+    inverseBendingMomentumAtVtx = trackParamAtVtx.GetInverseBendingMomentum();
+    xVtx = trackParamAtVtx.GetNonBendingCoor();
+    yVtx = trackParamAtVtx.GetBendingCoor();
+    zVtx = trackParamAtVtx.GetZ();
+    
+    // Global info
     nTrackHits       = recTrack->GetNTrackHits();
     fitFmin          = recTrack->GetFitFMin();
     matchTrigger     = recTrack->GetMatchTrigger();
     chi2MatchTrigger = recTrack->GetChi2MatchTrigger();
 
     // setting data member of ESD MUON
-    theESDTrack->SetInverseBendingMomentum(inverseBendingMomentum);
-    theESDTrack->SetThetaX(TMath::ATan(nonBendingSlope));
-    theESDTrack->SetThetaY(TMath::ATan(bendingSlope));
-    theESDTrack->SetZ(zRec);
-    theESDTrack->SetBendingCoor(yRec); // calculate vertex at ESD or Tracking level ?
-    theESDTrack->SetNonBendingCoor(xRec);
+    // at first station
+    theESDTrack->SetInverseBendingMomentumUncorrected(inverseBendingMomentum);
+    theESDTrack->SetThetaXUncorrected(TMath::ATan(nonBendingSlope));
+    theESDTrack->SetThetaYUncorrected(TMath::ATan(bendingSlope));
+    theESDTrack->SetZUncorrected(zRec);
+    theESDTrack->SetBendingCoorUncorrected(yRec);
+    theESDTrack->SetNonBendingCoorUncorrected(xRec);
+    // at vertex
+    theESDTrack->SetInverseBendingMomentum(inverseBendingMomentumAtVtx);
+    theESDTrack->SetThetaX(TMath::ATan(nonBendingSlopeAtVtx));
+    theESDTrack->SetThetaY(TMath::ATan(bendingSlopeAtVtx));
+    theESDTrack->SetZ(zVtx);
+    theESDTrack->SetBendingCoor(yVtx);
+    theESDTrack->SetNonBendingCoor(xVtx);
+    // global info
     theESDTrack->SetChi2(fitFmin);
     theESDTrack->SetNHit(nTrackHits);
     theESDTrack->SetMatchTrigger(matchTrigger);
@@ -528,24 +582,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;
+
+}