]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliReconstruction.cxx
Alignment framework (C.Cheshkov). More information is available in http://agenda...
[u/mrichter/AliRoot.git] / STEER / AliReconstruction.cxx
index 9df426ef4dee6914d464886503e062b5e7804032..6333f977d1647ed5f4d51abb4198b45397c7c35c 100644 (file)
 //   rec.Run();                                                              //
 //                                                                           //
 // The Run method returns kTRUE in case of successful execution.             //
+//                                                                           //
+// If the input to the reconstruction are not simulated digits but raw data, //
+// this can be specified by an argument of the Run method or by the method   //
+//                                                                           //
+//   rec.SetInput("...");                                                    //
+//                                                                           //
+// The input formats and the corresponding argument are:                     //
+// - DDL raw data files: directory name, ends with "/"                       //
+// - raw data root file: root file name, extension ".root"                   //
+// - 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.                                           //
+//                                                                           //
 // 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.SetGAliceFile("...");                                               //
 //                                                                           //
-// The reconstruction can be switched on or off for individual detectors by  //
+// The local reconstruction can be switched on or off for individual         //
+// detectors by                                                              //
 //                                                                           //
-//   rec.SetRunReconstruction("...");                                        //
+//   rec.SetRunLocalReconstruction("...");                                   //
 //                                                                           //
 // The argument is a (case sensitive) string with the names of the           //
 // detectors separated by a space. The special string "ALL" selects all      //
 // available detectors. This is the default.                                 //
 //                                                                           //
-// The tracking in ITS, TPC and TRD and the creation of ESD tracks can be    //
-// switched off by                                                           //
+// The reconstruction of the primary vertex position can be switched off by  //
+//                                                                           //
+//   rec.SetRunVertexFinder(kFALSE);                                         //
 //                                                                           //
-//   rec.SetRunTracking(kFALSE);                                             //
+// The tracking and the creation of ESD tracks can be switched on for        //
+// selected detectors by                                                     //
+//                                                                           //
+//   rec.SetRunTracking("...");                                              //
+//                                                                           //
+// Uniform/nonuniform field tracking switches (default: uniform field)       //
+//                                                                           //
+//   rec.SetUniformFieldTracking();  ( rec.SetNonuniformFieldTracking(); )   //
 //                                                                           //
 // The filling of additional ESD information can be steered by               //
 //                                                                           //
 //   rec.SetFillESD("...");                                                  //
 //                                                                           //
-// Again, the string specifies the list of detectors. The default is "ALL".  //
+// Again, for both methods the string specifies the list of detectors.       //
+// The default is "ALL".                                                     //
 //                                                                           //
-// The reconstruction requires digits as input. For the creation of digits   //
-// have a look at the class AliSimulation.                                   //
+// The call of the shortcut method                                           //
+//                                                                           //
+//   rec.SetRunReconstruction("...");                                        //
+//                                                                           //
+// is equivalent to calling SetRunLocalReconstruction, SetRunTracking and    //
+// SetFillESD with the same detector selecting string as argument.           //
+//                                                                           //
+// The reconstruction requires digits or raw data as input. For the creation //
+// of digits and raw data have a look at the class AliSimulation.            //
+//                                                                           //
+// For debug purposes the method SetCheckPointLevel can be used. If the      //
+// argument is greater than 0, files with ESD events will be written after   //
+// selected steps of the reconstruction for each event:                      //
+//   level 1: after tracking and after filling of ESD (final)                //
+//   level 2: in addition after each tracking step                           //
+//   level 3: in addition after the filling of ESD for each detector         //
+// If a final check point file exists for an event, this event will be       //
+// skipped in the reconstruction. The tracking and the filling of ESD for    //
+// a detector will be skipped as well, if the corresponding check point      //
+// file exists. The ESD event will then be loaded from the file instead.     //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TArrayF.h>
+#include <TFile.h>
+#include <TSystem.h>
+#include <TROOT.h>
+#include <TPluginManager.h>
+#include <TStopwatch.h>
 
 #include "AliReconstruction.h"
+#include "AliReconstructor.h"
+#include "AliLog.h"
 #include "AliRunLoader.h"
 #include "AliRun.h"
-#include "AliModule.h"
-#include "AliDetector.h"
-#include "AliTracker.h"
+#include "AliRawReaderFile.h"
+#include "AliRawReaderDate.h"
+#include "AliRawReaderRoot.h"
 #include "AliESD.h"
+#include "AliESDVertex.h"
+#include "AliTracker.h"
+#include "AliVertexer.h"
 #include "AliHeader.h"
 #include "AliGenEventHeader.h"
+#include "AliPID.h"
 #include "AliESDpid.h"
-#include "AliMagF.h"
-#include <TArrayF.h>
+//#include "AliMagF.h"
+
+
 
+#include "AliRunTag.h"
+//#include "AliLHCTag.h"
+#include "AliDetectorTag.h"
+#include "AliEventTag.h"
+
+#include "AliTrackPointArray.h"
 
 ClassImp(AliReconstruction)
 
 
+//_____________________________________________________________________________
+const char* AliReconstruction::fgkDetectorName[AliReconstruction::fgkNDetectors] = {"ITS", "TPC", "TRD", "TOF", "PHOS", "RICH", "EMCAL", "MUON", "FMD", "ZDC", "PMD", "START", "VZERO", "CRT", "HLT"};
+
 //_____________________________________________________________________________
 AliReconstruction::AliReconstruction(const char* gAliceFilename,
                                     const char* name, const char* title) :
   TNamed(name, title),
 
