Fix for checking dependencies of a LEGO module

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

diff --git a/ANALYSIS/AliAnalysisTaskCfg.cxx b/ANALYSIS/AliAnalysisTaskCfg.cxx
index a1cc7aea5499c76362a4d4e2589a2b9fd1829227..bba0499eab18aa07c8ff841306f99441cec913d2 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskCfg.cxx
+++ b/ANALYSIS/AliAnalysisTaskCfg.cxx
@@ -19,6 +19,7 @@
 #include "Riostream.h"
 #include "TError.h"
 #include "TMacro.h"
+#include "TInterpreter.h"
 #include "TSystem.h"
 #include "TObjArray.h"
 #include "TObjString.h"
@@ -48,11 +49,13 @@
 # Lines that do not start with #Module are ignored, except those in embedded
   macro blocks
 #Module.Begin        QAsym
-#Module.Libs         PWG1
+#Module.Libs         PWGPP
 #Module.Deps         PhysicsSelection
 #Module.DataTypes    ESD, AOD, MC
-#Module.MacroName    $ALICE_ROOT/PWG1/PilotTrain/AddTaskQAsym.C
+#Module.MacroName    $ALICE_ROOT/PWGPP/PilotTrain/AddTaskQAsym.C
 #Module.MacroArgs    0, AliVEvent::kAnyINT, AliVEvent::kHighMult, AliVEvent::kEMC7, AliVEvent::kMUU7
+#Module.OutputFile   
+#Module.TerminateFile
 #Module.StartConfig  
 __R_ADDTASK__->SelectCollisionCandidates();
 #Module.EndConfig
@@ -70,6 +73,11 @@ __R_ADDTASK__->SelectCollisionCandidates();
 // the right order in the grid handler to generate train macros.
 
 
+using std::cout;
+using std::endl;
+using std::ios;
+using std::ofstream;
+using std::ifstream;
 ClassImp(AliAnalysisTaskCfg)
 
 //______________________________________________________________________________
@@ -80,6 +88,8 @@ AliAnalysisTaskCfg::AliAnalysisTaskCfg()
                     fLibs(),
                     fDeps(),
                     fDataTypes(),
+                    fOutputFile(),
+                    fTerminateFile(),
                     fMacro(0),
                     fConfigDeps(0),
                     fRAddTask(0)
@@ -95,6 +105,8 @@ AliAnalysisTaskCfg::AliAnalysisTaskCfg(const char *name)
                     fLibs(),
                     fDeps(),
                     fDataTypes(),
+                    fOutputFile(),
+                    fTerminateFile(),
                     fMacro(0),
                     fConfigDeps(0),
                     fRAddTask(0)
@@ -111,6 +123,8 @@ AliAnalysisTaskCfg::AliAnalysisTaskCfg(const AliAnalysisTaskCfg &other)
                     fLibs(other.fLibs),
                     fDeps(other.fDeps),
                     fDataTypes(other.fDataTypes),
+                    fOutputFile(other.fOutputFile),
+                    fTerminateFile(other.fTerminateFile),
                     fMacro(0),
                     fConfigDeps(0),
                     fRAddTask(0)
@@ -139,6 +153,8 @@ AliAnalysisTaskCfg& AliAnalysisTaskCfg::operator=(const AliAnalysisTaskCfg &othe
    fLibs      = other.fLibs;
    fDeps      = other.fDeps;
    fDataTypes = other.fDataTypes;
+   fOutputFile = other.fOutputFile;
+   fTerminateFile = other.fTerminateFile;
    if (other.fMacro) fMacro = new TMacro(*other.fMacro);
    if (other.fConfigDeps) fConfigDeps = new TMacro(*other.fConfigDeps);
    fRAddTask  = other.fRAddTask;
@@ -205,11 +221,24 @@ Long64_t AliAnalysisTaskCfg::ExecuteMacro(const char *newargs)
    Int_t ntasks0 = mgr->GetTasks()->GetEntriesFast();
    TString args = newargs;
    if (args.IsNull()) args = fMacroArgs;
-   Long64_t retval = fMacro->Exec(args);
-   if (retval >=0) {
+   Int_t error = 0;
+   Long64_t retval = fMacro->Exec(args, &error);
+   if (error != TInterpreter::kNoError)
+   {
+      Error("ExecuteMacro", "Macro interpretation failed");
+      return -1;
+   }
+   Int_t ntasks = mgr->GetTasks()->GetEntriesFast();
+   if (ntasks<=ntasks0)
+   {
+      Error("ExecuteMacro", "The macro did not add any tasks to the manager");
+      return -1;
+   }
+   Long64_t ptrTask = (Long64_t)mgr->GetTasks()->At(ntasks0);
+   if (retval >= ptrTask) {
       TObject::SetBit(AliAnalysisTaskCfg::kLoaded, kTRUE);
       fRAddTask = reinterpret_cast<TObject*>(retval);
-      if (fConfigDeps) {
+      if (fConfigDeps && dynamic_cast<TObject*>(fRAddTask)) {
          TString classname = fRAddTask->ClassName();
          classname += Form("* __R_ADDTASK__ = (%s*)0x%lx;", classname.Data(),(ULong_t)retval);
          classname.Prepend("  ");
@@ -220,7 +249,6 @@ Long64_t AliAnalysisTaskCfg::ExecuteMacro(const char *newargs)
          }
       }   
    }
-   Int_t ntasks = mgr->GetTasks()->GetEntriesFast();
    Info("ExecuteMacro", "Macro %s added %d tasks to the manager", fMacro->GetName(), ntasks-ntasks0);
    return retval;
 }
@@ -230,7 +258,9 @@ Int_t AliAnalysisTaskCfg::GetNlibs() const
 {
 // Returns number of requested libraries.
    if (fLibs.IsNull()) return 0;
-   Int_t nlibs = fLibs.CountChar(',')+1;
+   TObjArray *list  = fLibs.Tokenize(",");
+   Int_t nlibs = list->GetEntriesFast();
+   delete list;
    return nlibs;
 }
 
@@ -240,7 +270,7 @@ const char *AliAnalysisTaskCfg::GetLibrary(Int_t i) const
 // Returns library name for the i-th library.
    Int_t nlibs = GetNlibs();
    if (i>=nlibs) return 0;
-   TString libname;
+   static TString libname;
    TObjArray *list  = fLibs.Tokenize(",");
    libname = list->At(i)->GetName();
    libname.ReplaceAll(".so","");
@@ -295,7 +325,7 @@ const char *AliAnalysisTaskCfg::GetDependency(Int_t i) const
 // Returns library name for the i-th library.
    Int_t ndeps = GetNdeps();
    if (i>=ndeps) return 0;
-   TString depname;
+   static TString depname;
    TObjArray *list  = fDeps.Tokenize(",");
    depname = list->At(i)->GetName();
    depname.ReplaceAll(" ","");
@@ -307,7 +337,19 @@ const char *AliAnalysisTaskCfg::GetDependency(Int_t i) const
 Bool_t AliAnalysisTaskCfg::NeedsDependency(const char *dep) const
 {
 // Check if a given library is needed by the module.
-   return fDeps.Contains(dep);
+   Int_t indmin = 0;
+   Int_t indmax = 0;
+   Int_t len = fDeps.Length();
+   TString crt;
+   while (indmax<len) {
+      indmax = fDeps.Index(",",indmin);
+      if (indmax < 0) indmax = len;
+      // indmin points to the beginning of the string while indmax to the end+1
+      crt = fDeps(indmin, indmax-indmin);
+      if (crt==dep) return kTRUE;
+      indmin = indmax+1;
+   }
+   return kFALSE;
 }
 
 //______________________________________________________________________________
@@ -353,7 +395,14 @@ Long64_t AliAnalysisTaskCfg::ExecuteConfigMacro()
       Error("ExecuteConfigMacro", "Cannot load requested libraries: %s", fLibs.Data());
       return -1;
    }
