X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliQAManager.cxx;h=3a54b32e7ff0433bc333cd152ea4a951b2a0d937;hb=d4ed52153650b8718603186529e6ffb73b762994;hp=924b5e14689fe715a26a3d37a148ff545599b5c9;hpb=5e3038863574961027b55bb5bbe45eff415eb880;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliQAManager.cxx b/STEER/AliQAManager.cxx
index 924b5e14689..3a54b32e7ff 100644
--- a/STEER/AliQAManager.cxx
+++ b/STEER/AliQAManager.cxx
@@ -54,6 +54,8 @@
 #include "AliLog.h"
 #include "AliModule.h"
 #include "AliQAv1.h"
+#include "AliQAChecker.h"
+#include "AliQACheckerBase.h"
 #include "AliQADataMakerRec.h"
 #include "AliQADataMakerSim.h"
 #include "AliQAManager.h" 
@@ -103,7 +105,7 @@ AliQAManager::AliQAManager() :
 }
 
 //_____________________________________________________________________________
-AliQAManager::AliQAManager(const Char_t * mode, const Char_t* gAliceFilename) :
+AliQAManager::AliQAManager(AliQAv1::MODE_t mode, const Char_t* gAliceFilename) :
   AliCDBManager(), 
   fCurrentEvent(0),  
 	fCycleSame(kFALSE),
@@ -114,7 +116,7 @@ AliQAManager::AliQAManager(const Char_t * mode, const Char_t* gAliceFilename) :
 	fGAliceFileName(gAliceFilename), 
 	fFirstEvent(0),        
 	fMaxEvents(0),   
-  fMode(mode), 
+  fMode(AliQAv1::GetModeName(mode)), 
 	fNumberOfEvents(999999), 
   fRecoParam(),
 	fRunNumber(0), 
@@ -135,11 +137,6 @@ AliQAManager::AliQAManager(const Char_t * mode, const Char_t* gAliceFilename) :
     }
   }
   SetWriteExpert() ; 
-  fMode.ToLower() ; 
-  if (fMode.Contains("sim")) 
-		fMode.ReplaceAll("s", "S") ; 
-  else if (fMode.Contains("rec")) 
-    fMode.ReplaceAll("r", "R") ; 
 }
 
 //_____________________________________________________________________________
