cleanup and inherit from TOBject

diff --git a/PWG2/FLOW/AliFlowCommonHist.cxx b/PWG2/FLOW/AliFlowCommonHist.cxx
index 7ecf4a793d696fb4bcaa043ee8409e191942753c..5eb974f6346454d311cc580e1f2faf3462a9aced 100644 (file)
--- a/PWG2/FLOW/AliFlowCommonHist.cxx
+++ b/PWG2/FLOW/AliFlowCommonHist.cxx
@@ -38,20 +38,18 @@ ClassImp(AliFlowCommonHist)
 
 //-----------------------------------------------------------------------
 
-  AliFlowCommonHist::AliFlowCommonHist(TString input):
-//   fEvent(0),
-   fTrack(0), 
-   fHistMultOrig(0),
-   fHistMultInt(0),
-   fHistMultDiff(0),
-   fHistPtInt(0),
-   fHistPtDiff(0),
-   fHistPhiInt(0),
-   fHistPhiDiff(0),
-   fHistEtaInt(0),
-   fHistEtaDiff(0),
-   fHistProMeanPtperBin(0),
-   fHistQ(0)
+  AliFlowCommonHist::AliFlowCommonHist(TString input):TObject(),
+   fHistMultOrig(NULL),
+   fHistMultInt(NULL),
+   fHistMultDiff(NULL),
+   fHistPtInt(NULL),
+   fHistPtDiff(NULL),
+   fHistPhiInt(NULL),
+   fHistPhiDiff(NULL),
+   fHistEtaInt(NULL),
+   fHistEtaDiff(NULL),
+   fHistProMeanPtperBin(NULL),
+   fHistQ(NULL)
  {
   //constructor creating histograms 
   Int_t fNbinsMult = AliFlowCommonConstants::GetNbinsMult();
@@ -199,6 +197,9 @@ Bool_t AliFlowCommonHist::FillControlHistograms(AliFlowEventSimple* Event)
 
   Int_t fMultInt = 0;
   Int_t fMultDiff = 0;
+  
+  AliFlowTrackSimple* fTrack = NULL;     
+
   for (Int_t i=0;i<fNumberOfTracks;i++) {
     fTrack = Event->GetTrack(i);
     if (fTrack ) {

diff --git a/PWG2/FLOW/AliFlowCommonHist.h b/PWG2/FLOW/AliFlowCommonHist.h
index 17b5d3cafaa5e5953554fa405da2f660a777a3b7..f018335936d583d0b37da16784c3ae03e619910e 100644 (file)
--- a/PWG2/FLOW/AliFlowCommonHist.h
+++ b/PWG2/FLOW/AliFlowCommonHist.h
@@ -8,7 +8,7 @@
 
 // AliFlowCommonHist:
 // Description: Class to organise common histograms for Flow Analysis
-// authors: N. van der Kolk (kolk@nikhef.nl) and A. Bilandzic (anteb@nikhef.nl)
+// authors: N.K A.B R.S
 
              
 class AliFlowEventSimple;
@@ -17,7 +17,7 @@ class TH1F;
 class TH1D;
 class TProfile;
 
-class AliFlowCommonHist {
+class AliFlowCommonHist: public TObject {
 
  public:
 
@@ -49,21 +49,19 @@ class AliFlowCommonHist {
   AliFlowCommonHist(const AliFlowCommonHist& aSetOfHists);
   AliFlowCommonHist& operator=(const AliFlowCommonHist& aSetOfHists);
 
-  AliFlowTrackSimple* fTrack;     //!
-
   //define histograms here
   //control histograms
-  TH1F*     fHistMultOrig;        //!
-  TH1F*     fHistMultInt;         //!
-  TH1F*     fHistMultDiff;        //!
-  TH1F*     fHistPtInt;           //!
-  TH1F*     fHistPtDiff;          //!
-  TH1F*     fHistPhiInt;          //!
-  TH1F*     fHistPhiDiff;         //!
-  TH1F*     fHistEtaInt;          //!
-  TH1F*     fHistEtaDiff;         //!
-  TProfile* fHistProMeanPtperBin; //!
-  TH1F*     fHistQ;               //!
+  TH1F*     fHistMultOrig;        
+  TH1F*     fHistMultInt;        
+  TH1F*     fHistMultDiff;       
+  TH1F*     fHistPtInt;          
+  TH1F*     fHistPtDiff;         
+  TH1F*     fHistPhiInt;          
+  TH1F*     fHistPhiDiff;         
+  TH1F*     fHistEtaInt;          
+  TH1F*     fHistEtaDiff;         
+  TProfile* fHistProMeanPtperBin; 
+  TH1F*     fHistQ;               
   
   ClassDef(AliFlowCommonHist,0);                 // macro for rootcint
 };