From a7fa310f944440f25623a2e058d13d35eb986807 Mon Sep 17 00:00:00 2001 From: abercuci Date: Fri, 6 Aug 2010 09:20:47 +0000 Subject: [PATCH] stream line task switch on/off for usage with PilotAnalysis.C --- PWG1/TRD/macros/AddTRDcheckDET.C | 10 ++++------ PWG1/TRD/macros/AddTRDcheckPID.C | 8 +++----- PWG1/TRD/macros/AddTRDefficiency.C | 8 +++----- PWG1/TRD/macros/AddTRDinfoGen.C | 5 +---- PWG1/TRD/macros/AddTRDresolution.C | 8 +++----- PWG1/TRD/macros/AddTRDv0Monitor.C | 8 +++----- PWG1/TRD/macros/AliTRDperformanceTrain.h | 2 +- PWG1/TRD/macros/helper.C | 5 +++-- 8 files changed, 21 insertions(+), 33 deletions(-) diff --git a/PWG1/TRD/macros/AddTRDcheckDET.C b/PWG1/TRD/macros/AddTRDcheckDET.C index 58fe80ccc42..1dfba1d77b8 100644 --- a/PWG1/TRD/macros/AddTRDcheckDET.C +++ b/PWG1/TRD/macros/AddTRDcheckDET.C @@ -1,4 +1,5 @@ #if ! defined (__CINT__) || defined (__MAKECINT__) +#include "TError.h" #include "AliLog.h" #include "AliAnalysisManager.h" #include "AliAnalysisDataContainer.h" @@ -7,12 +8,9 @@ #include "PWG1/TRD/AliTRDcalibration.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDcheckDET(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) +void AddTRDcheckDET(AliAnalysisManager *mgr, Int_t map, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) { - Int_t map = ParseOptions(trd); - if(!(TSTBIT(map, kCheckDET))) return; - printf("AddTRDcheckDET <- [0]=\"%s\" [1]=\"%s\" [2]=\"%s\" [3]=\"%s\"\n", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName(), ci[3]->GetName()); + Info("AddTRDcheckDET", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\" [3]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName(), ci[3]->GetName())); //AliLog::SetClassDebugLevel("AliTRDcheckDET", 5); AliTRDcheckDET *task(NULL); @@ -30,7 +28,7 @@ void AddTRDcheckDET(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain // CALIBRATION if(!(TSTBIT(map, kCalibration))) return; - AliTRDcalibration *ctask = 0x0; + AliTRDcalibration *ctask(NULL); mgr->AddTask(ctask = new AliTRDcalibration((char*)"calibration")); ctask->SetHisto2d(kTRUE); ctask->SetVector2d(kTRUE); diff --git a/PWG1/TRD/macros/AddTRDcheckPID.C b/PWG1/TRD/macros/AddTRDcheckPID.C index 9489ee371ed..e3109813bb4 100644 --- a/PWG1/TRD/macros/AddTRDcheckPID.C +++ b/PWG1/TRD/macros/AddTRDcheckPID.C @@ -1,5 +1,6 @@ #if ! defined (__CINT__) || defined (__MAKECINT__) #include "TTree.h" +#include "TError.h" #include "AliLog.h" #include "AliAnalysisManager.h" #include "AliAnalysisDataContainer.h" @@ -10,12 +11,9 @@ #include "PWG1/TRD/AliTRDpidRefMakerLQ.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci, AliAnalysisDataContainer **co) +void AddTRDcheckPID(AliAnalysisManager *mgr, Int_t map, AliAnalysisDataContainer **ci, AliAnalysisDataContainer **co) { - Int_t map = ParseOptions(trd); - if(!TSTBIT(map, kCheckPID)) return; - printf("AddTRDcheckPID <- [0]=\"%s\" [1]=\"%s\"\n", ci[0]->GetName(), ci[1]->GetName()); + Info("AddTRDcheckPID", Form("[0]=\"%s\" [1]=\"%s\"", ci[0]->GetName(), ci[1]->GetName())); AliTRDcheckPID *pid(NULL); mgr->AddTask(pid = new AliTRDcheckPID((char*)"TRDcheckPID")); diff --git a/PWG1/TRD/macros/AddTRDefficiency.C b/PWG1/TRD/macros/AddTRDefficiency.C index 0eb916be0b2..b5103cf5a52 100644 --- a/PWG1/TRD/macros/AddTRDefficiency.C +++ b/PWG1/TRD/macros/AddTRDefficiency.C @@ -1,4 +1,5 @@ #if ! defined (__CINT__) || defined (__MAKECINT__) +#include "TError.h" #include "AliAnalysisManager.h" #include "AliAnalysisDataContainer.h" #include "PWG1/TRD/macros/AliTRDperformanceTrain.h" @@ -7,12 +8,9 @@ #include "PWG1/TRD/AliTRDmultiplicity.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDefficiency(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) +void AddTRDefficiency(AliAnalysisManager *mgr, Int_t map, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) { - Int_t map = ParseOptions(trd); - if(!(TSTBIT(map, kEfficiency))) return; - printf("AddTRDefficiency <- [0]=\"%s\" [1]=\"%s\" [2]=\"%s\"\n", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName()); + Info("AddTRDefficiency", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName())); AliTRDrecoTask *eff(NULL); mgr->AddTask(eff = new AliTRDefficiency((char*)"TRDefficiency")); diff --git a/PWG1/TRD/macros/AddTRDinfoGen.C b/PWG1/TRD/macros/AddTRDinfoGen.C index 82f845c5172..b50d0af2d79 100644 --- a/PWG1/TRD/macros/AddTRDinfoGen.C +++ b/PWG1/TRD/macros/AddTRDinfoGen.C @@ -7,11 +7,8 @@ #include "PWG1/TRD/macros/AliTRDperformanceTrain.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDinfoGen(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **/*ci*/, AliAnalysisDataContainer **co) +void AddTRDinfoGen(AliAnalysisManager *mgr, Int_t /*map*/, AliAnalysisDataContainer **/*ci*/, AliAnalysisDataContainer **co) { - Int_t map = ParseOptions(trd); - if(!(TSTBIT(map, kInfoGen))) return; Bool_t mc(mgr->GetMCtruthEventHandler()?kTRUE:kFALSE); //AliLog::SetClassDebugLevel("AliTRDinfoGen", 2); AliTRDinfoGen *info(NULL); diff --git a/PWG1/TRD/macros/AddTRDresolution.C b/PWG1/TRD/macros/AddTRDresolution.C index 95e5212ba40..d887a15f4e6 100644 --- a/PWG1/TRD/macros/AddTRDresolution.C +++ b/PWG1/TRD/macros/AddTRDresolution.C @@ -1,5 +1,6 @@ #if ! defined (__CINT__) || defined (__MAKECINT__) #include "TTree.h" +#include "TError.h" #include "AliLog.h" #include "AliAnalysisManager.h" #include "AliAnalysisDataContainer.h" @@ -10,12 +11,9 @@ #include "PWG1/TRD/AliTRDalignmentTask.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci) +void AddTRDresolution(AliAnalysisManager *mgr, Int_t map, AliAnalysisDataContainer **ci) { - Int_t map = ParseOptions(trd); - if(!TSTBIT(map, kResolution)) return; - printf("AddTRDresolution <- [0]=\"%s\" [1]=\"%s\" [2]=\"%s\"\n", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName()); + Info("AddTRDresolution", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName())); AliLog::SetClassDebugLevel("AliTRDrecoTask", 2); AliLog::SetClassDebugLevel("AliTRDresolution", 2); diff --git a/PWG1/TRD/macros/AddTRDv0Monitor.C b/PWG1/TRD/macros/AddTRDv0Monitor.C index 3f058638b44..a4c3f5d3df3 100644 --- a/PWG1/TRD/macros/AddTRDv0Monitor.C +++ b/PWG1/TRD/macros/AddTRDv0Monitor.C @@ -1,5 +1,6 @@ #if ! defined (__CINT__) || defined (__MAKECINT__) #include "TTree.h" +#include "TError.h" #include "AliLog.h" #include "AliAnalysisManager.h" #include "AliAnalysisDataContainer.h" @@ -7,12 +8,9 @@ #include "PWG1/TRD/AliTRDv0Monitor.h" #endif -#include "PWG1/TRD/macros/helper.C" -void AddTRDv0Monitor(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) +void AddTRDv0Monitor(AliAnalysisManager *mgr, Int_t /*map*/, AliAnalysisDataContainer **ci/*, AliAnalysisDataContainer **co*/) { - Int_t map = ParseOptions(trd); - if(!TSTBIT(map, kV0Monitor)) return; - printf("AddTRDv0Monitor <- [0]=\"%s\" [1]=\"%s\" [2]=\"%s\"\n", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName()); + Info("AddTRDv0Monitor", Form("[0]=\"%s\" [1]=\"%s\" [2]=\"%s\"", ci[0]->GetName(), ci[1]->GetName(), ci[2]->GetName())); AliTRDv0Monitor *v0Mon(NULL);; mgr->AddTask(v0Mon = new AliTRDv0Monitor((char*)"TRDv0Monitor")); diff --git a/PWG1/TRD/macros/AliTRDperformanceTrain.h b/PWG1/TRD/macros/AliTRDperformanceTrain.h index 095746d18bd..03186d0081a 100644 --- a/PWG1/TRD/macros/AliTRDperformanceTrain.h +++ b/PWG1/TRD/macros/AliTRDperformanceTrain.h @@ -53,7 +53,7 @@ Char_t const* fgkTRDtaskClassName[NTRDTASKS] = { }; Char_t const* fgkTRDtaskOpt[NTRDTASKS+1] = { - "" + "ESD" ,"GEN" ,"DET" ,"EFF" diff --git a/PWG1/TRD/macros/helper.C b/PWG1/TRD/macros/helper.C index 91882cc8d23..f2e0a830be1 100644 --- a/PWG1/TRD/macros/helper.C +++ b/PWG1/TRD/macros/helper.C @@ -26,9 +26,10 @@ Int_t ParseOptions(Char_t *trd) continue; // taken care by special functions } else { Bool_t foundOpt = kFALSE; - for(Int_t itask = 2; itask < NTRDTASKS; itask++){ + for(Int_t itask = 0; itask < NTRDTASKS; itask++){ if(s.CompareTo(fgkTRDtaskOpt[itask]) != 0) continue; - SETBITT(fSteerTask, itask); SETBITT(fSteerTask, kInfoGen); + SETBITT(fSteerTask, itask); + if(itask>1) SETBITT(fSteerTask, kInfoGen); foundOpt = kTRUE; break; } -- 2.39.3