From 9c980fe55d43f84ef633aa11d5d391abc4ffb8a2 Mon Sep 17 00:00:00 2001 From: schutz Date: Sun, 27 Sep 2009 17:06:45 +0000 Subject: [PATCH] passing recoparam to run --- STEER/AliQAChecker.cxx | 20 ++++++-------------- STEER/AliQAChecker.h | 7 ++++--- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/STEER/AliQAChecker.cxx b/STEER/AliQAChecker.cxx index aa8d2247a34..951b18459b6 100644 --- a/STEER/AliQAChecker.cxx +++ b/STEER/AliQAChecker.cxx @@ -292,21 +292,13 @@ void AliQAChecker::LoadRunInfoFromGRP() } //_____________________________________________________________________________ -Bool_t AliQAChecker::Run(const char * fileName, Int_t runnumber) +Bool_t AliQAChecker::Run(const char * fileName, AliDetectorRecoParam * recoParam) { // run the Quality Assurance Checker for all tasks Hits, SDigits, Digits, DigitsR, RecPoints, TrackSegments, RecParticles and ESDs // starting from data in file TStopwatch stopwatch; stopwatch.Start(); - // set the run number - AliCDBManager::Instance()->SetRun(runnumber) ; - // search and set the event species - AliQAv1 * qa = AliQAv1::Instance() ; - for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { - if ( AliQAv1::GetQADataFile(fileName)->FindObjectAny(AliRecoParam::GetEventSpecieName(specie)) ) - qa->SetEventSpecie(AliRecoParam::ConvertIndex(specie)) ; - } //search for all detectors QA directories TList * detKeyList = AliQAv1::GetQADataFile(fileName)->GetListOfKeys() ; TIter nextd(detKeyList) ; @@ -365,7 +357,7 @@ Bool_t AliQAChecker::Run(const char * fileName, Int_t runnumber) TObjArray ** refOCDBDir = NULL ; GetRefSubDir(detNameQA.Data(), taskName.Data(), refDir, refOCDBDir) ; qac->SetRefandData(refDir, refOCDBDir, taskDir) ; - qac->Run(index) ; + qac->Run(index, recoParam) ; } } TString detList ; @@ -382,7 +374,7 @@ Bool_t AliQAChecker::Run(const char * fileName, Int_t runnumber) } //_____________________________________________________________________________ -Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TObjArray ** list) +Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TObjArray ** list, AliDetectorRecoParam * recoParam) { // run the Quality Assurance Checker for detector det, for task task starting from data in list @@ -417,7 +409,7 @@ Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task qac->Init(det) ; GetRefSubDir(AliQAv1::GetDetName(det), AliQAv1::GetTaskName(task), refDir, refOCDBDir) ; qac->SetRefandData(refDir, refOCDBDir) ; - qac->Run(index, list) ; + qac->Run(index, list, recoParam) ; // make the image qac->MakeImage(list, task, AliQAv1::Mode(task)) ; @@ -426,7 +418,7 @@ Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task } //_____________________________________________________________________________ -Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TNtupleD ** list) +Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TNtupleD ** list, AliDetectorRecoParam * recoParam) { // run the Quality Assurance Checker for detector det, for task task starting from data in list @@ -461,7 +453,7 @@ Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task qac->Init(det) ; GetRefSubDir(AliQAv1::GetDetName(det), AliQAv1::GetTaskName(task), refDir, refOCDBDir) ; qac->SetRefandData(refDir, refOCDBDir) ; - qac->Run(index, list, NULL) ; + qac->Run(index, list, recoParam) ; return kTRUE ; } diff --git a/STEER/AliQAChecker.h b/STEER/AliQAChecker.h index 1b33fd5d0b5..c8989f5a141 100644 --- a/STEER/AliQAChecker.h +++ b/STEER/AliQAChecker.h @@ -23,6 +23,7 @@ class TNtupleD ; class AliCDBEntry ; class AliRunInfo ; class AliQACheckerBase ; +class AliDetectorRecoParam ; class AliQAChecker: public TNamed { public: @@ -39,9 +40,9 @@ public: // static const char * GetQAResultFileName() { return fgQAResultFileName.Data() ; } // void SetQAResultDirName(const char * name) ; // void SetRefDirName(const char * name) ; - Bool_t Run(const char * fileName = NULL, Int_t runnumber = 0) ; - Bool_t Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TObjArray ** list); - Bool_t Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TNtupleD ** list); + Bool_t Run(const char * fileName = NULL, AliDetectorRecoParam * recoParam = NULL) ; + Bool_t Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TObjArray ** list, AliDetectorRecoParam * recoParam = NULL); + Bool_t Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task, TNtupleD ** list, AliDetectorRecoParam * recoParam = NULL); void SetRunInfo(AliRunInfo * ei) {fRunInfo = ei;} Int_t GetRunNumber() { return fRun ; } void SetRunNumber(Int_t run) { fRun = run ; } -- 2.39.3