Fix for Savannah bug report 59287

[u/mrichter/AliRoot.git] / STEER / AliQAManager.cxx

diff --git a/STEER/AliQAManager.cxx b/STEER/AliQAManager.cxx
index 528bfc2c53edfd7cc812ec93103a28b05610e1ac..2ead4fe364d2154f788781ed6b2f0a847090449b 100644 (file)
--- a/STEER/AliQAManager.cxx
+++ b/STEER/AliQAManager.cxx
@@ -203,9 +203,9 @@ AliQAManager::~AliQAManager()
                delete fRawReader ;
                fRawReader = NULL ;
        }
-  TCanvas fakeCanvas ; 
-  if (fPrintImage) 
-    fakeCanvas.Print(Form("%s%s%d.%s]", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps"); 
+//  TCanvas fakeCanvas ; 
+//  if (fPrintImage) 
+//    fakeCanvas.Print(Form("%s%s%d.%s]", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps"); 
 }
 
 //_____________________________________________________________________________
@@ -526,10 +526,9 @@ void  AliQAManager::EndOfCycle(TObjArray * detArray)
        // End of cycle QADataMakers 
        
   AliQAChecker::Instance()->SetRunNumber(fRunNumber) ; 
- if (fPrintImage) {
-    TCanvas fakeCanvas ; 
+  TCanvas fakeCanvas ; 
+  if (fPrintImage) 
     fakeCanvas.Print(Form("%s%s%d.%s[", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps") ; 
-  }
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQAv1::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet) ;
@@ -544,16 +543,15 @@ void  AliQAManager::EndOfCycle(TObjArray * detArray)
                        }
       if (qac) 
         qac->SetPrintImage(fPrintImage) ;
-      
-      if (IsSaveData()) {
-        for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
-          if ( fTasks.Contains(Form("%d", taskIndex)) ) 
-            qadm->EndOfCycle(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(taskIndex))) ;
-        }
+      for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
+        if ( fTasks.Contains(Form("%d", taskIndex)) ) 
+          qadm->EndOfCycle(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(taskIndex))) ;
       }
                        qadm->Finish();
                }
        }
+  if (fPrintImage) 
+    fakeCanvas.Print(Form("%s%s%d.%s]", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps"); 
 }
 
 //_____________________________________________________________________________
@@ -562,10 +560,9 @@ void  AliQAManager::EndOfCycle(TString detectors)
        // End of cycle QADataMakers 
        
   AliQAChecker::Instance()->SetRunNumber(fRunNumber) ; 
-  if (fPrintImage) {
-    TCanvas fakeCanvas ; 
+  TCanvas fakeCanvas ; 
+  if (fPrintImage) 
     fakeCanvas.Print(Form("%s%s%d.%s[", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps") ; 
-  }
   for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQAv1::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet) ;
@@ -577,15 +574,15 @@ void  AliQAManager::EndOfCycle(TString detectors)
         continue ;
       if (qac) 
         qac->SetPrintImage(fPrintImage) ;
-      if (IsSaveData()) {
-        for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
-          if ( fTasks.Contains(Form("%d", taskIndex)) ) 
-            qadm->EndOfCycle(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(taskIndex))) ;
-        }
+      for (UInt_t taskIndex = 0; taskIndex < AliQAv1::kNTASKINDEX; taskIndex++) {
+        if ( fTasks.Contains(Form("%d", taskIndex)) ) 
+          qadm->EndOfCycle(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(taskIndex))) ;
       }
                        qadm->Finish();
                }
        }
+  if (fPrintImage) 
+    fakeCanvas.Print(Form("%s%s%d.%s]", AliQAv1::GetImageFileName(), GetMode(), fRunNumber, AliQAv1::GetImageFileFormat()), "ps"); 
 }
 
 //_____________________________________________________________________________
