X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliQADataMakerRec.h;h=fd67aaa67b3f966a3942893200f0b604e4aa6a70;hb=c0893d2823f263710a2b90a3d1170b3654984ae2;hp=de2cffad211e3860dc23e86b39aec91f0e57c8c2;hpb=fb6e511e9418c799d0f0c75473103dae56f79ce5;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliQADataMakerRec.h b/STEER/AliQADataMakerRec.h
index de2cffad211..fd67aaa67b3 100644
--- a/STEER/AliQADataMakerRec.h
+++ b/STEER/AliQADataMakerRec.h
@@ -5,7 +5,6 @@
 
 
 /* $Id$ */
-
 //
 //  Base Class:
 //  Produces the data needed to calculate the quality assurance. 
@@ -20,7 +19,7 @@ class TNtupleD ;
 // --- AliRoot header files ---
 class AliDetectorRecoParam ;
 #include "AliQADataMaker.h"
-#include "AliQA.h"
+#include "AliQAv1.h"
 
 class AliQADataMakerRec: public AliQADataMaker {
   
@@ -31,32 +30,40 @@ public:
 	AliQADataMakerRec& operator = (const AliQADataMakerRec& qadm) ;
 	virtual ~AliQADataMakerRec() ; // dtor
   
- 	virtual Int_t Add2DigitsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t /*expert = kFALSE*/)    { return -1 ; } 
-	virtual Int_t Add2ESDsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE)  { return Add2List(hist, index, fESDsQAList, expert) ; }
-	virtual Int_t Add2HitsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t /*expert = kFALSE*/)       { return -1 ; }  
-	virtual Int_t Add2RecPointsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE)  { return Add2List(hist, index, fRecPointsQAList, expert) ; }
-	virtual Int_t Add2RawsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t saveForCorr = kFALSE)  { return Add2List(hist, index, fRawsQAList, expert, saveForCorr) ; }
-	virtual Int_t Add2SDigitsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t /*expert = kFALSE*/)   { return -1 ; } 
-	virtual void        Exec(AliQA::TASKINDEX_t task, TObject * data) ;
+ 	virtual Int_t Add2DigitsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE)    
+  { return Add2List(hist, index, fDigitsQAList, expert, image) ; }
+  virtual Int_t Add2ESDsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE)                      
+    { return Add2List(hist, index, fESDsQAList, expert, image) ; }
+  virtual Int_t Add2HitsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t /*expert = kFALSE*/, const Bool_t /*image = kFALSE*/)      
+    { return -1 ; }  
+  virtual Int_t Add2RecPointsList(TH1 * hist, const Int_t index, const Bool_t expert = kFALSE, const Bool_t image = kFALSE)                 
+    { return Add2List(hist, index, fRecPointsQAList, expert, image) ; }
+  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)  
+  { return Add2List(hist, index, fRawsQAList, expert, image, saveForCorr) ; }
+  virtual Int_t Add2SDigitsList(TH1 * /*hist*/, const Int_t /*index*/, const Bool_t /*expert = kFALSE*/, const Bool_t /*image = kFALSE*/)   { return -1 ; } 
+	
+  virtual void        Exec(AliQAv1::TASKINDEX_t task, TObject * data) ;
 	virtual void        EndOfCycle() ;
-	virtual void        EndOfCycle(AliQA::TASKINDEX_t task) ;
-	virtual void        EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray ** ) {AliInfo("To be implemented by detectors");} 
-	virtual TH1 *       GetDigitsData(const Int_t /*index*/) { return NULL ; } 
+	virtual void        EndOfCycle(AliQAv1::TASKINDEX_t task) ;
+	virtual void        EndOfDetectorCycle(AliQAv1::TASKINDEX_t, TObjArray ** ) {AliInfo("To be implemented by detectors");} 
+	virtual TH1 *       GetDigitsData(const Int_t index   )  { return dynamic_cast<TH1 *>(GetData(fDigitsQAList, index)) ; } 
 	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 ; }  
