]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ANALYSIS/AliAnalysisManager.cxx
Inverted logics (Panos)
[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisManager.cxx
index ab8e0352435d904ef559c621c5214169e0d8f9bb..8f3be8618a877776040788e7774c85f1cb663c11 100644 (file)
 #include <TChain.h>
 #include <TSystem.h>
 #include <TROOT.h>
+#include <TCanvas.h>
 
 #include "AliAnalysisTask.h"
 #include "AliAnalysisDataContainer.h"
 #include "AliAnalysisDataSlot.h"
+#include "AliVEventHandler.h"
+#include "AliSysInfo.h"
 #include "AliAnalysisManager.h"
 
 ClassImp(AliAnalysisManager)
 
 AliAnalysisManager *AliAnalysisManager::fgAnalysisManager = NULL;
 
-//______________________________________________________________________________
-AliAnalysisManager::AliAnalysisManager() 
-                   :TNamed(),
-                    fTree(NULL),
-                    fCurrentEntry(-1),
-                    fMode(kLocalAnalysis),
-                    fInitOK(kFALSE),
-                    fTasks(NULL),
-                    fTopTasks(NULL),
-                    fZombies(NULL),
-                    fContainers(NULL),
-                    fInputs(NULL),
-                    fOutputs(NULL)
-{
-// Dummy constructor.
-   fgAnalysisManager = this;
-}
-
 //______________________________________________________________________________
 AliAnalysisManager::AliAnalysisManager(const char *name, const char *title)
                    :TNamed(name,title),
                     fTree(NULL),
+                    fInputEventHandler(NULL),
+                    fOutputEventHandler(NULL),
+                    fMCtruthEventHandler(NULL),
                     fCurrentEntry(-1),
+                    fNSysInfo(0),
                     fMode(kLocalAnalysis),
                     fInitOK(kFALSE),
                     fDebug(0),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
@@ -84,16 +74,22 @@ AliAnalysisManager::AliAnalysisManager(const char *name, const char *title)
    fContainers = new TObjArray();
    fInputs     = new TObjArray();
    fOutputs    = new TObjArray();
+   SetEventLoop(kTRUE);
 }
 
 //______________________________________________________________________________
 AliAnalysisManager::AliAnalysisManager(const AliAnalysisManager& other)
                    :TNamed(other),
                     fTree(NULL),
+                    fInputEventHandler(NULL),
+                    fOutputEventHandler(NULL),
+                    fMCtruthEventHandler(NULL),
                     fCurrentEntry(-1),
+                    fNSysInfo(0),
                     fMode(other.fMode),
                     fInitOK(other.fInitOK),
                     fDebug(other.fDebug),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
@@ -117,8 +113,12 @@ AliAnalysisManager& AliAnalysisManager::operator=(const AliAnalysisManager& othe
 // Assignment
    if (&other != this) {
       TNamed::operator=(other);
+      fInputEventHandler   = other.fInputEventHandler;
+      fOutputEventHandler  = other.fOutputEventHandler;
+      fMCtruthEventHandler = other.fMCtruthEventHandler;
       fTree       = NULL;
       fCurrentEntry = -1;
+      fNSysInfo   = other.fNSysInfo;
       fMode       = other.fMode;
       fInitOK     = other.fInitOK;
       fDebug      = other.fDebug;
@@ -167,8 +167,39 @@ void AliAnalysisManager::Init(TTree *tree)
   // Init() will be called many times when running with PROOF.
    if (!tree) return;
    if (fDebug > 1) {
-      printf("AliAnalysisManager::Init(%s)\n", tree->GetName());
+      printf("->AliAnalysisManager::InitTree(%s)\n", tree->GetName());
    }
+
+   // Call InitTree of EventHandler
+   if (fOutputEventHandler) {
+      if (fMode == kProofAnalysis) {
+         fOutputEventHandler->Init(0x0, "proof");
+      } else {
+         fOutputEventHandler->Init(0x0, "local");
+      }
+   }
+
+   if (fInputEventHandler) {
+      if (fMode == kProofAnalysis) {
+         fInputEventHandler->Init(tree, "proof");
+      } else {
+         fInputEventHandler->Init(tree, "local");
+      }
+   } else {
+      // If no input event handler we need to get the tree once
+      // for the chain
+      if(!tree->GetTree()) tree->LoadTree(0);
+   }
+   
+
+   if (fMCtruthEventHandler) {
+      if (fMode == kProofAnalysis) {
+         fMCtruthEventHandler->Init(0x0, "proof");
+      } else {
+         fMCtruthEventHandler->Init(0x0, "local");
+      }
+   }
+
    if (!fInitOK) InitAnalysis();
    if (!fInitOK) return;
    fTree = tree;
@@ -178,18 +209,9 @@ void AliAnalysisManager::Init(TTree *tree)
       return;
    }
    top->SetData(tree);
-}
-
-//______________________________________________________________________________
-void AliAnalysisManager::Begin(TTree *tree)
-{
-  // The Begin() function is called at the start of the query.
-  // When running with PROOF Begin() is only called on the client.
-  // The tree argument is deprecated (on PROOF 0 is passed).
    if (fDebug > 1) {
-      cout << "AliAnalysisManager::Begin()" << endl;
-   }   
-   Init(tree);
+      printf("<-AliAnalysisManager::Init(%s)\n", tree->GetName());
+   }
 }
 
 //______________________________________________________________________________
