From: abercuci Date: Fri, 18 Jun 2010 07:57:34 +0000 (+0000) Subject: work on documentation and verbosity during measured data processing X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=e9d62bd215f3634b8a4c06a57bd8c3356a2e5b90;hp=fc0eba5b2a257fd4be0f1d30382e9977b7deea8e work on documentation and verbosity during measured data processing --- diff --git a/PWG1/TRD/AliTRDresolution.cxx b/PWG1/TRD/AliTRDresolution.cxx index a79ceaa..d31c0d0 100644 --- a/PWG1/TRD/AliTRDresolution.cxx +++ b/PWG1/TRD/AliTRDresolution.cxx @@ -708,7 +708,7 @@ TH1* AliTRDresolution::PlotTrackOut(const AliTRDtrackV1 *track) } AliExternalTrackParam *tout = NULL; if(!(tout = fkTrack->GetTrackOut())){ - AliWarning("Track did not exit TRD."); + AliDebug(2, "Track did not exit TRD."); return NULL; } TH1 *h(NULL); @@ -864,7 +864,7 @@ TH1* AliTRDresolution::PlotMC(const AliTRDtrackV1 *track) // if(!HasMCdata()){ - AliWarning("No MC defined. Results will not be available."); + AliDebug(2, "No MC defined. Results will not be available."); return NULL; } if(track) fkTrack = track; diff --git a/PWG1/TRD/macros/AddTRDcheckPID.C b/PWG1/TRD/macros/AddTRDcheckPID.C index 057c555..140079a 100644 --- a/PWG1/TRD/macros/AddTRDcheckPID.C +++ b/PWG1/TRD/macros/AddTRDcheckPID.C @@ -33,11 +33,14 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain if(!TSTBIT(map, kPIDRefMaker)) return; + //AliLog::SetClassDebugLevel("AliTRDpidRefMaker", 3); + //AliLog::SetClassDebugLevel("AliTRDpidRefMakerNN", 3); + //AliLog::SetClassDebugLevel("AliTRDpidRefMakerLQ", 3); + // TRD pid reference maker NN AliTRDpidRefMaker *ref(NULL); mgr->AddTask(ref = new AliTRDpidRefMakerNN((char*)"refMakerNN")); ref->SetDebugLevel(3); - //AliLog::SetClassDebugLevel("AliTRDpidRefMaker", 3); ref->SetMCdata(mgr->GetMCtruthEventHandler()); ref->SetFriends(kTRUE); mgr->ConnectInput( ref, 0, mgr->GetCommonInputContainer()); @@ -50,7 +53,6 @@ void AddTRDcheckPID(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataContain // TRD pid reference maker LQ mgr->AddTask(ref = new AliTRDpidRefMakerLQ((char*)"refMakerLQ")); ref->SetDebugLevel(3); - //AliLog::SetClassDebugLevel("AliTRDpidRefMakerLQ", 3); ref->SetMCdata(mgr->GetMCtruthEventHandler()); ref->SetFriends(kTRUE); mgr->ConnectInput(ref, 0, mgr->GetCommonInputContainer()); diff --git a/PWG1/TRD/macros/AddTRDresolution.C b/PWG1/TRD/macros/AddTRDresolution.C index 019b7c2..8b15a97 100644 --- a/PWG1/TRD/macros/AddTRDresolution.C +++ b/PWG1/TRD/macros/AddTRDresolution.C @@ -42,13 +42,21 @@ void AddTRDresolution(AliAnalysisManager *mgr, Char_t *trd, AliAnalysisDataConta // Cluster Error Parameterization if(TSTBIT(map, kClErrParam)){ AliTRDclusterResolution *taskCl(NULL); - //AliLog::SetClassDebugLevel("AliTRDclusterResolution", 5); - mgr->AddTask(taskCl = new AliTRDclusterResolution((char*)"ClErrCalibMC")); + AliLog::SetClassDebugLevel("AliTRDclusterResolution", 2); + mgr->AddTask(taskCl = new AliTRDclusterResolution((char*)"ClErrCalib")); taskCl->SetExB(); taskCl->SetDebugLevel(0); mgr->ConnectInput(taskCl, 0, mgr->GetCommonInputContainer()); - mgr->ConnectInput(taskCl, 1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2MC%s", res->GetName(), suffix[itq]))); + mgr->ConnectInput(taskCl, 1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2Trk%s", res->GetName(), suffix[itq]))); mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibClErrParam", mgr->GetCommonFileName()))); + if(mgr->GetMCtruthEventHandler()){ + mgr->AddTask(taskCl = new AliTRDclusterResolution((char*)"ClErrCalibMC")); + taskCl->SetExB(); + taskCl->SetDebugLevel(0); + mgr->ConnectInput(taskCl, 0, mgr->GetCommonInputContainer()); + mgr->ConnectInput(taskCl, 1, (AliAnalysisDataContainer*)coa->FindObject(Form("%sCl2MC%s", res->GetName(), suffix[itq]))); + mgr->ConnectOutput(taskCl, 1, mgr->CreateContainer(taskCl->GetName(), TObjArray::Class(), AliAnalysisManager::kOutputContainer, Form("%s:TRD.CalibClErrParam", mgr->GetCommonFileName()))); + } } } diff --git a/PWG1/TRD/macros/helper.C b/PWG1/TRD/macros/helper.C index 7c4db5a..b64224c 100644 --- a/PWG1/TRD/macros/helper.C +++ b/PWG1/TRD/macros/helper.C @@ -21,6 +21,8 @@ Int_t ParseOptions(Char_t *trd) if(s.CompareTo("ALL") == 0){ for(Int_t itask = 0; itask < NTRDQATASKS; itask++) SETBITT(fSteerTask, itask); continue; + } else if(s.CompareTo("NOMC") == 0 || s.CompareTo("NOFR") == 0){ + continue; // taken care by special functions } else { Bool_t foundOpt = kFALSE; for(Int_t itask = 2; itask < NTRDTASKS; itask++){ diff --git a/PWG1/TRD/run.C b/PWG1/TRD/run.C index 8c7ed31..fa8486a 100644 --- a/PWG1/TRD/run.C +++ b/PWG1/TRD/run.C @@ -1,8 +1,9 @@ // Steer TRD QA train for Reconstruction (Clusterizer, Tracking and PID). // // Usage: -// run.C(tasks, files) -// tasks : "ALL" or one/more of the following: +// run.C(optList, files, nev, first, runNo, ocdb_uri, grp_uri) +// +// optList : "ALL" [default] or one/more of the following: // "EFF" : TRD Tracking Efficiency // "EFFC" : TRD Tracking Efficiency Combined (barrel + stand alone) - only in case of simulations // "MULT" : TRD single track selection @@ -13,16 +14,25 @@ // "PID" : TRD PID - pion efficiency // "PIDR" : TRD PID - reference data // "DET" : Basic TRD Detector checks +// ****** SPECIAL OPTIONS ********** // "NOFR" : Data set does not have AliESDfriends.root -// "NOMC" : Data set does not have Monte Carlo Informations (real data), so all tasks which rely -// on MC information are switched off +// "NOMC" : Data set does not have Monte Carlo Informations (default have MC), // +// files : the list of ESD files to be processed [default AliESds.root from cwd] +// nev : number of events to be processed [default all] +// first : first event to process [default 0] +// runNo : run number [default 0] +// ocdb_uri : OCDB location [default local, $ALICE_ROOT]. In case of AliEn the syntax should be of the form +// alien://folder=/alice/data/2010/OCDB?user=username?cacheF=yourDirectory?cacheS=yourSize +// grp_uri : GRP/GRP/Data location [default cwd]. In case of AliEn the syntax should be of the form +// alien://folder=/alice/data/2010/OCDB?user=username?cacheF=yourDirectory?cacheS=yourSize // In compiled mode : // Don't forget to load first the libraries // gSystem->Load("libMemStat.so") // gSystem->Load("libMemStatGui.so") // gSystem->Load("libANALYSIS.so") // gSystem->Load("libANALYSISalice.so") +// gSystem->Load("libTENDER.so"); // gSystem->Load("libPWG1.so"); // gSystem->Load("libNetx.so") ; // gSystem->Load("libRAliEn.so"); @@ -94,7 +104,7 @@ void run(Char_t *optList="ALL", const Char_t *files=0x0, Long64_t nev=1234567890 timer.Start(); // VERY GENERAL SETTINGS - AliLog::SetGlobalLogLevel(AliLog::kError); + //AliLog::SetGlobalLogLevel(AliLog::kError); if(gSystem->Load("libANALYSIS.so")<0) return; if(gSystem->Load("libANALYSISalice.so")<0) return; if(gSystem->Load("libTENDER.so")<0) return;