Merged with changes from Panos

[u/mrichter/AliRoot.git] / MONITOR / AliMonitorTPC.h

diff --git a/MONITOR/AliMonitorTPC.h b/MONITOR/AliMonitorTPC.h
index 88a0e5ea18983e3a25d2e1d50c48ae7fc4988924..8a2072772de17f86ae62759781d05273090dd07c 100644 (file)
--- a/MONITOR/AliMonitorTPC.h
+++ b/MONITOR/AliMonitorTPC.h
@@ -6,28 +6,9 @@
 /* $Id$ */
 
 #include "AliMonitor.h"
-#include "AliMonitorHisto.h"
-#include "AliMonitorTrend.h"
-#include "AliTPCParam.h"
 
-
-class AliMonitorDataTPC : public TObject {
-public:
-  AliMonitorDataTPC();
-  AliMonitorDataTPC(Int_t size);
-  virtual ~AliMonitorDataTPC();
-  void     SetSize(Int_t size);
-
-  Int_t    fNTracks;   // number of TPC tracks
-  Float_t* fPt;        //[fNTracks]
-  Float_t* fEta;       //[fNTracks]
-  Float_t* fPhi;       //[fNTracks]
-
-private:
-  Int_t    fSize;      //! size of the arrays
-
-  ClassDef(AliMonitorDataTPC, 1)   // data structure for the TPC monitor tree branch
-};
+class AliTPCParam;
+class AliMonitorDataTPC;
 
 
 class AliMonitorTPC : public AliMonitor {
@@ -38,9 +19,12 @@ public:
   virtual void     CreateHistos(TFolder* folder);
   virtual void     CreateBranches(TTree* tree);
   virtual void     FillHistos(AliRunLoader* runLoader, 
-                             AliRawReader* rawReader);
+                             AliRawReader* rawReader, AliESD* esd);
 
 private:
+  AliMonitorTPC(const AliMonitorTPC& monitor);
+  AliMonitorTPC& operator = (const AliMonitorTPC& monitor);
+
   AliTPCParam*     fParam;              // TPC parameters
 
   AliMonitorHisto* fPadsCharge;         // charge distribution of TPC pads
@@ -53,6 +37,9 @@ private:
   AliMonitorHisto* fTrackPhi;           // phi distribution of TPC tracks
   AliMonitorHisto* fTrackNCl;           // number of clusters per track
   AliMonitorHisto* fTrackDEdxVsP;       // dE/dx vs momentum distribution of TPC tracks
+  AliMonitorHisto* fTrackDEdx;          // dE/dx distribution of TPC tracks for a given momentum region
+  AliMonitorHisto* fTrackEtaVsPhi;      // phi vs eta for TPC tracks
+  AliMonitorHisto* fPtEtaVsPhi;      // phi vs eta for TPC tracks
 
   AliMonitorDataTPC* fData;             // data for the monitor tree