@@ -199,15 +221,47 @@ void AliAnalysisManager::SlaveBegin(TTree *tree)
   // When running with PROOF SlaveBegin() is called on each slave server.
   // The tree argument is deprecated (on PROOF 0 is passed).
    if (fDebug > 1) {
-      cout << "AliAnalysisManager::SlaveBegin()" << endl;
+      cout << "->AliAnalysisManager::SlaveBegin()" << endl;
+   }
+
+   // Call Init of EventHandler
+   if (fOutputEventHandler) {
+      if (fMode == kProofAnalysis) {
+         fOutputEventHandler->Init("proof");
+      } else {
+         fOutputEventHandler->Init("local");
+      }
+   }
+
+   if (fInputEventHandler) {
+      fInputEventHandler->SetInputTree(tree);
+      if (fMode == kProofAnalysis) {
+         fInputEventHandler->Init("proof");
+      } else {
+         fInputEventHandler->Init("local");
+      }
+   }
+
+   if (fMCtruthEventHandler) {
+      if (fMode == kProofAnalysis) {
+         fMCtruthEventHandler->Init("proof");
+      } else {
+         fMCtruthEventHandler->Init("local");
+      }
    }
 
    TIter next(fTasks);
    AliAnalysisTask *task;
    // Call CreateOutputObjects for all tasks
-   while ((task=(AliAnalysisTask*)next())) 
+   while ((task=(AliAnalysisTask*)next())) {
+      TDirectory *curdir = gDirectory;
       task->CreateOutputObjects();
-   if (fMode == kLocalAnalysis) Init(tree);   
+      if (curdir) curdir->cd();
+   }
+
+   if (fDebug > 1) {
+      cout << "<-AliAnalysisManager::SlaveBegin()" << endl;
+   }
 }
 
 //______________________________________________________________________________
@@ -218,11 +272,30 @@ Bool_t AliAnalysisManager::Notify()
    // is started when using PROOF. It is normaly not necessary to make changes
    // to the generated code, but the routine can be extended by the
    // user if needed. The return value is currently not used.
-   if (fTree) {
-      TFile *curfile = fTree->GetCurrentFile();
-      if (curfile && fDebug>1) printf("AliAnalysisManager::Notify() file: %s\n", curfile->GetName());
-   }
-   return kTRUE;
+    if (fTree) {
+       TFile *curfile = fTree->GetCurrentFile();
+       if (curfile && fDebug>1) printf("AliAnalysisManager::Notify() file: %s\n", curfile->GetName());
+       TIter next(fTasks);
+       AliAnalysisTask *task;
+       // Call Notify for all tasks
+       while ((task=(AliAnalysisTask*)next())) 
+           task->Notify();
+       
+       // Call Notify of the event handlers
+       if (fInputEventHandler) {
+           fInputEventHandler->Notify(curfile->GetName());
+       }
+
+       if (fOutputEventHandler) {
+           fOutputEventHandler->Notify(curfile->GetName());
+       }
+
+       if (fMCtruthEventHandler) {
+           fMCtruthEventHandler->Notify(curfile->GetName());
+       }
+
+    }
+    return kTRUE;
 }    
 
 //______________________________________________________________________________
