Fix for Savannah bug report 59287

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

diff --git a/STEER/AliQAManager.cxx b/STEER/AliQAManager.cxx
index 355a993ea1d570141734b843311b79edc2f28bd3..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