Fixed initialization of AOD output file.
authoragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 29 Apr 2009 12:11:34 +0000 (12:11 +0000)
committeragheata <agheata@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 29 Apr 2009 12:11:34 +0000 (12:11 +0000)
ANALYSIS/AliAnalysisManager.cxx

index 04531c7..0a635e2 100644 (file)
@@ -271,15 +271,9 @@ void AliAnalysisManager::SlaveBegin(TTree *tree)
          TIter nextout(fOutputs);
          AliAnalysisDataContainer *c_aod;
          while ((c_aod=(AliAnalysisDataContainer*)nextout())) if (!strcmp(c_aod->GetFileName(),"default")) break;
-         if (c_aod && c_aod->IsSpecialOutput()) {
-            // Merging via files
-            if (fDebug > 1) printf("   Initializing special output file %s...\n", fOutputEventHandler->GetOutputFileName());
-            OpenProofFile(fOutputEventHandler->GetOutputFileName(), "RECREATE");
-            c_aod->SetFile(gFile);
-            init = fOutputEventHandler->Init("proofspecial");
-            if (!init) msg = "Failed to initialize output handler on worker using special proof output";
-         } else {
-            // Merging in memory
+         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";
          }