]> 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 da311d5e8039ffe230986201b1f2cbfcdc7c393a..8ed90819babdf5e825ff4e8d71164a5ac4b669b0 100644 (file)
 // - raw data DATE file: DATE file name, any other non-empty string          //
 // - MC root files     : empty string, default                               //
 //                                                                           //
+// By default all events are reconstructed. The reconstruction can be        //
+// limited to a range of events by giving the index of the first and the     //
+// last event as an argument to the Run method or by calling                 //
+//                                                                           //
+//   rec.SetEventRange(..., ...);                                            //
+//                                                                           //
+// 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                                                         //
 //                                                                           //
 //   rec.SetRunTracking("...");                                              //
 //                                                                           //
+// Uniform/nonuniform field tracking switches (default: uniform field)       //
+//                                                                           //
+//   rec.SetUniformFieldTracking(); ( rec.SetUniformFieldTracking(kFALSE); ) //
+//                                                                           //
 // The filling of additional ESD information can be steered by               //
 //                                                                           //
 //   rec.SetFillESD("...");                                                  //
 #include <TROOT.h>
 #include <TPluginManager.h>
 #include <TStopwatch.h>
+#include <TGeoManager.h>
+#include <TLorentzVector.h>
 
 #include "AliReconstruction.h"
 #include "AliReconstructor.h"
 #include "AliRawReaderFile.h"
 #include "AliRawReaderDate.h"
 #include "AliRawReaderRoot.h"
-#include "AliTracker.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 "AliESDpid.h"
-#include "AliMagF.h"
+#include "AliESDtrack.h"
+
+#include "AliRunTag.h"
+#include "AliDetectorTag.h"
+#include "AliEventTag.h"
+
+#include "AliTrackPointArray.h"
+#include "AliCDBManager.h"
+#include "AliCDBEntry.h"
+#include "AliAlignObj.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,
+AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdbUri,
                                     const char* name, const char* title) :
   TNamed(name, title),
 
-  fRunLocalReconstruction("ALL"),
+  fUniformField(kTRUE),
   fRunVertexFinder(kTRUE),
+  fRunHLTTracking(kFALSE),
+  fRunMuonTracking(kFALSE),
+  fStopOnError(kFALSE),
+  fWriteAlignmentData(kFALSE),
+  fWriteESDfriend(kFALSE),
+  fWriteAOD(kFALSE),
+  fFillTriggerESD(kTRUE),
+
+  fRunLocalReconstruction("ALL"),
   fRunTracking("ALL"),
   fFillESD("ALL"),
   fGAliceFileName(gAliceFilename),
   fInput(""),
-  fStopOnError(kFALSE),
+  fEquipIdMap(""),
+  fFirstEvent(0),
+  fLastEvent(-1),
+  fNumberOfEventsPerFile(1),
   fCheckPointLevel(0),
   fOptions(),
+  fLoadAlignFromCDB(kTRUE),
+  fLoadAlignData("ALL"),
 
   fRunLoader(NULL),
   fRawReader(NULL),
 
-  fVertexer(NULL)
+  fVertexer(NULL),
+  fDiamondProfile(NULL),
+
+  fAlignObjArray(NULL),
+  fCDBUri(cdbUri),
+  fSpecCDBUri()
 {
 // create reconstruction object with default parameters
   
@@ -149,30 +218,50 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename,
     fLoader[iDet] = NULL;
     fTracker[iDet] = NULL;
   }
+  AliPID pid;
 }
 
 //_____________________________________________________________________________
 AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   TNamed(rec),
 
-  fRunLocalReconstruction(rec.fRunLocalReconstruction),
+  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),
   fRunTracking(rec.fRunTracking),
   fFillESD(rec.fFillESD),
   fGAliceFileName(rec.fGAliceFileName),
   fInput(rec.fInput),
-  fStopOnError(rec.fStopOnError),
+  fEquipIdMap(rec.fEquipIdMap),
+  fFirstEvent(rec.fFirstEvent),
+  fLastEvent(rec.fLastEvent),
+  fNumberOfEventsPerFile(rec.fNumberOfEventsPerFile),
   fCheckPointLevel(0),
   fOptions(),
+  fLoadAlignFromCDB(rec.fLoadAlignFromCDB),
+  fLoadAlignData(rec.fLoadAlignData),
 
   fRunLoader(NULL),
   fRawReader(NULL),
 
-  fVertexer(NULL)
+  fVertexer(NULL),
+  fDiamondProfile(NULL),
+
+  fAlignObjArray(rec.fAlignObjArray),
+  fCDBUri(rec.fCDBUri),
+  fSpecCDBUri()
 {
 // copy constructor
 
-  for (Int_t i = 0; i < fOptions.GetEntriesFast(); i++) {
+  for (Int_t i = 0; i < rec.fOptions.GetEntriesFast(); i++) {
     if (rec.fOptions[i]) fOptions.Add(rec.fOptions[i]->Clone());
   }
   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
@@ -180,6 +269,9 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
     fLoader[iDet] = NULL;
     fTracker[iDet] = NULL;
   }
+  for (Int_t i = 0; i < rec.fSpecCDBUri.GetEntriesFast(); i++) {
+    if (rec.fSpecCDBUri[i]) fSpecCDBUri.Add(rec.fSpecCDBUri[i]->Clone());
+  }
 }
 
 //_____________________________________________________________________________
@@ -199,8 +291,264 @@ AliReconstruction::~AliReconstruction()
 
   CleanUp();
   fOptions.Delete();
+  fSpecCDBUri.Delete();
 }
 
