]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliReconstruction.cxx
Functionality to create AOD files from ESD files added in AliReconstruction.
[u/mrichter/AliRoot.git] / STEER / AliReconstruction.cxx
index b2725506781cc8e50a2b0f2fd45139c87bb90a84..8ed90819babdf5e825ff4e8d71164a5ac4b669b0 100644 (file)
 // The index -1 (default) can be used for the last event to indicate no      //
 // upper limit of the event range.                                           //
 //                                                                           //
+// In case of raw-data reconstruction the user can modify the default        //
+// number of events per digits/clusters/tracks file. In case the option      //
+// is not used the number is set 1. In case the user provides 0, than        //
+// the number of events is equal to the number of events inside the          //
+// raw-data file (i.e. one digits/clusters/tracks file):                     //
+//                                                                           //
+//   rec.SetNumberOfEventsPerFile(...);                                      //
+//                                                                           //
+//                                                                           //
 // The name of the galice file can be changed from the default               //
 // "galice.root" by passing it as argument to the AliReconstruction          //
 // constructor or by                                                         //
 #include "AliRawReaderFile.h"
 #include "AliRawReaderDate.h"
 #include "AliRawReaderRoot.h"
+#include "AliRawEventHeaderBase.h"
 #include "AliESD.h"
 #include "AliESDfriend.h"
 #include "AliESDVertex.h"
+#include "AliMultiplicity.h"
 #include "AliTracker.h"
 #include "AliVertexer.h"
 #include "AliVertexerTracks.h"
+#include "AliV0vertexer.h"
+#include "AliCascadeVertexer.h"
 #include "AliHeader.h"
 #include "AliGenEventHeader.h"
 #include "AliPID.h"
 #include "AliCentralTrigger.h"
 #include "AliCTPRawStream.h"
 
+#include "AliAODEvent.h"
+#include "AliAODHeader.h"
+#include "AliAODTrack.h"
+#include "AliAODVertex.h"
+#include "AliAODCluster.h"
+
+
 ClassImp(AliReconstruction)
 
 
 //_____________________________________________________________________________
-const char* AliReconstruction::fgkDetectorName[AliReconstruction::fgkNDetectors] = {"ITS", "TPC", "TRD", "TOF", "PHOS", "RICH", "EMCAL", "MUON", "FMD", "ZDC", "PMD", "START", "VZERO", "CRT", "HLT"};
+const char* AliReconstruction::fgkDetectorName[AliReconstruction::fgkNDetectors] = {"ITS", "TPC", "TRD", "TOF", "PHOS", "HMPID", "EMCAL", "MUON", "FMD", "ZDC", "PMD", "T0", "VZERO", "ACORDE", "HLT"};
 
 //_____________________________________________________________________________
 AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdbUri,
@@ -160,9 +180,11 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdb
   fUniformField(kTRUE),
   fRunVertexFinder(kTRUE),
   fRunHLTTracking(kFALSE),
+  fRunMuonTracking(kFALSE),
   fStopOnError(kFALSE),
   fWriteAlignmentData(kFALSE),
   fWriteESDfriend(kFALSE),
+  fWriteAOD(kFALSE),
   fFillTriggerESD(kTRUE),
 
   fRunLocalReconstruction("ALL"),
@@ -173,6 +195,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdb
   fEquipIdMap(""),
   fFirstEvent(0),
   fLastEvent(-1),
+  fNumberOfEventsPerFile(1),
   fCheckPointLevel(0),
   fOptions(),
   fLoadAlignFromCDB(kTRUE),
@@ -182,6 +205,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdb
   fRawReader(NULL),
 
   fVertexer(NULL),
+  fDiamondProfile(NULL),
 
   fAlignObjArray(NULL),
   fCDBUri(cdbUri),
@@ -204,9 +228,11 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fUniformField(rec.fUniformField),
   fRunVertexFinder(rec.fRunVertexFinder),
   fRunHLTTracking(rec.fRunHLTTracking),
+  fRunMuonTracking(rec.fRunMuonTracking),
   fStopOnError(rec.fStopOnError),
   fWriteAlignmentData(rec.fWriteAlignmentData),
   fWriteESDfriend(rec.fWriteESDfriend),
+  fWriteAOD(rec.fWriteAOD),
   fFillTriggerESD(rec.fFillTriggerESD),
 
   fRunLocalReconstruction(rec.fRunLocalReconstruction),
@@ -217,6 +243,7 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fEquipIdMap(rec.fEquipIdMap),
   fFirstEvent(rec.fFirstEvent),
   fLastEvent(rec.fLastEvent),
+  fNumberOfEventsPerFile(rec.fNumberOfEventsPerFile),
   fCheckPointLevel(0),
   fOptions(),
   fLoadAlignFromCDB(rec.fLoadAlignFromCDB),
@@ -226,6 +253,7 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fRawReader(NULL),
 
   fVertexer(NULL),
+  fDiamondProfile(NULL),
 
   fAlignObjArray(rec.fAlignObjArray),
   fCDBUri(rec.fCDBUri),
@@ -283,22 +311,22 @@ void AliReconstruction::InitCDBStorage()
     fCDBUri = "";
   }
   else {
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    AliWarning(Form("Default CDB storage is set to: %s",fCDBUri.Data()));
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2, Form("Default CDB storage is set to: %s",fCDBUri.Data()));
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     man->SetDefaultStorage(fCDBUri);
   }
 
   // Now activate the detector specific CDB storage locations
-  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
-    TString detName = fgkDetectorName[iDet];
-    TObject* obj = fSpecCDBUri.FindObject(detName.Data());
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    AliWarning(Form("Specific CDB storage for %s is set to: %s",detName.Data(),obj->GetTitle()));
-    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-    if (obj) man->SetSpecificStorage(detName.Data(),obj->GetTitle());
+  for (Int_t i = 0; i < fSpecCDBUri.GetEntriesFast(); i++) {
+    TObject* obj = fSpecCDBUri[i];
+    if (!obj) continue;
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliDebug(2, Form("Specific CDB storage for %s is set to: %s",obj->GetName(),obj->GetTitle()));
+    AliDebug(2, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    man->SetSpecificStorage(obj->GetName(), obj->GetTitle());
   }
-  
+  man->Print();
 }
 
 //_____________________________________________________________________________
@@ -311,13 +339,44 @@ void AliReconstruction::SetDefaultStorage(const char* uri) {
 }
 
 //_____________________________________________________________________________
