Default output AOD container created as "special" by default. Merging of AOD's in...

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index 0a635e2d82d29fe01b0782df5a3cddd1f9d8717e..c4f6d16508c2a84538752e0f7e2e2ec767b5fce5 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -268,18 +268,13 @@ void AliAnalysisManager::SlaveBegin(TTree *tree)
    // Call Init of EventHandler
    if (fOutputEventHandler) {
       if (fMode == kProofAnalysis) {
-         TIter nextout(fOutputs);
-         AliAnalysisDataContainer *c_aod;
-         while ((c_aod=(AliAnalysisDataContainer*)nextout())) if (!strcmp(c_aod->GetFileName(),"default")) break;
-         if (c_aod) {
-            // Merging AOD's in PROOF via TProofOutputFile
-            if (fDebug > 1) printf("   Initializing AOD output file %s...\n", fOutputEventHandler->GetOutputFileName());
-            init = fOutputEventHandler->Init("proof");
-            if (!init) msg = "Failed to initialize output handler on worker";
-         }   
+         // Merging AOD's in PROOF via TProofOutputFile
+         if (fDebug > 1) printf("   Initializing AOD output file %s...\n", fOutputEventHandler->GetOutputFileName());
+         init = fOutputEventHandler->Init("proof");
+         if (!init) msg = "Failed to initialize output handler on worker";
       } else {
          init = fOutputEventHandler->Init("local");
-         if (!init) msg = "Failed to initialize output handler on worker";
+         if (!init) msg = "Failed to initialize output handler";
       }
       initOK &= init;
       if (!fSelector) Error("SlaveBegin", "Selector not set");
@@ -1306,5 +1301,6 @@ void AliAnalysisManager::SetOutputEventHandler(AliVEventHandler*  handler)
 // Set the input event handler and create a container for it.
    fOutputEventHandler   = handler;
    fCommonOutput = CreateContainer("cAUTO_OUTPUT", TTree::Class(), AliAnalysisManager::kOutputContainer, "default");
+   fCommonOutput->SetSpecialOutput();
    Warning("SetOutputEventHandler", " An automatic output container for the output tree was created.\nPlease use: mgr->GetCommonOutputContainer() to access it.");
 }