@@ -328,6 +325,9 @@ Bool_t AliQAManager::DoIt(const AliQAv1::TASKINDEX_t taskIndex)
 Bool_t AliQAManager::Finish(const AliQAv1::TASKINDEX_t taskIndex) 
 {
 	// write output to file for all detectors
+  
+  AliQAChecker::Instance()->SetRunNumber(fRunNumber) ; 
+
 	for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
 		if (IsSelected(AliQAv1::GetDetName(iDet))) {
 			AliQADataMaker * qadm = GetQADataMaker(iDet) ;
@@ -369,8 +369,8 @@ TCanvas ** AliQAManager::GetImage(Char_t * detName)
   // retrieves QA Image for the given detector
   TCanvas ** rv = NULL ; 
   Int_t detIndex = AliQAv1::GetDetIndex(detName) ; 
-  AliQADataMaker * qadm = GetQADataMaker(detIndex) ; 
-  rv = qadm->GetImage() ;
+  AliQACheckerBase * qac = AliQAChecker::Instance()->GetDetQAChecker(detIndex) ; 
+  rv = qac->GetImage() ;
   return rv ; 
 }
 
@@ -515,13 +515,15 @@ void  AliQAManager::EndOfCycle(TObjArray * detArray)
 {
 	// End of cycle QADataMakers 
 	
-  if (fPrintImage) {
+  AliQAChecker::Instance()->SetRunNumber(fRunNumber) ; 
+ if (fPrintImage) {
     TCanvas fakeCanvas ; 
     fakeCanvas.Print(Form("%s%s%d.%s[", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat())) ; 
   }
 	for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
 		if (IsSelected(AliQAv1::GetDetName(iDet))) {
 			AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+			AliQACheckerBase * qac = AliQAChecker::Instance()->GetDetQAChecker(iDet) ;
 			if (!qadm) 
 				continue ;	
 			// skip non active detectors
@@ -530,7 +532,7 @@ void  AliQAManager::EndOfCycle(TObjArray * detArray)
 				if (!det || !det->IsActive())  
 					continue ;
 			}
-      qadm->SetPrintImage(fPrintImage) ;
+      qac->SetPrintImage(fPrintImage) ;
       
 			for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
 				if ( fTasks.Contains(Form("%d", taskIndex)) ) 
@@ -546,6 +548,7 @@ void  AliQAManager::EndOfCycle(TString detectors)
 {
 	// End of cycle QADataMakers 
 	
+  AliQAChecker::Instance()->SetRunNumber(fRunNumber) ; 
   if (fPrintImage) {
     TCanvas fakeCanvas ; 
     fakeCanvas.Print(Form("%s%s%d.%s[", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat())) ; 
@@ -553,12 +556,13 @@ void  AliQAManager::EndOfCycle(TString detectors)
   for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
 		if (IsSelected(AliQAv1::GetDetName(iDet))) {
 			AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+      AliQACheckerBase * qac = AliQAChecker::Instance()->GetDetQAChecker(iDet) ;
 			if (!qadm) 
 				continue ;	
 			// skip non active detectors
       if (!detectors.Contains(AliQAv1::GetDetName(iDet))) 
         continue ;
-      qadm->SetPrintImage(fPrintImage) ;
+      qac->SetPrintImage(fPrintImage) ;
    		for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
 				if ( fTasks.Contains(Form("%d", taskIndex)) ) 
 					qadm->EndOfCycle(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(taskIndex))) ;
@@ -1084,13 +1088,13 @@ void AliQAManager::Reset(const Bool_t sameCycle)
 }
 
 //_____________________________________________________________________________
-AliQAManager * AliQAManager::QAManager(const Char_t * mode, TMap *entryCache, Int_t run) 
+AliQAManager * AliQAManager::QAManager(AliQAv1::MODE_t mode, TMap *entryCache, Int_t run) 
 {
   // returns AliQAManager instance (singleton)
   
 	if (!fgQAInstance) {
-    if ( (strcmp(mode, "sim") != 0) && (strcmp(mode, "rec") != 0) ) {
-      AliErrorClass("You must specify sim or rec") ; 
+    if ( (mode != AliQAv1::kSIMMODE) && (mode != AliQAv1::kRECMODE) ) {
+      AliErrorClass("You must specify kSIMMODE or kRECMODE") ; 
       return NULL ; 
     }
     fgQAInstance = new AliQAManager(mode) ;  
@@ -1106,37 +1110,7 @@ AliQAManager * AliQAManager::QAManager(const Char_t * mode, TMap *entryCache, In
 AliQAManager * AliQAManager::QAManager(AliQAv1::TASKINDEX_t task) 
 {
   // returns AliQAManager instance (singleton)
-  switch (task) {
-    case AliQAv1::kRAWS:
-      return QAManager("rec") ; 
-      break;
-    case AliQAv1::kHITS:
-      return QAManager("sim") ; 
-      break;
-    case AliQAv1::kSDIGITS:
-      return QAManager("sim") ; 
-      break;
-    case AliQAv1::kDIGITS:
-      return QAManager("sim") ; 
-      break;
-    case AliQAv1::kDIGITSR:
-      return QAManager("rec") ; 
-      break;
-    case AliQAv1::kRECPOINTS:
-      return QAManager("rec") ; 
-    case AliQAv1::kTRACKSEGMENTS:
-      return NULL ; 
-      break;
-    case AliQAv1::kRECPARTICLES:
-      return NULL ; 
-      break;
-    case AliQAv1::kESDS:
-      return QAManager("rec") ; 
-      break;
-    default:
-      return NULL ; 
-      break;
-  }
+  return QAManager(AliQAv1::Mode(task)) ; 
 }
 
 //_____________________________________________________________________________