@@ -246,112 +319,187 @@ Bool_t AliAnalysisManager::Process(Long64_t entry)
   //  Assuming that fChain is the pointer to the TChain being processed,
   //  use fChain->GetTree()->GetEntry(entry).
    if (fDebug > 1) {
-      cout << "AliAnalysisManager::Process()" << endl;
+      cout << "->AliAnalysisManager::Process(" << entry << ")" << endl;
    }
+   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(entry);
+   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(entry);
+   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
+   
    GetEntry(entry);
    ExecAnalysis();
+   if (fDebug > 1) {
+      cout << "<-AliAnalysisManager::Process()" << endl;
+   }
    return kTRUE;
 }
 
 //______________________________________________________________________________
 void AliAnalysisManager::PackOutput(TList *target)
 {
-  // Pack all output data containers in the output list.
+  // Pack all output data containers in the output list. Called at SlaveTerminate
+  // stage in PROOF case for each slave.
    if (fDebug > 1) {
-      cout << "AliAnalysisManager::PackOutput()" << endl;
+      cout << "->AliAnalysisManager::PackOutput()" << endl;
    }   
    if (!target) {
       Error("PackOutput", "No target. Aborting.");
       return;
    }
-
+   if (fInputEventHandler)   fInputEventHandler  ->Terminate();
+   if (fOutputEventHandler)  fOutputEventHandler ->Terminate();
+   if (fMCtruthEventHandler) fMCtruthEventHandler->Terminate();
+   
    if (fMode == kProofAnalysis) {
-      AliAnalysisDataContainer *top = (AliAnalysisDataContainer*)fInputs->At(0);
-      if (!top) {
-          cout<<"Error: No top input container !" <<endl;
-          return;
-      }
-      top->SetData(0);
-
       TIter next(fOutputs);
       AliAnalysisDataContainer *output;
       while ((output=(AliAnalysisDataContainer*)next())) {
-         if (fDebug > 1) printf("   Packing container %s\n", output->GetName());
-         if (output->GetData()) target->Add(output);
-//         output->SetDataOwned(kFALSE);
+         if (output->GetData() && !output->IsSpecialOutput()) {
+            if (output->GetProducer()->IsPostEventLoop()) continue;
+
+            const char *filename = output->GetFileName();
+            if (!(strcmp(filename, "default"))) {
+               if (fOutputEventHandler) filename = fOutputEventHandler->GetOutputFileName();
+            }      
+            if (strlen(filename)) {
+               TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename);
+               TDirectory *opwd = gDirectory;
+               if (file) file->cd();
+               else      file = new TFile(filename, "RECREATE");
+               if (file->IsZombie()) continue;
+               // Clear file list to release object ownership to user.
+               // Save data to file, then close.
+               file->Clear();
+               output->GetData()->Write();
+               file->Close();
+               // Set null directory to histograms and trees.
+               TMethodCall callEnv;
+               if (output->GetData()->IsA())
+                  callEnv.InitWithPrototype(output->GetData()->IsA(), "SetDirectory", "TDirectory*");
+               if (callEnv.IsValid()) {
+                  callEnv.SetParam(Long_t(0));
+                  callEnv.Execute(output->GetData());
+               }
+               // Restore current directory
+               if (opwd) opwd->cd();
+            }   
+            AliAnalysisDataWrapper *wrap = output->ExportData();
+            // Output wrappers must delete data after merging (AG 13/11/07)
+            wrap->SetDeleteData(kTRUE);
+            if (fDebug > 1) printf("   Packing container %s...\n", output->GetName());
+            target->Add(wrap);
+         }   
+         // Special outputs files are closed and copied on the remote location
+         if (output->IsSpecialOutput() && strlen(output->GetFileName())) {
+            TDirectory *opwd = gDirectory;
+            TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(output->GetFileName());
+            if (!file) continue;
+            file->cd();
+            if (output->GetData()) output->GetData()->Write();
+            file->Close();
+            if (opwd) opwd->cd();
+            if (strlen(fSpecialOutputLocation.Data())) {
+               TString remote = fSpecialOutputLocation;
+               remote += "/";
+               Int_t gid = gROOT->ProcessLine("gProofServ->GetGroupId();");
+               remote += Form("%s_%d_", gSystem->HostName(), gid);
+               remote += output->GetFileName();
+               TFile::Cp(output->GetFileName(), remote.Data());
+            } else {
+            // No special location specified-> use TProofFile as merging utility
+               char line[256];
+               sprintf(line, "((TList*)0x%lx)->Add(new TProofFile(\"%s\"));",
+                       (ULong_t)target, output->GetFileName());
+               gROOT->ProcessLine(line);
+            }
+         }      
       }
+      // Cleanup tasks on each slave
+      TIter nexttask(fTasks);
+      AliAnalysisTask *task;
+      while ((task=(AliAnalysisTask*)nexttask())) task->Cleanup();
    } 
