Initialiye the runloader also when processing ESD

diff --git a/STEER/AliQADataMakerSteer.cxx b/STEER/AliQADataMakerSteer.cxx
index 0741398cc76dc8d3fcdb78abc83dd934e02deafe..70d46d847145b43e8cd8ec707c806e499d3b6fc3 100644 (file)
--- a/STEER/AliQADataMakerSteer.cxx
+++ b/STEER/AliQADataMakerSteer.cxx
@@ -190,20 +190,6 @@ Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX taskIndex, const  char *
                fRawReader->RewindEvents();
                fNumberOfEvents = 999999 ;
                
-       } else if (taskIndex == AliQA::kESDS) {
-               if (!gSystem->AccessPathName("AliESDs.root")) { // AliESDs.root exists
-                       TFile * esdFile = TFile::Open("AliESDs.root") ;
-                       fESDTree = dynamic_cast<TTree *> (esdFile->Get("esdTree")) ; 
-               fESD     = new AliESDEvent() ;
-            fESD->ReadFromTree(fESDTree) ;
-                       fESDTree->GetEntry(0) ; 
-                       fRunNumber = fESD->GetRunNumber() ; 
-                       fNumberOfEvents = fESDTree->GetEntries() ;
-               } else {
-                       AliError("AliESDs.root not found") ; 
-                       return kFALSE ; 
-               }
-               
        } else {
                if ( !InitRunLoader() ) {
                        AliError("Problems in getting the Run Loader") ; 
@@ -212,8 +198,21 @@ Bool_t AliQADataMakerSteer::Init(const AliQA::TASKINDEX taskIndex, const  char *
                        fRunNumber      = fRunLoader->GetAliRun()->GetRunNumber() ; 
                        fNumberOfEvents = fRunLoader->GetNumberOfEvents() ;
                }
-       }
-               
+               if (taskIndex == AliQA::kESDS) {
+                       if (!gSystem->AccessPathName("AliESDs.root")) { // AliESDs.root exists
+                               TFile * esdFile = TFile::Open("AliESDs.root") ;
+                               fESDTree = dynamic_cast<TTree *> (esdFile->Get("esdTree")) ; 
+                               fESD     = new AliESDEvent() ;
+                               fESD->ReadFromTree(fESDTree) ;
+                               fESDTree->GetEntry(0) ; 
+                               fRunNumber = fESD->GetRunNumber() ; 
+                               fNumberOfEvents = fESDTree->GetEntries() ;
+                       } else {
+                               AliError("AliESDs.root not found") ; 
+                               return kFALSE ; 
+                       }
+               }
+       }       
        // Initialize all QA data makers for all detectors
        for (UInt_t iDet = 0; iDet < fgkNDetectors ; iDet++) {
                AliQADataMaker * qadm = GetQADataMaker(iDet) ;
@@ -284,6 +283,13 @@ Bool_t AliQADataMakerSteer::Finish(const AliQA::TASKINDEX taskIndex)
        return kTRUE ; 
 }
 
+//_____________________________________________________________________________
+Bool_t AliQADataMakerSteer::Merge() 
+{
+       // Merge 
+
+}
+
 //_____________________________________________________________________________
 void AliQADataMakerSteer::Reset()
 {

diff --git a/STEER/AliQADataMakerSteer.h b/STEER/AliQADataMakerSteer.h
index 225f5d4452c0147108ef90778869f217e8ad3e1c..7436f6679fb84dc4d793500e56ece647524ca378 100644 (file)
--- a/STEER/AliQADataMakerSteer.h
+++ b/STEER/AliQADataMakerSteer.h
@@ -36,6 +36,7 @@ public:
        AliQADataMakerSteer(const AliQADataMakerSteer & qas) ; 
        AliQADataMakerSteer & operator = (const AliQADataMakerSteer & qas) ; 
        virtual ~AliQADataMakerSteer() ; 
+       Bool_t Merge() ;  
     void   Reset() ;  
        Bool_t Run(const AliQA::TASKINDEX taskIndex, const char * fileName = NULL) ; 
        void   SetCycleLength(const AliQA::DETECTORINDEX det, const Int_t cycle) { fQACycles[det] = cycle ; }