]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - STEER/AliQADataMakerSteer.cxx
Base class (AliMisaligner); each detector will provide its derived class,
[u/mrichter/AliRoot.git] / STEER / AliQADataMakerSteer.cxx
index 2e0b8698b135ade27452a13734559c940c5c814c..fce56b43213efe753911f5a98341fc8cfd9fe6a6 100644 (file)
@@ -41,6 +41,7 @@
 #include "AliCDBId.h"
 #include "AliCDBMetaData.h"
 #include "AliCodeTimer.h"
+#include "AliCorrQADataMakerRec.h"
 #include "AliDetectorRecoParam.h"
 #include "AliESDEvent.h"
 #include "AliGeomManager.h"
 #include "AliRawReaderRoot.h"
 #include "AliRun.h"
 #include "AliRunLoader.h"
+#include "AliRunTag.h"
 
 ClassImp(AliQADataMakerSteer) 
 
 //_____________________________________________________________________________
-AliQADataMakerSteer::AliQADataMakerSteer(char * mode, const char* gAliceFilename, const char * name, const char * title) :
+AliQADataMakerSteer::AliQADataMakerSteer(const Char_t * mode, const Char_t* gAliceFilename, const Char_t * name, const Char_t * title) :
        TNamed(name, title), 
        fCurrentEvent(0),  
        fCycleSame(kFALSE),
@@ -79,7 +81,8 @@ AliQADataMakerSteer::AliQADataMakerSteer(char * mode, const char* gAliceFilename
        fRawReader(NULL), 
        fRawReaderDelete(kTRUE), 
        fRunLoader(NULL), 
-  fTasks("") 
+  fTasks(""), 
+  fEventSpecie(AliRecoParam::kDefault)
 {
        // default ctor
        fMaxEvents = fNumberOfEvents ; 
@@ -88,6 +91,7 @@ AliQADataMakerSteer::AliQADataMakerSteer(char * mode, const char* gAliceFilename
                        fLoader[iDet]      = NULL ;
                        fQADataMaker[iDet] = NULL ;
                        fQACycles[iDet]    = 999999 ;
+      fQAWriteExpert[iDet] = kTRUE ;
                }
        }       
 }
@@ -111,13 +115,15 @@ AliQADataMakerSteer::AliQADataMakerSteer(const AliQADataMakerSteer & qas) :
        fRawReader(NULL), 
        fRawReaderDelete(kTRUE), 
        fRunLoader(NULL), 
-  fTasks(qas.fTasks) 
+  fTasks(qas.fTasks),
+  fEventSpecie(qas.fEventSpecie)
 {
        // cpy ctor
        for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
-               fLoader[iDet]      = qas.fLoader[iDet] ;
-               fQADataMaker[iDet] = qas.fQADataMaker[iDet] ;
-               fQACycles[iDet]    = qas.fQACycles[iDet] ;      
+               fLoader[iDet]         = qas.fLoader[iDet] ;
+               fQADataMaker[iDet]    = qas.fQADataMaker[iDet] ;
+               fQACycles[iDet]       = qas.fQACycles[iDet] ;   
+    fQAWriteExpert[iDet] = qas.fQAWriteExpert[iDet] ;
        }
 }
 