-   fContainers->Clear();
    if (fDebug > 1) {
-      printf("   ->output list contains %d containers\n", target->GetSize());
+      printf("<-AliAnalysisManager::PackOutput: output list contains %d containers\n", target->GetSize());
    }
 }
 
 //______________________________________________________________________________
-void AliAnalysisManager::ReplaceOutputContainers(TList *source)
+void AliAnalysisManager::ImportWrappers(TList *source)
 {
-// Replace all exising containers with the ones coming in source.
+// Import data in output containers from wrappers coming in source.
+   if (fDebug > 1) {
+      cout << "->AliAnalysisManager::ImportWrappers()" << endl;
+   }   
    TIter next(fOutputs);
-   AliAnalysisDataContainer *cont, *output;
+   AliAnalysisDataContainer *cont;
+   AliAnalysisDataWrapper   *wrap;
+   Int_t icont = 0;
    while ((cont=(AliAnalysisDataContainer*)next())) {
-      output = (AliAnalysisDataContainer*)source->FindObject(cont->GetName());
-      if (!output) {
-         printf("Error: container %s not found in analysis output !\n", cont->GetName());
+      if (cont->GetProducer()->IsPostEventLoop() ||
+          cont->IsSpecialOutput()) continue;
+      wrap = (AliAnalysisDataWrapper*)source->FindObject(cont->GetName());
+      if (!wrap && fDebug>1) {
+         printf("(WW) ImportWrappers: container %s not found in analysis output !\n", cont->GetName());
          continue;
       }
-      if (fDebug > 1) printf("...Replacing output container %s\n", output->GetName());
-      if (cont->GetFileName()) printf("    -> %s\n", output->GetFileName());
-      Int_t ntasks = fTasks->GetEntries();
-      AliAnalysisTask *task;
-      AliAnalysisDataSlot *oslot;
-      for (Int_t i=0; i<ntasks; i++) {
-         task = (AliAnalysisTask*)fTasks->At(i);
-         Int_t nout = task->GetNoutputs();
-         for (Int_t iout=0; iout<nout; iout++) {
-            oslot = task->GetOutputSlot(iout);
-            if (oslot->GetContainer() == cont) oslot->ConnectContainer(output);
-         }
-      }
-//      output->GetConsumers()->Delete();
-//      if (output->GetProducer()) delete output->GetProducer();
+      icont++;
+      if (fDebug > 1) printf("   Importing data for container %s\n", wrap->GetName());
+      if (cont->GetFileName()) printf("    -> %s\n", cont->GetFileName());
+      cont->ImportData(wrap);
    }         
+   if (fDebug > 1) {
+      cout << "<-AliAnalysisManager::ImportWrappers(): "<< icont << " containers imported" << endl;
+   }   
 }
 
 //______________________________________________________________________________
 void AliAnalysisManager::UnpackOutput(TList *source)
 {
-  // Called by AliAnalysisSelector::Terminate. Output containers should
-  // be in source in the same order as in fOutputs.
-
+  // Called by AliAnalysisSelector::Terminate only on the client.
+   if (fDebug > 1) {
+      cout << "->AliAnalysisManager::UnpackOutput()" << endl;
+   }   
    if (!source) {
-      Error("PackOutput", "No target. Aborting.");
+      Error("UnpackOutput", "No target. Aborting.");
       return;
    }
    if (fDebug > 1) {
-      printf("AliAnalysisManager::UnpackOutput(): %d containers\n", source->GetSize());
       printf("   Source list contains %d containers\n", source->GetSize());
    }   
 
-   if (fMode == kProofAnalysis) {
-      ReplaceOutputContainers(source);
-      fOutputs->Clear();
-   }
-
-   TCollection *collection = source;
-   if (fMode == kLocalAnalysis) collection = fOutputs;
-   TIter next(collection);
+   if (fMode == kProofAnalysis) ImportWrappers(source);
 
+   TIter next(fOutputs);
    AliAnalysisDataContainer *output;
    while ((output=(AliAnalysisDataContainer*)next())) {
-      if (fMode == kProofAnalysis) {
-         output->SetDataOwned(kTRUE);
-         fOutputs->Add(output);
-      }
       if (!output->GetData()) continue;
+      // Check if there are client tasks that run post event loop
+      if (output->HasConsumers()) {
+         // Disable event loop semaphore
+         output->SetPostEventLoop(kTRUE);
+         TObjArray *list = output->GetConsumers();
+         Int_t ncons = list->GetEntriesFast();
+         for (Int_t i=0; i<ncons; i++) {
+            AliAnalysisTask *task = (AliAnalysisTask*)list->At(i);
+            task->CheckNotify(kTRUE);
+            // If task is active, execute it
+            if (task->IsPostEventLoop() && task->IsActive()) {
+               if (fDebug > 1) {
+                  cout << "== Executing post event loop task " << task->GetName() << endl;
+               }                  
+               task->ExecuteTask();
+            }   
+         }
+      }   
       // Check if the output need to be written to a file.
       const char *filename = output->GetFileName();
+      if (!(strcmp(filename, "default"))) {
+         if (fOutputEventHandler) filename = fOutputEventHandler->GetOutputFileName();
+      }
+      
       if (!filename || !strlen(filename)) continue;
       TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename);
+      TDirectory *opwd = gDirectory;
       if (file) file->cd();
       else      file = new TFile(filename, "RECREATE");
       if (file->IsZombie()) continue;
@@ -363,8 +511,12 @@ void AliAnalysisManager::UnpackOutput(TList *source)
          callEnv.SetParam((Long_t) file);
          callEnv.Execute(output->GetData());
       }
-      output->GetData()->Write();      
+      output->GetData()->Write();
+      if (opwd) opwd->cd();
    }
