fix steering of (all) individual TRD tasks by AddTrainPerformanceTRD.C

diff --git a/PWG1/TRD/AliTRDcheckESD.cxx b/PWG1/TRD/AliTRDcheckESD.cxx
index 10a20d2005b980665eab1aa5bb5b023ab4e51ab6..4c29e629d55d2b6bbafcf7babd0d5676bacf1cef 100644 (file)
--- a/PWG1/TRD/AliTRDcheckESD.cxx
+++ b/PWG1/TRD/AliTRDcheckESD.cxx
@@ -828,7 +828,7 @@ void AliTRDcheckESD::UserExec(Option_t *){
     // pid quality\r
     Bool_t kBarrel = Bool_t(status & AliESDtrack::kTRDin);\r
 \r
-    TH3F *hhh;\r
+    TH3F *hhh(NULL);\r
     // find position and momentum of the track at entrance in TRD\r
     Double_t localCoord[3] = {0., 0., 0.};\r
     Bool_t localCoordGood = esdTrack->GetXYZAt(298., fESD->GetMagneticField(), localCoord);\r

diff --git a/PWG1/TRD/AliTRDpwg1Helper.cxx b/PWG1/TRD/AliTRDpwg1Helper.cxx
index 0ab87b825660d17bbcde9ee6a880e054629cba6a..e53a9355d091bfbe60eb4351806c41b84c10e455 100644 (file)
--- a/PWG1/TRD/AliTRDpwg1Helper.cxx
+++ b/PWG1/TRD/AliTRDpwg1Helper.cxx
@@ -46,7 +46,7 @@ Char_t const* AliTRDpwg1Helper::fgkTRDtaskOpt[AliTRDpwg1Helper::kNTRDTASKS+1] =
 
 //______________________________________________________
 Int_t AliTRDpwg1Helper::ParseOptions(Char_t *trd){
-  Int_t fSteerTask = 1;
+  Int_t fSteerTask = 0;
   TObjArray *tasksArray = TString(trd).Tokenize(" ");
   for(Int_t isel = 0; isel < tasksArray->GetEntriesFast(); isel++){
     TString s = (dynamic_cast<TObjString *>(tasksArray->UncheckedAt(isel)))->String();
@@ -113,6 +113,14 @@ void AliTRDpwg1Helper::MergeProd(const Char_t *mark, const Char_t *files, const
   gSystem->Exec(Form("rm -rfv %s %s merge", MERGE, PURGE));
 }
 
+//______________________________________________________
+Int_t AliTRDpwg1Helper::GetTaskIndex(const Char_t *name){
+  for(Int_t it(0); it<kNTRDTASKS; it++){
+    if(strcmp(fgkTRDtaskClassName[it], name)==0) return it;
+  }
+  return -1;
+}
+
 //______________________________________________________
 Bool_t AliTRDpwg1Helper::HasReadMCData(Char_t *opt){
   return !(Bool_t)strstr(opt, "NOMC");

diff --git a/PWG1/TRD/AliTRDpwg1Helper.h b/PWG1/TRD/AliTRDpwg1Helper.h
index 6cb5cf517423484e0e0ed25ab1eb9d69f93ebeb6..dec88165dee7dc8be22611b449b9c577dd994ce4 100644 (file)
--- a/PWG1/TRD/AliTRDpwg1Helper.h
+++ b/PWG1/TRD/AliTRDpwg1Helper.h
@@ -37,11 +37,13 @@ class AliTRDpwg1Helper{
     static const Char_t * fgkTRDtaskClassName[kNTRDTASKS];
     static const Char_t * fgkTRDtaskOpt[kNTRDTASKS + 1];
 
-    static Int_t ParseOptions(Char_t *trd);
-    static void MergeProd(const Char_t *mark, const Char_t *files, Int_t nBatch);
+    static Int_t  GetTaskIndex(const Char_t *name);
     static Bool_t HasReadMCData(Char_t *opt);
     static Bool_t HasReadFriendData(Char_t *opt);
 
+    static void   MergeProd(const Char_t *mark, const Char_t *files, Int_t nBatch);
+    static Int_t  ParseOptions(Char_t *trd);
+
     AliTRDpwg1Helper();
     ~AliTRDpwg1Helper();
 };

diff --git a/PWG1/TRD/AliTRDresolution.cxx b/PWG1/TRD/AliTRDresolution.cxx
index ee3e02f39ec2dac32479572dabb1bdc0c642eb24..37e842b259096d70cf6d704c5fe543582189b28f 100644 (file)
--- a/PWG1/TRD/AliTRDresolution.cxx
+++ b/PWG1/TRD/AliTRDresolution.cxx
@@ -398,7 +398,8 @@ TH1* AliTRDresolution::PlotCluster(const AliTRDtrackV1 *track)
       d -= ((Int_t)(2 * d)) / 2.0;
       if (d > 0.25) d  = 0.5 - d;
 
-      AliTRDclusterInfo *clInfo = new AliTRDclusterInfo;
+      AliTRDclusterInfo *clInfo(NULL);
+      clInfo = new AliTRDclusterInfo;
       clInfo->SetCluster(c);
       Float_t covF[] = {cov[0], cov[1], cov[2]};
       clInfo->SetGlobalPosition(yt, zt, dydx, dzdx, covF);

diff --git a/PWG1/TRD/macros/helper.C b/PWG1/TRD/macros/helper.C
index f2e0a830be11b3fe99b8e5fce058dd5a4ae5a817..f6c95ed669c9390378b114ffdb1f945f69701e10 100644 (file)
--- a/PWG1/TRD/macros/helper.C
+++ b/PWG1/TRD/macros/helper.C
@@ -15,7 +15,7 @@
 //____________________________________________
 Int_t ParseOptions(Char_t *trd)
 {
-  Int_t fSteerTask = 1;
+  Int_t fSteerTask = 0;
   TObjArray *tasksArray = TString(trd).Tokenize(" ");
   for(Int_t isel = 0; isel < tasksArray->GetEntriesFast(); isel++){
     TString s = (dynamic_cast<TObjString *>(tasksArray->UncheckedAt(isel)))->String();

diff --git a/PWG1/macros/AddTrainPerformanceTRD.C b/PWG1/macros/AddTrainPerformanceTRD.C
index e242cc38030ed6e9f57c5c9a0ac47c6e68bcce5f..1df86e5336a3917e865e4e766ce9fc692717b02a 100644 (file)
--- a/PWG1/macros/AddTrainPerformanceTRD.C
+++ b/PWG1/macros/AddTrainPerformanceTRD.C
@@ -95,7 +95,7 @@ Bool_t AddTrainPerformanceTRD(Char_t *trd="ALL", const Char_t *addMacroPath = "$
   Int_t bitmap = ParseOptions(trd);
   for(Int_t it=0; it<NTRDQATASKS; it++){
     if(!TSTBIT(bitmap, it)) continue;
-    if(gROOT->LoadMacro(Form("%s/Add%s.C+", addMacroPath, TString(fgkTRDtaskClassName[it])(3,20).Data()))) {
+    if(gROOT->LoadMacro(Form("%s/Add%s.C++", addMacroPath, TString(fgkTRDtaskClassName[it])(3,20).Data()))) {
       Error("AddTrainPerformanceTRD()", Form("Error loading %s task.", fgkTRDtaskClassName[it]));
       return kFALSE;
     }