@@ -176,11 +182,11 @@ Bool_t AliQADataMakerSteer::DoIt(const AliQA::TASKINDEX_t taskIndex)
                for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                        if (IsSelected(AliQA::GetDetName(iDet))) {
                                AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+                               if (!qadm) continue; // This detector doesn't have any QA (for example, HLT)
                                if ( qadm->IsCycleDone() ) {
-                                       qadm->EndOfCycle(AliQA::kRAWS) ;
-                                       qadm->StartOfCycle(AliQA::kRAWS) ;
+          qadm->EndOfCycle(taskIndex) ;
                                }
-                               TTree * data ; 
+                               TTree * data = NULL 
                                AliLoader* loader = GetLoader(qadm->GetUniqueID());
                                switch (taskIndex) {
                                        case AliQA::kNULLTASKINDEX : 
@@ -189,41 +195,49 @@ Bool_t AliQADataMakerSteer::DoIt(const AliQA::TASKINDEX_t taskIndex)
                                                qadm->Exec(taskIndex, fRawReader) ; 
                                                break ; 
                                        case AliQA::kHITS :
-                                               loader->LoadHits() ; 
-                                               data = loader->TreeH() ; 
-                                               if ( ! data ) {
-                                                       AliWarning(Form(" Hit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
-                                               } else {
-                                                       qadm->Exec(taskIndex, data) ;
-                                               } 
+            if( loader ) {
+              loader->LoadHits() ; 
+              data = loader->TreeH() ; 
+              if ( ! data ) {
+                AliWarning(Form(" Hit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
+                break ; 
+              } 
+            } 
+            qadm->Exec(taskIndex, data) ;
                                                break ;
                                                case AliQA::kSDIGITS :
-                                               loader->LoadSDigits() ; 
-                                               data = loader->TreeS() ; 
-                                               if ( ! data ) {
-                                                       AliWarning(Form(" SDigit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
-                                               } else {
-                                                       qadm->Exec(taskIndex, data) ; 
-                                       }
+            if( loader ) {      
+              loader->LoadSDigits() ; 
+              data = loader->TreeS() ; 
+              if ( ! data ) {
+                AliWarning(Form(" SDigit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
+                break ; 
+              } 
+            }
+            qadm->Exec(taskIndex, data) ; 
                                                break; 
                                                case AliQA::kDIGITS :
-                                               loader->LoadDigits() ; 
-                                               data = loader->TreeD() ; 
-                                               if ( ! data ) {
-                                                       AliWarning(Form(" Digit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
-                                               } else {
-                                                       qadm->Exec(taskIndex, data) ;
-                                               }
+            if( loader ) {      
+              loader->LoadDigits() ; 
+              data = loader->TreeD() ; 
+              if ( ! data ) {
+                AliWarning(Form(" Digit Tree not found for  %s", AliQA::GetDetName(iDet))) ; 
+                break ; 
+              } 
+            }
+            qadm->Exec(taskIndex, data) ;
                                                break; 
                                                case AliQA::kRECPOINTS :
-                                               loader->LoadRecPoints() ; 
-                                               data = loader->TreeR() ; 
-                                               if (!data) {
-                                                       AliWarning(Form("RecPoints not found for %s", AliQA::GetDetName(iDet))) ; 
-                                               } else {
-                                                       qadm->Exec(taskIndex, data) ; 
-                                               }
-                                               break; 
+            if( loader ) {      
+              loader->LoadRecPoints() ; 
+              data = loader->TreeR() ; 
+              if (!data) {
+                AliWarning(Form("RecPoints not found for %s", AliQA::GetDetName(iDet))) ; 
+                break ; 
+              } 
+            }
+            qadm->Exec(taskIndex, data) ; 
+            break; 
                                                case AliQA::kTRACKSEGMENTS :
                                                break; 
                                                case AliQA::kRECPARTICLES :
@@ -236,6 +250,7 @@ Bool_t AliQADataMakerSteer::DoIt(const AliQA::TASKINDEX_t taskIndex)
                                } //task switch
                        }
                } // detector loop
+    Increment() ; 
        } // event loop 
        // Save QA data for all detectors
        rv = Finish(taskIndex) ;
@@ -253,7 +268,8 @@ Bool_t AliQADataMakerSteer::Finish(const AliQA::TASKINDEX_t taskIndex)
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQA::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet) ;
-                       qadm->EndOfCycle(taskIndex) ; 
+                       if (qadm) 
+        qadm->EndOfCycle(taskIndex) ;
                }
        }
        return kTRUE ; 
@@ -290,7 +306,7 @@ AliLoader * AliQADataMakerSteer::GetLoader(Int_t iDet)
 {
        // get the loader for a detector
 
-       if ( !fRunLoader ) 
+       if ( !fRunLoader || iDet == AliQA::kCORR
                return NULL ; 
        
        TString detName = AliQA::GetDetName(iDet) ;
@@ -325,12 +341,38 @@ AliLoader * AliQADataMakerSteer::GetLoader(Int_t iDet)
 }
 
 //_____________________________________________________________________________
-AliQADataMaker * AliQADataMakerSteer::GetQADataMaker(const Int_t iDet)
+AliQA * AliQADataMakerSteer::GetQA(UInt_t run, UInt_t evt) 
+{
+// retrieves the QA object stored in a file named "Run{run}.Event{evt}_1.ESD.tag.root"  
+  char * fileName = Form("Run%d.Event%d_1.ESD.tag.root", run, evt) ; 
+  TFile * tagFile = TFile::Open(fileName) ;
+  if ( !tagFile ) {
+    AliError(Form("File %s not found", fileName)) ;
+    return NULL ; 
+  }
+  TTree * tagTree = dynamic_cast<TTree *>(tagFile->Get("T")) ; 
+  if ( !tagTree ) {
+    AliError(Form("Tree T not found in %s", fileName)) ; 
+    tagFile->Close() ; 
+    return NULL ; 
+  }
+  AliRunTag * tag = new AliRunTag ; 
+  tagTree->SetBranchAddress("AliTAG", &tag) ; 
+  tagTree->GetEntry(evt) ; 
+  AliQA * qa = AliQA::Instance(tag->GetQALength(), tag->GetQA(), tag->GetESLength(), tag->GetEventSpecies()) ; 
+  tagFile->Close() ; 
+  return qa ; 
+}
+
+//_____________________________________________________________________________
+AliQADataMaker * AliQADataMakerSteer::GetQADataMaker(const Int_t iDet) 
 {
        // get the quality assurance data maker for a detector
        
-       if (fQADataMaker[iDet]) 
+       if (fQADataMaker[iDet]) {
+    fQADataMaker[iDet]->SetEventSpecie(fEventSpecie) ; 
                return fQADataMaker[iDet] ;
+  }
        
        AliQADataMaker * qadm = NULL ;
        
@@ -339,9 +381,19 @@ AliQADataMaker * AliQADataMakerSteer::GetQADataMaker(const Int_t iDet)
                qadm->SetName(AliQA::GetDetName(iDet));
                qadm->SetUniqueID(iDet);
                fQADataMaker[iDet] = qadm;
+    qadm->SetEventSpecie(fEventSpecie) ; 
                return qadm;
        }
 
+       if (iDet == AliQA::kCORR) { //the data maker for correlations among detectors
+    qadm = new AliCorrQADataMakerRec(fQADataMaker) ; 
+               qadm->SetName(AliQA::GetDetName(iDet));
+               qadm->SetUniqueID(iDet);
+               fQADataMaker[iDet] = qadm;
+    qadm->SetEventSpecie(fEventSpecie) ; 
+               return qadm;
+  }
+
        // load the QA data maker object
        TPluginManager* pluginManager = gROOT->GetPluginManager() ;
        TString detName = AliQA::GetDetName(iDet) ;
@@ -373,9 +425,10 @@ AliQADataMaker * AliQADataMakerSteer::GetQADataMaker(const Int_t iDet)
                qadm->SetName(AliQA::GetDetName(iDet));
                qadm->SetUniqueID(iDet);
                fQADataMaker[iDet] = qadm ;
+    qadm->SetEventSpecie(fEventSpecie) ; 
        }
-       
-               return qadm ;
+
+  return qadm ;
 }
 
 //_____________________________________________________________________________
@@ -403,12 +456,47 @@ void  AliQADataMakerSteer::EndOfCycle(TObjArray * detArray)
        }
 }
 
+//_____________________________________________________________________________
+void  AliQADataMakerSteer::EndOfCycle(TString detectors) 
+{
+       // End of cycle QADataMakers 
+       
+       for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
+               if (IsSelected(AliQA::GetDetName(iDet))) {
+                       AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+                       if (!qadm) 
+                               continue ;      
+                       // skip non active detectors
+      if (!detectors.Contains(AliQA::GetDetName(iDet))) 
+        continue ;
+               for (UInt_t taskIndex = 0; taskIndex < AliQA::kNTASKINDEX; taskIndex++) {
+                               if ( fTasks.Contains(Form("%d", taskIndex)) ) 
+                                       qadm->EndOfCycle(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex))) ;
+                       }
+                       qadm->Finish();
+               }
+       }
+}
+
+//_____________________________________________________________________________
+void AliQADataMakerSteer::Increment()
+{
+  // Increments the cycle counter for all QA Data Makers
+       for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
+               if (IsSelected(AliQA::GetDetName(iDet))) {
+                       AliQADataMaker * qadm = GetQADataMaker(iDet) ;
+                       if (qadm) 
+        qadm->Increment() ;
+    }
+  }
+}
+  
 //_____________________________________________________________________________
 Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char * input )
 {
        // Initialize the event source and QA data makers
        
-       //fTasks = AliQA::GetTaskName(taskIndex) ; 
+       fTasks += Form("%d", taskIndex) ; 
 
        if (taskIndex == AliQA::kRAWS) { 
                if (!fRawReader) {
@@ -426,37 +514,37 @@ Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char
                        fMaxEvents = fNumberOfEvents ; 
                } else if (taskIndex == AliQA::kESDS) {
                        fTasks = AliQA::GetTaskName(AliQA::kESDS) ; 
-               if (!gSystem->AccessPathName("AliESDs.root")) { // AliESDs.root exists
-                       TFile * esdFile = TFile::Open("AliESDs.root") ;
-                       fESDTree = dynamic_cast<TTree *> (esdFile->Get("esdTree")) ; 
-                       if ( !fESDTree ) {
-                               AliError("esdTree not found") ; 
-                               return kFALSE ; 
-                       } else {
-                               fESD     = new AliESDEvent() ;
-                               fESD->ReadFromTree(fESDTree) ;
-                               fESDTree->GetEntry(0) ; 
-                               fRunNumber = fESD->GetRunNumber() ; 
-                               fNumberOfEvents = fESDTree->GetEntries() ;
-                               if ( fMaxEvents < 0 ) 
-                                       fMaxEvents = fNumberOfEvents ; 
-                       }
-               } else {
-                       AliError("AliESDs.root not found") ; 
-                       return kFALSE ; 
-               }                       
-               } else {
-               if ( !InitRunLoader() ) { 
-                       AliWarning("No Run Loader not found") ; 
-               } else {
-                       fNumberOfEvents = fRunLoader->GetNumberOfEvents() ;
-                       if ( fMaxEvents < 0 ) 
-                               fMaxEvents = fNumberOfEvents ; 
-               }
-       }
+      if (!gSystem->AccessPathName("AliESDs.root")) { // AliESDs.root exists
+        TFile * esdFile = TFile::Open("AliESDs.root") ;
+        fESDTree = dynamic_cast<TTree *> (esdFile->Get("esdTree")) ; 
+        if ( !fESDTree ) {
+          AliError("esdTree not found") ; 
+          return kFALSE ; 
+        } else {
+          fESD     = new AliESDEvent() ;
+          fESD->ReadFromTree(fESDTree) ;
+          fESDTree->GetEntry(0) ; 
+          fRunNumber = fESD->GetRunNumber() ; 
+          fNumberOfEvents = fESDTree->GetEntries() ;
+          if ( fMaxEvents < 0 ) 
+            fMaxEvents = fNumberOfEvents ; 
+        }
+      } else {
+        AliError("AliESDs.root not found") ; 
+        return kFALSE ; 
+      }                        
+    } else {
+      if ( !InitRunLoader() ) { 
+        AliWarning("No Run Loader not found") ; 
+      } else {
+        fNumberOfEvents = fRunLoader->GetNumberOfEvents() ;
+        if ( fMaxEvents < 0 ) 
+          fMaxEvents = fNumberOfEvents ; 
+      }
+    }
 
-       // Get Detectors 
-       TObjArray* detArray = NULL ; 
+  // Get Detectors 
+  TObjArray* detArray = NULL ; 
        if (fRunLoader) // check if RunLoader exists 
                if ( fRunLoader->GetAliRun() ) { // check if AliRun exists in gAlice.root
                        detArray = fRunLoader->GetAliRun()->Detectors() ;
@@ -468,15 +556,14 @@ Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX_t taskIndex, const  char
        if ( !  AliGeomManager::GetGeometry() ) 
                AliGeomManager::LoadGeometry() ; 
        
-       InitQADataMaker(fRunNumber, fRecoParam, fCycleSame, kTRUE, detArray) ; 
+       InitQADataMaker(fRunNumber, detArray) ; //, fCycleSame, kTRUE, detArray) ; 
        return kTRUE ; 
 }
 
 //_____________________________________________________________________________
-void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par, Bool_t sameCycle, Bool_t startOption, TObjArray * detArray) 
+void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, TObjArray * detArray) 
 {
        // Initializes The QADataMaker for all active detectors and for all active tasks 
-
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQA::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet) ;
@@ -484,6 +571,8 @@ void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par,
                                AliError(Form("AliQADataMaker not found for %s", AliQA::GetDetName(iDet))) ; 
                                fDetectorsW.ReplaceAll(AliQA::GetDetName(iDet), "") ; 
                        } else {
+        if (fQAWriteExpert[iDet])
+          qadm->SetWriteExpert() ; 
                                AliDebug(1, Form("Data Maker found for %s", qadm->GetName())) ; 
                                // skip non active detectors
                                if (detArray) {
@@ -491,15 +580,14 @@ void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par,
                                        if (!det || !det->IsActive())  
                                                continue ;
                                }
+                               if (fQAWriteExpert[iDet]) qadm->SetWriteExpert() ; 
              // Set default reco params
-                               qadm->SetRecoParam(par.GetDetRecoParam(iDet));
+        Bool_t sameCycle = kFALSE ; 
                                for (UInt_t taskIndex = 0; taskIndex < AliQA::kNTASKINDEX; taskIndex++) {
                                        if ( fTasks.Contains(Form("%d", taskIndex)) ) {
-                                               qadm->Init(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), run, GetQACycles(qadm->GetUniqueID())) ;
-                                               if (startOption) {
-                                                       qadm->StartOfCycle(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), sameCycle) ;
-                                                       sameCycle = kTRUE ;
-                                               }
+                                               qadm->Init(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), GetQACycles(qadm->GetUniqueID())) ;
+            qadm->StartOfCycle(AliQA::GetTaskIndex(AliQA::GetTaskName(taskIndex)), run,  sameCycle) ;
+            sameCycle = kTRUE ;
                                        }
                                }
                        }
