removerd double filling of histogram

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

diff --git a/STEER/AliQAChecker.cxx b/STEER/AliQAChecker.cxx
index 951b18459b66650857f9b23fe10e53cda404cb32..a3059e56c2fe12a1b3f87f51014e0f94c4928956 100644 (file)
--- a/STEER/AliQAChecker.cxx
+++ b/STEER/AliQAChecker.cxx
@@ -146,47 +146,6 @@ AliQAChecker::~AliQAChecker()
        
        return qac ; 
 }
- 
-//_____________________________________________________________________________
-void AliQAChecker::GetRefSubDir(const char * det, const char * task, TDirectory *& dirFile, TObjArray **& dirOCDB)     
-{ 
-  // Opens and returns the file with the reference data 
-  dirFile = NULL ; 
-  TString refStorage(AliQAv1::GetQARefStorage()) ;
-  if (!refStorage.Contains(AliQAv1::GetLabLocalOCDB()) && !refStorage.Contains(AliQAv1::GetLabAliEnOCDB())) {
-    AliError(Form("%s is not a valid location for reference data", refStorage.Data())) ; 
-    return ; 
-  } else {
-    AliQAManager* manQA = AliQAManager::QAManager(AliQAv1::GetTaskIndex(task)) ;
-    dirOCDB = new TObjArray*[AliRecoParam::kNSpecies] ;        
-    for (Int_t specie = 0 ; specie < AliRecoParam::kNSpecies ; specie++) {
-      dirOCDB[specie] = NULL ; 
-      if ( !AliQAv1::Instance()->IsEventSpecieSet(specie) ) 
-        continue ; 
-      AliQAv1::SetQARefDataDirName(specie) ;
-      if ( ! manQA->GetLock() ) { 
-        manQA->SetDefaultStorage(AliQAv1::GetQARefStorage()) ; 
-        manQA->SetSpecificStorage("*", AliQAv1::GetQARefStorage()) ;
-        manQA->SetRun(AliCDBManager::Instance()->GetRun()) ; 
-        manQA->SetLock() ; 
-      }
-      char * detOCDBDir = Form("%s/%s/%s", det, AliQAv1::GetRefOCDBDirName(), AliQAv1::GetRefDataDirName()) ; 
-      AliCDBEntry * entry = manQA->Get(detOCDBDir, manQA->GetRun()) ;
-      if (entry) {
-        TList * listDetQAD =static_cast<TList *>(entry->GetObject()) ;
-        if ( strcmp(listDetQAD->ClassName(), "TList") != 0 ) {
-          AliError(Form("Expected a Tlist and found a %s for detector %s", listDetQAD->ClassName(), det)) ; 
-          continue ; 
-        }       
-        TIter next(listDetQAD) ;
-        TObjArray * ar ; 
-        while ( (ar = (TObjArray*)next()) ) 
-          if ( listDetQAD ) 
-            dirOCDB[specie] = static_cast<TObjArray *>(listDetQAD->FindObject(Form("%s/%s", task, AliRecoParam::GetEventSpecieName(specie)))) ;             
-      }
-    }
-  }
-}
 
 //_____________________________________________________________________________
 AliQAChecker * AliQAChecker::Instance()
@@ -352,21 +311,16 @@ Bool_t AliQAChecker::Run(const char * fileName, AliDetectorRecoParam * recoParam
       if ( taskName == AliQAv1::GetTaskName(AliQAv1::kESDS) ) 
         index = AliQAv1::kESD ; 
       qac->Init(AliQAv1::DETECTORINDEX_t(det)) ; 
-      
-      TDirectory * refDir     = NULL ; 
-      TObjArray ** refOCDBDir = NULL ; 
-      GetRefSubDir(detNameQA.Data(), taskName.Data(), refDir, refOCDBDir) ;
-                 qac->SetRefandData(refDir, refOCDBDir, taskDir) ;
                  qac->Run(index, recoParam) ; 
     }
   }
   TString detList ; 
   for ( Int_t det = 0; det < AliQAv1::kNDET; det++) {
-    if (fFoundDetectors.Contains(qa->GetDetName(det))) {
-      detList += qa->GetDetName(det) ; 
+    if (fFoundDetectors.Contains(AliQAv1::GetDetName(det))) {
+      detList += AliQAv1::GetDetName(det) ; 
       detList += " " ; 
-      fFoundDetectors.ReplaceAll(qa->GetDetName(det), "") ; 
-      qa->Show(qa->GetDetIndex(qa->GetDetName(det))) ; 
+      fFoundDetectors.ReplaceAll(AliQAv1::GetDetName(det), "") ; 
+      AliQAv1::Instance()->Show(AliQAv1::GetDetIndex(AliQAv1::GetDetName(det))) ; 
     }  
   }
   AliInfo(Form("QA performed for following detectors: %s", detList.Data())) ; 
@@ -404,11 +358,7 @@ Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task
        else if ( task == AliQAv1::kESDS ) 
                index = AliQAv1::kESD ; 
 
-       TDirectory * refDir     = NULL ; 
-       TObjArray ** refOCDBDir = NULL  ;       
   qac->Init(det) ; 
-  GetRefSubDir(AliQAv1::GetDetName(det), AliQAv1::GetTaskName(task), refDir, refOCDBDir) ;
-  qac->SetRefandData(refDir, refOCDBDir) ; 
   qac->Run(index, list, recoParam) ; 
   
   // make the image 
@@ -448,11 +398,7 @@ Bool_t AliQAChecker::Run(AliQAv1::DETECTORINDEX_t det, AliQAv1::TASKINDEX_t task
        else if ( task == AliQAv1::kESDS ) 
                index = AliQAv1::kESD ; 
   
-       TDirectory * refDir     = NULL ; 
-       TObjArray ** refOCDBDir = NULL ;        
   qac->Init(det) ; 
-  GetRefSubDir(AliQAv1::GetDetName(det), AliQAv1::GetTaskName(task), refDir, refOCDBDir) ;
-  qac->SetRefandData(refDir, refOCDBDir) ; 
   qac->Run(index, list, recoParam) ; 
 
   return kTRUE ;