+   if (fDebug > 1) {
+      cout << "<-AliAnalysisManager::UnpackOutput()" << endl;
+   }   
 }
 
 //______________________________________________________________________________
@@ -374,12 +526,60 @@ void AliAnalysisManager::Terminate()
   // a query. It always runs on the client, it can be used to present
   // the results graphically.
    if (fDebug > 1) {
-      cout << "AliAnalysisManager::Terminate()" << endl;
+      cout << "->AliAnalysisManager::Terminate()" << endl;
    }   
    AliAnalysisTask *task;
    TIter next(fTasks);
    // Call Terminate() for tasks
    while ((task=(AliAnalysisTask*)next())) task->Terminate();
+   if (fDebug > 1) {
+      cout << "<-AliAnalysisManager::Terminate()" << endl;
+   }   
+   //
+   if (fInputEventHandler)   fInputEventHandler  ->TerminateIO();
+   if (fOutputEventHandler)  fOutputEventHandler ->TerminateIO();
+   if (fMCtruthEventHandler) fMCtruthEventHandler->TerminateIO();
+   TIter next1(fOutputs);
+   AliAnalysisDataContainer *output;
+   while ((output=(AliAnalysisDataContainer*)next1())) {
+      // Close all files at output
+      const char *filename = output->GetFileName();
+      if (!(strcmp(filename, "default"))) {
+         if (fOutputEventHandler) filename = fOutputEventHandler->GetOutputFileName();
+      }
+      
+      if (!filename || !strlen(filename)) continue;
+      TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename);
+      if (!file || file->IsZombie()) continue;
+      file->Close();
+   }   
+
+   Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
+   if (getsysInfo) {
+      TDirectory *cdir = gDirectory;
+      TFile f("syswatch.root", "RECREATE");
+      if (!f.IsZombie()) {
+         TTree *tree = AliSysInfo::MakeTree("syswatch.log");
+         tree->SetMarkerStyle(kCircle);
+         tree->SetMarkerColor(kBlue);
+         tree->SetMarkerSize(0.5);
+         if (!gROOT->IsBatch()) {
+            tree->SetAlias("event", "id0");
+            tree->SetAlias("memUSED", "mi.fMemUsed");
+            tree->SetAlias("userCPU", "pI.fCpuUser");
+            TCanvas *c = new TCanvas("SysInfo","SysInfo",10,10,800,600);
+            c->Divide(2,1,0.01,0.01);
+            c->cd(1);
+            tree->Draw("memUSED:event","","", 1234567890, 0);
+            c->cd(2);
+            tree->Draw("userCPU:event","","", 1234567890, 0);
+         }   
+         tree->Write();
+         f.Close();
+         delete tree;
+      }
+      if (cdir) cdir->cd();
+   }      
 }
 
 //______________________________________________________________________________