-void AliReconstruction::SetSpecificStorage(const char* detName, const char* uri) {
+void AliReconstruction::SetSpecificStorage(const char* calibType, const char* uri) {
 // Store a detector-specific CDB storage location
 // Activate it later within the Run() method
 
-  TObject* obj = fSpecCDBUri.FindObject(detName);
+  AliCDBPath aPath(calibType);
+  if(!aPath.IsValid()){
+       // if calibType is not wildcard but it is a valid detector, add "/*" to make it a valid path
+       for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+               if(!strcmp(calibType, fgkDetectorName[iDet])) {
+                       aPath.SetPath(Form("%s/*", calibType));
+                       AliInfo(Form("Path for specific storage set to %s", aPath.GetPath().Data()));
+                       break;
+               }
+        }
+       if(!aPath.IsValid()){
+               AliError(Form("Not a valid path or detector: %s", calibType));
+               return;
+       }
+  }
+
+  // check that calibType refers to a "valid" detector name
+  Bool_t isDetector = kFALSE;
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    TString detName = fgkDetectorName[iDet];
+    if(aPath.GetLevel0() == detName) {
+       isDetector = kTRUE;
+       break;
+    }
+  }
+
+  if(!isDetector) {
+       AliError(Form("Not a valid detector: %s", aPath.GetLevel0().Data()));
+       return;
+  }
+
+  TObject* obj = fSpecCDBUri.FindObject(aPath.GetPath().Data());
   if (obj) fSpecCDBUri.Remove(obj);
-  fSpecCDBUri.Add(new TNamed(detName, uri));
+  fSpecCDBUri.Add(new TNamed(aPath.GetPath().Data(), uri));
 
 }
 
@@ -460,9 +519,9 @@ Bool_t AliReconstruction::MisalignGeometry(const TString& detectors)
   
        if ((detStr.CompareTo("ALL") == 0)) detStr = "";
        dataNotLoaded += detStr;
-       AliInfo(Form("Alignment data loaded for: %s",
+       if(!dataLoaded.IsNull()) AliInfo(Form("Alignment data loaded for: %s",
                          dataLoaded.Data()));
-       AliInfo(Form("Didn't/couldn't load alignment data for: %s",
+       if(!dataNotLoaded.IsNull()) AliInfo(Form("Didn't/couldn't load alignment data for: %s",
                          dataNotLoaded.Data()));
   } // fLoadAlignFromCDB flag
  
@@ -483,6 +542,11 @@ Bool_t AliReconstruction::MisalignGeometry(const TString& detectors)
     }
   }
 
+  delete fAlignObjArray; fAlignObjArray=0;
+
+  // Update the TGeoPhysicalNodes
+  gGeoManager->RefreshPhysicalNodes();
+
   return kTRUE;
 }
 
