Label for the ITS tracklets (Jan Fiete)

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisManager.cxx

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index 7308469880b8228ea1944e17b4735c7470014c41..8f3be8618a877776040788e7774c85f1cb663c11 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -58,6 +58,7 @@ AliAnalysisManager::AliAnalysisManager(const char *name, const char *title)
                     fMode(kLocalAnalysis),
                     fInitOK(kFALSE),
                     fDebug(0),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
@@ -88,6 +89,7 @@ AliAnalysisManager::AliAnalysisManager(const AliAnalysisManager& other)
                     fMode(other.fMode),
                     fInitOK(other.fInitOK),
                     fDebug(other.fDebug),
+                    fSpecialOutputLocation(""), 
                     fTasks(NULL),
                     fTopTasks(NULL),
                     fZombies(NULL),
@@ -353,6 +355,33 @@ void AliAnalysisManager::PackOutput(TList *target)
       while ((output=(AliAnalysisDataContainer*)next())) {
          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);
@@ -375,9 +404,19 @@ void AliAnalysisManager::PackOutput(TList *target)
                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();
    } 
    if (fDebug > 1) {
       printf("<-AliAnalysisManager::PackOutput: output list contains %d containers\n", target->GetSize());
@@ -416,8 +455,7 @@ void AliAnalysisManager::ImportWrappers(TList *source)
 //______________________________________________________________________________
 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;
    }   
@@ -924,7 +962,8 @@ void AliAnalysisManager::ExecAnalysis(Option_t *option)
       if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
 //
 //    Execute the tasks
-      TIter next1(cont->GetConsumers());
+//      TIter next1(cont->GetConsumers());
+      TIter next1(fTopTasks);
       while ((task=(AliAnalysisTask*)next1())) {
          if (fDebug >1) {
             cout << "    Executing task " << task->GetName() << endl;