@@ -406,6 +606,10 @@ AliAnalysisDataContainer *AliAnalysisManager::CreateContainer(const char *name,
 //   kExchangeContainer  = 0, used to exchange date between tasks
 //   kInputContainer   = 1, used to store input data
 //   kOutputContainer  = 2, used for posting results
+   if (fContainers->FindObject(name)) {
+      Error("CreateContainer","A container named %s already defined !\n",name);
+      return NULL;
+   }   
    AliAnalysisDataContainer *cont = new AliAnalysisDataContainer(name, datatype);
    fContainers->Add(cont);
    switch (type) {
@@ -413,9 +617,11 @@ AliAnalysisDataContainer *AliAnalysisManager::CreateContainer(const char *name,
          fInputs->Add(cont);
          break;
       case kOutputContainer:
-         if (fOutputs->FindObject(name)) printf("CreateContainer: warning: a container named %s existing !\n",name);
          fOutputs->Add(cont);
-         if (filename && strlen(filename)) cont->SetFileName(filename);
+         if (filename && strlen(filename)) {
+            cont->SetFileName(filename);
+            cont->SetDataOwned(kFALSE);  // data owned by the file
+         }   
          break;
       case kExchangeContainer:
          break;   
@@ -535,6 +741,22 @@ Bool_t AliAnalysisManager::InitAnalysis()
          return kFALSE;
       }   
    }
+   // Check that all containers feeding post-event loop tasks are in the outputs list
+   TIter nextcont(fContainers); // loop over all containers
+   while ((cont=(AliAnalysisDataContainer*)nextcont())) {
+      if (!cont->IsPostEventLoop() && !fOutputs->FindObject(cont)) {
+         if (cont->HasConsumers()) {
+         // Check if one of the consumers is post event loop
+            TIter nextconsumer(cont->GetConsumers());
+            while ((task=(AliAnalysisTask*)nextconsumer())) {
+               if (task->IsPostEventLoop()) {
+                  fOutputs->Add(cont);
+                  break;
+               }
+            }
+         }
+      }
+   }   
    fInitOK = kTRUE;
    return kTRUE;
 }   
@@ -543,6 +765,13 @@ Bool_t AliAnalysisManager::InitAnalysis()
 void AliAnalysisManager::PrintStatus(Option_t *option) const
 {
 // Print task hierarchy.
+   if (!fInitOK) {
+      Info("PrintStatus", "Analysis manager %s not initialized : call InitAnalysis() first", GetName());
+      return;
+   }   
+   Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
+   if (getsysInfo)
+      Info("PrintStatus", "System information will be collected each %lld events", fNSysInfo);
    TIter next(fTopTasks);
    AliAnalysisTask *task;
    while ((task=(AliAnalysisTask*)next()))
@@ -557,9 +786,10 @@ void AliAnalysisManager::ResetAnalysis()
 }
 
 //______________________________________________________________________________