@@ -506,8 +570,7 @@ void AliReconstruction::SetOption(const char* detector, const char* option)
 
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::Run(const char* input,
-                             Int_t firstEvent, Int_t lastEvent)
+Bool_t AliReconstruction::Run(const char* input)
 {
 // run the reconstruction
 
@@ -542,22 +605,9 @@ Bool_t AliReconstruction::Run(const char* input,
     TGeoManager::Import(geom.Data());
     if (!gGeoManager) if (fStopOnError) return kFALSE;
   }
-  if (!MisalignGeometry(fLoadAlignData)) if (fStopOnError) return kFALSE;
 
-  // Temporary fix by A.Gheata
-  // Could be removed with the next Root version (>5.11)
-  if (gGeoManager) {
-    TIter next(gGeoManager->GetListOfVolumes());
-    TGeoVolume *vol;
-    while ((vol = (TGeoVolume *)next())) {
-      if (vol->GetVoxels()) {
-       if (vol->GetVoxels()->NeedRebuild()) {
-         vol->GetVoxels()->Voxelize();
-         vol->FindOverlaps();
-       }
-      }
-    }
-  }
+  AliCDBManager* man = AliCDBManager::Instance();
+  if (!MisalignGeometry(fLoadAlignData)) if (fStopOnError) return kFALSE;
 
   // local reconstruction
   if (!fRunLocalReconstruction.IsNull()) {
@@ -616,27 +666,32 @@ Bool_t AliReconstruction::Run(const char* input,
   delete esd; delete hltesd;
   esd = NULL; hltesd = NULL;
 
-  // create the file and tree with ESD additions
-  TFile *filef=0; TTree *treef=0; AliESDfriend *esdf=0;
+  // create the branch with ESD additions
+  AliESDfriend *esdf=0;
   if (fWriteESDfriend) {
-     filef = TFile::Open("AliESDfriends.root", "RECREATE");
-     if (!filef->IsOpen()) {
-        AliError("opening AliESDfriends.root failed");
-     }
-     treef = new TTree("esdFriendTree", "Tree with ESD friends");
-     treef->Branch("ESDfriend", "AliESDfriend", &esdf);
+     TBranch *br=tree->Branch("ESDfriend.", "AliESDfriend", &esdf);
+     br->SetFile("AliESDfriends.root");
   }
 
-  gROOT->cd();
+  // Get the diamond profile from OCDB
+  AliCDBEntry* entry = AliCDBManager::Instance()
+       ->Get("GRP/Calib/MeanVertex");
+       
+  if(entry) {
+       fDiamondProfile = dynamic_cast<AliESDVertex*> (entry->GetObject());  
+  } else {
+       AliError("No diamond profile found in OCDB!");
+  }
 
-  AliVertexerTracks tVertexer;
+  AliVertexerTracks tVertexer(AliTracker::GetBz());
+  if(fDiamondProfile) tVertexer.SetVtxStart(fDiamondProfile);
 
   // loop over events
   if (fRawReader) fRawReader->RewindEvents();
   
   for (Int_t iEvent = 0; iEvent < fRunLoader->GetNumberOfEvents(); iEvent++) {
     if (fRawReader) fRawReader->NextEvent();
-    if ((iEvent < firstEvent) || ((lastEvent >= 0) && (iEvent > lastEvent))) {
+    if ((iEvent < fFirstEvent) || ((fLastEvent >= 0) && (iEvent > fLastEvent))) {
       // copy old ESD to the new one
       if (treeOld) {
        treeOld->SetBranchAddress("ESD", &esd);
@@ -654,11 +709,11 @@ Bool_t AliReconstruction::Run(const char* input,
     AliInfo(Form("processing event %d", iEvent));
     fRunLoader->GetEvent(iEvent);
 
-    char fileName[256];
-    sprintf(fileName, "ESD_%d.%d_final.root", 
+    char aFileName[256];
+    sprintf(aFileName, "ESD_%d.%d_final.root", 
            fRunLoader->GetHeader()->GetRun(), 
            fRunLoader->GetHeader()->GetEventNrInRun());
-    if (!gSystem->AccessPathName(fileName)) continue;
+    if (!gSystem->AccessPathName(aFileName)) continue;
 
     // local reconstruction
     if (!fRunLocalReconstruction.IsNull()) {
@@ -670,13 +725,16 @@ Bool_t AliReconstruction::Run(const char* input,
     esd = new AliESD; hltesd = new AliESD;
     esd->SetRunNumber(fRunLoader->GetHeader()->GetRun());
     hltesd->SetRunNumber(fRunLoader->GetHeader()->GetRun());
-    esd->SetEventNumber(fRunLoader->GetHeader()->GetEventNrInRun());
-    hltesd->SetEventNumber(fRunLoader->GetHeader()->GetEventNrInRun());
+    esd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun());
+    hltesd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun());
 
     // Set magnetic field from the tracker
     esd->SetMagneticField(AliTracker::GetBz());
     hltesd->SetMagneticField(AliTracker::GetBz());
 
+    // Fill raw-data error log into the ESD
+    if (fRawReader) FillRawDataErrorLog(iEvent,esd);
+
     // vertex finder
     if (fRunVertexFinder) {
       if (!ReadESD(esd, "vertex")) {
@@ -697,6 +755,15 @@ Bool_t AliReconstruction::Run(const char* input,
       }
     }
 
+    // Muon tracking
+    if (!fRunTracking.IsNull()) {
+      if (fRunMuonTracking) {
+       if (!RunMuonTracking()) {
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
+       }
+      }
+    }
+
     // barrel tracking
     if (!fRunTracking.IsNull()) {
       if (!ReadESD(esd, "tracking")) {
@@ -713,6 +780,8 @@ Bool_t AliReconstruction::Run(const char* input,
        if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
       }
     }
+    // fill Event header information from the RawEventHeader
+    if (fRawReader){FillRawEventHeaderESD(esd);}
 
     // combined PID
     AliESDpid::MakePID(esd);
@@ -727,36 +796,63 @@ Bool_t AliReconstruction::Run(const char* input,
       }
     }
 
-    esd->SetPrimaryVertex(tVertexer.FindPrimaryVertex(esd));
+    //Try to improve the reconstructed primary vertex position using the tracks
+    AliESDVertex *pvtx=tVertexer.FindPrimaryVertex(esd);
+    if(fDiamondProfile) esd->SetDiamond(fDiamondProfile);
+    
+    if (pvtx)
+    if (pvtx->GetStatus()) {
+       // Store the improved primary vertex
+       esd->SetPrimaryVertex(pvtx);
+       // Propagate the tracks to the DCA to the improved primary vertex
+       Double_t somethingbig = 777.;
+       Double_t bz = esd->GetMagneticField();
+       Int_t nt=esd->GetNumberOfTracks();
+       while (nt--) {
+        AliESDtrack *t = esd->GetTrack(nt);
+         t->RelateToVertex(pvtx, bz, somethingbig);
+       } 
+    }
+
+    {
+    // V0 finding
+    AliV0vertexer vtxer;
+    vtxer.Tracks2V0vertices(esd);
 
+    // Cascade finding
+    AliCascadeVertexer cvtxer;
+    cvtxer.V0sTracks2CascadeVertices(esd);
+    }
     // write ESD
-    tree->Fill();
-    // write HLT ESD
-    hlttree->Fill();
-
-    // write ESD friend
     if (fWriteESDfriend) {
        esdf=new AliESDfriend();
        esd->GetESDfriend(esdf);
-       treef->Fill();  
     }
+    tree->Fill();
+
+    // write HLT ESD
+    hlttree->Fill();
 
     if (fCheckPointLevel > 0)  WriteESD(esd, "final"); 
  
-    delete esd; delete hltesd;
-    esd = NULL; hltesd = NULL;
+    delete esd; delete esdf; delete hltesd;
+    esd = NULL; esdf=NULL; hltesd = NULL;
   }
 
   AliInfo(Form("Execution time for filling ESD : R:%.2fs C:%.2fs",
               stopwatch.RealTime(),stopwatch.CpuTime()));
 
   file->cd();
+  if (fWriteESDfriend)
+    tree->SetBranchStatus("ESDfriend*",0);
   tree->Write();
   hlttree->Write();
 
-  if (fWriteESDfriend) {
-     filef->cd();
-     treef->Write(); delete treef; filef->Close(); delete filef; 
+  if (fWriteAOD) {
+    TFile *aodFile = TFile::Open("AliAOD.root", "RECREATE");
+    ESDFile2AODFile(file, aodFile);
+    aodFile->Close();
   }
 
   // Create tags for the events in the ESD tree (the ESD tree is always present)
@@ -776,6 +872,9 @@ Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
   TStopwatch stopwatch;
   stopwatch.Start();
 
+  AliCDBManager* man = AliCDBManager::Instance();
+  Bool_t origCache = man->GetCacheFlag();
+
   TString detStr = detectors;
   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
     if (!IsSelected(fgkDetectorName[iDet], detStr)) continue;
@@ -786,6 +885,13 @@ Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
     AliInfo(Form("running reconstruction for %s", fgkDetectorName[iDet]));
     TStopwatch stopwatchDet;
     stopwatchDet.Start();
+
+    AliInfo(Form("Loading calibration data from OCDB for %s", fgkDetectorName[iDet]));
+
+    man->SetCacheFlag(kTRUE);
+    TString calibPath = Form("%s/Calib/*", fgkDetectorName[iDet]);
+    man->GetAll(calibPath); // entries are cached!
+
     if (fRawReader) {
       fRawReader->RewindEvents();
       reconstructor->Reconstruct(fRunLoader, fRawReader);
@@ -795,8 +901,13 @@ Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
     AliInfo(Form("Execution time for %s: R:%.2fs C:%.2fs",
                 fgkDetectorName[iDet],
                 stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
+
+    // unload calibration data
+    man->ClearCache();
   }
 
+  man->SetCacheFlag(origCache);
+
   if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
     AliError(Form("the following detectors were not found: %s",
                   detStr.Data()));
@@ -901,6 +1012,7 @@ Bool_t AliReconstruction::RunVertexFinder(AliESD*& esd)
   }
 
   if (fVertexer) {
+    if(fDiamondProfile) fVertexer->SetVtxStart(fDiamondProfile);
     AliInfo("running the ITS vertex finder");
     if (fLoader[0]) fLoader[0]->LoadRecPoints();
     vertex = fVertexer->FindVertexForCurrentEvent(fRunLoader->GetEventNumber());
@@ -928,6 +1040,10 @@ Bool_t AliReconstruction::RunVertexFinder(AliESD*& esd)
     vertex = new AliESDVertex(vtxPos, vtxErr);
   }
   esd->SetVertex(vertex);
+  // if SPD multiplicity has been determined, it is stored in the ESD
+  AliMultiplicity *mult= fVertexer->GetMultiplicity();
+  if(mult)esd->SetMultiplicity(mult);
+
   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
     if (fTracker[iDet]) fTracker[iDet]->SetVertex(vtxPos, vtxErr);
   }  
@@ -999,6 +1115,62 @@ Bool_t AliReconstruction::RunHLTTracking(AliESD*& esd)
   return kTRUE;
 }
 
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunMuonTracking()
+{
+// run the muon spectrometer tracking
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  if (!fRunLoader) {
+    AliError("Missing runLoader!");
+    return kFALSE;
+  }
+  Int_t iDet = 7; // for MUON
+
+  AliInfo("is running...");
+
+  // Get a pointer to the MUON reconstructor
+  AliReconstructor *reconstructor = GetReconstructor(iDet);
+  if (!reconstructor) return kFALSE;
+
+  
+  TString detName = fgkDetectorName[iDet];
+  AliDebug(1, Form("%s tracking", detName.Data()));
+  AliTracker *tracker =  reconstructor->CreateTracker(fRunLoader);
+  if (!tracker) {
+    AliWarning(Form("couldn't create a tracker for %s", detName.Data()));
+    return kFALSE;
+  }
+     
+  // create Tracks
+  fLoader[iDet]->LoadTracks("update");
+  fLoader[iDet]->CleanTracks();
+  fLoader[iDet]->MakeTracksContainer();
+
+  // read RecPoints
+  fLoader[iDet]->LoadRecPoints("read");
+
+  if (!tracker->Clusters2Tracks(0x0)) {
+    AliError(Form("%s Clusters2Tracks failed", fgkDetectorName[iDet]));
+    return kFALSE;
+  }
+  fLoader[iDet]->UnloadRecPoints();
+
+  fLoader[iDet]->WriteTracks("OVERWRITE");
+  fLoader[iDet]->UnloadTracks();
+
+  delete tracker;
+  
+
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+}
+
+
 //_____________________________________________________________________________
 Bool_t AliReconstruction::RunTracking(AliESD*& esd)
 {
@@ -1231,6 +1403,39 @@ Bool_t AliReconstruction::FillTriggerESD(AliESD*& esd)
   return kTRUE;
 }
 
+
+
+
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::FillRawEventHeaderESD(AliESD*& esd)
+{
+  // 
+  // Filling information from RawReader Header
+  // 
+
+  AliInfo("Filling information from RawReader Header");
+  esd->SetBunchCrossNumber(0);
+  esd->SetOrbitNumber(0);
+  esd->SetPeriodNumber(0);
+  esd->SetTimeStamp(0);
+  esd->SetEventType(0);
+  const AliRawEventHeaderBase * eventHeader = fRawReader->GetEventHeader();
+  if (eventHeader){
+
+    const UInt_t *id = eventHeader->GetP("Id");
+    esd->SetBunchCrossNumber((id)[1]&0x00000fff);
+    esd->SetOrbitNumber((((id)[0]<<20)&0xf00000)|(((id)[1]>>12)&0xfffff));
+    esd->SetPeriodNumber(((id)[0]>>4)&0x0fffffff);
+
+    esd->SetTimeStamp((eventHeader->Get("Timestamp")));  
+    esd->SetEventType((eventHeader->Get("Type")));
+  }
+
+  return kTRUE;
+}
+
+
 //_____________________________________________________________________________
 Bool_t AliReconstruction::IsSelected(TString detName, TString& detectors) const
 {
@@ -1327,6 +1532,10 @@ Bool_t AliReconstruction::InitRunLoader()
       iEvent++;
     }
     fRawReader->RewindEvents();
+    if (fNumberOfEventsPerFile > 0)
+      fRunLoader->SetNumberOfEventsPerFile(fNumberOfEventsPerFile);
+    else
+      fRunLoader->SetNumberOfEventsPerFile(iEvent);
     fRunLoader->WriteHeader("OVERWRITE");
     fRunLoader->CdGAFile();
     fRunLoader->Write(0, TObject::kOverwrite);
@@ -1351,10 +1560,10 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
 
   if (detName == "HLT") {
     if (!gROOT->GetClass("AliLevel3")) {
-      gSystem->Load("libAliL3Src.so");
-      gSystem->Load("libAliL3Misc.so");
-      gSystem->Load("libAliL3Hough.so");
-      gSystem->Load("libAliL3Comp.so");
+      gSystem->Load("libAliHLTSrc.so");
+      gSystem->Load("libAliHLTMisc.so");
+      gSystem->Load("libAliHLTHough.so");
+      gSystem->Load("libAliHLTComp.so");
     }
   }
 
@@ -1394,7 +1603,7 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
        ->CreateDetectorFolders(fRunLoader->GetEventFolder(), 
                                detName, detName);
       // first check if a plugin is defined for the loader
-      TPluginHandler* pluginHandler = 
+      pluginHandler = 
        pluginManager->FindHandler("AliLoader", detName);
       // if not, add a plugin for it
       if (!pluginHandler) {
@@ -1461,6 +1670,11 @@ Bool_t AliReconstruction::CreateTrackers(const TString& detectors)
       fRunHLTTracking = kTRUE;
       continue;
     }
+    if (detName == "MUON") {
+      fRunMuonTracking = kTRUE;
+      continue;
+    }
+
 
     fTracker[iDet] = reconstructor->CreateTracker(fRunLoader);
     if (!fTracker[iDet] && (iDet < 7)) {
@@ -1486,6 +1700,8 @@ void AliReconstruction::CleanUp(TFile* file, TFile* fileOld)
   }
   delete fVertexer;
   fVertexer = NULL;
+  delete fDiamondProfile;
+  fDiamondProfile = NULL;
 
   delete fRunLoader;
   fRunLoader = NULL;
@@ -1513,7 +1729,7 @@ Bool_t AliReconstruction::ReadESD(AliESD*& esd, const char* recStep) const
   if (!esd) return kFALSE;
   char fileName[256];
   sprintf(fileName, "ESD_%d.%d_%s.root", 
-         esd->GetRunNumber(), esd->GetEventNumber(), recStep);
+         esd->GetRunNumber(), esd->GetEventNumberInFile(), recStep);
   if (gSystem->AccessPathName(fileName)) return kFALSE;
 
   AliInfo(Form("reading ESD from file %s", fileName));
@@ -1541,7 +1757,7 @@ void AliReconstruction::WriteESD(AliESD* esd, const char* recStep) const
   if (!esd) return;
   char fileName[256];
   sprintf(fileName, "ESD_%d.%d_%s.root", 
-         esd->GetRunNumber(), esd->GetEventNumber(), recStep);
+         esd->GetRunNumber(), esd->GetEventNumberInFile(), recStep);
 
   AliDebug(1, Form("writing ESD to file %s", fileName));
   TFile* file = TFile::Open(fileName, "recreate");
@@ -1607,17 +1823,18 @@ void AliReconstruction::CreateTag(TFile* file)
     delete file;
     return ;
   }  
-  Int_t firstEvent = 0,lastEvent = 0;
+  Int_t lastEvent = 0;
   TTree *t = (TTree*) file->Get("esdTree");
   TBranch * b = t->GetBranch("ESD");
   AliESD *esd = 0;
   b->SetAddress(&esd);
 
-  b->GetEntry(0);
+  b->GetEntry(fFirstEvent);
   Int_t iInitRunNumber = esd->GetRunNumber();
   
-  Int_t iNumberOfEvents = b->GetEntries();
-  for (Int_t iEventNumber = 0; iEventNumber < iNumberOfEvents; iEventNumber++) {
+  Int_t iNumberOfEvents = (Int_t)b->GetEntries();
+  if(fLastEvent != -1) iNumberOfEvents = fLastEvent + 1;
+  for (Int_t iEventNumber = fFirstEvent; iEventNumber < iNumberOfEvents; iEventNumber++) {
     ntrack = 0;
     nPos = 0;
     nNeg = 0;
@@ -1821,14 +2038,15 @@ void AliReconstruction::CreateTag(TFile* file)
     tag->SetRunId(iInitRunNumber);
     tag->AddEventTag(*evTag);
   }
-  lastEvent = iNumberOfEvents;
+  if(fLastEvent == -1) lastEvent = (Int_t)b->GetEntries();
+  else lastEvent = fLastEvent;
        
   ttag.Fill();
   tag->Clear();
 
   char fileName[256];
   sprintf(fileName, "Run%d.Event%d_%d.ESD.tag.root", 
-         tag->GetRunId(),firstEvent,lastEvent );
+         tag->GetRunId(),fFirstEvent,lastEvent );
   AliInfo(Form("writing tags to file %s", fileName));
   AliDebug(1, Form("writing tags to file %s", fileName));
  
@@ -1841,6 +2059,688 @@ void AliReconstruction::CreateTag(TFile* file)
   delete evTag;
 }
 
+//_____________________________________________________________________________
+void AliReconstruction::ESDFile2AODFile(TFile* esdFile, TFile* aodFile)
+{
+  // write all files from the given esd file to an aod file
+  
+  // create an AliAOD object 
+  AliAODEvent *aod = new AliAODEvent();
+  aod->CreateStdContent();
+  
+  // go to the file
+  aodFile->cd();
+  
+  // create the tree
+  TTree *aodTree = new TTree("AOD", "AliAOD tree");
+  aodTree->Branch(aod->GetList());
+
+  // connect to ESD
+  TTree *t = (TTree*) esdFile->Get("esdTree");
+  TBranch *b = t->GetBranch("ESD");
+  AliESD *esd = 0;
+  b->SetAddress(&esd);
+
+  Int_t nEvents = b->GetEntries();
+
+  // set arrays and pointers
+  Float_t posF[3];
+  Double_t pos[3];
+  Double_t p[3];
+  Double_t covVtx[6];
+  Double_t covTr[21];
+  Double_t pid[10];
+
+  // loop over events and fill them
+  for (Int_t iEvent = 0; iEvent < nEvents; ++iEvent) {
+    b->GetEntry(iEvent);
+
+    // Multiplicity information needed by the header (to be revised!)
+    Int_t nTracks   = esd->GetNumberOfTracks();
+    Int_t nPosTracks = 0;
+    for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) 
+      if (esd->GetTrack(iTrack)->GetSign()> 0) nPosTracks++;
+
+    // create the header
+    aod->AddHeader(new AliAODHeader(esd->GetRunNumber(),
+                                   esd->GetBunchCrossNumber(),
+                                   esd->GetOrbitNumber(),
+                                   esd->GetPeriodNumber(),
+                                   nTracks,
+                                   nPosTracks,
+                                   nTracks-nPosTracks,
+                                   esd->GetMagneticField(),
+                                   -999., // fill muon magnetic field
+                                   -999., // centrality; to be filled, still
+                                   esd->GetZDCN1Energy(),
+                                   esd->GetZDCP1Energy(),
+                                   esd->GetZDCN2Energy(),
+                                   esd->GetZDCP2Energy(),
+                                   esd->GetZDCEMEnergy(),
+                                   esd->GetTriggerMask(),
+                                   esd->GetTriggerCluster(),
+                                   esd->GetEventType()));
+
+    Int_t nV0s      = esd->GetNumberOfV0s();
+    Int_t nCascades = esd->GetNumberOfCascades();
+    Int_t nKinks    = esd->GetNumberOfKinks();
+    Int_t nVertices = nV0s + nCascades + nKinks;
+    
+    aod->ResetStd(nTracks, nVertices);
+    AliAODTrack *aodTrack;
+    
+
+    // Array to take into account the tracks already added to the AOD
+    Bool_t * usedTrack = NULL;
+    if (nTracks>0) {
+      usedTrack = new Bool_t[nTracks];
+      for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) usedTrack[iTrack]=kFALSE;
+    }
+    // Array to take into account the V0s already added to the AOD
+    Bool_t * usedV0 = NULL;
+    if (nV0s>0) {
+      usedV0 = new Bool_t[nV0s];
+      for (Int_t iV0=0; iV0<nV0s; ++iV0) usedV0[iV0]=kFALSE;
+    }
+    // Array to take into account the kinks already added to the AOD
+    Bool_t * usedKink = NULL;
+    if (nKinks>0) {
+      usedKink = new Bool_t[nKinks];
+      for (Int_t iKink=0; iKink<nKinks; ++iKink) usedKink[iKink]=kFALSE;
+    }
+
+    // Access to the AOD container of vertices
+    TClonesArray &vertices = *(aod->GetVertices());
+    Int_t jVertices=0;
+
+    // Access to the AOD container of tracks
+    TClonesArray &tracks = *(aod->GetTracks());
+    Int_t jTracks=0; 
+  
+    // Add primary vertex. The primary tracks will be defined
+    // after the loops on the composite objects (V0, cascades, kinks)
+    const AliESDVertex *vtx = esd->GetPrimaryVertex();
+      
+    vtx->GetXYZ(pos); // position
+    vtx->GetCovMatrix(covVtx); //covariance matrix
+
+    AliAODVertex * primary = new(vertices[jVertices++])
+      AliAODVertex(pos, covVtx, vtx->GetChi2toNDF(), NULL, AliAODVertex::kPrimary);
+         
+    // Create vertices starting from the most complex objects
+      
+    // Cascades
+    for (Int_t nCascade = 0; nCascade < nCascades; ++nCascade) {
+      AliESDcascade *cascade = esd->GetCascade(nCascade);
+      
+      cascade->GetXYZ(pos[0], pos[1], pos[2]);
+      cascade->GetPosCovXi(covVtx);
+     
+      // Add the cascade vertex
+      AliAODVertex * vcascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                       covVtx,
+                                                                       cascade->GetChi2Xi(), // = chi2/NDF since NDF = 2*2-3
+                                                                       primary,
+                                                                       AliAODVertex::kCascade);
+
+      primary->AddDaughter(vcascade);
+
+      // Add the V0 from the cascade. The ESD class have to be optimized...
+      // Now we have to search for the corresponding Vo in the list of V0s
+      // using the indeces of the positive and negative tracks
+
+      Int_t posFromV0 = cascade->GetPindex();
+      Int_t negFromV0 = cascade->GetNindex();
+
+
+      AliESDv0 * v0 = 0x0;
+      Int_t indV0 = -1;
+
+      for (Int_t iV0=0; iV0<nV0s; ++iV0) {
+
+       v0 = esd->GetV0(iV0);
+       Int_t posV0 = v0->GetPindex();
+       Int_t negV0 = v0->GetNindex();
+
+       if (posV0==posFromV0 && negV0==negFromV0) {
+         indV0 = iV0;
+         break;
+       }
+      }
+
+      AliAODVertex * vV0FromCascade = 0x0;
+
+      if (indV0>-1 && !usedV0[indV0] ) {
+       
+       // the V0 exists in the array of V0s and is not used
+
+       usedV0[indV0] = kTRUE;
+       
+       v0->GetXYZ(pos[0], pos[1], pos[2]);
+       v0->GetPosCov(covVtx);
+       
+       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                covVtx,
+                                                                v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
+                                                                vcascade,
+                                                                AliAODVertex::kV0);
+      } else {
+
+       // the V0 doesn't exist in the array of V0s or was used
+       cerr << "Error: event " << iEvent << " cascade " << nCascade
+            << " The V0 " << indV0 
+            << " doesn't exist in the array of V0s or was used!" << endl;
+
+       cascade->GetXYZ(pos[0], pos[1], pos[2]);
+       cascade->GetPosCov(covVtx);
+      
+       vV0FromCascade = new(vertices[jVertices++]) AliAODVertex(pos,
+                                                                covVtx,
+                                                                v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
+                                                                vcascade,
+                                                                AliAODVertex::kV0);
+       vcascade->AddDaughter(vV0FromCascade);
+      }
+
+      // Add the positive tracks from the V0
+
+      if (! usedTrack[posFromV0]) {
+
+       usedTrack[posFromV0] = kTRUE;
+
+       AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
+       
+       vV0FromCascade->AddDaughter(aodTrack =
+                                   new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(), 
+                                          p, 
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vV0FromCascade,
+                                          kTRUE,  // check if this is right
+                                          kFALSE, // check if this is right
+                                          AliAODTrack::kSecondary)
+               );
+       aodTrack->ConvertAliPIDtoAODPID();
+      }
+      else {
+       cerr << "Error: event " << iEvent << " cascade " << nCascade
+            << " track " << posFromV0 << " has already been used!" << endl;
+      }
+
+      // Add the negative tracks from the V0
+
+      if (!usedTrack[negFromV0]) {
+       
+       usedTrack[negFromV0] = kTRUE;
+       
+       AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
+       
+       vV0FromCascade->AddDaughter(aodTrack =
+                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(),
+                                          p,
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vV0FromCascade,
+                                          kTRUE,  // check if this is right
+                                          kFALSE, // check if this is right
+                                          AliAODTrack::kSecondary)
+               );
+       aodTrack->ConvertAliPIDtoAODPID();
+      }
+      else {
+       cerr << "Error: event " << iEvent << " cascade " << nCascade
+            << " track " << negFromV0 << " has already been used!" << endl;
+      }
+
+      // Add the bachelor track from the cascade
+
+      Int_t bachelor = cascade->GetBindex();
+      
+      if(!usedTrack[bachelor]) {
+      
+       usedTrack[bachelor] = kTRUE;
+       
+       AliESDtrack *esdTrack = esd->GetTrack(bachelor);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
+
+       vcascade->AddDaughter(aodTrack =
+               new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(),
+                                          p,
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vcascade,
+                                          kTRUE,  // check if this is right
+                                          kFALSE, // check if this is right
+                                          AliAODTrack::kSecondary)
+               );
+       aodTrack->ConvertAliPIDtoAODPID();
+     }
+      else {
+       cerr << "Error: event " << iEvent << " cascade " << nCascade
+            << " track " << bachelor << " has already been used!" << endl;
+      }
+
+      // Add the primary track of the cascade (if any)
+
+    } // end of the loop on cascades
+    
+    // V0s
+        
+    for (Int_t nV0 = 0; nV0 < nV0s; ++nV0) {
+
+      if (usedV0[nV0]) continue; // skip if aready added to the AOD
+
+      AliESDv0 *v0 = esd->GetV0(nV0);
+      
+      v0->GetXYZ(pos[0], pos[1], pos[2]);
+      v0->GetPosCov(covVtx);
+
+      AliAODVertex * vV0 = 
+       new(vertices[jVertices++]) AliAODVertex(pos,
+                                               covVtx,
+                                               v0->GetChi2V0(), // = chi2/NDF since NDF = 2*2-3
+                                               primary,
+                                               AliAODVertex::kV0);
+      primary->AddDaughter(vV0);
+
+      Int_t posFromV0 = v0->GetPindex();
+      Int_t negFromV0 = v0->GetNindex();
+      
+      // Add the positive tracks from the V0
+
+      if (!usedTrack[posFromV0]) {
+       
+       usedTrack[posFromV0] = kTRUE;
+
+       AliESDtrack *esdTrack = esd->GetTrack(posFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
+       
+       vV0->AddDaughter(aodTrack =
+               new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(), 
+                                          p, 
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vV0,
+                                          kTRUE,  // check if this is right
+                                          kFALSE, // check if this is right
+                                          AliAODTrack::kSecondary)
+               );
+       aodTrack->ConvertAliPIDtoAODPID();
+      }
+      else {
+       cerr << "Error: event " << iEvent << " V0 " << nV0
+            << " track " << posFromV0 << " has already been used!" << endl;
+      }
+
+      // Add the negative tracks from the V0
+
+      if (!usedTrack[negFromV0]) {
+
+       usedTrack[negFromV0] = kTRUE;
+
+       AliESDtrack *esdTrack = esd->GetTrack(negFromV0);
+       esdTrack->GetPxPyPz(p);
+       esdTrack->GetXYZ(pos);
+       esdTrack->GetCovarianceXYZPxPyPz(covTr);
+       esdTrack->GetESDpid(pid);
+
+       vV0->AddDaughter(aodTrack =
+                new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(),
+                                          p,
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vV0,
+                                          kTRUE,  // check if this is right
+                                          kFALSE, // check if this is right
+                                          AliAODTrack::kSecondary)
+               );
+       aodTrack->ConvertAliPIDtoAODPID();
+      }
+      else {
+       cerr << "Error: event " << iEvent << " V0 " << nV0
+            << " track " << negFromV0 << " has already been used!" << endl;
+      }
+
+    } // end of the loop on V0s
+    
+    // Kinks: it is a big mess the access to the information in the kinks
+    // The loop is on the tracks in order to find the mother and daugther of each kink
+
+
+    for (Int_t iTrack=0; iTrack<nTracks; ++iTrack) {
+
+
+      AliESDtrack * esdTrack = esd->GetTrack(iTrack);
+
+      Int_t ikink = esdTrack->GetKinkIndex(0);
+
+      if (ikink) {
+       // Negative kink index: mother, positive: daughter
+
+       // Search for the second track of the kink
+
+       for (Int_t jTrack = iTrack+1; jTrack<nTracks; ++jTrack) {
+
+         AliESDtrack * esdTrack1 = esd->GetTrack(jTrack);
+
+         Int_t jkink = esdTrack1->GetKinkIndex(0);
+
+         if ( TMath::Abs(ikink)==TMath::Abs(jkink) ) {
+
+           // The two tracks are from the same kink
+         
+           if (usedKink[TMath::Abs(ikink)-1]) continue; // skip used kinks
+
+           Int_t imother = -1;
+           Int_t idaughter = -1;
+
+           if (ikink<0 && jkink>0) {
+
+             imother = iTrack;
+             idaughter = jTrack;
+           }
+           else if (ikink>0 && jkink<0) {
+
+             imother = jTrack;
+             idaughter = iTrack;
+           }
+           else {
+             cerr << "Error: Wrong combination of kink indexes: "
+             << ikink << " " << jkink << endl;
+             continue;
+           }
+
+           // Add the mother track
+
+           AliAODTrack * mother = NULL;
+
+           if (!usedTrack[imother]) {
+       
+             usedTrack[imother] = kTRUE;
+       
+             AliESDtrack *esdTrack = esd->GetTrack(imother);
+             esdTrack->GetPxPyPz(p);
+             esdTrack->GetXYZ(pos);
+             esdTrack->GetCovarianceXYZPxPyPz(covTr);
+             esdTrack->GetESDpid(pid);
+
+             mother = 
+               new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(),
+                                          p,
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          primary,
+                                          kTRUE, // check if this is right
+                                          kTRUE, // check if this is right
+                                          AliAODTrack::kPrimary);
+             primary->AddDaughter(mother);
+             mother->ConvertAliPIDtoAODPID();
+           }
+           else {
+             cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1
+             << " track " << imother << " has already been used!" << endl;
+           }
+
+           // Add the kink vertex
+           AliESDkink * kink = esd->GetKink(TMath::Abs(ikink)-1);
+
+           AliAODVertex * vkink = 
+           new(vertices[jVertices++]) AliAODVertex(kink->GetPosition(),
+                                                   NULL,
+                                                   0.,
+                                                   mother,
+                                                   AliAODVertex::kKink);
+           // Add the daughter track
+
+           AliAODTrack * daughter = NULL;
+
+           if (!usedTrack[idaughter]) {
+       
+             usedTrack[idaughter] = kTRUE;
+       
+             AliESDtrack *esdTrack = esd->GetTrack(idaughter);
+             esdTrack->GetPxPyPz(p);
+             esdTrack->GetXYZ(pos);
+             esdTrack->GetCovarianceXYZPxPyPz(covTr);
+             esdTrack->GetESDpid(pid);
+
+             daughter = 
+               new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                          esdTrack->GetLabel(),
+                                          p,
+                                          kTRUE,
+                                          pos,
+                                          kFALSE,
+                                          covTr, 
+                                          (Short_t)esdTrack->GetSign(),
+                                          esdTrack->GetITSClusterMap(), 
+                                          pid,
+                                          vkink,
+                                          kTRUE, // check if this is right
+                                          kTRUE, // check if this is right
+                                          AliAODTrack::kPrimary);
+             vkink->AddDaughter(daughter);
+             daughter->ConvertAliPIDtoAODPID();
+           }
+           else {
+             cerr << "Error: event " << iEvent << " kink " << TMath::Abs(ikink)-1
+             << " track " << idaughter << " has already been used!" << endl;
+           }
+
+
+         }
+       }
+
+      }      
+
+    }
+
+    
+    // Tracks (primary and orphan)
+      
+    for (Int_t nTrack = 0; nTrack < nTracks; ++nTrack) {
+       
+
+      if (usedTrack[nTrack]) continue;
+
+      AliESDtrack *esdTrack = esd->GetTrack(nTrack);
+      esdTrack->GetPxPyPz(p);
+      esdTrack->GetXYZ(pos);
+      esdTrack->GetCovarianceXYZPxPyPz(covTr);
+      esdTrack->GetESDpid(pid);
+
+      Float_t impactXY, impactZ;
+
+      esdTrack->GetImpactParameters(impactXY,impactZ);
+
+      if (impactXY<3) {
+       // track inside the beam pipe
+      
+       primary->AddDaughter(aodTrack =
+           new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                        esdTrack->GetLabel(),
+                                        p,
+                                        kTRUE,
+                                        pos,
+                                        kFALSE,
+                                        covTr, 
+                                        (Short_t)esdTrack->GetSign(),
+                                        esdTrack->GetITSClusterMap(), 
+                                        pid,
+                                        primary,
+                                        kTRUE, // check if this is right
+                                        kTRUE, // check if this is right
+                                        AliAODTrack::kPrimary)
+           );
+       aodTrack->ConvertAliPIDtoAODPID();
+      }
+      else {
+       // outside the beam pipe: orphan track
+           aodTrack =
+           new(tracks[jTracks++]) AliAODTrack(esdTrack->GetID(),
+                                        esdTrack->GetLabel(),
+                                        p,
+                                        kTRUE,
+                                        pos,
+                                        kFALSE,
+                                        covTr, 
+                                        (Short_t)esdTrack->GetSign(),
+                                        esdTrack->GetITSClusterMap(), 
+                                        pid,
+                                        NULL,
+                                        kFALSE, // check if this is right
+                                        kFALSE, // check if this is right
+                                        AliAODTrack::kOrphan);
+           aodTrack->ConvertAliPIDtoAODPID();
+      }        
+    } // end of loop on tracks
+
+    // muon tracks
+    Int_t nMuTracks = esd->GetNumberOfMuonTracks();
+    for (Int_t nMuTrack = 0; nMuTrack < nMuTracks; ++nMuTrack) {
+      
+      AliESDMuonTrack *esdMuTrack = esd->GetMuonTrack(nMuTrack);     
+      p[0] = esdMuTrack->Px(); 
+      p[1] = esdMuTrack->Py(); 
+      p[2] = esdMuTrack->Pz();
+      pos[0] = primary->GetX(); 
+      pos[1] = primary->GetY(); 
+      pos[2] = primary->GetZ();
+      
+      // has to be changed once the muon pid is provided by the ESD
+      for (Int_t i = 0; i < 10; pid[i++] = 0.); pid[AliAODTrack::kMuon]=1.;
+      
+      primary->AddDaughter(
+         new(tracks[jTracks++]) AliAODTrack(0, // no ID provided
+                                            0, // no label provided
+                                            p,
+                                            kTRUE,
+                                            pos,
+                                            kFALSE,
+                                            NULL, // no covariance matrix provided
+                                            (Short_t)-99, // no charge provided
+                                            0, // no ITSClusterMap
+                                            pid,
+                                            primary,
+                                            kTRUE,  // check if this is right
+                                            kTRUE,  // not used for vertex fit
+                                            AliAODTrack::kPrimary)
+         );
+    }
+    
+    // Access to the AOD container of clusters
+    TClonesArray &clusters = *(aod->GetClusters());
+    Int_t jClusters=0;
+
+    // Calo Clusters
+    Int_t nClusters    = esd->GetNumberOfCaloClusters();
+
+    for (Int_t iClust=0; iClust<nClusters; ++iClust) {
+
+      AliESDCaloCluster * cluster = esd->GetCaloCluster(iClust);
+
+      Int_t id = cluster->GetID();
+      Int_t label = -1;
+      Float_t energy = cluster->GetClusterEnergy();
+      cluster->GetGlobalPosition(posF);
+      AliAODVertex *prodVertex = primary;
+      AliAODTrack *primTrack = NULL;
+      Char_t ttype=AliAODCluster::kUndef;
+      
+      if (cluster->IsPHOS()) ttype=AliAODCluster::kPHOSNeutral;
+      else if (cluster->IsEMCAL()) {
+       
+       if (cluster->GetClusterType() == AliESDCaloCluster::kPseudoCluster)
+         ttype = AliAODCluster::kEMCALPseudoCluster;
+       else
+         ttype = AliAODCluster::kEMCALClusterv1;
+       
+      }
+      
+      new(clusters[jClusters++]) AliAODCluster(id,
+                                              label,
+                                              energy,
+                                              pos,
+                                              NULL, // no covariance matrix provided
+                                              NULL, // no pid for clusters provided
+                                              prodVertex,
+                                              primTrack,
+                                              ttype);
+      
+    } // end of loop on calo clusters
+    
+    delete [] usedTrack;
+    delete [] usedV0;
+    delete [] usedKink;
+    
+    // fill the tree for this event
+    aodTree->Fill();
+  } // end of event loop
+  
+  aodTree->GetUserInfo()->Add(aod);
+  
+  // close ESD file
+  esdFile->Close();
+  
+  // write the tree to the specified file
+  aodFile = aodTree->GetCurrentFile();
+  aodFile->cd();
+  aodTree->Write();
+  
+  return;
+}
+
+
 void AliReconstruction::WriteAlignmentData(AliESD* esd)
 {
   // Write space-points which are then used in the alignment procedures
@@ -1892,3 +2792,25 @@ void AliReconstruction::WriteAlignmentData(AliESD* esd)
     fLoader[3]->UnloadRecPoints();
   }
 }
+
+//_____________________________________________________________________________
+void AliReconstruction::FillRawDataErrorLog(Int_t iEvent, AliESD* esd)
+{
+  // The method reads the raw-data error log
+  // accumulated within the rawReader.
+  // It extracts the raw-data errors related to
+  // the current event and stores them into
+  // a TClonesArray inside the esd object.
+
+  if (!fRawReader) return;
+
+  for(Int_t i = 0; i < fRawReader->GetNumberOfErrorLogs(); i++) {
+
+    AliRawDataErrorLog *log = fRawReader->GetErrorLog(i);
+    if (!log) continue;
+    if (iEvent != log->GetEventNumber()) continue;
+
+    esd->AddRawDataErrorLog(log);
+  }
+
+}