QADataMaker gets the event specie fro AliDetectorRecoParam

diff --git a/STEER/AliQADataMaker.h b/STEER/AliQADataMaker.h
index c708eeec1abb21a21edcbb23d9580eee2183f605..38c5517b3f33ff2f0c1b31cd250932aea65fe76d 100644 (file)
--- a/STEER/AliQADataMaker.h
+++ b/STEER/AliQADataMaker.h
@@ -47,9 +47,9 @@ public:
        virtual Int_t Add2RecPointsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE)       = 0 ; 
        virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE, const Bool_t saveForCorr = kFALSE)            = 0 ; 
        virtual Int_t Add2SDigitsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE)         = 0 ; 
-       virtual void        Exec(AliQAv1::TASKINDEX_t, TObject * data)                                       = 0 ;
+       virtual void        Exec(AliQAv1::TASKINDEX_t, TObject * data)             = 0 ;
        virtual void        EndOfCycle()                                           = 0 ;
-       virtual void        EndOfCycle(AliQAv1::TASKINDEX_t        )                 = 0 ;
+       virtual void        EndOfCycle(AliQAv1::TASKINDEX_t )                      = 0 ;
        void                Finish() const ; 
        virtual TH1 *       GetDigitsData(const Int_t index)                       = 0 ; 
        virtual TH1 *       GetESDsData(const Int_t index)                         = 0 ; 
@@ -59,6 +59,7 @@ public:
        virtual TH1 *       GetSDigitsData(const Int_t index)                      = 0 ; 
        const char *        GetDetectorDirName() const { return fDetectorDirName.Data() ; }
   TList *             GetParameterList() const { return fParameterList[AliRecoParam::AConvert(fEventSpecie)] ; }
+  virtual const AliDetectorRecoParam * GetRecoParam() { return NULL ; }
        Int_t               Increment() { return ++fCycleCounter ; } 
        virtual TObjArray** Init(AliQAv1::TASKINDEX_t, Int_t cycles = -1)                               = 0 ;
        virtual void        Init(AliQAv1::TASKINDEX_t, TObjArray ** list, Int_t run, Int_t cycles = -1) = 0 ;
@@ -73,7 +74,8 @@ public:
   Bool_t              WriteExpert() { return fWriteExpert ; }
   void                SetEventSpecie(AliRecoParam::EventSpecie_t es) { fEventSpecie = es ; }
   void                SetEventSpecie(Int_t es) { fEventSpecie = AliRecoParam::Convert(es) ; }
-       virtual void        SetRecoParam(const AliDetectorRecoParam */*param*/) {AliInfo("To be implemented by AliQADataMakerRec, not needed yet in Sim") ; } 
+  virtual void        SetRecoParam(const AliDetectorRecoParam *) {;}
+
          
 protected: 
 

diff --git a/STEER/AliQADataMakerRec.h b/STEER/AliQADataMakerRec.h
index caf1c8504b53b60ce908b2c5a25803928d0d02a8..e6b1e0b60e0d0ccbda9305569bc8a1c67d23f5ca 100644 (file)
--- a/STEER/AliQADataMakerRec.h
+++ b/STEER/AliQADataMakerRec.h
@@ -45,6 +45,8 @@ public:
        virtual TH1 *       GetDigitsData(const Int_t /*index*/) { return NULL ; } 
        virtual TH1 *       GetESDsData(const Int_t index)       { return dynamic_cast<TH1 *>(GetData(fESDsQAList, index)) ; }
        virtual TH1 *       GetHitsData(const Int_t /*index*/)   { return NULL ; }
+  virtual const AliDetectorRecoParam * GetRecoParam() { return fRecoParam ; }
+
        virtual TH1 *       GetRecPointsData(const Int_t index)  { return dynamic_cast<TH1 *>(GetData(fRecPointsQAList, index)) ; }
        virtual TH1 *       GetRawsData(const Int_t index)       { return dynamic_cast<TH1 *>(GetData(fRawsQAList, index))  ; }
        virtual TH1 *       GetSDigitsData(const Int_t /*index*/)   { return NULL ; }  

diff --git a/STEER/AliQAManager.cxx b/STEER/AliQAManager.cxx
index cb0e9e7c7c51a4ce3c88734d01f5d77a9936b733..d813b525ba9a70e92b083eecdb402f39a07f2699 100644 (file)
--- a/STEER/AliQAManager.cxx
+++ b/STEER/AliQAManager.cxx
@@ -85,8 +85,7 @@ AliQAManager::AliQAManager() :
   fRawReader(NULL), 
   fRawReaderDelete(kTRUE), 
   fRunLoader(NULL), 