-	virtual TObjArray** Init(AliQA::TASKINDEX_t task, Int_t cycles = -1) ;
-	virtual void        Init(AliQA::TASKINDEX_t task, TObjArray ** list, Int_t run, Int_t cycles = -1) ;
+  virtual void        MakeImage(AliQAv1::TASKINDEX_t task) ; 
+	virtual TObjArray** Init(AliQAv1::TASKINDEX_t task, Int_t cycles = -1) ;
+	virtual void        Init(AliQAv1::TASKINDEX_t task, TObjArray ** list, Int_t run, Int_t cycles = -1) ;
 	virtual void        StartOfCycle(Int_t run = -1) ;
-	virtual void        StartOfCycle(AliQA::TASKINDEX_t task, Int_t run, const Bool_t sameCycle = kFALSE) ;
-
+	virtual void        StartOfCycle(AliQAv1::TASKINDEX_t task, Int_t run, const Bool_t sameCycle = kFALSE) ;
 	virtual void        SetRecoParam(const AliDetectorRecoParam *param) { fRecoParam = param; }
 
 protected: 
 
-	virtual void   InitDigits()                        {AliWarning("Call not valid") ; }
+	virtual void   InitDigits()                        {AliInfo("To be implemented by detectors");}
 	virtual void   InitESDs()                          {AliInfo("To be implemented by detectors");}
   virtual void   InitRecoParams() ; 
 	virtual void   InitHits()                          {AliWarning("Call not valid") ; }
@@ -68,8 +75,8 @@ protected:
 	virtual void   MakeESDs(AliESDEvent * )            {AliInfo("To be implemented by detectors");} 
 	virtual void   MakeHits(TClonesArray * )           {AliWarning("Call not valid") ; }
 	virtual void   MakeHits(TTree * )                  {AliWarning("Call not valid") ; }  
-	virtual void   MakeDigits(TClonesArray * )         {AliWarning("Call not valid") ; }    
-	virtual void   MakeDigits(TTree * )                {AliWarning("Call not valid") ; }   
+	virtual void   MakeDigits(TClonesArray * )         {AliInfo("To be implemented by detectors");}   
+	virtual void   MakeDigits(TTree * )                {AliInfo("To be implemented by detectors");}   
  	//virtual void   MakeRecParticles(TClonesArray * ) {AliInfo("To be implemented by detectors");} 
 	virtual void   MakeRaws(AliRawReader *)            {AliInfo("To be implemented by detectors");} 
 	virtual void   MakeRecPoints(TTree * )             {AliInfo("To be implemented by detectors");} 
@@ -77,13 +84,14 @@ protected:
 	virtual void   MakeSDigits(TTree * )               {AliWarning("Call not valid") ; }    
 	virtual void   StartOfDetectorCycle()              {AliInfo("To be implemented by detectors");} 
 
-	TObjArray * *               fESDsQAList ;      //! list of the ESDs QA data objects
-	TObjArray * *               fRawsQAList ;      //! list of the raws QA data objects
-	TObjArray * *               fRecPointsQAList ; //! list of the RecPoints QA data objects
-  TNtupleD  * *               fCorrNt ;          //! This is used by Corr only to hold its Ntuple. 
-  const AliDetectorRecoParam *fRecoParam;        //! const pointer to the reco parameters to be used in the reco QA
+	TObjArray * *               fDigitsQAList ;     //! list of the digits QA data objects
+	TObjArray * *               fESDsQAList ;       //! list of the ESDs QA data objects
+	TObjArray * *               fRawsQAList ;       //! list of the raws QA data objects
+	TObjArray * *               fRecPointsQAList ;  //! list of the RecPoints QA data objects
+  TNtupleD  **                 fCorrNt ;          //! This is used by Corr only to hold its Ntuple. 
+  const AliDetectorRecoParam *fRecoParam;         //! const pointer to the reco parameters to be used in the reco QA
   
- ClassDef(AliQADataMakerRec,2)  // description 
+ ClassDef(AliQADataMakerRec,4)  // description 
 
 };