Updating name

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

diff --git a/STEER/AliQA.cxx b/STEER/AliQA.cxx
index 0781d0f57423269a1876e323f23117812aafab55..b23fdcc45058f565807912f5f72d7610138c8951 100644 (file)
--- a/STEER/AliQA.cxx
+++ b/STEER/AliQA.cxx
@@ -50,13 +50,13 @@ AliQA    * AliQA::fgQA                   = 0x0 ;
 TFile    * AliQA::fgQADataFile           = 0x0 ;   
 TString    AliQA::fgQADataFileName       = "QA" ;  // will transform into Det.QA.run.cycle.root  
 TFile    * AliQA::fgQARefFile            = 0x0 ;   
-TString    AliQA::fgQARefDirName            = "" ; 
+TString    AliQA::fgQARefDirName              = "" ; 
 TString    AliQA::fgQARefFileName        = "QA.root" ;
 TFile    * AliQA::fgQAResultFile         = 0x0 ;  
 TString    AliQA::fgQAResultDirName      = "" ;  
 TString    AliQA::fgQAResultFileName     = "QA.root" ; 
 TString    AliQA::fgDetNames[]           = {"ITS", "TPC", "TRD", "TOF", "PHOS", "HMPID", "EMCAL", "MUON", "FMD",
-                                           "ZDC", "PMD", "T0", "VZERO", "ACORDE", "HLT", "Global"} ;   
+                                            "ZDC", "PMD", "T0", "VZERO", "ACORDE", "HLT", "Global", "CORR"} ;   
 TString    AliQA::fgGRPPath              = "GRP/GRP/Data" ; 
 TString    AliQA::fgRTNames[]            = {"UNKNOWN", "AUTO_TEST", "CALIBRATION", "CALIBRATION_PULSER", "CHANNEL_DELAY_TUNING", "COSMIC", 
                                                                                                                                                                                "COSMICS", "DAQ_FO_UNIF_SCAN", "DAQ_GEN_DAC_SCAN", "DAQ_MEAN_TH_SCAN", "DAQ_MIN_TH_SCAN", 
@@ -72,9 +72,14 @@ const TString AliQA::fkgLabLocalOCDB     = "local://" ;
 const TString AliQA::fkgLabAliEnOCDB     = "alien://" ;  
 const TString AliQA::fkgRefFileName      = "QA.root" ; 
 const TString AliQA::fkgQAName           = "QA"  ; 
+const TString AliQA::fkgQACorrNtName     = "CorrQA" ;  
 const TString AliQA::fkgRefOCDBDirName   = "Ref"  ; 
-TString AliQA::fkgRefDataDirName        = ""  ; 
+TString AliQA::fkgRefDataDirName              = ""  ; 
 const TString AliQA::fkgQARefOCDBDefault = "alien://folder=/alice/QA/20"  ; 
+const TString AliQA::fkgExpert           = "Expert" ; 
+const UInt_t  AliQA::fkgExpertBit        = 16 ; 
+const UInt_t  AliQA::fkgQABit            = 17 ; 
+
 //____________________________________________________________________________
 AliQA::AliQA() : 
   TNamed("", ""), 
@@ -106,10 +111,12 @@ AliQA::AliQA(const AliQA& qa) :
 AliQA& AliQA::operator = (const AliQA& qa)
 {
 // assignment operator
-
-  this->~AliQA();
-  new(this) AliQA(qa);
-  return *this;
+    if(&qa == this) return *this;
+    
+    fNdet = qa.fNdet;
+    for (Int_t index = 0 ; index < fNdet ; index++) 
+       fQA[index] = qa.fQA[index]; 
+    return *this;
 }
 
 //_______________________________________________________________
@@ -299,10 +306,10 @@ const char * AliQA::GetDetName(Int_t det)
 }
 
 //_______________________________________________________________
-TFile * AliQA::GetQADataFile(const char * name, const Int_t run, const Int_t cycle) 
+TFile * AliQA::GetQADataFile(const char * name, const Int_t run) 
 {
   // opens the file to store the detectors Quality Assurance Data Maker results
-       const char * temp = Form("%s.%s.%d.%d.root", name, fgQADataFileName.Data(), run, cycle) ; 
+       const char * temp = Form("%s.%s.%d.root", name, fgQADataFileName.Data(), run) ; 
        TString opt ; 
        if (! fgQADataFile ) {     
                if  (gSystem->AccessPathName(temp))
@@ -392,7 +399,7 @@ const AliQA::TASKINDEX_t AliQA::GetTaskIndex(const char * name)
 {
        // returns the detector index corresponding to a given name
        TString sname(name) ; 
-       TASKINDEX_t rv ; 
+       TASKINDEX_t rv = kNULLTASKINDEX ; 
        for (Int_t tsk = 0; tsk < kNTASKINDEX ; tsk++) {
                if ( GetTaskName(tsk) == sname ) {
                        rv = TASKINDEX_t(tsk) ; 
@@ -715,7 +722,7 @@ void AliQA::ShowASCIIStatus(DETECTORINDEX_t det, ALITASK_t tsk, const ULong_t st
                }
        }
        if (! text.IsNull())
-               printf("           %8s %4s 0x%4x, Problem signalled: %8s \n", GetDetName(det).Data(), GetAliTaskName(tsk), status, text.Data()) ; 
+               printf("           %8s %4s 0x%4lx, Problem signalled: %8s \n", GetDetName(det).Data(), GetAliTaskName(tsk), status, text.Data()) ; 
 }
 
 //_______________________________________________________________