@@ -507,6 +595,7 @@ void  AliQADataMakerSteer::InitQADataMaker(UInt_t run, const AliRecoParam & par,
        }
 }
 
+
 //_____________________________________________________________________________
 Bool_t AliQADataMakerSteer::InitRunLoader()
 {
@@ -563,17 +652,21 @@ Bool_t AliQADataMakerSteer::IsSelected(const char * det)
        
        Bool_t rv = kFALSE;
        const TString detName(det) ;
-       // check if all detectors are selected
-       if (fDetectors.Contains("ALL")) {
-               fDetectors = "ALL";
-               rv = kTRUE;
-       } else if ((fDetectors.CompareTo(detName) == 0) ||
-                          fDetectors.BeginsWith(detName+" ") ||
-                          fDetectors.EndsWith(" "+detName) ||
-                          fDetectors.Contains(" "+detName+" ")) {
-               rv = kTRUE;
-       }
-               
+  // always activates Correlation
+  if ( detName.Contains(AliQA::GetDetName(AliQA::kCORR))) {
+    rv = kTRUE ; 
+  } else {
+    // check if all detectors are selected
+    if (fDetectors.Contains("ALL")) {
+      fDetectors = "ALL";
+      rv = kTRUE;
+    } else if ((fDetectors.CompareTo(detName) == 0) ||
+               fDetectors.BeginsWith(detName+" ") ||
+               fDetectors.EndsWith(" "+detName) ||
+               fDetectors.Contains(" "+detName+" ")) {
+      rv = kTRUE;
+    }
+  }
        return rv ;
 }
 