-   return fConfigDeps->Exec();
+   Int_t error = 0;
+   Long64_t retval = fConfigDeps->Exec("", &error);
+   if (error != TInterpreter::kNoError)
+   {
+      Error("ExecuteMacro", "Macro interpretation failed");
+      return -1;
+   }
+   return retval;
 }
 
 //______________________________________________________________________________
@@ -418,6 +467,8 @@ void AliAnalysisTaskCfg::SaveAs(const char *filename, Option_t *option) const
    out << "#Module.Libs " << fLibs << endl;
    out << "#Module.Deps " << fDeps << endl;
    out << "#Module.DataTypes " << fDataTypes << endl;
+   out << "#Module.OutputFile " << fOutputFile << endl;
+   out << "#Module.TerminateFile " << fTerminateFile << endl;
    out << "#Module.MacroName " << fMacroName << endl;
    out << "#Module.MacroArgs " << fMacroArgs << endl;
    if (fConfigDeps) {
@@ -430,7 +481,8 @@ void AliAnalysisTaskCfg::SaveAs(const char *filename, Option_t *option) const
 const char *AliAnalysisTaskCfg::DecodeValue(TString &line)
 {
 // Decode the value string from the line
-   TString value = line(line.Index(' '),line.Length());
+   static TString value;
+   value = line(line.Index(' '),line.Length());
    value = value.Strip(TString::kLeading,' ');
    value = value.Strip(TString::kTrailing,' ');
    return value.Data();
@@ -484,6 +536,14 @@ TObjArray *AliAnalysisTaskCfg::ExtractModulesFrom(const char *filename)
          // Data types
          decode = AliAnalysisTaskCfg::DecodeValue(line);
          cfg->SetDataTypes(decode);
+      } else if (cfg && line.BeginsWith("#Module.OutputFile")) {
+         // Desired output file name (via SetCommonOutput)
+         decode = AliAnalysisTaskCfg::DecodeValue(line);
+         cfg->SetOutputFileName(decode);
+      } else if (cfg && line.BeginsWith("#Module.TerminateFile")) {
+         // Custom file name produced in Terminate if any
+         decode = AliAnalysisTaskCfg::DecodeValue(line);
+         cfg->SetTerminateFileName(decode);
       } else if (cfg && line.BeginsWith("#Module.MacroName")) {
          // Name of the add task macro (including path)
          decode = AliAnalysisTaskCfg::DecodeValue(line);
@@ -502,12 +562,13 @@ TObjArray *AliAnalysisTaskCfg::ExtractModulesFrom(const char *filename)
       } else if (cfg && line.BeginsWith("#Module.StartConfig")) {
          // Marker for start of the configuration macro
          addConfig = new TMacro();
-         TString shortName = gSystem->BaseName(cfg->GetMacroName());
-         shortName = shortName(0,shortName.Index("."));
-         shortName += "Config";
+//         TString shortName = gSystem->BaseName(cfg->GetMacroName());
+//         shortName = shortName(0,shortName.Index("."));
+         TString shortName = cfg->GetName();
+         shortName += "_Config";
          addConfig->SetName(shortName);
-         shortName.Prepend("/");
-         shortName.Prepend(gSystem->DirName(cfg->GetMacroName()));
+//         shortName.Prepend("/");
+//         shortName.Prepend(gSystem->DirName(cfg->GetMacroName()));
          shortName += ".C";
          addConfig->SetTitle(shortName);
       } else if (cfg && line.BeginsWith("#Module.EndMacro")) {