- Introduced merging via TProofFile waiting for a full API to handle the output file.

- Corrections in AliAnalysisDataWrapper::Merge()

diff --git a/ANALYSIS/AliAnalysisDataContainer.cxx b/ANALYSIS/AliAnalysisDataContainer.cxx
index 4dc993251dc36ad27f355d187ba0071c54c47804..b1afadcaba7174243966a537e281856a68ed8524 100644 (file)
--- a/ANALYSIS/AliAnalysisDataContainer.cxx
+++ b/ANALYSIS/AliAnalysisDataContainer.cxx
@@ -47,6 +47,7 @@
 
 #include <TClass.h>
 #include <TTree.h>
+#include <TH1.h>
 #include <TROOT.h>
 
 #include "AliAnalysisDataContainer.h"
@@ -412,39 +413,11 @@ Long64_t AliAnalysisDataWrapper::Merge(TCollection *list)
 {
 // Merge a list of containers with this one. Containers in the list must have
 // data of the same type.
+   if (TH1::AddDirectoryStatus()) TH1::AddDirectory(kFALSE);
    if (!fData) return 0;
    if (!list || list->IsEmpty()) return 1;
 
    TMethodCall callEnv;
-   if (fData->InheritsFrom(TSeqCollection::Class())) {
-//      printf("Collection wrapper %s 0x%lx (owner=%d) merge with:\n", GetName(), (ULong_t)this, TObject::TestBit(kDeleteData));
-      TSeqCollection *coll = (TSeqCollection*)fData;
-      if (coll->IsEmpty()) return 0;
-      Int_t nentries = coll->GetEntries();
-      AliAnalysisDataWrapper *top, *crt;
-      TIter next(list);
-      TSeqCollection *collcrt = 0;
-      TList *list1 = 0;
-      // Loop entries of the collection attached to this wrapper.
-      for (Int_t i=0; i<nentries; i++) {
-         list1 = new TList();
-         top = new AliAnalysisDataWrapper(coll->At(i));
-         next.Reset();
-         // Loop wrappers coming in the 'to merge with' list
-         while ((crt=(AliAnalysisDataWrapper*)next())) {
-//            printf("  %s 0x%lx (owner=%d)\n", crt->GetName(), (ULong_t)crt, crt->TestBit(AliAnalysisDataWrapper::kDeleteData));
-            collcrt = (TSeqCollection*)crt->Data();
-            list1->Add(new AliAnalysisDataWrapper(collcrt->At(i)));
-         }
-         // Now merge 'top' wrapper with 'list1'. This may go recursively.
-         top->Merge(list1);
-         delete top;
-         list1->Delete();
-         delete list1;
-      }
-      return nentries;
-   }   
-   
    if (fData->IsA())
       callEnv.InitWithPrototype(fData->IsA(), "Merge", "TCollection*");
    if (!callEnv.IsValid()) {
@@ -457,11 +430,11 @@ Long64_t AliAnalysisDataWrapper::Merge(TCollection *list)
    // Make a list where to temporary store the data to be merged.
    TList *collectionData = new TList();
    Int_t count = 0; // object counter
-//   printf("Wrapper %s 0x%lx (owner=%d) merged with:\n", GetName(), (ULong_t)this, TObject::TestBit(kDeleteData));
+   // printf("Wrapper %s 0x%lx (data=%s) merged with:\n", GetName(), (ULong_t)this, fData->ClassName());
    while ((cont=(AliAnalysisDataWrapper*)next1())) {
-//      printf("   %s 0x%lx (owner=%d)\n", cont->GetName(), (ULong_t)cont, cont->TestBit(AliAnalysisDataWrapper::kDeleteData));
       TObject *data = cont->Data();
       if (!data) continue;
+      // printf("   - %s 0x%lx (data=%s)\n", cont->GetName(), (ULong_t)cont, data->ClassName());
       collectionData->Add(data);
       count++;
    }

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index 8cf718e5f7b67d951de987ddd75a18d499fd64bd..d0ff02963dbe697f819ba6745de981c118bc6bcb 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -353,6 +353,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,6 +402,12 @@ 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);
             }
          }      
       }
@@ -416,8 +449,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;
    }