@@ -594,14 +687,13 @@ Bool_t AliQADataMakerSteer::MergeData(const Int_t runNumber) const
        // Merge all the cycles from all detectors in one single file per run
        TString cmd ;
        if (runNumber == -1) 
-               cmd = Form(".! ls *%s*.%d.*.root > tempo.txt", AliQA::GetQADataFileName(), runNumber) ; 
+               cmd = Form(".! ls *%s*.%d.root > tempo.txt", AliQA::GetQADataFileName(), runNumber) ; 
        else 
-               cmd = Form(".! ls *%s*.*.*.root > tempo.txt", AliQA::GetQADataFileName()) ; 
+               cmd = Form(".! ls *%s*.*.root > tempo.txt", AliQA::GetQADataFileName()) ; 
        gROOT->ProcessLine(cmd.Data()) ;
        ifstream in("tempo.txt") ; 
        const Int_t runMax = 10 ;  
        TString file[AliQA::kNDET*runMax] ;
-       Int_t run[AliQA::kNDET*runMax] = {-1} ;
        
        Int_t index = 0 ; 
        while ( 1 ) {
@@ -616,42 +708,18 @@ Bool_t AliQADataMakerSteer::MergeData(const Int_t runNumber) const
                AliError(Form("run number %d not found", runNumber)) ; 
                return kFALSE ; 
        }