@@ -778,7 +775,7 @@ Bool_t AliQAManager::IsSelected(const Char_t * det)
        Bool_t rv = kFALSE;
        const TString detName(det) ;
   // always activates Correlation
-  if ( detName.Contains(AliQAv1::GetDetName(AliQAv1::kCORR))) {
+  if ( detName.Contains(AliQAv1::GetDetName(AliQAv1::kCORR)) || detName.Contains(AliQAv1::GetDetName(AliQAv1::kGLOBAL))) {
     rv = kTRUE ; 
   } else {
     // check if all detectors are selected
@@ -1245,7 +1242,6 @@ void AliQAManager::RunOneEvent(AliRawReader * rawReader)
        //Runs all the QA data Maker for Raws only and on one event only (event loop done by calling method)
   if ( ! rawReader ) 
     return ; 
-  AliCodeTimerAuto("",0) ;
   if (fTasks.Contains(Form("%d", AliQAv1::kRAWS))){
     for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
       if (!IsSelected(AliQAv1::GetDetName(iDet))) 
@@ -1256,13 +1252,11 @@ void AliQAManager::RunOneEvent(AliRawReader * rawReader)
       if ( qadm->IsCycleDone() ) {
         qadm->EndOfCycle() ;
       }
-      AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQAv1::GetDetName(iDet))); 
       qadm->SetEventSpecie(fEventSpecie) ;  
       if ( qadm->GetRecoParam() ) 
         if ( AliRecoParam::Convert(qadm->GetRecoParam()->GetEventSpecie()) != AliRecoParam::kDefault)  
           qadm->SetEventSpecie(qadm->GetRecoParam()->GetEventSpecie()) ; 
                        qadm->Exec(AliQAv1::kRAWS, rawReader) ;
-      AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQAv1::GetDetName(iDet)));
                }
   }
 }
@@ -1272,7 +1266,6 @@ void AliQAManager::RunOneEvent(AliESDEvent *& esd)
 {
        //Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
        
-  AliCodeTimerAuto("",0) ;
   if (fTasks.Contains(Form("%d", AliQAv1::kESDS))) {
     for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
       if (!IsSelected(AliQAv1::GetDetName(iDet))) 
@@ -1287,9 +1280,7 @@ void AliQAManager::RunOneEvent(AliESDEvent *& esd)
       if ( qadm->IsCycleDone() ) {
         qadm->EndOfCycle() ;
       }
-      AliCodeTimerStart(Form("running ESD quality assurance data maker for %s", AliQAv1::GetDetName(iDet)));
                        qadm->Exec(AliQAv1::kESDS, esd) ;
-      AliCodeTimerStop(Form("running ESD quality assurance data maker for %s", AliQAv1::GetDetName(iDet)));
                }
        }
 }
@@ -1300,7 +1291,6 @@ void AliQAManager::RunOneEventInOneDetector(Int_t det, TTree * tree)
        // Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
   
   TString test(tree->GetName()) ; 
-  AliCodeTimerAuto("",0) ;
   if (fTasks.Contains(Form("%d", AliQAv1::kRECPOINTS))) {
     if (IsSelected(AliQAv1::GetDetName(det))) {
       AliQADataMaker *qadm = GetQADataMaker(det);  
@@ -1315,12 +1305,10 @@ void AliQAManager::RunOneEventInOneDetector(Int_t det, TTree * tree)
         if ( qadm->IsCycleDone() ) {
           qadm->EndOfCycle() ;
         }
-        AliCodeTimerStart(Form("running RecPoints quality assurance data maker for %s", AliQAv1::GetDetName(det)));
         if (test.Contains("TreeD")) {
           qadm->Exec(AliQAv1::kDIGITSR, tree) ;
         } else  if (test.Contains("TreeR")) {
           qadm->Exec(AliQAv1::kRECPOINTS, tree) ;
-          AliCodeTimerStop(Form("running RecPoints quality assurance data maker for %s", AliQAv1::GetDetName(det)));
         }
       }
     }