+//_____________________________________________________________________________
+void AliReconstruction::InitCDBStorage()
+{
+// activate a default CDB storage
+// First check if we have any CDB storage set, because it is used 
+// to retrieve the calibration and alignment constants
+
+  AliCDBManager* man = AliCDBManager::Instance();
+  if (man->IsDefaultStorageSet())
+  {
+    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    AliWarning("Default CDB storage has been already set !");
+    AliWarning(Form("Ignoring the default storage declared in AliReconstruction: %s",fCDBUri.Data()));
+    AliWarning("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+    fCDBUri = "";
+  }
+  else {
+    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 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();
+}
+
+//_____________________________________________________________________________
+void AliReconstruction::SetDefaultStorage(const char* uri) {
+// Store the desired default CDB storage location
+// Activate it later within the Run() method
+
+  fCDBUri = uri;
+
+}
+
+//_____________________________________________________________________________
+void AliReconstruction::SetSpecificStorage(const char* calibType, const char* uri) {
+// Store a detector-specific CDB storage location
+// Activate it later within the Run() method
+
+  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(aPath.GetPath().Data(), uri));
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::SetRunNumber()
+{
+  // The method is called in Run() in order
+  // to set a correct run number.
+  // In case of raw data reconstruction the
+  // run number is taken from the raw data header
+
+  if(AliCDBManager::Instance()->GetRun() < 0) {
+    if (!fRunLoader) {
+      AliError("No run loader is found !"); 
+      return kFALSE;
+    }
+    // read run number from gAlice
+    if(fRunLoader->GetAliRun())
+      AliCDBManager::Instance()->SetRun(fRunLoader->GetAliRun()->GetRunNumber());
+    else {
+      if(fRawReader) {
+       if(fRawReader->NextEvent()) {
+         AliCDBManager::Instance()->SetRun(fRawReader->GetRunNumber());
+         fRawReader->RewindEvents();
+       }
+       else {
+         AliError("No raw-data events found !");
+         return kFALSE;
+       }
+      }
+      else {
+       AliError("Neither gAlice nor RawReader objects are found !");
+       return kFALSE;
+      }
+    }
+    AliInfo(Form("CDB Run number: %d",AliCDBManager::Instance()->GetRun()));
+  }
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::ApplyAlignObjsToGeom(TObjArray* alObjArray)
+{
+  // Read collection of alignment objects (AliAlignObj derived) saved
+  // in the TClonesArray ClArrayName and apply them to the geometry
+  // manager singleton.
+  //
+  alObjArray->Sort();
+  Int_t nvols = alObjArray->GetEntriesFast();
+
+  Bool_t flag = kTRUE;
+
+  for(Int_t j=0; j<nvols; j++)
+    {
+      AliAlignObj* alobj = (AliAlignObj*) alObjArray->UncheckedAt(j);
+      if (alobj->ApplyToGeometry() == kFALSE) flag = kFALSE;
+    }
+
+  if (AliDebugLevelClass() >= 1) {
+    gGeoManager->GetTopNode()->CheckOverlaps(20);
+    TObjArray* ovexlist = gGeoManager->GetListOfOverlaps();
+    if(ovexlist->GetEntriesFast()){  
+      AliError("The application of alignment objects to the geometry caused huge overlaps/extrusions!");
+   }
+  }
+
+  return flag;
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::SetAlignObjArraySingleDet(const char* detName)
+{
+  // Fills array of single detector's alignable objects from CDB
+  
+  AliDebug(2, Form("Loading alignment data for detector: %s",detName));
+  
+  AliCDBEntry *entry;
+       
+  AliCDBPath path(detName,"Align","Data");
+       
+  entry=AliCDBManager::Instance()->Get(path.GetPath());
+  if(!entry){ 
+       AliDebug(2,Form("Couldn't load alignment data for detector %s",detName));
+       return kFALSE;
+  }
+  entry->SetOwner(1);
+  TClonesArray *alignArray = (TClonesArray*) entry->GetObject();       
+  alignArray->SetOwner(0);
+  AliDebug(2,Form("Found %d alignment objects for %s",
+                       alignArray->GetEntries(),detName));
+
+  AliAlignObj *alignObj=0;
+  TIter iter(alignArray);
+       
+  // loop over align objects in detector
+  while( ( alignObj=(AliAlignObj *) iter.Next() ) ){
+       fAlignObjArray->Add(alignObj);
+  }
+  // delete entry --- Don't delete, it is cached!
+       
+  AliDebug(2, Form("fAlignObjArray entries: %d",fAlignObjArray->GetEntries() ));
+  return kTRUE;
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::MisalignGeometry(const TString& detectors)
+{
+  // Read the alignment objects from CDB.
+  // Each detector is supposed to have the
+  // alignment objects in DET/Align/Data CDB path.
+  // All the detector objects are then collected,
+  // sorted by geometry level (starting from ALIC) and
+  // then applied to the TGeo geometry.
+  // Finally an overlaps check is performed.
+
+  // Load alignment data from CDB and fill fAlignObjArray 
+  if(fLoadAlignFromCDB){
+       if(!fAlignObjArray) fAlignObjArray = new TObjArray();
+       
+       //fAlignObjArray->RemoveAll(); 
+       fAlignObjArray->Clear();        
+       fAlignObjArray->SetOwner(0);
+       TString detStr = detectors;
+       TString dataNotLoaded="";
+       TString dataLoaded="";
+  
+       for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+         if (!IsSelected(fgkDetectorName[iDet], detStr)) continue;
+         if(!SetAlignObjArraySingleDet(fgkDetectorName[iDet])){
+           dataNotLoaded += fgkDetectorName[iDet];
+           dataNotLoaded += " ";
+         } else {
+           dataLoaded += fgkDetectorName[iDet];
+           dataLoaded += " ";
+         }
+       } // end loop over detectors
+  
+       if ((detStr.CompareTo("ALL") == 0)) detStr = "";
+       dataNotLoaded += detStr;
+       if(!dataLoaded.IsNull()) AliInfo(Form("Alignment data loaded for: %s",
+                         dataLoaded.Data()));
+       if(!dataNotLoaded.IsNull()) AliInfo(Form("Didn't/couldn't load alignment data for: %s",
+                         dataNotLoaded.Data()));
+  } // fLoadAlignFromCDB flag
+  // Check if the array with alignment objects was
+  // provided by the user. If yes, apply the objects
+  // to the present TGeo geometry
+  if (fAlignObjArray) {
+    if (gGeoManager && gGeoManager->IsClosed()) {
+      if (ApplyAlignObjsToGeom(fAlignObjArray) == kFALSE) {
+       AliError("The misalignment of one or more volumes failed!"
+                "Compare the list of simulated detectors and the list of detector alignment data!");
+       return kFALSE;
+      }
+    }
+    else {
+      AliError("Can't apply the misalignment! gGeoManager doesn't exist or it is still opened!");
+      return kFALSE;
+    }
+  }
+
+  delete fAlignObjArray; fAlignObjArray=0;
+
+  // Update the TGeoPhysicalNodes
+  gGeoManager->RefreshPhysicalNodes();
+
+  return kTRUE;
+}
 
 //_____________________________________________________________________________
 void AliReconstruction::SetGAliceFile(const char* fileName)
@@ -237,24 +585,29 @@ Bool_t AliReconstruction::Run(const char* input)
     fRawReader = new AliRawReaderDate(fileName);
     fRawReader->SelectEvents(7);
   }
+  if (!fEquipIdMap.IsNull() && fRawReader)
+    fRawReader->LoadEquipmentIdsMap(fEquipIdMap);
 
-  // open the run loader
-  fRunLoader = AliRunLoader::Open(fGAliceFileName.Data());
-  if (!fRunLoader) {
-    AliError(Form("no run loader found in file %s", fGAliceFileName.Data()));
-    CleanUp();
-    return kFALSE;
-  }
-  fRunLoader->LoadgAlice();
-  AliRun* aliRun = fRunLoader->GetAliRun();
-  if (!aliRun) {
-    AliError(Form("no gAlice object found in file %s",
-                  fGAliceFileName.Data()));
-    CleanUp();
-    return kFALSE;
+
+  // get the run loader
+  if (!InitRunLoader()) return kFALSE;
+
+  // Initialize the CDB storage
+  InitCDBStorage();
+
+  // Set run number in CDBManager (if it is not already set by the user)
+  if (!SetRunNumber()) if (fStopOnError) return kFALSE;
+
+  // Import ideal TGeo geometry and apply misalignment
+  if (!gGeoManager) {
+    TString geom(gSystem->DirName(fGAliceFileName));
+    geom += "/geometry.root";
+    TGeoManager::Import(geom.Data());
+    if (!gGeoManager) if (fStopOnError) return kFALSE;
   }
-  gAlice = aliRun;
-  AliTracker::SetFieldMap(gAlice->Field());
+
+  AliCDBManager* man = AliCDBManager::Instance();
+  if (!MisalignGeometry(fLoadAlignData)) if (fStopOnError) return kFALSE;
 
   // local reconstruction
   if (!fRunLocalReconstruction.IsNull()) {
@@ -262,8 +615,8 @@ Bool_t AliReconstruction::Run(const char* input)
       if (fStopOnError) {CleanUp(); return kFALSE;}
     }
   }
-  if (!fRunVertexFinder && fRunTracking.IsNull() && 
-      fFillESD.IsNull()) return kTRUE;
+//  if (!fRunVertexFinder && fRunTracking.IsNull() && 
+//      fFillESD.IsNull()) return kTRUE;
 
   // get vertexer
   if (fRunVertexFinder && !CreateVertexer()) {
@@ -273,7 +626,7 @@ Bool_t AliReconstruction::Run(const char* input)
     }
   }
 
-  // get loaders and trackers
+  // get trackers
   if (!fRunTracking.IsNull() && !CreateTrackers(fRunTracking)) {
     if (fStopOnError) {
       CleanUp(); 
@@ -281,50 +634,141 @@ Bool_t AliReconstruction::Run(const char* input)
     }      
   }
 
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  // get the possibly already existing ESD file and tree
+  AliESD* esd = new AliESD; AliESD* hltesd = new AliESD;
+  TFile* fileOld = NULL;
+  TTree* treeOld = NULL; TTree *hlttreeOld = NULL;
+  if (!gSystem->AccessPathName("AliESDs.root")){
+    gSystem->CopyFile("AliESDs.root", "AliESDs.old.root", kTRUE);
+    fileOld = TFile::Open("AliESDs.old.root");
+    if (fileOld && fileOld->IsOpen()) {
+      treeOld = (TTree*) fileOld->Get("esdTree");
+      if (treeOld) treeOld->SetBranchAddress("ESD", &esd);
+      hlttreeOld = (TTree*) fileOld->Get("HLTesdTree");
+      if (hlttreeOld) hlttreeOld->SetBranchAddress("ESD", &hltesd);
+    }
+  }
+
   // create the ESD output file and tree
   TFile* file = TFile::Open("AliESDs.root", "RECREATE");
   if (!file->IsOpen()) {
     AliError("opening AliESDs.root failed");
-    if (fStopOnError) {CleanUp(file); return kFALSE;}    
+    if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}    
   }
-  AliESD* esd = new AliESD;
   TTree* tree = new TTree("esdTree", "Tree with ESD objects");
   tree->Branch("ESD", "AliESD", &esd);
-  delete esd;
-  gROOT->cd();
+  TTree* hlttree = new TTree("HLTesdTree", "Tree with HLT ESD objects");
+  hlttree->Branch("ESD", "AliESD", &hltesd);
+  delete esd; delete hltesd;
+  esd = NULL; hltesd = NULL;
+
+  // create the branch with ESD additions
+  AliESDfriend *esdf=0;
+  if (fWriteESDfriend) {
+     TBranch *br=tree->Branch("ESDfriend.", "AliESDfriend", &esdf);
+     br->SetFile("AliESDfriends.root");
+  }
+
+  // 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(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 < fFirstEvent) || ((fLastEvent >= 0) && (iEvent > fLastEvent))) {
+      // copy old ESD to the new one
+      if (treeOld) {
+       treeOld->SetBranchAddress("ESD", &esd);
+       treeOld->GetEntry(iEvent);
+      }
+      tree->Fill();
+      if (hlttreeOld) {
+       hlttreeOld->SetBranchAddress("ESD", &hltesd);
+       hlttreeOld->GetEntry(iEvent);
+      }
+      hlttree->Fill();
+      continue;
+    }
+
     AliInfo(Form("processing event %d", iEvent));
     fRunLoader->GetEvent(iEvent);