-       
-       Int_t runIndex    = 0 ;  
-       Int_t runIndexMax = 0 ; 
-       TString stmp(Form(".%s.", AliQA::GetQADataFileName())) ; 
-       for (Int_t ifile = 0 ; ifile < index ; ifile++) {
-               TString tmp(file[ifile]) ; 
-               tmp.ReplaceAll(".root", "") ; 
-               TString det = tmp(0, tmp.Index(".")) ; 
-               tmp.Remove(0, tmp.Index(stmp)+4) ; 
-               TString ttmp = tmp(0, tmp.Index(".")) ; 
-               Int_t newRun = ttmp.Atoi() ;
-               for (Int_t irun = 0; irun <= runIndexMax; irun++) {
-                       if (newRun == run[irun]) 
-                               break ; 
-                       run[runIndex] = newRun ; 
-                       runIndex++ ; 
-               }
-               runIndexMax = runIndex ; 
-               ttmp = tmp(tmp.Index(".")+1, tmp.Length()) ; 
-               Int_t cycle = ttmp.Atoi() ;  
-               AliDebug(1, Form("%s : det = %s run = %d cycle = %d \n", file[ifile].Data(), det.Data(), newRun, cycle)) ; 
-       }
-       for (Int_t irun = 0 ; irun < runIndexMax ; irun++) {
-               TFileMerger merger ; 
-               TString outFileName(Form("Merged.%s.Data.%d.root",AliQA::GetQADataFileName(),run[irun]));               
-               merger.OutputFile(outFileName.Data()) ; 
-               for (Int_t ifile = 0 ; ifile < index-1 ; ifile++) {
-                       TString pattern(Form("%s.%d.", AliQA::GetQADataFileName(), run[irun])) ; 
-                       TString tmp(file[ifile]) ; 
-                       if (tmp.Contains(pattern)) {
-                               merger.AddFile(tmp) ; 
-                       }
-               }
-               merger.Merge() ; 
+
+  TFileMerger merger ; 
+  TString outFileName(Form("Merged.%s.Data.%d.root",AliQA::GetQADataFileName(),runNumber)); 
+  merger.OutputFile(outFileName.Data()) ; 
+  for (Int_t ifile = 0 ; ifile < index-1 ; ifile++) {
+    TString pattern(Form("%s.%d.", AliQA::GetQADataFileName(), runNumber)); 
+    TString tmp(file[ifile]) ; 
+    if (tmp.Contains(pattern)) {
+      merger.AddFile(tmp) ; 
+    }
        }
-       
+  merger.Merge() ; 
        return kTRUE ; 
 }
 
