small fix to run in PROOF

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

diff --git a/ANALYSIS/AliAnalysisDataContainer.cxx b/ANALYSIS/AliAnalysisDataContainer.cxx
index 4af71462ed6ca5ff7dd8a7c4ae9135b3fd173145..0aa772a5a2ddc3c195efa43128de4a35b66a8342 100644 (file)
--- a/ANALYSIS/AliAnalysisDataContainer.cxx
+++ b/ANALYSIS/AliAnalysisDataContainer.cxx
@@ -229,12 +229,12 @@ Long64_t AliAnalysisDataContainer::Merge(TCollection *list)
    if (!callEnv.IsValid() && !list->IsEmpty()) {
       cout << "No merge interface for data stored by " << GetName() << ". Merging not possible !" << endl;
       return 1;
-   }   
-   
+   }
+
    if (list->IsEmpty()) return 1;
 
    TIter next(list);
-   AliAnalysisDataContainer *cont;   
+   AliAnalysisDataContainer *cont;
    // Make a list where to temporary store the data to be merged.
    TList *collectionData = new TList();
    Int_t count = 0; // object counter
@@ -248,12 +248,12 @@ Long64_t AliAnalysisDataContainer::Merge(TCollection *list)
       printf(" ... merging object %s\n", data->GetName());
       collectionData->Add(data);
       count++;
-   }   
+   }
    callEnv.SetParam((Long_t) collectionData);
    callEnv.Execute(fData);
    delete collectionData;
-   
-   return count+1;   
+
+   return count+1;
 }
 
 //______________________________________________________________________________
@@ -266,15 +266,16 @@ void AliAnalysisDataContainer::PrintContainer(Option_t *option, Int_t indent) co
    opt.ToLower();
    Bool_t dep = (opt.Contains("dep"))?kTRUE:kFALSE;
    if (!dep) {
-      printf("%s\n", Form("%sContainer: %s  type: %s", ind.Data(), GetName(), GetTitle()));
+      printf("%sContainer: %s  type: %s", ind.Data(), GetName(), GetTitle());
       if (fProducer) 
-         printf("%s\n", Form("%s = Data producer: task %s",ind.Data(),fProducer->GetName()));
+         printf("%s = Data producer: task %s",ind.Data(),fProducer->GetName());
       else
-         printf("%s\n", Form("%s= No data producer"));
-      printf("%s", Form("%s = Consumer tasks: "));
+         printf("%s= No data producer",ind.Data());
+      printf("%s = Consumer tasks: ", ind.Data());
       if (!fConsumers || !fConsumers->GetEntriesFast()) printf("-none-\n");
       else printf("\n");
-   }   
+   }
+   printf("Filename: %s\n", fFileName.Data());
    TIter next(fConsumers);
    AliAnalysisTask *task;
    while ((task=(AliAnalysisTask*)next())) task->PrintTask(option, indent+3);
@@ -300,7 +301,7 @@ Bool_t AliAnalysisDataContainer::SetData(TObject *data, Option_t *)
          }
       }      
       return kTRUE;
-   } 
+   }
    // Check if it is the producer who published the data     
    if (fProducer->GetPublishedData()==data) {
       fData = data;