-    if (fRawReader) fRawReader->NextEvent();
 
-    char fileName[256];
-    sprintf(fileName, "ESD_%d.%d_final.root", 
-           aliRun->GetRunNumber(), aliRun->GetEvNumber());
-    if (!gSystem->AccessPathName(fileName)) continue;
+    char aFileName[256];
+    sprintf(aFileName, "ESD_%d.%d_final.root", 
+           fRunLoader->GetHeader()->GetRun(), 
+           fRunLoader->GetHeader()->GetEventNrInRun());
+    if (!gSystem->AccessPathName(aFileName)) continue;
+
+    // local reconstruction
+    if (!fRunLocalReconstruction.IsNull()) {
+      if (!RunLocalEventReconstruction(fRunLocalReconstruction)) {
+       if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
+      }
+    }
+
+    esd = new AliESD; hltesd = new AliESD;
+    esd->SetRunNumber(fRunLoader->GetHeader()->GetRun());
+    hltesd->SetRunNumber(fRunLoader->GetHeader()->GetRun());
+    esd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun());
+    hltesd->SetEventNumberInFile(fRunLoader->GetHeader()->GetEventNrInRun());
+
+    // Set magnetic field from the tracker
+    esd->SetMagneticField(AliTracker::GetBz());
+    hltesd->SetMagneticField(AliTracker::GetBz());
 
-    esd = new AliESD;
-    esd->SetRunNumber(aliRun->GetRunNumber());
-    esd->SetEventNumber(aliRun->GetEvNumber());
-    esd->SetMagneticField(aliRun->Field()->SolenoidField());
+    // Fill raw-data error log into the ESD
+    if (fRawReader) FillRawDataErrorLog(iEvent,esd);
 
     // vertex finder
     if (fRunVertexFinder) {
       if (!ReadESD(esd, "vertex")) {
        if (!RunVertexFinder(esd)) {
-         if (fStopOnError) {CleanUp(file); return kFALSE;}
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
        }
        if (fCheckPointLevel > 0) WriteESD(esd, "vertex");
       }
     }
 
+    // HLT tracking
+    if (!fRunTracking.IsNull()) {
+      if (fRunHLTTracking) {
+       hltesd->SetVertex(esd->GetVertex());
+       if (!RunHLTTracking(hltesd)) {
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
+       }
+      }
+    }
+
+    // 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")) {
        if (!RunTracking(esd)) {
-         if (fStopOnError) {CleanUp(file); return kFALSE;}
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
        }
        if (fCheckPointLevel > 0) WriteESD(esd, "tracking");
       }
@@ -333,24 +777,88 @@ Bool_t AliReconstruction::Run(const char* input)
     // fill ESD
     if (!fFillESD.IsNull()) {
       if (!FillESD(esd, fFillESD)) {
-       if (fStopOnError) {CleanUp(file); return kFALSE;}
+       if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
       }
     }
+    // fill Event header information from the RawEventHeader
+    if (fRawReader){FillRawEventHeaderESD(esd);}
 
     // combined PID
     AliESDpid::MakePID(esd);
     if (fCheckPointLevel > 1) WriteESD(esd, "PID");
 
+    if (fFillTriggerESD) {
+      if (!ReadESD(esd, "trigger")) {
+       if (!FillTriggerESD(esd)) {
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
+       }
+       if (fCheckPointLevel > 1) WriteESD(esd, "trigger");
+      }
+    }
+
+    //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
+    if (fWriteESDfriend) {
+       esdf=new AliESDfriend();
+       esd->GetESDfriend(esdf);
+    }
     tree->Fill();
 
-    if (fCheckPointLevel > 0) WriteESD(esd, "final");
-    delete esd;
+    // write HLT ESD
+    hlttree->Fill();
+
+    if (fCheckPointLevel > 0)  WriteESD(esd, "final"); 
+    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();
-  CleanUp(file);
+  hlttree->Write();
+
+  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)
+  // In case of empty events the tags will contain dummy values
+  CreateTag(file);
+  CleanUp(file, fileOld);
 
   return kTRUE;
 }