@@ -701,7 +769,7 @@ void AliQADataMakerSteer::Reset(const Bool_t sameCycle)
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                if (IsSelected(AliQA::GetDetName(iDet))) {
                        AliQADataMaker * qadm = GetQADataMaker(iDet);
-                       qadm->Reset(sameCycle);
+                       qadm->Reset();
                }
        } 
        if (fRawReaderDelete) { 
@@ -734,9 +802,10 @@ TString AliQADataMakerSteer::Run(const char * detectors, AliRawReader * rawReade
                rawReader->RewindEvents() ;
        }       
        
-       if ( !Init(AliQA::kRAWS) ) 
-               return kFALSE ; 
-       fRawReaderDelete = kFALSE ; 
+       if (!fCycleSame) 
+    if ( !Init(AliQA::kRAWS) ) 
+      return kFALSE ; 
+  fRawReaderDelete = kFALSE ; 
 
        DoIt(AliQA::kRAWS) ; 
        return  fDetectorsW ;
@@ -768,8 +837,9 @@ TString AliQADataMakerSteer::Run(const char * detectors, const char * fileName,
                }
        }
        
-       if ( !Init(AliQA::kRAWS, fileName) ) 
-               return kFALSE ; 
+       if (!fCycleSame) 
+    if ( !Init(AliQA::kRAWS, fileName) ) 
+      return kFALSE ; 
        
        DoIt(AliQA::kRAWS) ; 
        return  fDetectorsW ;
@@ -805,16 +875,18 @@ TString AliQADataMakerSteer::Run(const char * detectors, const AliQA::TASKINDEX_
        if ( taskIndex == AliQA::kNULLTASKINDEX) { 
                for (UInt_t task = 0; task < AliQA::kNTASKINDEX; task++) {
                        if ( fTasks.Contains(Form("%d", task)) ) {
-                               if ( !Init(AliQA::GetTaskIndex(AliQA::GetTaskName(task)), fileName) ) 
-                                       return kFALSE ; 
-                               DoIt(AliQA::GetTaskIndex(AliQA::GetTaskName(task))) ;
+        if (!fCycleSame)
+          if ( !Init(AliQA::GetTaskIndex(AliQA::GetTaskName(task)), fileName) ) 
+            return kFALSE ;
+        DoIt(AliQA::GetTaskIndex(AliQA::GetTaskName(task))) ;
                        }
                }
        } else {
-               if ( !Init(taskIndex, fileName) ) 
-                       return kFALSE ; 
-               DoIt(taskIndex) ; 
-       }               
+    if (! fCycleSame )
+      if ( !Init(taskIndex, fileName) ) 
+        return kFALSE ; 
+      DoIt(taskIndex) ; 
+  }            
        
        return fDetectorsW ;
 
@@ -824,20 +896,25 @@ TString AliQADataMakerSteer::Run(const char * detectors, const AliQA::TASKINDEX_
 void AliQADataMakerSteer::RunOneEvent(AliRawReader * rawReader) 
 {
        //Runs all the QA data Maker for Raws only and on one event only (event loop done by calling method)
-
+  if ( ! rawReader ) 
+    return ; 
        AliCodeTimerAuto("") ;
-       for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
-               if (!IsSelected(AliQA::GetDetName(iDet))) 
-                       continue;
-               AliQADataMaker *qadm = GetQADataMaker(iDet);  
-               if (!qadm) 
-                       continue;
-               if (fTasks.Contains(Form("%d", AliQA::kRAWS))){
-                       AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet))); 
+  if (fTasks.Contains(Form("%d", AliQA::kRAWS))){
+    for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+      if (!IsSelected(AliQA::GetDetName(iDet))) 
+        continue;
+      AliQADataMaker *qadm = GetQADataMaker(iDet);  
+      if (!qadm) 
+        continue;
+      if ( qadm->IsCycleDone() ) {
+        qadm->EndOfCycle() ;
+      }
+      AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet))); 
+      qadm->SetEventSpecie(fEventSpecie) ; 
                        qadm->Exec(AliQA::kRAWS, rawReader) ;
-                       AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet)));
+      AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQA::GetDetName(iDet)));
                }
-       }
+  }
 }
 
 //_____________________________________________________________________________
@@ -846,16 +923,19 @@ void AliQADataMakerSteer::RunOneEvent(AliESDEvent *& esd)
        //Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
        
   AliCodeTimerAuto("") ;