-void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree)
+void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree, Long64_t nentries, Long64_t firstentry)
 {
 // Start analysis for this manager. Analysis task can be: LOCAL, PROOF or GRID.
+// Process nentries starting from firstentry
    if (!fInitOK) {
       Error("StartAnalysis","Analysis manager was not initialized !");
       return;
@@ -576,22 +806,57 @@ void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree)
    }
    if (fMode == kGridAnalysis) {
       Warning("StartAnalysis", "GRID analysis mode not implemented. Running local.");
-      fMode = kLocalAnalysis; 
-   }     
-   char line[128];   
-   TChain *chain = dynamic_cast<TChain*>(tree);
+      fMode = kLocalAnalysis;
+   }
+   char line[256];
+   SetEventLoop(kFALSE);
+   // Disable all branches if requested and set event loop mode
+   if (tree) {
+      if (TestBit(kDisableBranches)) {
+         printf("Disabling all branches...\n");
+//         tree->SetBranchStatus("*",0); // not yet working
+      }   
+      SetEventLoop(kTRUE);
+   }   
+
+   TChain *chain = 0;
+   TString ttype = "TTree";
+   if (tree->IsA() == TChain::Class()) {
+      chain = (TChain*)tree;
+      if (!chain || !chain->GetListOfFiles()->First()) {
+         Error("StartAnalysis", "Cannot process null or empty chain...");
+         return;
+      }   
+      ttype = "TChain";
+   }   
+
+   // Initialize locally all tasks
+   TIter next(fTasks);
+   AliAnalysisTask *task;
+   while ((task=(AliAnalysisTask*)next())) {
+      task->LocalInit();
+   }
+   
    switch (fMode) {
       case kLocalAnalysis:
          if (!tree) {
+            TIter next(fTasks);
+            AliAnalysisTask *task;
+            // Call CreateOutputObjects for all tasks
+            while ((task=(AliAnalysisTask*)next())) {
+               TDirectory *curdir = gDirectory;
+               task->CreateOutputObjects();
+               if (curdir) curdir->cd();
+            }   
             ExecAnalysis();
+            Terminate();
             return;
          } 
          // Run tree-based analysis via AliAnalysisSelector  
-         gROOT->ProcessLine(".L $ALICE_ROOT/ANALYSIS/AliAnalysisSelector.cxx+");
          cout << "===== RUNNING LOCAL ANALYSIS " << GetName() << " ON TREE " << tree->GetName() << endl;
          sprintf(line, "AliAnalysisSelector *selector = new AliAnalysisSelector((AliAnalysisManager*)0x%lx);",(ULong_t)this);
          gROOT->ProcessLine(line);
-         sprintf(line, "((TTree*)0x%lx)->Process(selector);",(ULong_t)tree);
+         sprintf(line, "((%s*)0x%lx)->Process(selector, \"\",%lld, %lld);",ttype.Data(),(ULong_t)tree, nentries, firstentry);
          gROOT->ProcessLine(line);
          break;
       case kProofAnalysis:
@@ -604,7 +869,7 @@ void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree)
          if (chain) {
             chain->SetProof();
             cout << "===== RUNNING PROOF ANALYSIS " << GetName() << " ON CHAIN " << chain->GetName() << endl;
-            chain->Process(gSystem->ExpandPathName("$ALICE_ROOT/ANALYSIS/AliAnalysisSelector.cxx+"));
+            chain->Process("AliAnalysisSelector", "", nentries, firstentry);
          } else {
             printf("StartAnalysis: no chain\n");
             return;
@@ -615,10 +880,63 @@ void AliAnalysisManager::StartAnalysis(const char *type, TTree *tree)
    }   
 }   
 
