Fixing options of helpers to use the correct version of the Add() overloaded function...

Options* Add(const TString& name, const TString& desc, Bool_t def)

After this was implemented something like fOptions.Add("name", "arg", "desc") would use this function instead of the intended

Options* Add(const TString& name, const TString& arg, const TString& desc, const TString& val="")

f.ex. in GridHelper.C: fOptions.Add("run",    "RUNS",   "Range, list, and/or file of runs") would set the run option to "true" and ignore any later input containing run numbers due to the compiler converting the last parameter to a bool rather than choosing the intended function with all parameters as string. The solution is to use fOptions.Add("run",    "RUNS",   "Range, list, and/or file of runs", "");. It is perhaps worth considering to remove default "" value of the val parameter to make the choice of Add() function more transparent for each option.

diff --git a/PWGLF/FORWARD/trains/AAFPluginHelper.C b/PWGLF/FORWARD/trains/AAFPluginHelper.C
index 75c50f7e4849bc47bf83fd556ad58df47e435562..980a994ea4b8e2083a5003cc560685fe0024d630 100644 (file)
--- a/PWGLF/FORWARD/trains/AAFPluginHelper.C
+++ b/PWGLF/FORWARD/trains/AAFPluginHelper.C
@@ -82,8 +82,8 @@ struct AAFPluginHelper : public PluginHelper
     : PluginHelper(url, verbose)
   {
     fOptions.Add("workers", "N[x]", "Number of workers to use", 0);
-    fOptions.Add("dsname",  "NAME", "Make output dataset");
-    fOptions.Add("wrapper", "CMD", "Wrapper command");
+    fOptions.Add("dsname",  "NAME", "Make output dataset", "");
+    fOptions.Add("wrapper", "CMD", "Wrapper command", "");
     fOptions.Add("clear",   "Clear all packages");
     fOptions.Add("reset",   "soft|hard", "Reset cluster", "hard");
 

diff --git a/PWGLF/FORWARD/trains/GridHelper.C b/PWGLF/FORWARD/trains/GridHelper.C
index c6b93b72b778582efeee7f12ab4987656a069d01..50955a859bc55e69cc3804c307b5e26213cfde60 100644 (file)
--- a/PWGLF/FORWARD/trains/GridHelper.C
+++ b/PWGLF/FORWARD/trains/GridHelper.C
@@ -86,8 +86,8 @@ struct GridHelper : public PluginHelper
     fOptions.Add("oper", "FULL|TERMINATE|SUBMIT", "Analysis operation", "FULL");
     fOptions.Add("split",  "N|max",  "Max number of files before split","max");
     fOptions.Add("merge",  "N|max",  "Max number of files for merge",   "max");
-    fOptions.Add("run",    "RUNS",   "Range, list, and/or file of runs");
-    fOptions.Add("pattern","GLOB",   "File/directory name pattern");
+    fOptions.Add("run",    "RUNS",   "Range, list, and/or file of runs", "");
+    fOptions.Add("pattern","GLOB",   "File/directory name pattern", "");
     fOptions.Add("alien",  "VERSION","Alien API version",              "V1.1x");
     fOptions.Add("concat", "Concatenate all runs");
     fOptions.Add("ttl",    "N|max",  "Time to live",                    "max");

diff --git a/PWGLF/FORWARD/trains/PluginHelper.C b/PWGLF/FORWARD/trains/PluginHelper.C
index 3399d8c9295a9c80c17f0a7f77083ab6de8ddab1..d09a4d20479089337011f5e909d1184f4ffdacea 100644 (file)
--- a/PWGLF/FORWARD/trains/PluginHelper.C
+++ b/PWGLF/FORWARD/trains/PluginHelper.C
@@ -78,7 +78,7 @@ struct PluginHelper : public Helper
     fOptions.Add("root",    "VERSION", "ROOT version", "last");
     fOptions.Add("par", "Use par files");
     fOptions.Add("mode", "default|rec|sim", "AliROOT mode", "default");
-    fOptions.Add("storage", "URL", "Location for external storage");    
+    fOptions.Add("storage", "URL", "Location for external storage", "");    
     fOptions.Add("plugin", "Use AliEn handler");
 
     fExtraLibs.SetOwner();

diff --git a/PWGLF/FORWARD/trains/ProofHelper.C b/PWGLF/FORWARD/trains/ProofHelper.C
index ef7fba76819efb854bbc4ec2f956e92cda6a8ace..6b1067cb391bb32c23b5a1aaa28a87e4ea82a462 100644 (file)
--- a/PWGLF/FORWARD/trains/ProofHelper.C
+++ b/PWGLF/FORWARD/trains/ProofHelper.C
@@ -96,12 +96,12 @@ struct ProofHelper : public Helper
       fBasePars(false)
   {
     fOptions.Add("workers",  "N[x]", "Number of workers to use", 0);
-    fOptions.Add("dsname",   "NAME", "Make output dataset");
+    fOptions.Add("dsname",   "NAME", "Make output dataset", "");
     fOptions.Add("par",      "tasks|all", "Use par files",           "tasks");
     fOptions.Add("mode",     "default|rec|sim", "AliROOT mode",      "default");
-    fOptions.Add("storage",  "URL", "Location for external storage");    
-    fOptions.Add("wrapper",  "CMD", "Wrapper command");
-    fOptions.Add("clear",    "PKGS", "Clear packages ','-separated");
+    fOptions.Add("storage",  "URL", "Location for external storage", "");    
+    fOptions.Add("wrapper",  "CMD", "Wrapper command", "");
+    fOptions.Add("clear",    "PKGS", "Clear packages ','-separated", "");
     fOptions.Add("reset",    "soft|hard", "Reset cluster", "hard");
     if (!fUrl.GetUser() || fUrl.GetUser()[0] == '\0') 
       fUrl.SetUser(gSystem->GetUserInfo()->fUser);