couple of fixes in the implementation of the AliAnalysisTaskCfg

diff --git a/ANALYSIS/AliAnalysisAlien.cxx b/ANALYSIS/AliAnalysisAlien.cxx
index 41666963fde5e681aef063f741c27a84799922cf..eaa77a89dd4d8b9ecf2056991ffb733014eeb98d 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.cxx
+++ b/ANALYSIS/AliAnalysisAlien.cxx
@@ -476,7 +476,7 @@ Bool_t AliAnalysisAlien::CheckDependencies()
             // Remove at idep and move all objects below up one slot
             // down to index i included.
             fModules->RemoveAt(idep);
             // Remove at idep and move all objects below up one slot
             // down to index i included.
             fModules->RemoveAt(idep);

-            for (k=idep-1; k>=i; k++) fModules->AddAt(fModules->RemoveAt(k),k+1);
+            for (k=idep-1; k>=i; k--) fModules->AddAt(fModules->RemoveAt(k),k+1);

             fModules->AddAt(dep, i++);
          }
          //Redo from istart if dependencies were inserted
             fModules->AddAt(dep, i++);
          }
          //Redo from istart if dependencies were inserted


@@ -486,6 +486,22 @@ Bool_t AliAnalysisAlien::CheckDependencies()
    return kTRUE;
 }      
 
    return kTRUE;
 }      
 

+//______________________________________________________________________________
+AliAnalysisManager *AliAnalysisAlien::CreateAnalysisManager(const char *name, const char *filename)
+{
+// Create the analysis manager and optionally execute the macro in filename.
+   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+   if (mgr) return mgr;
+   mgr = new AliAnalysisManager(name);
+   mgr->SetGridHandler((AliAnalysisGrid*)this);
+   if (strlen(filename)) {
+      TString line = gSystem->ExpandPathName(filename);
+      line.Prepend(".x ");
+      gROOT->ProcessLine(line.Data());
+   }
+   return mgr;
+}      
+      

 //______________________________________________________________________________
 Int_t AliAnalysisAlien::GetNmodules() const
 {
 //______________________________________________________________________________
 Int_t AliAnalysisAlien::GetNmodules() const
 {


@@ -557,6 +573,11 @@ Bool_t AliAnalysisAlien::GenerateTest(const char *modname)
 Bool_t AliAnalysisAlien::LoadModules()
 {
 // Load all modules by executing the AddTask macros. Checks first the dependencies.
 Bool_t AliAnalysisAlien::LoadModules()
 {
 // Load all modules by executing the AddTask macros. Checks first the dependencies.

+   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+   if (!mgr) {
+      Error("LoadModules", "No analysis manager created yet. Use CreateAnalysisManager first.");
+      return kFALSE;
+   }   

    if (!CheckDependencies()) return kFALSE;
    TIter next(fModules);
    AliAnalysisTaskCfg *mod;
    if (!CheckDependencies()) return kFALSE;
    TIter next(fModules);
    AliAnalysisTaskCfg *mod;


@@ -576,7 +597,9 @@ Bool_t AliAnalysisAlien::LoadModules()
          if (!fAdditionalLibs.IsNull()) fAdditionalLibs += " ";
          fAdditionalLibs += lib;
       }
          if (!fAdditionalLibs.IsNull()) fAdditionalLibs += " ";
          fAdditionalLibs += lib;
       }

-   }      
+   }
+   if (!mgr->InitAnalysis()) return kFALSE;
+   mgr->PrintStatus();

    return kTRUE;
 }      
 
    return kTRUE;
 }      
 

diff --git a/ANALYSIS/AliAnalysisAlien.h b/ANALYSIS/AliAnalysisAlien.h
index 99b4d89eea486ca3b126d26bba926989d59bc81e..ee9a0644215d211ed5ceb5a0b81330e2c6b1776f 100644 (file)
--- a/ANALYSIS/AliAnalysisAlien.h
+++ b/ANALYSIS/AliAnalysisAlien.h
@@ -100,6 +100,7 @@ public:
 //Utilities
    void                AddModule(AliAnalysisTaskCfg *module);
    void                AddModules(TObjArray *list);
 //Utilities
    void                AddModule(AliAnalysisTaskCfg *module);
    void                AddModules(TObjArray *list);

+   AliAnalysisManager *CreateAnalysisManager(const char *name, const char *filename="");

    Int_t               GetNmodules() const;
    AliAnalysisTaskCfg *GetModule(const char *name);
    Bool_t              LoadModules();
    Int_t               GetNmodules() const;
    AliAnalysisTaskCfg *GetModule(const char *name);
    Bool_t              LoadModules();

diff --git a/ANALYSIS/AliAnalysisTaskCfg.cxx b/ANALYSIS/AliAnalysisTaskCfg.cxx
index a3455708ab0a678418ff8f4bd076d26734d6be87..d94df77ae79df9fe967f222d70c54eb7c7a9e762 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskCfg.cxx
+++ b/ANALYSIS/AliAnalysisTaskCfg.cxx
@@ -150,7 +150,7 @@ TMacro *AliAnalysisTaskCfg::OpenMacro(const char *name)
    }   
    TString expname;
    if (strlen(name)) expname = gSystem->ExpandPathName(name);
    }   
    TString expname;
    if (strlen(name)) expname = gSystem->ExpandPathName(name);

-   else              expname = gSystem->ExpandPathName(fMacroName);
+   else              expname = gSystem->ExpandPathName(fMacroName.Data());

    if (expname.IsNull()) {
       Error("OpenMacro", "Macro name not provided and not previously set");
       return 0;
    if (expname.IsNull()) {
       Error("OpenMacro", "Macro name not provided and not previously set");
       return 0;


@@ -364,7 +364,7 @@ void AliAnalysisTaskCfg::Print(Option_t * option) const
    if (full) {
       if (fMacro) fMacro->Print();
       else {
    if (full) {
       if (fMacro) fMacro->Print();
       else {

-         TMacro macro(gSystem->ExpandPathName(fMacroName));
+         TMacro macro(gSystem->ExpandPathName(fMacroName.Data()));

          macro.Print();
       }   
    }   
          macro.Print();
       }   
    }