Fixes for solving dependencies in the lego train generator (Mihaela, …

…Andrei)
sevdokim · Jul 1, 2015 · 560d73e · 560d73e
1 parent 82d30a5
commit 560d73e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ANALYSIS/ANALYSIS/AliAnalysisTaskCfg.cxx b/ANALYSIS/ANALYSIS/AliAnalysisTaskCfg.cxx
@@ -235,8 +235,8 @@ Long64_t AliAnalysisTaskCfg::ExecuteMacro(const char *newargs)
       return -1;
    }
 //   Long64_t ptrTask = (Long64_t)mgr->GetTasks()->At(ntasks0);
+   TObject::SetBit(AliAnalysisTaskCfg::kLoaded, kTRUE);
    if (retval) {
-      TObject::SetBit(AliAnalysisTaskCfg::kLoaded, kTRUE);
       fRAddTask = reinterpret_cast<TObject*>(retval);
       if (fConfigDeps && dynamic_cast<TObject*>(fRAddTask)) {
          TString classname = fRAddTask->ClassName();

diff --git a/ANALYSIS/ANALYSISaliceBase/AliAnalysisAlien.cxx b/ANALYSIS/ANALYSISaliceBase/AliAnalysisAlien.cxx
@@ -543,11 +543,12 @@ Bool_t AliAnalysisAlien::CheckDependencies()
             // down to index i included.
             fModules->RemoveAt(idep);
             for (k=idep-1; k>=i; k--) fModules->AddAt(fModules->RemoveAt(k),k+1);
+            istart = i;
             fModules->AddAt(dep, i++);
          }
-         //Redo from istart if dependencies were inserted
-         if (i>istart) i=istart-1;
       }
+      //Redo from istart if dependencies were inserted
+      if (i>istart) i=istart-1;
    }
    return kTRUE;
 }