+//______________________________________________________________________________
+void AliAnalysisManager::StartAnalysis(const char *type, const char *dataset, Long64_t nentries, Long64_t firstentry)
+{
+// Start analysis for this manager on a given dataset. Analysis task can be: 
+// LOCAL, PROOF or GRID. Process nentries starting from firstentry.
+   if (!fInitOK) {
+      Error("StartAnalysis","Analysis manager was not initialized !");
+      return;
+   }
+   if (fDebug>1) {
+      cout << "StartAnalysis: " << GetName() << endl;   
+   }   
+   TString anaType = type;
+   anaType.ToLower();
+   if (!anaType.Contains("proof")) {
+      Error("Cannot process datasets in %s mode. Try PROOF.", type);
+      return;
+   }   
+   fMode = kProofAnalysis;
+   char line[256];
+   SetEventLoop(kTRUE);
+   // Set the dataset flag
+   TObject::SetBit(kUseDataSet);
+   fTree = 0;
+
+   // Initialize locally all tasks
+   TIter next(fTasks);
+   AliAnalysisTask *task;
+   while ((task=(AliAnalysisTask*)next())) {
+      task->LocalInit();
+   }
+   
+   if (!gROOT->GetListOfProofs() || !gROOT->GetListOfProofs()->GetEntries()) {
+      printf("StartAnalysis: no PROOF!!!\n");
+      return;
+   }   
+   sprintf(line, "gProof->AddInput((TObject*)0x%lx);", (ULong_t)this);
+   gROOT->ProcessLine(line);
+   sprintf(line, "gProof->GetDataSet(\"%s\");", dataset);
+   if (!gROOT->ProcessLine(line)) {
+      Error("StartAnalysis", "Dataset %s not found", dataset);
+      return;
+   }   
+   sprintf(line, "gProof->Process(\"%s\", \"AliAnalysisSelector\", \"\", %lld, %lld);",
+           dataset, nentries, firstentry);
+   cout << "===== RUNNING PROOF ANALYSIS " << GetName() << " ON DATASET " << dataset << endl;
+   gROOT->ProcessLine(line);
+}   
+
 //______________________________________________________________________________
 void AliAnalysisManager::ExecAnalysis(Option_t *option)
 {
 // Execute analysis.
+   static Long64_t ncalls = 0;
+   Bool_t getsysInfo = ((fNSysInfo>0) && (fMode==kLocalAnalysis))?kTRUE:kFALSE;
+   if (getsysInfo && ncalls==0) AliSysInfo::AddStamp("Start", (Int_t)ncalls);
+   ncalls++;
    if (!fInitOK) {
      Error("ExecAnalysis", "Analysis manager was not initialized !");
       return;
@@ -626,9 +944,6 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
    AliAnalysisTask *task;
    // Check if the top tree is active.
    if (fTree) {
-      if (fDebug>1) {
-         printf("AliAnalysisManager::ExecAnalysis\n");
-      }   
       TIter next(fTasks);
    // De-activate all tasks
       while ((task=(AliAnalysisTask*)next())) task->SetActive(kFALSE);
@@ -638,17 +953,40 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
          return;
       }   
       cont->SetData(fTree); // This will notify all consumers
-      TIter next1(cont->GetConsumers());
+      Long64_t entry = fTree->GetTree()->GetReadEntry();
+      
+//
+//    Call BeginEvent() for optional input/output and MC services 
+      if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(entry);
+      if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(entry);
+      if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
+//
+//    Execute the tasks
+//      TIter next1(cont->GetConsumers());
+      TIter next1(fTopTasks);
       while ((task=(AliAnalysisTask*)next1())) {
-//         task->SetActive(kTRUE);
          if (fDebug >1) {
             cout << "    Executing task " << task->GetName() << endl;
          }   
+        
          task->ExecuteTask(option);
       }
+//
+//    Call FinishEvent() for optional output and MC services 
+      if (fInputEventHandler)   fInputEventHandler  ->FinishEvent();
+      if (fOutputEventHandler)  fOutputEventHandler ->FinishEvent();
+      if (fMCtruthEventHandler) fMCtruthEventHandler->FinishEvent();
+      // Gather system information if requested
+      if (getsysInfo && ((ncalls%fNSysInfo)==0)) 
+         AliSysInfo::AddStamp(Form("Event#%lld",ncalls),(Int_t)ncalls);
       return;
    }   
    // The event loop is not controlled by TSelector   
+//
+//  Call BeginEvent() for optional input/output and MC services 
+   if (fInputEventHandler)   fInputEventHandler  ->BeginEvent(-1);
+   if (fOutputEventHandler)  fOutputEventHandler ->BeginEvent(-1);
+   if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(-1);
    TIter next2(fTopTasks);
    while ((task=(AliAnalysisTask*)next2())) {
       task->SetActive(kTRUE);
@@ -657,6 +995,11 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
       }   
       task->ExecuteTask(option);
    }   
+//
+// Call FinishEvent() for optional output and MC services 
+   if (fInputEventHandler)   fInputEventHandler  ->FinishEvent();
+   if (fOutputEventHandler)  fOutputEventHandler ->FinishEvent();
+   if (fMCtruthEventHandler) fMCtruthEventHandler->FinishEvent();
 }
 
 //______________________________________________________________________________