@@ -364,33 +872,124 @@ 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;
     AliReconstructor* reconstructor = GetReconstructor(iDet);
     if (!reconstructor) continue;
+    if (reconstructor->HasLocalReconstruction()) continue;
 
     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);
     } else {
       reconstructor->Reconstruct(fRunLoader);
     }
-    AliInfo(Form("execution time for %s:", fgkDetectorName[iDet]));
-    ToAliInfo(stopwatchDet.Print());
+    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()));
     if (fStopOnError) return kFALSE;
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
+{
+// run the local reconstruction
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  TString detStr = detectors;
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    if (!IsSelected(fgkDetectorName[iDet], detStr)) continue;
+    AliReconstructor* reconstructor = GetReconstructor(iDet);
+    if (!reconstructor) continue;
+    AliLoader* loader = fLoader[iDet];
+
+    // conversion of digits
+    if (fRawReader && reconstructor->HasDigitConversion()) {
+      AliInfo(Form("converting raw data digits into root objects for %s", 
+                  fgkDetectorName[iDet]));
+      TStopwatch stopwatchDet;
+      stopwatchDet.Start();
+      loader->LoadDigits("update");
+      loader->CleanDigits();
+      loader->MakeDigitsContainer();
+      TTree* digitsTree = loader->TreeD();
+      reconstructor->ConvertDigits(fRawReader, digitsTree);
+      loader->WriteDigits("OVERWRITE");
+      loader->UnloadDigits();
+      AliInfo(Form("Execution time for %s: R:%.2fs C:%.2fs",
+                  fgkDetectorName[iDet],
+                  stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
+    }
+
+    // local reconstruction
+    if (!reconstructor->HasLocalReconstruction()) continue;
+    AliInfo(Form("running reconstruction for %s", fgkDetectorName[iDet]));
+    TStopwatch stopwatchDet;
+    stopwatchDet.Start();
+    loader->LoadRecPoints("update");
+    loader->CleanRecPoints();
+    loader->MakeRecPointsContainer();
+    TTree* clustersTree = loader->TreeR();
+    if (fRawReader && !reconstructor->HasDigitConversion()) {
+      reconstructor->Reconstruct(fRawReader, clustersTree);
+    } else {
+      loader->LoadDigits("read");
+      TTree* digitsTree = loader->TreeD();
+      if (!digitsTree) {
+       AliError(Form("Can't get the %s digits tree", fgkDetectorName[iDet]));
+       if (fStopOnError) return kFALSE;
+      } else {
+       reconstructor->Reconstruct(digitsTree, clustersTree);
+      }
+      loader->UnloadDigits();
+    }
+    loader->WriteRecPoints("OVERWRITE");
+    loader->UnloadRecPoints();
+    AliDebug(1,Form("Execution time for %s: R:%.2fs C:%.2fs",
+                   fgkDetectorName[iDet],
+                   stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
+  }
+
+  if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
+    AliError(Form("the following detectors were not found: %s",
+                  detStr.Data()));
+    if (fStopOnError) return kFALSE;
+  }
+  
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -413,14 +1012,19 @@ 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());
+    if (fLoader[0]) fLoader[0]->UnloadRecPoints();
     if(!vertex){
       AliWarning("Vertex not found");
       vertex = new AliESDVertex();
+      vertex->SetName("default");
     }
     else {
       vertex->SetTruePos(vtxPos);  // store also the vertex from MC
+      vertex->SetName("reconstructed");
     }
 
   } else {
@@ -436,17 +1040,137 @@ 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);
   }  
   delete vertex;
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunHLTTracking(AliESD*& esd)
+{
+// run the HLT barrel tracking
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  if (!fRunLoader) {
+    AliError("Missing runLoader!");
+    return kFALSE;
+  }
+
+  AliInfo("running HLT tracking");
+
+  // Get a pointer to the HLT reconstructor
+  AliReconstructor *reconstructor = GetReconstructor(fgkNDetectors-1);
+  if (!reconstructor) return kFALSE;
+
+  // TPC + ITS
+  for (Int_t iDet = 1; iDet >= 0; iDet--) {
+    TString detName = fgkDetectorName[iDet];
+    AliDebug(1, Form("%s HLT tracking", detName.Data()));
+    reconstructor->SetOption(detName.Data());
+    AliTracker *tracker = reconstructor->CreateTracker(fRunLoader);
+    if (!tracker) {
+      AliWarning(Form("couldn't create a HLT tracker for %s", detName.Data()));
+      if (fStopOnError) return kFALSE;
+      continue;
+    }
+    Double_t vtxPos[3];
+    Double_t vtxErr[3]={0.005,0.005,0.010};
+    const AliESDVertex *vertex = esd->GetVertex();
+    vertex->GetXYZ(vtxPos);
+    tracker->SetVertex(vtxPos,vtxErr);
+    if(iDet != 1) {
+      fLoader[iDet]->LoadRecPoints("read");
+      TTree* tree = fLoader[iDet]->TreeR();
+      if (!tree) {
+       AliError(Form("Can't get the %s cluster tree", detName.Data()));
+       return kFALSE;
+      }
+      tracker->LoadClusters(tree);
+    }
+    if (tracker->Clusters2Tracks(esd) != 0) {
+      AliError(Form("HLT %s Clusters2Tracks failed", fgkDetectorName[iDet]));
+      return kFALSE;
+    }
+    if(iDet != 1) {
+      tracker->UnloadClusters();
+    }
+    delete tracker;
+  }
+
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  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)
 {
@@ -479,6 +1203,12 @@ Bool_t AliReconstruction::RunTracking(AliESD*& esd)
     if (fCheckPointLevel > 1) {
       WriteESD(esd, Form("%s.tracking", fgkDetectorName[iDet]));
     }
+    // preliminary PID in TPC needed by the ITS tracker
+    if (iDet == 1) {
+      GetReconstructor(1)->FillESD(fRunLoader, esd);
+      GetReconstructor(1)->FillESD((TTree*)NULL, (TTree*)NULL, esd);
+      AliESDpid::MakePID(esd);
+    }
   }
 
   // pass 2: ALL backwards
