- Small fix in data ownership by containers

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

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index 5a7f70bdac0ded856d8571a18ceb3cb57e7e8c41..b0bf7b7fc6a8a7a318282342c147eba2e6d6a479 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -486,6 +486,7 @@ void AliAnalysisManager::ImportWrappers(TList *source)
    AliAnalysisDataWrapper   *wrap;
    Int_t icont = 0;
    while ((cont=(AliAnalysisDataContainer*)next())) {
+      wrap = 0;
       if (cont->GetProducer()->IsPostEventLoop()) continue;
       if (cont->IsSpecialOutput()) {
          if (strlen(fSpecialOutputLocation.Data())) continue;
@@ -500,9 +501,16 @@ void AliAnalysisManager::ImportWrappers(TList *source)
          // Normally we should connect data from the copied file to the
          // corresponding output container, but it is not obvious how to do this
          // automatically if several objects in file...
-         continue;
+         TFile *f = new TFile(cont->GetFileName(), "READ");
+         TObject *obj = f->Get(cont->GetName());
+         if (!obj) {
+            Error("ImportWrappers", "Could not find object %s in file %s", cont->GetName(), cont->GetFileName());
+            continue;
+         }
+         wrap = new AliAnalysisDataWrapper(obj);
+         wrap->SetDeleteData(kFALSE);
       }   
-      wrap = (AliAnalysisDataWrapper*)source->FindObject(cont->GetName());
+      if (!wrap) wrap = (AliAnalysisDataWrapper*)source->FindObject(cont->GetName());
       if (!wrap) {
          Error("ImportWrappers","Container %s not found in analysis output !", cont->GetName());
          continue;