Added new cuts, fixed bug in backround calculation.

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

diff --git a/STEER/AliQAv1.cxx b/STEER/AliQAv1.cxx
index eaf16798fb0221e759092157d9b35bd49e0669ac..90b2ae9f4d9c32c0c26feedf38cc952943bfe91d 100644 (file)
--- a/STEER/AliQAv1.cxx
+++ b/STEER/AliQAv1.cxx
@@ -61,7 +61,7 @@ TString        AliQAv1::fgDetNames[]           = {"ITS", "TPC", "TRD", "TOF", "P
                                                   "ZDC", "PMD", "T0", "VZERO", "ACORDE", "HLT", "Global", "CORR"} ;   
 TString        AliQAv1::fgGRPPath              = "GRP/GRP/Data" ; 
 TString        AliQAv1::fgTaskNames[]          = {"Raws", "Hits", "SDigits", "Digits", "DigitsR", "RecPoints", "TrackSegments", "RecParticles", "ESDs"} ;   
-TString        AliQAv1::fgModeNames[]          = {"", "Sim", "Rec"} ;   
+TString        AliQAv1::fgModeNames[]          = {"", "Sim", "Rec", "QA"} ;   
 const TString  AliQAv1::fgkLabLocalFile        = "file://"  ; 
 const TString  AliQAv1::fgkLabLocalOCDB        = "local://" ;  
 const TString  AliQAv1::fgkLabAliEnOCDB        = "alien://" ;  
@@ -288,30 +288,29 @@ Bool_t AliQAv1::CheckRange(AliRecoParam::EventSpecie_t es) const
 const char * AliQAv1::GetAliTaskName(ALITASK_t tsk)
 {
        // returns the char name corresponding to module index
-       TString tskName ;
        switch (tsk) {
                case kNULLTASK:
                        break ; 
                case kRAW:
-                       tskName = "RAW" ;
+                       return "RAW" ;
                        break ;  
                case kSIM:
-                       tskName = "SIM" ;
+                       return "SIM" ;
                        break ;
                case kREC:
-                       tskName = "REC" ;
+                       return "REC" ;
                        break ;
                case kESD:
-                       tskName = "ESD" ;
+                       return "ESD" ;
                        break ;
                case kANA:
-                       tskName = "ANA" ;
+                       return "ANA" ;
                        break ;
                default:
-                       tsk = kNULLTASK ; 
+      return "" ; 
                        break ;
        }
-       return tskName.Data() ;
+  return "" ;
 }
 
 //_______________________________________________________________
@@ -473,29 +472,29 @@ TFile * AliQAv1::GetQADataFile(const char * fileName)
 TFile * AliQAv1::GetQAResultFile() 
 {
   // opens the file to store the  Quality Assurance Data Checker results       
-  if (fgQAResultFile) 
-    if (fgQAResultFile->IsOpen()) 
-      fgQAResultFile->Close();
-  
-               TString dirName(fgQAResultDirName) ; 
-               if ( dirName.Contains(fgkLabLocalFile)) 
-                       dirName.ReplaceAll(fgkLabLocalFile, "") ;
-               TString fileName(dirName + fgQAResultFileName) ; 
-               TString opt("") ; 
-               if ( !gSystem->AccessPathName(fileName) )
-                       opt = "UPDATE" ; 
-               else { 
-                       if ( gSystem->AccessPathName(dirName) )
-                               gSystem->mkdir(dirName) ; 
-                       opt = "NEW" ; 
-               }
-               fgQAResultFile = TFile::Open(fileName, opt) ;   
-       
-       return fgQAResultFile ;
+  if (fgQAResultFile) {
+   if (fgQAResultFile->IsOpen()) 
+    fgQAResultFile->Close();
+   delete fgQAResultFile;
+  }
+  TString dirName(fgQAResultDirName) ; 
+  if ( dirName.Contains(fgkLabLocalFile)) 
+    dirName.ReplaceAll(fgkLabLocalFile, "") ;
+  TString fileName(dirName + fgQAResultFileName) ; 
+  TString opt("") ; 
+  if ( !gSystem->AccessPathName(fileName) )
+    opt = "UPDATE" ; 
+  else { 
+    if ( gSystem->AccessPathName(dirName) )
+      gSystem->mkdir(dirName) ; 
+    opt = "NEW" ; 
+  }
+  fgQAResultFile = TFile::Open(fileName, opt) ;   
+  return fgQAResultFile ; 
 }
 
 //_______________________________________________________________
-const AliQAv1::QABIT_t AliQAv1::GetQAStatusBit(AliRecoParam::EventSpecie_t es, DETECTORINDEX_t det, ALITASK_t tsk) const
+AliQAv1::QABIT_t AliQAv1::GetQAStatusBit(AliRecoParam::EventSpecie_t es, DETECTORINDEX_t det, ALITASK_t tsk) const
 {
     // returns the QA bit set
   QABIT_t rv = kNULLBit ; 
@@ -604,9 +603,8 @@ AliQAv1 * AliQAv1::Instance()
   // Get an instance of the singleton. The only authorized way to call the ctor
 
   if ( ! fgQA) {
-    TFile * f = GetQAResultFile() ; 
-    fgQA = static_cast<AliQAv1 *>(f->Get("QA")) ; 
-    f->Close() ; 
+    GetQAResultFile() ; 
+    fgQA = static_cast<AliQAv1 *>(fgQAResultFile->Get("QA")) ; 
     if ( ! fgQA ) 
       fgQA = new AliQAv1() ;
   }
@@ -629,8 +627,8 @@ AliQAv1 * AliQAv1::Instance(const DETECTORINDEX_t det)
   // Get an instance of the singleton. The only authorized way to call the ctor
   
   if ( ! fgQA) {
-    TFile * f = GetQAResultFile() ; 
-    fgQA = static_cast<AliQAv1 *>(f->Get(GetQAName())) ; 
+    GetQAResultFile() ; 
+    fgQA = static_cast<AliQAv1 *>(fgQAResultFile->Get(GetQAName())) ; 
     if ( ! fgQA ) 
       fgQA = new AliQAv1(det) ;
   }            
@@ -893,12 +891,10 @@ void AliQAv1::ShowStatus(DETECTORINDEX_t det, ALITASK_t tsk, AliRecoParam::Event
 void AliQAv1::ShowASCIIStatus(AliRecoParam::EventSpecie_t es, DETECTORINDEX_t det, ALITASK_t tsk, const ULong_t status) const 
 {
        // print the QA status in human readable format
-       TString text; 
-  QABIT_t bit = GetQAStatusBit(es, det, tsk) ; 
+  const QABIT_t bit = GetQAStatusBit(es, det, tsk) ; 
   if ( bit != kNULLBit ) {
-    text = GetBitName(bit) ; 
-    text += " " ; 
-    AliInfoClass(Form("           %8s %8s %4s 0x%4lx, Problem signalled: %8s \n", AliRecoParam::GetEventSpecieName(es), GetDetName(det).Data(), GetAliTaskName(tsk), status, text.Data())) ; 
+          AliInfoClass(Form("           %8s %8s %4s  \n", AliRecoParam::GetEventSpecieName(es), GetDetName(det).Data(), GetAliTaskName(tsk))) ; 
+          AliInfoClass(Form("           %8s %8s %4s 0x%4lx, Problem signalled: %8s \n", AliRecoParam::GetEventSpecieName(es), GetDetName(det).Data(), GetAliTaskName(tsk), status, GetBitName(bit))) ; 
   }
 }