@@ -489,13 +1219,8 @@ Bool_t AliReconstruction::RunTracking(AliESD*& esd)
     // load clusters
     if (iDet > 1) {     // all except ITS, TPC
       TTree* tree = NULL;
-      if (iDet == 3) {   // TOF
-       fLoader[iDet]->LoadDigits("read");
-       tree = fLoader[iDet]->TreeD();
-      } else {
-       fLoader[iDet]->LoadRecPoints("read");
-       tree = fLoader[iDet]->TreeR();
-      }
+      fLoader[iDet]->LoadRecPoints("read");
+      tree = fLoader[iDet]->TreeR();
       if (!tree) {
        AliError(Form("Can't get the %s cluster tree", fgkDetectorName[iDet]));
        return kFALSE;
@@ -515,14 +1240,21 @@ Bool_t AliReconstruction::RunTracking(AliESD*& esd)
     // unload clusters
     if (iDet > 2) {     // all except ITS, TPC, TRD
       fTracker[iDet]->UnloadClusters();
-      if (iDet == 3) {   // TOF
-       fLoader[iDet]->UnloadDigits();
-      } else {
-       fLoader[iDet]->UnloadRecPoints();
-      }
+      fLoader[iDet]->UnloadRecPoints();
+    }
+    // updated PID in TPC needed by the ITS tracker -MI
+    if (iDet == 1) {
+      GetReconstructor(1)->FillESD(fRunLoader, esd);
+      GetReconstructor(1)->FillESD((TTree*)NULL, (TTree*)NULL, esd);
+      AliESDpid::MakePID(esd);
     }
   }
 
+  // write space-points to the ESD in case alignment data output
+  // is switched on
+  if (fWriteAlignmentData)
+    WriteAlignmentData(esd);
+
   // pass 3: TRD + TPC + ITS refit inwards
   for (Int_t iDet = 2; iDet >= 0; iDet--) {
     if (!fTracker[iDet]) continue;
@@ -541,9 +1273,24 @@ Bool_t AliReconstruction::RunTracking(AliESD*& esd)
     fTracker[iDet]->UnloadClusters();
     fLoader[iDet]->UnloadRecPoints();
   }
-
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  //
+  // Propagate track to the vertex - if not done by ITS
+  //
+  Int_t ntracks = esd->GetNumberOfTracks();
+  for (Int_t itrack=0; itrack<ntracks; itrack++){
+    const Double_t kRadius  = 3;   // beam pipe radius
+    const Double_t kMaxStep = 5;   // max step
+    const Double_t kMaxD    = 123456;  // max distance to prim vertex
+    Double_t       fieldZ   = AliTracker::GetBz();  //
+    AliESDtrack * track = esd->GetTrack(itrack);
+    if (!track) continue;
+    if (track->IsOn(AliESDtrack::kITSrefit)) continue;
+    track->PropagateTo(kRadius, fieldZ, track->GetMass(),kMaxStep,kTRUE);
+    track->RelateToVertex(esd->GetVertex(),fieldZ, kMaxD);
+  }
+  
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -565,6 +1312,36 @@ Bool_t AliReconstruction::FillESD(AliESD*& esd, const TString& detectors)
 
     if (!ReadESD(esd, fgkDetectorName[iDet])) {
       AliDebug(1, Form("filling ESD for %s", fgkDetectorName[iDet]));
+      TTree* clustersTree = NULL;
+      if (reconstructor->HasLocalReconstruction() && fLoader[iDet]) {
+       fLoader[iDet]->LoadRecPoints("read");
+       clustersTree = fLoader[iDet]->TreeR();
+       if (!clustersTree) {
+         AliError(Form("Can't get the %s clusters tree", 
+                       fgkDetectorName[iDet]));
+         if (fStopOnError) return kFALSE;
+       }
+      }
+      if (fRawReader && !reconstructor->HasDigitConversion()) {
+        reconstructor->FillESD(fRawReader, clustersTree, esd);
+      } else {
+       TTree* digitsTree = NULL;
+       if (fLoader[iDet]) {
+         fLoader[iDet]->LoadDigits("read");
+         digitsTree = fLoader[iDet]->TreeD();
+         if (!digitsTree) {
+           AliError(Form("Can't get the %s digits tree", 
+                         fgkDetectorName[iDet]));
+           if (fStopOnError) return kFALSE;
+         }
+       }
+       reconstructor->FillESD(digitsTree, clustersTree, esd);
+       if (fLoader[iDet]) fLoader[iDet]->UnloadDigits();
+      }
+      if (reconstructor->HasLocalReconstruction() && fLoader[iDet]) {
+       fLoader[iDet]->UnloadRecPoints();
+      }
+
       if (fRawReader) {
         reconstructor->FillESD(fRunLoader, fRawReader, esd);
       } else {
@@ -580,8 +1357,80 @@ Bool_t AliReconstruction::FillESD(AliESD*& esd, const TString& detectors)
     if (fStopOnError) return kFALSE;
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::FillTriggerESD(AliESD*& esd)
+{
+  // Reads the trigger decision which is
+  // stored in Trigger.root file and fills
+  // the corresponding esd entries
+
+  AliInfo("Filling trigger information into the ESD");
+
+  if (fRawReader) {
+    AliCTPRawStream input(fRawReader);
+    if (!input.Next()) {
+      AliError("No valid CTP (trigger) DDL raw data is found ! The trigger information is not stored in the ESD !");
+      return kFALSE;
+    }
+    esd->SetTriggerMask(input.GetClassMask());
+    esd->SetTriggerCluster(input.GetClusterMask());
+  }
+  else {
+    AliRunLoader *runloader = AliRunLoader::GetRunLoader();
+    if (runloader) {
+      if (!runloader->LoadTrigger()) {
+       AliCentralTrigger *aCTP = runloader->GetTrigger();
+       esd->SetTriggerMask(aCTP->GetClassMask());
+       esd->SetTriggerCluster(aCTP->GetClusterMask());
+      }
+      else {
+       AliWarning("No trigger can be loaded! The trigger information is not stored in the ESD !");
+       return kFALSE;
+      }
+    }
+    else {
+      AliError("No run loader is available! The trigger information is not stored in the ESD !");
+      return kFALSE;
+    }
+  }
+
+  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;
 }
@@ -620,10 +1469,86 @@ Bool_t AliReconstruction::IsSelected(TString detName, TString& detectors) const
   return result;
 }
 
+//_____________________________________________________________________________
+Bool_t AliReconstruction::InitRunLoader()
+{
+// get or create the run loader
+
+  if (gAlice) delete gAlice;
+  gAlice = NULL;
+
+  if (!gSystem->AccessPathName(fGAliceFileName.Data())) { // galice.root exists
+    // load all base libraries to get the loader classes
+    TString libs = gSystem->GetLibraries();
+    for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+      TString detName = fgkDetectorName[iDet];
+      if (detName == "HLT") continue;
+      if (libs.Contains("lib" + detName + "base.so")) continue;
+      gSystem->Load("lib" + detName + "base.so");
+    }
+    fRunLoader = AliRunLoader::Open(fGAliceFileName.Data());
+    if (!fRunLoader) {
+      AliError(Form("no run loader found in file %s", fGAliceFileName.Data()));
+      CleanUp();
+      return kFALSE;
+    }
+    fRunLoader->CdGAFile();
+    if (gFile->GetKey(AliRunLoader::GetGAliceName())) {
+      if (fRunLoader->LoadgAlice() == 0) {
+       gAlice = fRunLoader->GetAliRun();
+       AliTracker::SetFieldMap(gAlice->Field(),fUniformField);
+      }
+    }
+    if (!gAlice && !fRawReader) {
+      AliError(Form("no gAlice object found in file %s",
+                   fGAliceFileName.Data()));
+      CleanUp();
+      return kFALSE;
+    }
+
+  } else {               // galice.root does not exist
+    if (!fRawReader) {
+      AliError(Form("the file %s does not exist", fGAliceFileName.Data()));
+      CleanUp();
+      return kFALSE;
+    }
+    fRunLoader = AliRunLoader::Open(fGAliceFileName.Data(),
+                                   AliConfig::GetDefaultEventFolderName(),
+                                   "recreate");
+    if (!fRunLoader) {
+      AliError(Form("could not create run loader in file %s", 
+                   fGAliceFileName.Data()));
+      CleanUp();
+      return kFALSE;
+    }
+    fRunLoader->MakeTree("E");
+    Int_t iEvent = 0;
+    while (fRawReader->NextEvent()) {
+      fRunLoader->SetEventNumber(iEvent);
+      fRunLoader->GetHeader()->Reset(fRawReader->GetRunNumber(), 
+                                    iEvent, iEvent);
+      fRunLoader->MakeTree("H");
+      fRunLoader->TreeE()->Fill();
+      iEvent++;
+    }
+    fRawReader->RewindEvents();
+    if (fNumberOfEventsPerFile > 0)
+      fRunLoader->SetNumberOfEventsPerFile(fNumberOfEventsPerFile);
+    else
+      fRunLoader->SetNumberOfEventsPerFile(iEvent);
+    fRunLoader->WriteHeader("OVERWRITE");
+    fRunLoader->CdGAFile();
+    fRunLoader->Write(0, TObject::kOverwrite);
+//    AliTracker::SetFieldMap(???);
+  }
+
+  return kTRUE;
+}
+
 //_____________________________________________________________________________
 AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
 {
-// get the reconstructor object for a detector
+// get the reconstructor object and the loader for a detector
 
   if (fReconstructor[iDet]) return fReconstructor[iDet];
 
@@ -631,14 +1556,14 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
   TPluginManager* pluginManager = gROOT->GetPluginManager();
   TString detName = fgkDetectorName[iDet];
   TString recName = "Ali" + detName + "Reconstructor";
-  if (!gAlice->GetDetector(detName) && (detName != "HLT")) return NULL;
+  if (gAlice && !gAlice->GetDetector(detName) && (detName != "HLT")) return NULL;
 
   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");
     }
   }
 