-  fTasks(""), 
-  fEventSpecie(AliRecoParam::kDefault)
+  fTasks("") 
 {
        // default ctor
        fMaxEvents = fNumberOfEvents ; 
@@ -119,8 +118,7 @@ AliQAManager::AliQAManager(const Char_t * mode, const Char_t* gAliceFilename) :
        fRawReader(NULL), 
        fRawReaderDelete(kTRUE), 
        fRunLoader(NULL), 
-  fTasks(""), 
-  fEventSpecie(AliRecoParam::kDefault)
+  fTasks("") 
 {
        // default ctor
        fMaxEvents = fNumberOfEvents ; 
@@ -153,8 +151,7 @@ AliQAManager::AliQAManager(const AliQAManager & qas) :
        fRawReader(NULL), 
        fRawReaderDelete(kTRUE), 
        fRunLoader(NULL), 
-  fTasks(qas.fTasks),
-  fEventSpecie(qas.fEventSpecie)
+  fTasks(qas.fTasks)
 {
        // cpy ctor
        for (UInt_t iDet = 0; iDet < fgkNDetectors; iDet++) {
@@ -407,7 +404,7 @@ AliQADataMaker * AliQAManager::GetQADataMaker(const Int_t iDet)
        // get the quality assurance data maker for a detector
        
        if (fQADataMaker[iDet]) {
-    fQADataMaker[iDet]->SetEventSpecie(fEventSpecie) ; 
+    fQADataMaker[iDet]->SetEventSpecie(fQADataMaker[iDet]->GetRecoParam()->GetEventSpecie()) ; 
                return fQADataMaker[iDet] ;
   }
        
@@ -418,7 +415,7 @@ AliQADataMaker * AliQAManager::GetQADataMaker(const Int_t iDet)
                qadm->SetName(AliQAv1::GetDetName(iDet));
                qadm->SetUniqueID(iDet);
                fQADataMaker[iDet] = qadm;
-    qadm->SetEventSpecie(fEventSpecie) ; 
+    qadm->SetEventSpecie(qadm->GetRecoParam()->GetEventSpecie()) ; 
                return qadm;
        }
 
@@ -427,7 +424,7 @@ AliQADataMaker * AliQAManager::GetQADataMaker(const Int_t iDet)
                qadm->SetName(AliQAv1::GetDetName(iDet));
                qadm->SetUniqueID(iDet);
                fQADataMaker[iDet] = qadm;
-    qadm->SetEventSpecie(fEventSpecie) ; 
+    qadm->SetEventSpecie(qadm->GetRecoParam()->GetEventSpecie()) ; 
                return qadm;
   }
 
@@ -462,7 +459,7 @@ AliQADataMaker * AliQAManager::GetQADataMaker(const Int_t iDet)
                qadm->SetName(AliQAv1::GetDetName(iDet));
                qadm->SetUniqueID(iDet);
                fQADataMaker[iDet] = qadm ;
-    qadm->SetEventSpecie(fEventSpecie) ; 
+    qadm->SetEventSpecie(qadm->GetRecoParam()->GetEventSpecie()) ; 
        }
 
   return qadm ;
@@ -1161,7 +1158,7 @@ void AliQAManager::RunOneEvent(AliRawReader * rawReader)
         qadm->EndOfCycle() ;
       }
       AliCodeTimerStart(Form("running RAW quality assurance data maker for %s", AliQAv1::GetDetName(iDet))); 
-      qadm->SetEventSpecie(fEventSpecie) ; 
+      qadm->SetEventSpecie(qadm->GetRecoParam()->GetEventSpecie()) ; 
                        qadm->Exec(AliQAv1::kRAWS, rawReader) ;
       AliCodeTimerStop(Form("running RAW quality assurance data maker for %s", AliQAv1::GetDetName(iDet)));
                }
@@ -1338,7 +1335,6 @@ Bool_t AliQAManager::SaveIt2OCDB(const Int_t runNumber, TFile * inputFile, const
 void AliQAManager::SetEventSpecie(AliRecoParam::EventSpecie_t es) 
 {
   // set the current event specie and inform AliQAv1 that this event specie has been encountered
-  fEventSpecie = es ;
   AliQAv1::Instance()->SetEventSpecie(es) ; 
 }
 

diff --git a/STEER/AliQAManager.h b/STEER/AliQAManager.h
index 911dbbc8f6d6224b712b4e89b616bd902aed7d03..c42adfe4af9b52686e3a02f0bf838bb2ba657294 100644 (file)
--- a/STEER/AliQAManager.h
+++ b/STEER/AliQAManager.h
@@ -109,7 +109,6 @@ private:
        AliQADataMaker *        fQADataMaker[fgkNDetectors];    //! array of QA data maker objects
        Int_t                   fQACycles[fgkNDetectors];       //! array of QA cycle length
        Bool_t                  fQAWriteExpert[fgkNDetectors];  //! array of QA cycle length
-       AliRecoParam::EventSpecie_t fEventSpecie ;              //! event specie, see AliRecoParam::EventSpecie_t 
   ClassDef(AliQAManager, 0)      // class for running the QA makers
 };