Merge branch master into TRDdev

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

diff --git a/STEER/STEERBase/AliQA.cxx b/STEER/STEERBase/AliQA.cxx
index 4310fd62e69825c3c0a3a5717a41c5eb6a4913ad..19656a0ad8eae96bf369edd97752b6ff5d3986b3 100644 (file)
--- a/STEER/STEERBase/AliQA.cxx
+++ b/STEER/STEERBase/AliQA.cxx
@@ -57,11 +57,7 @@ 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", "CORR"
-                                                                                       #ifdef MFT_UPGRADE
-                                               , "MFT"
-                                                                                       #endif 
-                                                                                       };   
+                                            "ZDC", "PMD", "T0", "VZERO", "ACORDE", "HLT", "Global", "CORR","MFT"};   
 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", 
@@ -110,17 +106,23 @@ AliQA::AliQA(const AliQA& qa) :
   fTask(qa.fTask)
 { 
   // cpy ctor
-  for (Int_t index = 0 ; index < fNdet ; index++) 
-       fQA[index] = qa.fQA[index] ; 
+  memcpy(fQA, qa.fQA, sizeof(ULong_t)*fNdet);
 }
 
 //_____________________________________________________________________________
 AliQA& AliQA::operator = (const AliQA& qa)
 {
-// assignment operator
-
-  this->~AliQA();
-  new(this) AliQA(qa);
+  //
+  // Assignment operator
+  if(this != &qa) {
+    TNamed::operator=(qa);
+    fNdet = qa.fNdet;
+    delete [] fQA;
+    fQA = new ULong_t[fNdet];
+    memcpy(fQA, qa.fQA, sizeof(ULong_t)*fNdet);
+    fDet = qa.fDet;
+    fTask = qa.fTask;
+  }
   return *this;
 }
 
@@ -548,7 +550,7 @@ AliQA *  AliQA::Instance(const TASKINDEX_t tsk)
 }
 
 //_______________________________________________________________
-Long64_t AliQA::Merge(TCollection * list) {
+Long64_t AliQA::Merge(const TCollection * list) {
   // Merge the QA resuls in the list into this single AliQA object
   
   Long64_t nmerge=0;