@@ -646,10 +1571,12 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
   // first check if a plugin is defined for the reconstructor
   TPluginHandler* pluginHandler = 
     pluginManager->FindHandler("AliReconstructor", detName);
-  // if not, but the reconstructor class is implemented, add a plugin for it
-  if (!pluginHandler && gROOT->GetClass(recName.Data())) {
+  // if not, add a plugin for it
+  if (!pluginHandler) {
     AliDebug(1, Form("defining plugin for %s", recName.Data()));
-    if (gSystem->Load("lib" + detName + "base.so") == 0) {
+    TString libs = gSystem->GetLibraries();
+    if (libs.Contains("lib" + detName + "base.so") ||
+       (gSystem->Load("lib" + detName + "base.so") >= 0)) {
       pluginManager->AddHandler("AliReconstructor", detName, 
                                recName, detName + "rec", recName + "()");
     } else {
@@ -664,9 +1591,49 @@ AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
   if (reconstructor) {
     TObject* obj = fOptions.FindObject(detName.Data());
     if (obj) reconstructor->SetOption(obj->GetTitle());
+    reconstructor->Init(fRunLoader);
     fReconstructor[iDet] = reconstructor;
   }
 
+  // get or create the loader
+  if (detName != "HLT") {
+    fLoader[iDet] = fRunLoader->GetLoader(detName + "Loader");
+    if (!fLoader[iDet]) {
+      AliConfig::Instance()
+       ->CreateDetectorFolders(fRunLoader->GetEventFolder(), 
+                               detName, detName);
+      // first check if a plugin is defined for the loader
+      pluginHandler = 
+       pluginManager->FindHandler("AliLoader", detName);
+      // if not, add a plugin for it
+      if (!pluginHandler) {
+       TString loaderName = "Ali" + detName + "Loader";
+       AliDebug(1, Form("defining plugin for %s", loaderName.Data()));
+       pluginManager->AddHandler("AliLoader", detName, 
+                                 loaderName, detName + "base", 
+                                 loaderName + "(const char*, TFolder*)");
+       pluginHandler = pluginManager->FindHandler("AliLoader", detName);
+      }
+      if (pluginHandler && (pluginHandler->LoadPlugin() == 0)) {
+       fLoader[iDet] = 
+         (AliLoader*) pluginHandler->ExecPlugin(2, detName.Data(), 
+                                                fRunLoader->GetEventFolder());
+      }
+      if (!fLoader[iDet]) {   // use default loader
+       fLoader[iDet] = new AliLoader(detName, fRunLoader->GetEventFolder());
+      }
+      if (!fLoader[iDet]) {
+       AliWarning(Form("couldn't get loader for %s", detName.Data()));
+       if (fStopOnError) return NULL;
+      } else {
+       fRunLoader->AddLoader(fLoader[iDet]);
+       fRunLoader->CdGAFile();
+       if (gFile && !gFile->IsWritable()) gFile->ReOpen("UPDATE");
+       fRunLoader->Write(0, TObject::kOverwrite);
+      }
+    }
+  }
+      
   return reconstructor;
 }
 
@@ -691,7 +1658,7 @@ Bool_t AliReconstruction::CreateVertexer()
 //_____________________________________________________________________________
 Bool_t AliReconstruction::CreateTrackers(const TString& detectors)
 {
-// get the loaders and create the trackers
+// create the trackers
 
   TString detStr = detectors;
   for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
@@ -699,17 +1666,20 @@ Bool_t AliReconstruction::CreateTrackers(const TString& detectors)
     AliReconstructor* reconstructor = GetReconstructor(iDet);
     if (!reconstructor) continue;
     TString detName = fgkDetectorName[iDet];
-    if (detName == "HLT") continue;
-    fLoader[iDet] = fRunLoader->GetLoader(detName + "Loader");
-    if (!fLoader[iDet]) {
-      AliWarning(Form("no %s loader found", detName.Data()));
+    if (detName == "HLT") {
+      fRunHLTTracking = kTRUE;
+      continue;
+    }
+    if (detName == "MUON") {
+      fRunMuonTracking = kTRUE;
+      continue;
+    }
+
+
+    fTracker[iDet] = reconstructor->CreateTracker(fRunLoader);
+    if (!fTracker[iDet] && (iDet < 7)) {
+      AliWarning(Form("couldn't create a tracker for %s", detName.Data()));
       if (fStopOnError) return kFALSE;
-    } else {
-      fTracker[iDet] = reconstructor->CreateTracker(fRunLoader);
-      if (!fTracker[iDet] && (iDet < 7)) {
-       AliWarning(Form("couldn't create a tracker for %s", detName.Data()));
-       if (fStopOnError) return kFALSE;
-      }
     }
   }
 
@@ -717,7 +1687,7 @@ Bool_t AliReconstruction::CreateTrackers(const TString& detectors)
 }
 
 //_____________________________________________________________________________
-void AliReconstruction::CleanUp(TFile* file)
+void AliReconstruction::CleanUp(TFile* file, TFile* fileOld)
 {
 // delete trackers and the run loader and close and delete the file
 
@@ -730,6 +1700,8 @@ void AliReconstruction::CleanUp(TFile* file)
   }
   delete fVertexer;
   fVertexer = NULL;
+  delete fDiamondProfile;
+  fDiamondProfile = NULL;
 
   delete fRunLoader;
   fRunLoader = NULL;
@@ -740,6 +1712,12 @@ void AliReconstruction::CleanUp(TFile* file)
     file->Close();
     delete file;
   }
+
+  if (fileOld) {
+    fileOld->Close();
+    delete fileOld;
+    gSystem->Unlink("AliESDs.old.root");
+  }
 }
 
 
@@ -751,9 +1729,10 @@ 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));
   AliDebug(1, Form("reading ESD from file %s", fileName));
   TFile* file = TFile::Open(fileName);
   if (!file || !file->IsOpen()) {
@@ -778,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");
@@ -790,3 +1769,1048 @@ void AliReconstruction::WriteESD(AliESD* esd, const char* recStep) const
   }
   delete file;
 }
