Transfer of the initialisation of the QA Data objects in the framework; clean the...

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

diff --git a/STEER/AliQADataMakerRec.cxx b/STEER/AliQADataMakerRec.cxx
index 3f5bbb0355c887e8c9bb4309ac3d834afa821033..b5a9b593d9a08439b4d169d5916a89a918d0d04b 100644 (file)
--- a/STEER/AliQADataMakerRec.cxx
+++ b/STEER/AliQADataMakerRec.cxx
@@ -53,7 +53,8 @@ AliQADataMakerRec::AliQADataMakerRec(const char * name, const char * title) :
   fRawsQAList(NULL), 
   fRecPointsQAList(NULL),
   fCorrNt(NULL), 
-  fRecoParam(NULL) 
+  fRecoParam(NULL),
+  fRecPointsArray(NULL)
 {
   // ctor
        fDetectorDirName = GetName() ; 
@@ -67,7 +68,8 @@ AliQADataMakerRec::AliQADataMakerRec(const AliQADataMakerRec& qadm) :
   fRawsQAList(qadm.fRawsQAList),
   fRecPointsQAList(qadm.fRecPointsQAList),
   fCorrNt(qadm.fCorrNt),  
-  fRecoParam(qadm.fRecoParam) 
+  fRecoParam(qadm.fRecoParam),
+  fRecPointsArray(NULL)
 {
   //copy ctor
        SetName(qadm.GetName()) ; 
@@ -115,6 +117,10 @@ AliQADataMakerRec::~AliQADataMakerRec()
     }
                delete[] fRecPointsQAList ; 
   }
+  if (fRecPointsArray) {
+    fRecPointsArray->Clear() ; 
+    delete fRecPointsArray ; 
+  }
 }
 
 //__________________________________________________________________
@@ -165,8 +171,8 @@ void AliQADataMakerRec::EndOfCycle(AliQAv1::TASKINDEX_t task)
   if (!subDir)
     subDir = fDetectorDir->mkdir(AliQAv1::GetTaskName(task)) ;  
   subDir->cd() ; 
-  for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
-    if (! AliQAv1::Instance(AliQAv1::GetDetIndex(GetName()))->IsEventSpecieSet(AliRecoParam::ConvertIndex(specie)) ) 
+  for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) { // skip Default
+    if (! AliQAv1::Instance(AliQAv1::GetDetIndex(GetName()))->IsEventSpecieSet(AliRecoParam::ConvertIndex(specie)) || AliRecoParam::ConvertIndex(specie) == AliRecoParam::kDefault) 
       continue ; 
     TDirectory * eventSpecieDir = subDir->GetDirectory(AliRecoParam::GetEventSpecieName(specie)) ;
     if (!eventSpecieDir)