-  fRunReconstruction("ALL"),
-  fRunTracking(kTRUE),
+  fRunLocalReconstruction("ALL"),
+  fUniformField(kTRUE),
+  fRunVertexFinder(kTRUE),
+  fRunHLTTracking(kFALSE),
+  fRunTracking("ALL"),
   fFillESD("ALL"),
   fGAliceFileName(gAliceFilename),
+  fInput(""),
+  fFirstEvent(0),
+  fLastEvent(-1),
   fStopOnError(kFALSE),
+  fCheckPointLevel(0),
+  fOptions(),
 
   fRunLoader(NULL),
-  fITSLoader(NULL),
-  fITSTracker(NULL),
-  fTPCLoader(NULL),
-  fTPCTracker(NULL),
-  fTRDLoader(NULL),
-  fTRDTracker(NULL),
-  fTOFLoader(NULL),
-  fTOFTracker(NULL)
+  fRawReader(NULL),
+
+  fVertexer(NULL),
+
+  fWriteAlignmentData(kFALSE)
 {
 // create reconstruction object with default parameters
-
+  
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    fReconstructor[iDet] = NULL;
+    fLoader[iDet] = NULL;
+    fTracker[iDet] = NULL;
+  }
+  AliPID pid;
 }
 
 //_____________________________________________________________________________
 AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   TNamed(rec),
 
-  fRunReconstruction(rec.fRunReconstruction),
+  fRunLocalReconstruction(rec.fRunLocalReconstruction),
+  fUniformField(rec.fUniformField),
+  fRunVertexFinder(rec.fRunVertexFinder),
+  fRunHLTTracking(rec.fRunHLTTracking),
   fRunTracking(rec.fRunTracking),
   fFillESD(rec.fFillESD),
   fGAliceFileName(rec.fGAliceFileName),
+  fInput(rec.fInput),
+  fFirstEvent(rec.fFirstEvent),
+  fLastEvent(rec.fLastEvent),
   fStopOnError(rec.fStopOnError),
+  fCheckPointLevel(0),
+  fOptions(),
 
   fRunLoader(NULL),
-  fITSLoader(NULL),
-  fITSTracker(NULL),
-  fTPCLoader(NULL),
-  fTPCTracker(NULL),
-  fTRDLoader(NULL),
-  fTRDTracker(NULL),
-  fTOFLoader(NULL),
-  fTOFTracker(NULL)
+  fRawReader(NULL),
+
+  fVertexer(NULL),
+
+  fWriteAlignmentData(rec.fWriteAlignmentData)
 {
 // copy constructor
 
+  for (Int_t i = 0; i < fOptions.GetEntriesFast(); i++) {
+    if (rec.fOptions[i]) fOptions.Add(rec.fOptions[i]->Clone());
+  }
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    fReconstructor[iDet] = NULL;
+    fLoader[iDet] = NULL;
+    fTracker[iDet] = NULL;
+  }
 }
 
 //_____________________________________________________________________________
@@ -139,6 +234,7 @@ AliReconstruction::~AliReconstruction()
 // clean up
 
   CleanUp();
+  fOptions.Delete();
 }
 
 
@@ -150,340 +246,608 @@ void AliReconstruction::SetGAliceFile(const char* fileName)
   fGAliceFileName = fileName;
 }
 