+
+
+
+
+//_____________________________________________________________________________
+void AliReconstruction::CreateTag(TFile* file)
+{
+  /////////////
+  //muon code//
+  ////////////
+  Double_t fMUONMASS = 0.105658369;
+  //Variables
+  Double_t fX,fY,fZ ;
+  Double_t fThetaX, fThetaY, fPyz, fChisquare;
+  Double_t fPxRec,fPyRec, fPzRec, fEnergy;
+  Int_t fCharge;
+  TLorentzVector fEPvector;
+
+  Float_t fZVertexCut = 10.0; 
+  Float_t fRhoVertexCut = 2.0; 
+
+  Float_t fLowPtCut = 1.0;
+  Float_t fHighPtCut = 3.0;
+  Float_t fVeryHighPtCut = 10.0;
+  ////////////
+
+  Double_t partFrac[5] = {0.01, 0.01, 0.85, 0.10, 0.05};
+
+  // Creates the tags for all the events in a given ESD file
+  Int_t ntrack;
+  Int_t nProtons, nKaons, nPions, nMuons, nElectrons;
+  Int_t nPos, nNeg, nNeutr;
+  Int_t nK0s, nNeutrons, nPi0s, nGamas;
+  Int_t nCh1GeV, nCh3GeV, nCh10GeV;
+  Int_t nMu1GeV, nMu3GeV, nMu10GeV;
+  Int_t nEl1GeV, nEl3GeV, nEl10GeV;
+  Float_t maxPt = .0, meanPt = .0, totalP = .0;
+  Int_t fVertexflag;
+  Int_t iRunNumber = 0;
+  TString fVertexName("default");
+
+  AliRunTag *tag = new AliRunTag();
+  AliEventTag *evTag = new AliEventTag();
+  TTree ttag("T","A Tree with event tags");
+  TBranch * btag = ttag.Branch("AliTAG", &tag);
+  btag->SetCompressionLevel(9);
+  
+  AliInfo(Form("Creating the tags......."));   
+  
+  if (!file || !file->IsOpen()) {
+    AliError(Form("opening failed"));
+    delete file;
+    return ;
+  }  
+  Int_t lastEvent = 0;
+  TTree *t = (TTree*) file->Get("esdTree");
+  TBranch * b = t->GetBranch("ESD");
+  AliESD *esd = 0;
+  b->SetAddress(&esd);
+
+  b->GetEntry(fFirstEvent);
+  Int_t iInitRunNumber = esd->GetRunNumber();
+  
+  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;
+    nNeutr =0;
+    nK0s = 0;
+    nNeutrons = 0;
+    nPi0s = 0;
+    nGamas = 0;
+    nProtons = 0;
+    nKaons = 0;
+    nPions = 0;
+    nMuons = 0;
+    nElectrons = 0;      
+    nCh1GeV = 0;
+    nCh3GeV = 0;
+    nCh10GeV = 0;
+    nMu1GeV = 0;
+    nMu3GeV = 0;
+    nMu10GeV = 0;
+    nEl1GeV = 0;
+    nEl3GeV = 0;
+    nEl10GeV = 0;
+    maxPt = .0;
+    meanPt = .0;
+    totalP = .0;
+    fVertexflag = 0;
+
+    b->GetEntry(iEventNumber);
+    iRunNumber = esd->GetRunNumber();
+    if(iRunNumber != iInitRunNumber) AliFatal("Inconsistency of run numbers in the AliESD!!!");
+    const AliESDVertex * vertexIn = esd->GetVertex();
+    if (!vertexIn) AliError("ESD has not defined vertex.");
+    if (vertexIn) fVertexName = vertexIn->GetName();
+    if(fVertexName != "default") fVertexflag = 1;
+    for (Int_t iTrackNumber = 0; iTrackNumber < esd->GetNumberOfTracks(); iTrackNumber++) {
+      AliESDtrack * esdTrack = esd->GetTrack(iTrackNumber);
+      UInt_t status = esdTrack->GetStatus();
+      
+      //select only tracks with ITS refit
+      if ((status&AliESDtrack::kITSrefit)==0) continue;
+      //select only tracks with TPC refit
+      if ((status&AliESDtrack::kTPCrefit)==0) continue;
+      
+      //select only tracks with the "combined PID"
+      if ((status&AliESDtrack::kESDpid)==0) continue;
+      Double_t p[3];
+      esdTrack->GetPxPyPz(p);
+      Double_t momentum = sqrt(pow(p[0],2) + pow(p[1],2) + pow(p[2],2));
+      Double_t fPt = sqrt(pow(p[0],2) + pow(p[1],2));
+      totalP += momentum;
+      meanPt += fPt;
+      if(fPt > maxPt) maxPt = fPt;
+      
+      if(esdTrack->GetSign() > 0) {
+       nPos++;
+       if(fPt > fLowPtCut) nCh1GeV++;
+       if(fPt > fHighPtCut) nCh3GeV++;
+       if(fPt > fVeryHighPtCut) nCh10GeV++;
+      }
+      if(esdTrack->GetSign() < 0) {
+       nNeg++;
+       if(fPt > fLowPtCut) nCh1GeV++;
+       if(fPt > fHighPtCut) nCh3GeV++;
+       if(fPt > fVeryHighPtCut) nCh10GeV++;
+      }
+      if(esdTrack->GetSign() == 0) nNeutr++;
+      
+      //PID
+      Double_t prob[5];
+      esdTrack->GetESDpid(prob);
+      
+      Double_t rcc = 0.0;
+      for(Int_t i = 0; i < AliPID::kSPECIES; i++) rcc += prob[i]*partFrac[i];
+      if(rcc == 0.0) continue;
+      //Bayes' formula
+      Double_t w[5];
+      for(Int_t i = 0; i < AliPID::kSPECIES; i++) w[i] = prob[i]*partFrac[i]/rcc;
+      
+      //protons
+      if ((w[4]>w[3])&&(w[4]>w[2])&&(w[4]>w[1])&&(w[4]>w[0])) nProtons++;
+      //kaons
+      if ((w[3]>w[4])&&(w[3]>w[2])&&(w[3]>w[1])&&(w[3]>w[0])) nKaons++;
+      //pions
+      if ((w[2]>w[4])&&(w[2]>w[3])&&(w[2]>w[1])&&(w[2]>w[0])) nPions++; 
+      //electrons
+      if ((w[0]>w[4])&&(w[0]>w[3])&&(w[0]>w[2])&&(w[0]>w[1])) {
+       nElectrons++;
+       if(fPt > fLowPtCut) nEl1GeV++;
+       if(fPt > fHighPtCut) nEl3GeV++;
+       if(fPt > fVeryHighPtCut) nEl10GeV++;
+      }          
+      ntrack++;
+    }//track loop
+    
+    /////////////
+    //muon code//
+    ////////////
+    Int_t nMuonTracks = esd->GetNumberOfMuonTracks();
+    // loop over all reconstructed tracks (also first track of combination)
+    for (Int_t iTrack = 0; iTrack <  nMuonTracks;  iTrack++) {
+      AliESDMuonTrack* muonTrack = esd->GetMuonTrack(iTrack);
+      if (muonTrack == 0x0) continue;
+      
+      // Coordinates at vertex
+      fZ = muonTrack->GetZ(); 
+      fY = muonTrack->GetBendingCoor();
+      fX = muonTrack->GetNonBendingCoor(); 
+      
+      fThetaX = muonTrack->GetThetaX();
+      fThetaY = muonTrack->GetThetaY();
+      
+      fPyz = 1./TMath::Abs(muonTrack->GetInverseBendingMomentum());
+      fPzRec = - fPyz / TMath::Sqrt(1.0 + TMath::Tan(fThetaY)*TMath::Tan(fThetaY));
+      fPxRec = fPzRec * TMath::Tan(fThetaX);
+      fPyRec = fPzRec * TMath::Tan(fThetaY);
+      fCharge = Int_t(TMath::Sign(1.,muonTrack->GetInverseBendingMomentum()));
+      
+      //ChiSquare of the track if needed
+      fChisquare = muonTrack->GetChi2()/(2.0 * muonTrack->GetNHit() - 5);
+      fEnergy = TMath::Sqrt(fMUONMASS * fMUONMASS + fPxRec * fPxRec + fPyRec * fPyRec + fPzRec * fPzRec);
+      fEPvector.SetPxPyPzE(fPxRec, fPyRec, fPzRec, fEnergy);
+      
+      // total number of muons inside a vertex cut 
+      if((TMath::Abs(fZ)<fZVertexCut) && (TMath::Sqrt(fY*fY+fX*fX)<fRhoVertexCut)) {
+       nMuons++;
+       if(fEPvector.Pt() > fLowPtCut) {
+         nMu1GeV++; 
+         if(fEPvector.Pt() > fHighPtCut) {
+           nMu3GeV++; 
+           if (fEPvector.Pt() > fVeryHighPtCut) {
+             nMu10GeV++;
+           }
+         }
+       }
+      }
+    }//muon track loop
+    
+    // Fill the event tags 
+    if(ntrack != 0)
+      meanPt = meanPt/ntrack;
+    
+    evTag->SetEventId(iEventNumber+1);
+    if (vertexIn) {
+      evTag->SetVertexX(vertexIn->GetXv());
+      evTag->SetVertexY(vertexIn->GetYv());
+      evTag->SetVertexZ(vertexIn->GetZv());
+      evTag->SetVertexZError(vertexIn->GetZRes());
+    }  
+    evTag->SetVertexFlag(fVertexflag);
+
+    evTag->SetT0VertexZ(esd->GetT0zVertex());
+    
+    evTag->SetTriggerMask(esd->GetTriggerMask());
+    evTag->SetTriggerCluster(esd->GetTriggerCluster());
+    
+    evTag->SetZDCNeutron1Energy(esd->GetZDCN1Energy());
+    evTag->SetZDCProton1Energy(esd->GetZDCP1Energy());
+    evTag->SetZDCNeutron2Energy(esd->GetZDCN2Energy());
+    evTag->SetZDCProton2Energy(esd->GetZDCP2Energy());
+    evTag->SetZDCEMEnergy(esd->GetZDCEMEnergy());
+    evTag->SetNumOfParticipants(esd->GetZDCParticipants());
+    
+    
+    evTag->SetNumOfTracks(esd->GetNumberOfTracks());
+    evTag->SetNumOfPosTracks(nPos);
+    evTag->SetNumOfNegTracks(nNeg);
+    evTag->SetNumOfNeutrTracks(nNeutr);
+    
+    evTag->SetNumOfV0s(esd->GetNumberOfV0s());
+    evTag->SetNumOfCascades(esd->GetNumberOfCascades());
+    evTag->SetNumOfKinks(esd->GetNumberOfKinks());
+    evTag->SetNumOfPMDTracks(esd->GetNumberOfPmdTracks());
+    
+    evTag->SetNumOfProtons(nProtons);
+    evTag->SetNumOfKaons(nKaons);
+    evTag->SetNumOfPions(nPions);
+    evTag->SetNumOfMuons(nMuons);
+    evTag->SetNumOfElectrons(nElectrons);
+    evTag->SetNumOfPhotons(nGamas);
+    evTag->SetNumOfPi0s(nPi0s);
+    evTag->SetNumOfNeutrons(nNeutrons);
+    evTag->SetNumOfKaon0s(nK0s);
+    
+    evTag->SetNumOfChargedAbove1GeV(nCh1GeV);
+    evTag->SetNumOfChargedAbove3GeV(nCh3GeV);
+    evTag->SetNumOfChargedAbove10GeV(nCh10GeV);
+    evTag->SetNumOfMuonsAbove1GeV(nMu1GeV);
+    evTag->SetNumOfMuonsAbove3GeV(nMu3GeV);
+    evTag->SetNumOfMuonsAbove10GeV(nMu10GeV);
+    evTag->SetNumOfElectronsAbove1GeV(nEl1GeV);
+    evTag->SetNumOfElectronsAbove3GeV(nEl3GeV);
+    evTag->SetNumOfElectronsAbove10GeV(nEl10GeV);
+    
+    evTag->SetNumOfPHOSClusters(esd->GetNumberOfPHOSClusters());
+    evTag->SetNumOfEMCALClusters(esd->GetNumberOfEMCALClusters());
+    
+    evTag->SetTotalMomentum(totalP);
+    evTag->SetMeanPt(meanPt);
+    evTag->SetMaxPt(maxPt);
+    
+    tag->SetRunId(iInitRunNumber);
+    tag->AddEventTag(*evTag);
+  }
+  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(),fFirstEvent,lastEvent );
+  AliInfo(Form("writing tags to file %s", fileName));
+  AliDebug(1, Form("writing tags to file %s", fileName));
+  TFile* ftag = TFile::Open(fileName, "recreate");
+  ftag->cd();
+  ttag.Write();
+  ftag->Close();
+  file->cd();
+  delete tag;
+  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
+  // For the moment only ITS, TRD and TPC
+
+  // Load TOF clusters
+  if (fTracker[3]){
+    fLoader[3]->LoadRecPoints("read");
+    TTree* tree = fLoader[3]->TreeR();
+    if (!tree) {
+      AliError(Form("Can't get the %s cluster tree", fgkDetectorName[3]));
+      return;
+    }
+    fTracker[3]->LoadClusters(tree);
+  }
+  Int_t ntracks = esd->GetNumberOfTracks();
+  for (Int_t itrack = 0; itrack < ntracks; itrack++)
+    {
+      AliESDtrack *track = esd->GetTrack(itrack);
+      Int_t nsp = 0;
+      Int_t idx[200];
+      for (Int_t iDet = 3; iDet >= 0; iDet--)
+       nsp += track->GetNcls(iDet);
+      if (nsp) {
+       AliTrackPointArray *sp = new AliTrackPointArray(nsp);
+       track->SetTrackPointArray(sp);
+       Int_t isptrack = 0;
+       for (Int_t iDet = 3; iDet >= 0; iDet--) {
+         AliTracker *tracker = fTracker[iDet];
+         if (!tracker) continue;
+         Int_t nspdet = track->GetNcls(iDet);
+         if (nspdet <= 0) continue;
+         track->GetClusters(iDet,idx);
+         AliTrackPoint p;
+         Int_t isp = 0;
+         Int_t isp2 = 0;
+         while (isp < nspdet) {
+           Bool_t isvalid = tracker->GetTrackPoint(idx[isp2],p); isp2++;
+           const Int_t kNTPCmax = 159;
+           if (iDet==1 && isp2>kNTPCmax) break;   // to be fixed
+           if (!isvalid) continue;
+           sp->AddPoint(isptrack,&p); isptrack++; isp++;
+         }
+       }       
+      }
+    }
+  if (fTracker[3]){
+    fTracker[3]->UnloadClusters();
+    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);
+  }
+
+}