From: schutz <schutz@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 30 Apr 2010 17:00:32 +0000 (+0000)
Subject: more suggestions from valgrind
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=a04582a1500d579f52c9e7a13ea7085d280d1d8b;hp=e6e63685e572ac4dea148a029c4f7d152a9d8567;p=u%2Fmrichter%2FAliRoot.git

more suggestions from valgrind
---

diff --git a/STEER/AliQACheckerBase.cxx b/STEER/AliQACheckerBase.cxx
index 910932fc754..03a84c05995 100644
--- a/STEER/AliQACheckerBase.cxx
+++ b/STEER/AliQACheckerBase.cxx
@@ -56,15 +56,13 @@ AliQACheckerBase::AliQACheckerBase(const char * name, const char * title) :
   fDataSubDir(0x0),
   fRefSubDir(0x0), 
   fRefOCDBSubDir(new TObjArray*[AliRecoParam::kNSpecies]), 
-  fLowTestValue(0x0),
-  fUpTestValue(0x0),
+  fLowTestValue(new Float_t[AliQAv1::kNBIT]),
+  fUpTestValue(new Float_t[AliQAv1::kNBIT]),
   fImage(new TCanvas*[AliRecoParam::kNSpecies]), 
   fPrintImage(kTRUE), 
   fExternParamList(new TList())
 {
   // ctor
-  fLowTestValue = new Float_t[AliQAv1::kNBIT] ; 
-  fUpTestValue  = new Float_t[AliQAv1::kNBIT] ; 
   fLowTestValue[AliQAv1::kINFO]    =  0.5   ; 
   fUpTestValue[AliQAv1::kINFO]     = 1.0 ; 
   fLowTestValue[AliQAv1::kWARNING] =  0.002 ; 
@@ -96,9 +94,9 @@ AliQACheckerBase::AliQACheckerBase(const AliQACheckerBase& qac) :
   fDataSubDir(qac.fDataSubDir), 
   fRefSubDir(qac.fRefSubDir), 
   fRefOCDBSubDir(qac.fRefOCDBSubDir), 
-  fLowTestValue(qac.fLowTestValue),
-  fUpTestValue(qac.fLowTestValue), 
-  fImage(NULL),  
+  fLowTestValue(new Float_t[AliQAv1::kNBIT]),
+  fUpTestValue(new Float_t[AliQAv1::kNBIT]), 
+  fImage(new TCanvas*[AliRecoParam::kNSpecies]),  
   fPrintImage(kTRUE), 
   fExternParamList(new TList())  
 {
@@ -196,8 +194,6 @@ void AliQACheckerBase::Check(Double_t * test, AliQAv1::ALITASK_t task, TObjArray
 
 	Int_t count[AliRecoParam::kNSpecies]   = { 0 }; 
 
-//  TDirectory * refDir     = NULL ; 
-//	TObjArray ** refOCDBDir = NULL  ;	
   GetRefSubDir(GetName(), AliQAv1::GetTaskName(task), fRefSubDir, fRefOCDBSubDir) ;
  // SetRefandData(refDir, refOCDBDir) ; 
   
@@ -277,7 +273,7 @@ void AliQACheckerBase::GetRefSubDir(const char * det, const char * task, TDirect
     return ; 
   } else {
     AliQAManager* manQA = AliQAManager::QAManager(AliQAv1::GetTaskIndex(task)) ;
-    dirOCDB = new TObjArray*[AliRecoParam::kNSpecies] ;	
+      //    dirOCDB = new TObjArray*[AliRecoParam::kNSpecies] ;	
     for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
       dirOCDB[specie] = NULL ; 
       if ( !AliQAv1::Instance()->IsEventSpecieSet(specie) ) 
diff --git a/STEER/AliQAv1.cxx b/STEER/AliQAv1.cxx
index f439b44c342..20ed4b71b11 100644
--- a/STEER/AliQAv1.cxx
+++ b/STEER/AliQAv1.cxx
@@ -472,13 +472,11 @@ TFile * AliQAv1::GetQADataFile(const char * fileName)
 TFile * AliQAv1::GetQAResultFile() 
 {
   // opens the file to store the  Quality Assurance Data Checker results	
-  if (fgQAResultFile && fgQAResultFile->IsOpen()) 
-  {
+  if (fgQAResultFile) {
+   if (fgQAResultFile->IsOpen()) 
     fgQAResultFile->Close();
+   delete fgQAResultFile;
   }
-  delete fgQAResultFile;
-  fgQAResultFile=0x0;
-  
   TString dirName(fgQAResultDirName) ; 
   if ( dirName.Contains(fgkLabLocalFile)) 
     dirName.ReplaceAll(fgkLabLocalFile, "") ;
@@ -492,8 +490,7 @@ TFile * AliQAv1::GetQAResultFile()
     opt = "NEW" ; 
   }
   fgQAResultFile = TFile::Open(fileName, opt) ;   
-	
-	return fgQAResultFile ;
+  return fgQAResultFile ; 
 }
 
 //_______________________________________________________________
@@ -606,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() ;
   }
@@ -631,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) ;
   }