Fixes for bug #49914: Compilation breaks in trunk, and bug #48629: Trunk cannot read...

[u/mrichter/AliRoot.git] / TPC / AliTPCQADataMakerRec.h

diff --git a/TPC/AliTPCQADataMakerRec.h b/TPC/AliTPCQADataMakerRec.h
index 4df8563ea7cc33ce29a86bf647abf61d5260baf1..5af6c62539044a848de9631d749f572f761f8548 100644 (file)
--- a/TPC/AliTPCQADataMakerRec.h
+++ b/TPC/AliTPCQADataMakerRec.h
@@ -22,20 +22,25 @@
 // --- AliRoot header files ---
 #include <AliQADataMakerRec.h>
 #include <AliRawReader.h>
+#include <AliTPCAltroMapping.h>
 
 #include <AliTPCdataQA.h>
 
 class AliTPCQADataMakerRec: public AliQADataMakerRec {
 
 public:
+  enum HRawsType_t         {kTPCdataQA=0, kOccupancy, kOccupancyVsSector, kNClustersPerEventVsSector, kQVsSector, kQmaxVsSector} ; 
+  enum HRECPOINTsType_t    {KClusters=0, kRatio, kPt} ; 
+  enum HESDsType_t         {kQmaxShort=0, kQmaxMedium, kQmaxLong, kQShort, kQMedium, kQLong, kRow} ; 
+
   AliTPCQADataMakerRec() ;          // ctor
   AliTPCQADataMakerRec(const AliTPCQADataMakerRec& qadm) ;   
   AliTPCQADataMakerRec& operator = (const AliTPCQADataMakerRec& qadm) ;
-  virtual ~AliTPCQADataMakerRec() { delete fTPCdataQA; } // dtor
+  virtual ~AliTPCQADataMakerRec(); 
   
 private:
   virtual void   StartOfDetectorCycle() {}; // empty 
-  virtual void   EndOfDetectorCycle(AliQA::TASKINDEX_t, TObjArray* list) ;
+  virtual void   EndOfDetectorCycle(AliQAv1::TASKINDEX_t, TObjArray** list) ;
 
   // ESD QA
   virtual void   InitESDs() ; 
@@ -49,21 +54,11 @@ private:
   virtual void   InitRecPoints();
   virtual void   MakeRecPoints(TTree *recTree);
 
-  AliTPCdataQA* fTPCdataQA;//! TPC calibration object for making raw data QA
+  virtual void LoadMaps();
 
-  TH1F* fHistESDclusters;  //! Clusters per ESD track
-  TH1F* fHistESDratio;     //! Ratio of clusters to findables
-  TH1F* fHistESDpt;        //! Pt spectrum
   
-  TH1F* fHistRawsOccupancy;//! Pad occupancy (1 entry per pad)
-
-  TH1F* fHistRecPointsQmaxShort; //! Qmax (short pads)
-  TH1F* fHistRecPointsQmaxMedium;//! Qmax (medium pads)
-  TH1F* fHistRecPointsQmaxLong;  //! Qmax (long pads)
-  TH1F* fHistRecPointsQShort;    //! Q (short pads)
-  TH1F* fHistRecPointsQMedium;   //! Q (medium pads)
-  TH1F* fHistRecPointsQLong;     //! Q (long pads)
-  TH1F* fHistRecPointsRow;       //! Row distribution
+  AliTPCAltroMapping *fMapping[6]; //! Pointers to ALTRO mapping
+  AliTPCdataQA** fTPCdataQA;//! TPC calibration object for making raw data QA
 
   ClassDef(AliTPCQADataMakerRec,1)  // TPC Rec Quality Assurance Data Maker 
 };