-       for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
-               if (!IsSelected(AliQA::GetDetName(iDet))) 
-                       continue;
-               AliQADataMaker *qadm = GetQADataMaker(iDet);  
-               if (!qadm) 
-                       continue;
-               if (fTasks.Contains(Form("%d", AliQA::kESDS))) {
-                       AliCodeTimerStart(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
+  if (fTasks.Contains(Form("%d", AliQA::kESDS))) {
+    for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
+      if (!IsSelected(AliQA::GetDetName(iDet))) 
+        continue;
+      AliQADataMaker *qadm = GetQADataMaker(iDet);  
+      if (!qadm) 
+        continue;
+      if ( qadm->IsCycleDone() ) {
+        qadm->EndOfCycle() ;
+      }
+      AliCodeTimerStart(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
                        qadm->Exec(AliQA::kESDS, esd) ;
-                       AliCodeTimerStop(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
+      AliCodeTimerStop(Form("running ESD quality assurance data maker for %s", AliQA::GetDetName(iDet)));
                }
        }
 }
@@ -865,20 +945,23 @@ void AliQADataMakerSteer::RunOneEventInOneDetector(Int_t det, TTree * tree)
 {
        // Runs all the QA data Maker for ESDs only and on one event only (event loop done by calling method)
        AliCodeTimerAuto("") ;
-       if (!IsSelected(AliQA::GetDetName(det))) {
-               AliQADataMaker *qadm = GetQADataMaker(det);  
-               if (qadm) { 
-                       if (fTasks.Contains(Form("%d", AliQA::kRECPOINTS))) {
-                               AliCodeTimerStart(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
-                               qadm->Exec(AliQA::kRECPOINTS, tree) ;
-                               AliCodeTimerStop(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
-                       }
-               }
-       }
+  if (fTasks.Contains(Form("%d", AliQA::kRECPOINTS))) {
+    if (IsSelected(AliQA::GetDetName(det))) {
+      AliQADataMaker *qadm = GetQADataMaker(det);  
+      if (qadm) { 
+        if ( qadm->IsCycleDone() ) {
+          qadm->EndOfCycle() ;
+        }
+        AliCodeTimerStart(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
+        qadm->Exec(AliQA::kRECPOINTS, tree) ;
+        AliCodeTimerStop(Form("running RecPoints quality assurance data maker for %s", AliQA::GetDetName(det)));
+      }
+    }
+  }
 }
 
 //_____________________________________________________________________________
-Bool_t AliQADataMakerSteer::Save2OCDB(const Int_t runNumber, const char * year, const Int_t cycleNumber, const char * detectors) const
+Bool_t AliQADataMakerSteer::Save2OCDB(const Int_t runNumber, AliRecoParam::EventSpecie_t es, const char * year, const char * detectors) const
 {
        // take the locasl QA data merge into a single file and save in OCDB 
        Bool_t rv = kTRUE ; 
@@ -898,15 +981,15 @@ Bool_t AliQADataMakerSteer::Save2OCDB(const Int_t runNumber, const char * year,
                rv = Merge(runNumber) ; 
                if ( ! rv )
                        return kFALSE ; 
-               TString inputFileName(Form("Merged.%s.%d.root", AliQA::GetQADataFileName(), runNumber)) ; 
+               TString inputFileName(Form("Merged.%s.Data.%d.root", AliQA::GetQADataFileName(), runNumber)) ; 
                inputFile = TFile::Open(inputFileName.Data()) ; 
-               rv = SaveIt2OCDB(runNumber, inputFile, year) ; 
+               rv = SaveIt2OCDB(runNumber, inputFile, year, es) ; 
        } else {
                for (Int_t index = 0; index < AliQA::kNDET; index++) {
                        if (sdet.Contains(AliQA::GetDetName(index))) {
-                               TString inputFileName(Form("%s.%s.%d.%d.root", AliQA::GetDetName(index), AliQA::GetQADataFileName(), runNumber, cycleNumber)) ; 
+                               TString inputFileName(Form("%s.%s.%d.root", AliQA::GetDetName(index), AliQA::GetQADataFileName(), runNumber)) ; 
                                inputFile = TFile::Open(inputFileName.Data()) ;                         
-                               rv *= SaveIt2OCDB(runNumber, inputFile, year) ; 
+                               rv *= SaveIt2OCDB(runNumber, inputFile, year, es) ; 
                        }
                }
        }
@@ -914,7 +997,7 @@ Bool_t AliQADataMakerSteer::Save2OCDB(const Int_t runNumber, const char * year,
 }
 
 //_____________________________________________________________________________
-Bool_t AliQADataMakerSteer::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile, const char * year) const
+Bool_t AliQADataMakerSteer::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile, const char * year, AliRecoParam::EventSpecie_t es) const
 {
        // reads the TH1 from file and adds it to appropriate list before saving to OCDB
        Bool_t rv = kTRUE ;
@@ -942,29 +1025,50 @@ Bool_t AliQADataMakerSteer::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile
                TDirectory * detDir = inputFile->GetDirectory(AliQA::GetDetName(detIndex)) ; 
                if ( detDir ) {
                        AliInfo(Form("Entering %s", detDir->GetName())) ;
+      AliQA::SetQARefDataDirName(es) ;
                        TString detOCDBDir(Form("%s/%s/%s", AliQA::GetDetName(detIndex), AliQA::GetRefOCDBDirName(), AliQA::GetRefDataDirName())) ; 
                        AliCDBId idr(detOCDBDir.Data(), runNumber, AliCDBRunRange::Infinity())  ;
                        TList * listDetQAD = new TList() ;
                        TString listName(Form("%s QA data Reference", AliQA::GetDetName(detIndex))) ; 
-                       mdr.SetComment("HMPID QA stuff");
+                       mdr.SetComment(Form("%s QA stuff", AliQA::GetDetName(detIndex)));
                        listDetQAD->SetName(listName) ; 
                        TList * taskList = detDir->GetListOfKeys() ; 
                        TIter nextTask(taskList) ; 
                        TKey * taskKey ; 
                        while ( (taskKey = dynamic_cast<TKey*>(nextTask())) ) {
                                TDirectory * taskDir = detDir->GetDirectory(taskKey->GetName()) ; 
-                               AliInfo(Form("Saving %s", taskDir->GetName())) ; 
+        TDirectory * esDir   = taskDir->GetDirectory(AliRecoParam::GetEventSpecieName(es)) ; 
+                               AliInfo(Form("Saving %s", esDir->GetName())) ; 
                                TObjArray * listTaskQAD = new TObjArray(100) ; 
-                               listTaskQAD->SetName(taskKey->GetName()) ;
+                               listTaskQAD->SetName(Form("%s/%s", taskKey->GetName(), AliRecoParam::GetEventSpecieName(es))) ;
                                listDetQAD->Add(listTaskQAD) ; 
-                               TList * histList = taskDir->GetListOfKeys() ; 
+                               TList * histList = esDir->GetListOfKeys() ; 
                                TIter nextHist(histList) ; 
                                TKey * histKey ; 
                                while ( (histKey = dynamic_cast<TKey*>(nextHist())) ) {
-                                       TObject * odata = taskDir->Get(histKey->GetName()) ; 
+                                       TObject * odata = esDir->Get(histKey->GetName()) ; 
                                        if ( !odata ) {
                                                AliError(Form("%s in %s/%s returns a NULL pointer !!", histKey->GetName(), detDir->GetName(), taskDir->GetName())) ;
                                        } else {
+            if ( AliQA::GetExpert() == histKey->GetName() ) {
+              TDirectory * expertDir   = esDir->GetDirectory(histKey->GetName()) ; 
+              TList * expertHistList = expertDir->GetListOfKeys() ; 
+              TIter nextExpertHist(expertHistList) ; 
+              TKey * expertHistKey ; 
+              while ( (expertHistKey = dynamic_cast<TKey*>(nextExpertHist())) ) {
+                TObject * expertOdata = expertDir->Get(expertHistKey->GetName()) ; 
+                if ( !expertOdata ) {
+                  AliError(Form("%s in %s/%s/Expert returns a NULL pointer !!", expertHistKey->GetName(), detDir->GetName(), taskDir->GetName())) ;
+                } else {
+                  AliInfo(Form("Adding %s", expertHistKey->GetName())) ;
+                  if ( expertOdata->IsA()->InheritsFrom("TH1") ) {
+                    AliInfo(Form("Adding %s", expertHistKey->GetName())) ;
+                    TH1 * hExpertdata = static_cast<TH1*>(expertOdata) ; 
+                    listTaskQAD->Add(hExpertdata) ; 
+                  }                  
+                }                
+              }
+            }
                                                AliInfo(Form("Adding %s", histKey->GetName())) ;
                                                if ( odata->IsA()->InheritsFrom("TH1") ) {
                                                        AliInfo(Form("Adding %s", histKey->GetName())) ;
@@ -981,17 +1085,19 @@ Bool_t AliQADataMakerSteer::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile
 }      
 
 //_____________________________________________________________________________
-void AliQADataMakerSteer::SetRecoParam(const char* detector, AliDetectorRecoParam *par)
+void AliQADataMakerSteer::SetEventSpecie(AliRecoParam::EventSpecie_t es) 
+{
+  // set the current event specie and inform AliQA that this event specie has been encountered
+  fEventSpecie = es ;
+  AliQA::Instance()->SetEventSpecie(es) ; 
+}
+
+//_____________________________________________________________________________
+void AliQADataMakerSteer::SetRecoParam(const Int_t det, const AliDetectorRecoParam *par) 
 {
   // Set custom reconstruction parameters for a given detector
   // Single set of parameters for all the events
-  for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
-    if(!strcmp(detector, AliQA::GetDetName(iDet))) {
-      par->SetAsDefault();
-      fRecoParam.AddDetRecoParam(iDet,par);
-      break;
-    }
-  }
+  GetQADataMaker(det)->SetRecoParam(par) ; 
 }