+//_____________________________________________________________________________
+void AliReconstruction::SetOption(const char* detector, const char* option)
+{
+// set options for the reconstruction of a detector
+
+  TObject* obj = fOptions.FindObject(detector);
+  if (obj) fOptions.Remove(obj);
+  fOptions.Add(new TNamed(detector, option));
+}
+
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::Run()
+Bool_t AliReconstruction::Run(const char* input,
+                             Int_t firstEvent, Int_t lastEvent)
 {
 // run the reconstruction
 
-  // open the run loader
-  fRunLoader = AliRunLoader::Open(fGAliceFileName.Data());
-  if (!fRunLoader) {
-    Error("Run", "no run loader found in file %s", 
-         fGAliceFileName.Data());
-    CleanUp();
-    return kFALSE;
-  }
-  fRunLoader->LoadgAlice();
-  AliRun* aliRun = fRunLoader->GetAliRun();
-  if (!aliRun) {
-    Error("Run", "no gAlice object found in file %s", 
-         fGAliceFileName.Data());
-    CleanUp();
-    return kFALSE;
+  // set the input
+  if (!input) input = fInput.Data();
+  TString fileName(input);
+  if (fileName.EndsWith("/")) {
+    fRawReader = new AliRawReaderFile(fileName);
+  } else if (fileName.EndsWith(".root")) {
+    fRawReader = new AliRawReaderRoot(fileName);
+  } else if (!fileName.IsNull()) {
+    fRawReader = new AliRawReaderDate(fileName);
+    fRawReader->SelectEvents(7);
   }
-  gAlice = aliRun;
+
+  // get the run loader
+  if (!InitRunLoader()) return kFALSE;
 
   // local reconstruction
-  if (!fRunReconstruction.IsNull()) {
-    if (!RunReconstruction(fRunReconstruction)) {
+  if (!fRunLocalReconstruction.IsNull()) {
+    if (!RunLocalReconstruction(fRunLocalReconstruction)) {
       if (fStopOnError) {CleanUp(); return kFALSE;}
     }
   }
-  if (!fRunTracking && fFillESD.IsNull()) return kTRUE;
-
-  if (fRunTracking) {
-    // get loaders and trackers
-    fITSLoader = fRunLoader->GetLoader("ITSLoader");
-    if (!fITSLoader) {
-      Error("Run", "no ITS loader found");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    fITSTracker = NULL;
-    if (aliRun->GetDetector("ITS")) {
-      fITSTracker = aliRun->GetDetector("ITS")->CreateTracker();
-    }
-    if (!fITSTracker) {
-      Error("Run", "couldn't create a tracker for ITS");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    
-    fTPCLoader = fRunLoader->GetLoader("TPCLoader");
-    if (!fTPCLoader) {
-      Error("Run", "no TPC loader found");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    fTPCTracker = NULL;
-    if (aliRun->GetDetector("TPC")) {
-      fTPCTracker = aliRun->GetDetector("TPC")->CreateTracker();
+//  if (!fRunVertexFinder && fRunTracking.IsNull() && 
+//      fFillESD.IsNull()) return kTRUE;
+
+  // get vertexer
+  if (fRunVertexFinder && !CreateVertexer()) {
+    if (fStopOnError) {
+      CleanUp(); 
+      return kFALSE;
     }
-    if (!fTPCTracker) {
-      Error("Run", "couldn't create a tracker for TPC");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    
-    fTRDLoader = fRunLoader->GetLoader("TRDLoader");
-    if (!fTRDLoader) {
-      Error("Run", "no TRD loader found");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    fTRDTracker = NULL;
-    if (aliRun->GetDetector("TRD")) {
-      fTRDTracker = aliRun->GetDetector("TRD")->CreateTracker();
-    }
-    if (!fTRDTracker) {
-      Error("Run", "couldn't create a tracker for TRD");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    
-    fTOFLoader = fRunLoader->GetLoader("TOFLoader");
-    if (!fTOFLoader) {
-      Error("Run", "no TOF loader found");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
-    }
-    fTOFTracker = NULL;
-    if (aliRun->GetDetector("TOF")) {
-      fTOFTracker = aliRun->GetDetector("TOF")->CreateTracker();
-    }
-    if (!fTOFTracker) {
-      Error("Run", "couldn't create a tracker for TOF");
-      if (fStopOnError) {CleanUp(); return kFALSE;}
+  }
+
+  // get trackers
+  if (!fRunTracking.IsNull() && !CreateTrackers(fRunTracking)) {
+    if (fStopOnError) {
+      CleanUp(); 
+      return kFALSE;
+    }      
+  }
+
+
+  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
+
+  // create the ESD output file and tree
   TFile* file = TFile::Open("AliESDs.root", "RECREATE");
   if (!file->IsOpen()) {
-    Error("Run", "opening AliESDs.root failed");
-    if (fStopOnError) {CleanUp(file); return kFALSE;}    
+    AliError("opening AliESDs.root failed");
+    if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}    
   }
+  TTree* tree = new TTree("esdTree", "Tree with ESD objects");
+  tree->Branch("ESD", "AliESD", &esd);
+  TTree* hlttree = new TTree("HLTesdTree", "Tree with HLT ESD objects");
+  hlttree->Branch("ESD", "AliESD", &hltesd);
+  delete esd; delete hltesd;
+  esd = NULL; hltesd = NULL;
+  gROOT->cd();
 
   // loop over events
+  if (fRawReader) fRawReader->RewindEvents();
+  
   for (Int_t iEvent = 0; iEvent < fRunLoader->GetNumberOfEvents(); iEvent++) {
-    Info("Run", "processing event %d", iEvent);
-    AliESD* esd = new AliESD;
+    if (fRawReader) fRawReader->NextEvent();
+    if ((iEvent < firstEvent) || ((lastEvent >= 0) && (iEvent > lastEvent))) {
+      // 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);
-    esd->SetRunNumber(aliRun->GetRunNumber());
-    esd->SetEventNumber(aliRun->GetEvNumber());
-    esd->SetMagneticField(aliRun->Field()->SolenoidField());
+
+    char fileName[256];
+    sprintf(fileName, "ESD_%d.%d_final.root", 
+           fRunLoader->GetHeader()->GetRun(), 
+           fRunLoader->GetHeader()->GetEventNrInRun());
+    if (!gSystem->AccessPathName(fileName)) 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->SetEventNumber(fRunLoader->GetHeader()->GetEventNrInRun());
+    hltesd->SetEventNumber(fRunLoader->GetHeader()->GetEventNrInRun());
+    if (gAlice) {
+      esd->SetMagneticField(gAlice->Field()->SolenoidField());
+      hltesd->SetMagneticField(gAlice->Field()->SolenoidField());
+    } else {
+      // ???
+    }
+
+    // vertex finder
+    if (fRunVertexFinder) {
+      if (!ReadESD(esd, "vertex")) {
+       if (!RunVertexFinder(esd)) {
+         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;}
+       }
+      }
+    }
 
     // barrel tracking
-    if (fRunTracking) {
-      if (!RunTracking(esd)) {
-       if (fStopOnError) {CleanUp(file); return kFALSE;}
+    if (!fRunTracking.IsNull()) {
+      if (!ReadESD(esd, "tracking")) {
+       if (!RunTracking(esd)) {
+         if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
+       }
+       if (fCheckPointLevel > 0) WriteESD(esd, "tracking");
       }
     }
 
     // fill ESD
     if (!fFillESD.IsNull()) {
       if (!FillESD(esd, fFillESD)) {
-       if (fStopOnError) {CleanUp(file); return kFALSE;}
+       if (fStopOnError) {CleanUp(file, fileOld); return kFALSE;}
       }
     }
 
     // combined PID
     AliESDpid::MakePID(esd);
+    if (fCheckPointLevel > 1) WriteESD(esd, "PID");
 
     // write ESD
-    char name[100]; 
-    sprintf(name, "ESD%d", iEvent);
-    file->cd();
-    if (!esd->Write(name)) {
-      Error("Run", "writing ESD failed");
-      if (fStopOnError) {CleanUp(file); return kFALSE;}
-    }
+    tree->Fill();
+    // write HLT ESD
+    hlttree->Fill();
+
+    if (fCheckPointLevel > 0)  WriteESD(esd, "final"); 
+    delete esd; delete hltesd;
+    esd = NULL; hltesd = NULL;
   }
 
-  CleanUp(file);
+  AliInfo(Form("Execution time for filling ESD : R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  file->cd();
+  tree->Write();
+  hlttree->Write();
+
+  // 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;
 }
 
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::RunReconstruction(const TString& detectors)
+Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
 {
-// run the reconstruction
+// 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;
+    if (reconstructor->HasLocalReconstruction()) continue;
+
+    AliInfo(Form("running reconstruction for %s", fgkDetectorName[iDet]));
+    TStopwatch stopwatchDet;
+    stopwatchDet.Start();
+    if (fRawReader) {
+      fRawReader->RewindEvents();
+      reconstructor->Reconstruct(fRunLoader, fRawReader);
+    } else {
+      reconstructor->Reconstruct(fRunLoader);
+    }
+    AliInfo(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;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
+{
+// run the local reconstruction
 
   TStopwatch stopwatch;
   stopwatch.Start();
 
   TString detStr = detectors;
-  TObjArray* detArray = fRunLoader->GetAliRun()->Detectors();
-  for (Int_t iDet = 0; iDet < detArray->GetEntriesFast(); iDet++) {
-    AliModule* det = (AliModule*) detArray->At(iDet);
-    if (!det || !det->IsActive()) continue;
-    if (IsSelected(det->GetName(), detStr)) {
-      Info("RunReconstruction", "running reconstruction for %s", 
-          det->GetName());
+  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();
-      det->Reconstruct();
-      Info("RunReconstruction", "execution time for %s:", det->GetName());
-      stopwatchDet.Print();
+      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()) {
-    Error("RunReconstruction", "the following detectors were not found: %s", 
-         detStr.Data());
+    AliError(Form("the following detectors were not found: %s",
+                  detStr.Data()));
     if (fStopOnError) return kFALSE;
   }
-
-  Info("RunReconstruction", "execution time:");
-  stopwatch.Print();
+  
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::RunTracking(AliESD* esd)
+Bool_t AliReconstruction::RunVertexFinder(AliESD*& esd)
 {
 // run the barrel tracking
 
   TStopwatch stopwatch;
   stopwatch.Start();
 
-  // get the primary vertex (from MC for the moment)
-  TArrayF vertex(3);     
-  fRunLoader->GetHeader()->GenEventHeader()->PrimaryVertex(vertex);
-  Double_t vtxPos[3] = {vertex[0], vertex[1], vertex[2]};
-  Double_t vtxCov[6] = {
-    0.005,
-    0.000, 0.005,
-    0.000, 0.000, 0.010
-  };
-  Double_t vtxErr[3] = {vtxCov[0], vtxCov[2], vtxCov[5]}; // diag. elements
-  esd->SetVertex(vtxPos, vtxCov);
-  fITSTracker->SetVertex(vtxPos, vtxErr);
-  fTPCTracker->SetVertex(vtxPos, vtxErr);
-  fTRDTracker->SetVertex(vtxPos, vtxErr);
-
-  // TPC tracking
-  Info("RunTracking", "TPC tracking");
-  fTPCLoader->LoadRecPoints("read");
-  TTree* tpcTree = fTPCLoader->TreeR();
-  if (!tpcTree) {
-    Error("RunTracking", "Can't get the TPC cluster tree");
-    return kFALSE;
-  }     
-  fTPCTracker->LoadClusters(tpcTree);
-  if (fTPCTracker->Clusters2Tracks(esd) != 0) {
-    Error("RunTracking", "TPC Clusters2Tracks failed");
-    return kFALSE;
+  AliESDVertex* vertex = NULL;
+  Double_t vtxPos[3] = {0, 0, 0};
+  Double_t vtxErr[3] = {0.07, 0.07, 0.1};
+  TArrayF mcVertex(3); 
+  if (fRunLoader->GetHeader() && fRunLoader->GetHeader()->GenEventHeader()) {
+    fRunLoader->GetHeader()->GenEventHeader()->PrimaryVertex(mcVertex);
+    for (Int_t i = 0; i < 3; i++) vtxPos[i] = mcVertex[i];
   }
 
-  fRunLoader->GetAliRun()->GetDetector("TPC")->FillESD(esd); // preliminary PID
-  AliESDpid::MakePID(esd);                  // for the ITS tracker
+  if (fVertexer) {
+    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();
+    }
+    else {
+      vertex->SetTruePos(vtxPos);  // store also the vertex from MC
+    }
 
-  // ITS tracking
-  Info("RunTracking", "ITS tracking");
-  fITSLoader->LoadRecPoints("read");
-  TTree* itsTree = fITSLoader->TreeR();
-  if (!itsTree) {
-    Error("RunTracking", "Can't get the ITS cluster tree");
-    return kFALSE;
-  }     
-  fITSTracker->LoadClusters(itsTree);
-  if (fITSTracker->Clusters2Tracks(esd) != 0) {
-    Error("RunTracking", "ITS Clusters2Tracks failed");
-    return kFALSE;
+  } else {
+    AliInfo("getting the primary vertex from MC");
+    vertex = new AliESDVertex(vtxPos, vtxErr);
   }
 
-  // ITS back propagation
-  Info("RunTracking", "ITS back propagation");
-  if (fITSTracker->PropagateBack(esd) != 0) {
-    Error("RunTracking", "ITS backward propagation failed");
-    return kFALSE;
+  if (vertex) {
+    vertex->GetXYZ(vtxPos);
+    vertex->GetSigmaXYZ(vtxErr);
+  } else {
+    AliWarning("no vertex reconstructed");
+    vertex = new AliESDVertex(vtxPos, vtxErr);
   }
+  esd->SetVertex(vertex);
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    if (fTracker[iDet]) fTracker[iDet]->SetVertex(vtxPos, vtxErr);
+  }  
+  delete vertex;
 
-  // TPC back propagation
-  Info("RunTracking", "TPC back propagation");
-  if (fTPCTracker->PropagateBack(esd) != 0) {
-    Error("RunTracking", "TPC backward propagation failed");
-    return kFALSE;
-  }
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
-  // TRD back propagation
-  Info("RunTracking", "TRD back propagation");
-  fTRDLoader->LoadRecPoints("read");
-  TTree* trdTree = fTRDLoader->TreeR();
-  if (!trdTree) {
-    Error("RunTracking", "Can't get the TRD cluster tree");
-    return kFALSE;
-  }     
-  fTRDTracker->LoadClusters(trdTree);
-  if (fTRDTracker->PropagateBack(esd) != 0) {
-    Error("RunTracking", "TRD backward propagation failed");
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunHLTTracking(AliESD*& esd)
+{
+// run the HLT barrel tracking
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  if (!fRunLoader) {
+    AliError("Missing runLoader!");
     return kFALSE;
   }
 
-  // TOF back propagation
-  Info("RunTracking", "TOF back propagation");
-  fTOFLoader->LoadDigits("read");
-  TTree* tofTree = fTOFLoader->TreeD();
-  if (!tofTree) {
-    Error("RunTracking", "Can't get the TOF digits tree");
-    return kFALSE;
-  }     
-  fTOFTracker->LoadClusters(tofTree);
-  if (fTOFTracker->PropagateBack(esd) != 0) {
-    Error("RunTracking", "TOF backward propagation failed");
-    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;
   }
-  fTOFTracker->UnloadClusters();
-  fTOFLoader->UnloadDigits();
 
-  // TRD inward refit
-  Info("RunTracking", "TRD inward refit");
-  if (fTRDTracker->RefitInward(esd) != 0) {
-    Error("RunTracking", "TRD inward refit failed");
-    return kFALSE;
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::RunTracking(AliESD*& esd)
+{
+// run the barrel tracking
+
+  TStopwatch stopwatch;
+  stopwatch.Start();
+
+  AliInfo("running tracking");
+
+  // pass 1: TPC + ITS inwards
+  for (Int_t iDet = 1; iDet >= 0; iDet--) {
+    if (!fTracker[iDet]) continue;
+    AliDebug(1, Form("%s tracking", fgkDetectorName[iDet]));
+
+    // load clusters
+    fLoader[iDet]->LoadRecPoints("read");
+    TTree* tree = fLoader[iDet]->TreeR();
+    if (!tree) {
+      AliError(Form("Can't get the %s cluster tree", fgkDetectorName[iDet]));
+      return kFALSE;
+    }
+    fTracker[iDet]->LoadClusters(tree);
+
+    // run tracking
+    if (fTracker[iDet]->Clusters2Tracks(esd) != 0) {
+      AliError(Form("%s Clusters2Tracks failed", fgkDetectorName[iDet]));
+      return kFALSE;
+    }
+    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);
+    }
   }
-  fTRDTracker->UnloadClusters();
-  fTRDLoader->UnloadRecPoints();
-    
-  // TPC inward refit
-  Info("RunTracking", "TPC inward refit");
-  if (fTPCTracker->RefitInward(esd) != 0) {
-    Error("RunTracking", "TPC inward refit failed");
-    return kFALSE;
+
+  // pass 2: ALL backwards
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    if (!fTracker[iDet]) continue;
+    AliDebug(1, Form("%s back propagation", fgkDetectorName[iDet]));
+
+    // load clusters
+    if (iDet > 1) {     // all except ITS, TPC
+      TTree* tree = NULL;
+      fLoader[iDet]->LoadRecPoints("read");
+      tree = fLoader[iDet]->TreeR();
+      if (!tree) {
+       AliError(Form("Can't get the %s cluster tree", fgkDetectorName[iDet]));
+       return kFALSE;
+      }
+      fTracker[iDet]->LoadClusters(tree);
+    }
+
+    // run tracking
+    if (fTracker[iDet]->PropagateBack(esd) != 0) {
+      AliError(Form("%s backward propagation failed", fgkDetectorName[iDet]));
+      return kFALSE;
+    }
+    if (fCheckPointLevel > 1) {
+      WriteESD(esd, Form("%s.back", fgkDetectorName[iDet]));
+    }
+
+    // unload clusters
+    if (iDet > 2) {     // all except ITS, TPC, TRD
+      fTracker[iDet]->UnloadClusters();
+      fLoader[iDet]->UnloadRecPoints();
+    }
   }
-  fTPCTracker->UnloadClusters();
-  fTPCLoader->UnloadRecPoints();
-    
-  // ITS inward refit
-  Info("RunTracking", "ITS inward refit");
-  if (fITSTracker->RefitInward(esd) != 0) {
-    Error("RunTracking", "ITS inward refit failed");
-    return kFALSE;
+
+  // 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;
+    AliDebug(1, Form("%s inward refit", fgkDetectorName[iDet]));
+
+    // run tracking
+    if (fTracker[iDet]->RefitInward(esd) != 0) {
+      AliError(Form("%s inward refit failed", fgkDetectorName[iDet]));
+      return kFALSE;
+    }
+    if (fCheckPointLevel > 1) {
+      WriteESD(esd, Form("%s.refit", fgkDetectorName[iDet]));
+    }
+
+    // unload clusters
+    fTracker[iDet]->UnloadClusters();
+    fLoader[iDet]->UnloadRecPoints();
   }
-  fITSTracker->UnloadClusters();
-  fITSLoader->UnloadRecPoints();
 
-  Info("RunTracking", "execution time:");
-  stopwatch.Print();
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
 
 //_____________________________________________________________________________
-Bool_t AliReconstruction::FillESD(AliESD* esd, const TString& detectors)
+Bool_t AliReconstruction::FillESD(AliESD*& esd, const TString& detectors)
 {
 // fill the event summary data
 
   TStopwatch stopwatch;
   stopwatch.Start();
+  AliInfo("filling ESD");
 
   TString detStr = detectors;
-  TObjArray* detArray = fRunLoader->GetAliRun()->Detectors();
-  for (Int_t iDet = 0; iDet < detArray->GetEntriesFast(); iDet++) {
-    AliModule* det = (AliModule*) detArray->At(iDet);
-    if (!det || !det->IsActive()) continue;
-    if (IsSelected(det->GetName(), detStr)) {
-      Info("FillESD", "filling ESD for %s", 
-          det->GetName());
-      det->FillESD(esd);
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    if (!IsSelected(fgkDetectorName[iDet], detStr)) continue;
+    AliReconstructor* reconstructor = GetReconstructor(iDet);
+    if (!reconstructor) continue;
+
+    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 {
+        reconstructor->FillESD(fRunLoader, esd);
+      }
+      if (fCheckPointLevel > 2) WriteESD(esd, fgkDetectorName[iDet]);
     }
   }
 
   if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
-    Error("FillESD", "the following detectors were not found: %s", 
-         detStr.Data());
+    AliError(Form("the following detectors were not found: %s", 
+                  detStr.Data()));
     if (fStopOnError) return kFALSE;
   }
 
-  Info("FillESD", "execution time:");
-  stopwatch.Print();
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -523,24 +887,597 @@ Bool_t AliReconstruction::IsSelected(TString detName, TString& detectors) const
 }
 
 //_____________________________________________________________________________
-void AliReconstruction::CleanUp(TFile* file)
+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);
+       AliExternalTrackParam::SetFieldMap(gAlice->Field());
+       if(fUniformField)
+         AliExternalTrackParam::SetUniformFieldTracking();
+       else
+         AliExternalTrackParam::SetNonuniformFieldTracking();
+      }
+    }
+    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();
+    fRunLoader->WriteHeader("OVERWRITE");
+    fRunLoader->CdGAFile();
+    fRunLoader->Write(0, TObject::kOverwrite);
+//    AliTracker::SetFieldMap(???);
+  }
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+AliReconstructor* AliReconstruction::GetReconstructor(Int_t iDet)
+{
+// get the reconstructor object and the loader for a detector
+
+  if (fReconstructor[iDet]) return fReconstructor[iDet];
+
+  // load the reconstructor object
+  TPluginManager* pluginManager = gROOT->GetPluginManager();
+  TString detName = fgkDetectorName[iDet];
+  TString recName = "Ali" + detName + "Reconstructor";
+  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");
+    }
+  }
+
+  AliReconstructor* reconstructor = NULL;
+  // first check if a plugin is defined for the reconstructor
+  TPluginHandler* pluginHandler = 
+    pluginManager->FindHandler("AliReconstructor", detName);
+  // if not, add a plugin for it
+  if (!pluginHandler) {
+    AliDebug(1, Form("defining plugin for %s", recName.Data()));
+    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 {
+      pluginManager->AddHandler("AliReconstructor", detName, 
+                               recName, detName, recName + "()");
+    }
+    pluginHandler = pluginManager->FindHandler("AliReconstructor", detName);
+  }
+  if (pluginHandler && (pluginHandler->LoadPlugin() == 0)) {
+    reconstructor = (AliReconstructor*) pluginHandler->ExecPlugin(0);
+  }
+  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
+      TPluginHandler* 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;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::CreateVertexer()
+{
+// create the vertexer
+
+  fVertexer = NULL;
+  AliReconstructor* itsReconstructor = GetReconstructor(0);
+  if (itsReconstructor) {
+    fVertexer = itsReconstructor->CreateVertexer(fRunLoader);
+  }
+  if (!fVertexer) {
+    AliWarning("couldn't create a vertexer for ITS");
+    if (fStopOnError) return kFALSE;
+  }
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::CreateTrackers(const TString& detectors)
+{
+// create the trackers
+
+  TString detStr = detectors;
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    if (!IsSelected(fgkDetectorName[iDet], detStr)) continue;
+    AliReconstructor* reconstructor = GetReconstructor(iDet);
+    if (!reconstructor) continue;
+    TString detName = fgkDetectorName[iDet];
+    if (detName == "HLT") {
+      fRunHLTTracking = 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;
+    }
+  }
+
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+void AliReconstruction::CleanUp(TFile* file, TFile* fileOld)
 {
 // delete trackers and the run loader and close and delete the file
 
-  delete fITSTracker;
-  fITSTracker = NULL;
-  delete fTPCTracker;
-  fTPCTracker = NULL;
-  delete fTRDTracker;
-  fTRDTracker = NULL;
-  delete fTOFTracker;
-  fTOFTracker = NULL;
+  for (Int_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+    delete fReconstructor[iDet];
+    fReconstructor[iDet] = NULL;
+    fLoader[iDet] = NULL;
+    delete fTracker[iDet];
+    fTracker[iDet] = NULL;
+  }
+  delete fVertexer;
+  fVertexer = NULL;
 
   delete fRunLoader;
   fRunLoader = NULL;
+  delete fRawReader;
+  fRawReader = NULL;
 
   if (file) {
     file->Close();
     delete file;
   }
+
+  if (fileOld) {
+    fileOld->Close();
+    delete fileOld;
+    gSystem->Unlink("AliESDs.old.root");
+  }
+}
+
+
+//_____________________________________________________________________________
+Bool_t AliReconstruction::ReadESD(AliESD*& esd, const char* recStep) const
+{
+// read the ESD event from a file
+
+  if (!esd) return kFALSE;
+  char fileName[256];
+  sprintf(fileName, "ESD_%d.%d_%s.root", 
+         esd->GetRunNumber(), esd->GetEventNumber(), 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()) {
+    AliError(Form("opening %s failed", fileName));
+    delete file;
+    return kFALSE;
+  }
+
+  gROOT->cd();
+  delete esd;
+  esd = (AliESD*) file->Get("ESD");
+  file->Close();
+  delete file;
+  return kTRUE;
+}
+
+//_____________________________________________________________________________
+void AliReconstruction::WriteESD(AliESD* esd, const char* recStep) const
+{
+// write the ESD event to a file
+
+  if (!esd) return;
+  char fileName[256];
+  sprintf(fileName, "ESD_%d.%d_%s.root", 
+         esd->GetRunNumber(), esd->GetEventNumber(), recStep);
+
+  AliDebug(1, Form("writing ESD to file %s", fileName));
+  TFile* file = TFile::Open(fileName, "recreate");
+  if (!file || !file->IsOpen()) {
+    AliError(Form("opening %s failed", fileName));
+  } else {
+    esd->Write("ESD");
+    file->Close();
+  }
+  delete file;
+}
+
+
+
+
+//_____________________________________________________________________________
+void AliReconstruction::CreateTag(TFile* file)
+{
+  // 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;
+
+  AliRunTag *tag = new AliRunTag();
+  AliDetectorTag *detTag = new AliDetectorTag();
+  AliEventTag *evTag = new AliEventTag();
+  TTree ttag("T","A Tree with event tags");
+  TBranch * btag = ttag.Branch("AliTAG", "AliRunTag", &tag);
+  btag->SetCompressionLevel(9);
+
+  AliInfo(Form("Creating the tags......."));   
+  
+  if (!file || !file->IsOpen()) {
+    AliError(Form("opening failed"));
+    delete file;
+    return ;
+  }
+
+  TTree *t = (TTree*) file->Get("esdTree");
+  TBranch * b = t->GetBranch("ESD");
+  AliESD *esd = 0;
+  b->SetAddress(&esd);
+
+  tag->SetRunId(esd->GetRunNumber());
+
+  Int_t firstEvent = 0,lastEvent = 0;
+  Int_t iNumberOfEvents = b->GetEntries();
+  for (Int_t iEventNumber = 0; 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;
+
+      b->GetEntry(iEventNumber);
+      const AliESDVertex * vertexIn = esd->GetVertex();
+
+      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-->remove extremely high Pt tracks
+         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 > 1.0)
+               nCh1GeV++;
+             if(fPt > 3.0)
+               nCh3GeV++;
+             if(fPt > 10.0)
+               nCh10GeV++;
+           }
+         if(esdTrack->GetSign() < 0)
+           {
+             nNeg++;
+             if(fPt > 1.0)
+               nCh1GeV++;
+             if(fPt > 3.0)
+               nCh3GeV++;
+             if(fPt > 10.0)
+               nCh10GeV++;
+           }
+         if(esdTrack->GetSign() == 0)
+           nNeutr++;
+         
+         //PID
+         Double_t prob[10];
+         esdTrack->GetESDpid(prob);
+                   
+         //K0s
+         if ((prob[8]>prob[7])&&(prob[8]>prob[6])&&(prob[8]>prob[5])&&(prob[8]>prob[4])&&(prob[8]>prob[3])&&(prob[8]>prob[2])&&(prob[8]>prob[1])&&(prob[8]>prob[0]))
+           nK0s++;
+         //neutrons
+         if ((prob[7]>prob[8])&&(prob[7]>prob[6])&&(prob[7]>prob[5])&&(prob[7]>prob[4])&&(prob[7]>prob[3])&&(prob[7]>prob[2])&&(prob[7]>prob[1])&&(prob[7]>prob[0]))
+           nNeutrons++; 
+         //pi0s
+         if ((prob[6]>prob[8])&&(prob[6]>prob[7])&&(prob[6]>prob[5])&&(prob[6]>prob[4])&&(prob[6]>prob[3])&&(prob[6]>prob[2])&&(prob[6]>prob[1])&&(prob[6]>prob[0]))
+           nPi0s++;
+         //gamas
+         if ((prob[5]>prob[8])&&(prob[5]>prob[7])&&(prob[5]>prob[6])&&(prob[5]>prob[4])&&(prob[5]>prob[3])&&(prob[5]>prob[2])&&(prob[5]>prob[1])&&(prob[5]>prob[0]))
+           nGamas++;
+         //protons
+         if ((prob[4]>prob[8])&&(prob[4]>prob[7])&&(prob[4]>prob[6])&&(prob[4]>prob[5])&&(prob[4]>prob[3])&&(prob[4]>prob[2])&&(prob[4]>prob[1])&&(prob[4]>prob[0]))
+           nProtons++;
+         //kaons
+         if ((prob[3]>prob[8])&&(prob[3]>prob[7])&&(prob[3]>prob[6])&&(prob[3]>prob[5])&&(prob[3]>prob[4])&&(prob[3]>prob[2])&&(prob[3]>prob[1])&&(prob[3]>prob[0]))
+           nKaons++;
+         //kaons
+         if ((prob[2]>prob[8])&&(prob[2]>prob[7])&&(prob[2]>prob[6])&&(prob[2]>prob[5])&&(prob[2]>prob[4])&&(prob[2]>prob[3])&&(prob[2]>prob[1])&&(prob[2]>prob[0]))
+           nPions++; 
+         //muons
+         if ((prob[1]>prob[8])&&(prob[1]>prob[7])&&(prob[1]>prob[6])&&(prob[1]>prob[5])&&(prob[1]>prob[4])&&(prob[1]>prob[3])&&(prob[1]>prob[2])&&(prob[1]>prob[0]))
+           {
+             nMuons++;
+             if(fPt > 1.0)
+               nMu1GeV++;
+             if(fPt > 3.0)
+               nMu3GeV++;
+             if(fPt > 10.0)
+               nMu10GeV++;
+           }
+         //electrons
+         if ((prob[0]>prob[8])&&(prob[0]>prob[7])&&(prob[0]>prob[6])&&(prob[0]>prob[5])&&(prob[0]>prob[4])&&(prob[0]>prob[3])&&(prob[0]>prob[2])&&(prob[0]>prob[1]))
+           {
+             nElectrons++;
+             if(fPt > 1.0)
+               nEl1GeV++;
+             if(fPt > 3.0)
+               nEl3GeV++;
+             if(fPt > 10.0)
+               nEl10GeV++;
+           }
+         
+         
+         
+         ntrack++;
+       }//track loop
+      // Fill the event tags 
+      if(ntrack != 0)
+       meanPt = meanPt/ntrack;
+      
+      evTag->SetEventId(iEventNumber+1);
+      evTag->SetVertexX(vertexIn->GetXv());
+      evTag->SetVertexY(vertexIn->GetYv());
+      evTag->SetVertexZ(vertexIn->GetZv());
+      
+      evTag->SetT0VertexZ(esd->GetT0zVertex());
+      
+      evTag->SetTrigger(esd->GetTrigger());
+      
+      evTag->SetZDCNeutronEnergy(esd->GetZDCNEnergy());
+      evTag->SetZDCProtonEnergy(esd->GetZDCPEnergy());
+      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->SetNumOfPHOSTracks(esd->GetNumberOfPHOSParticles());
+      evTag->SetNumOfEMCALTracks(esd->GetNumberOfEMCALParticles());
+      
+      evTag->SetTotalMomentum(totalP);
+      evTag->SetMeanPt(meanPt);
+      evTag->SetMaxPt(maxPt);
+  
+      tag->AddEventTag(*evTag);
+    }
+  lastEvent = iNumberOfEvents;
+       
+  ttag.Fill();
+  tag->Clear();
+
+  char fileName[256];
+  sprintf(fileName, "Run%d.Event%d_%d.ESD.tag.root", 
+         tag->GetRunId(),firstEvent,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 detTag;
+  delete evTag;
+}
+
+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
+  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;
+      UInt_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);
+         cout<<iDet<<" "<<nspdet<<endl;
+         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++;
+           if (!isvalid) continue;
+           sp->AddPoint(isptrack,&p); isptrack++; isp++;
+         }
+         //      for (Int_t isp = 0; isp < nspdet; isp++) {
+           //      AliCluster *cl = tracker->GetCluster(idx[isp]);
+           //      UShort_t volid = tracker->GetVolumeID(idx[isp]);
+         //        tracker->GetTrackPoint(idx[isp],p);
+         //        sp->AddPoint(isptrack,&p); isptrack++;
+         //      }
+       }       
+      }
+    }
+  fTracker[3]->UnloadClusters();
+  fLoader[3]->UnloadRecPoints();
 }