Cluster histograms: fill with clusters with more than 1 cell, change return by contin...

[u/mrichter/AliRoot.git] / PWG4 / PartCorrBase / AliAnaPartCorrMaker.h

diff --git a/PWG4/PartCorrBase/AliAnaPartCorrMaker.h b/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
index 121e9fd9217730fa311ae18bc09230df555c311b..3f1fbdd5364bbb2999be73667752f720e184b1d0 100755 (executable)
--- a/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
+++ b/PWG4/PartCorrBase/AliAnaPartCorrMaker.h
@@ -17,28 +17,30 @@
 class TList; 
 class TClonesArray;
 #include<TObject.h>
-class TString;
+class TH1I;
 
 // --- Analysis system ---
-class AliCaloTrackReader ;
+#include "AliCaloTrackReader.h" 
+#include "AliCalorimeterUtils.h"
 
 class AliAnaPartCorrMaker : public TObject {
 
  public: 
-  
   AliAnaPartCorrMaker() ; // default ctor
-  AliAnaPartCorrMaker(const AliAnaPartCorrMaker & maker) ; // cpy ctor
   virtual ~AliAnaPartCorrMaker() ; //virtual dtor
+  AliAnaPartCorrMaker(const AliAnaPartCorrMaker & maker) ; // cpy ctor
 
  private:
-  AliAnaPartCorrMaker & operator = (const AliAnaPartCorrMaker & ) {;}//cpy assignment
+  AliAnaPartCorrMaker & operator = (const AliAnaPartCorrMaker & ) ;//cpy assignment
 
  public:
        
   //Setter and getters
-  TList * GetAODBranchList() ;
+  TList * GetListOfAnalysisCuts();
   TList * GetOutputContainer() ;
 
+  TList * FillAndGetAODBranchList();
+  
   Int_t GetAnaDebug() const  { return fAnaDebug ; }
   void SetAnaDebug(Int_t d)  { fAnaDebug = d ; }
        
@@ -49,7 +51,7 @@ class AliAnaPartCorrMaker : public TObject {
   Bool_t AreAODsMade() const { return fMakeAOD ; }
   void SwitchOnAODsMaker()   { fMakeAOD = kTRUE ; }
   void SwitchOffAODsMaker()  { fMakeAOD = kFALSE ; }
-  
+       
   void Terminate(TList * outputList);
 
   void AddAnalysis(TObject* ana, Int_t n) {
@@ -58,9 +60,12 @@ class AliAnaPartCorrMaker : public TObject {
       abort();}
   }
   
-  AliCaloTrackReader * GetReader() const {return fReader ; }
-  void SetReader(AliCaloTrackReader * const reader) { fReader = reader ; }
+  AliCaloTrackReader * GetReader() {if(!fReader) fReader = new AliCaloTrackReader ();return fReader ; }
+  void SetReader(AliCaloTrackReader * reader) { fReader = reader ; }
        
+  AliCalorimeterUtils * GetCaloUtils() {if(!fCaloUtils) fCaloUtils = new AliCalorimeterUtils(); return fCaloUtils ; }
+  void SetCaloUtils(AliCalorimeterUtils * caloutils) { fCaloUtils = caloutils ; }
+       
   //Others
   void Init();
   void InitParameters();
@@ -73,16 +78,21 @@ class AliAnaPartCorrMaker : public TObject {
   
   //General Data members
   
-  TList * fOutputContainer ; // output histograms container
+  TList * fOutputContainer ;   //! Output histograms container
   TList * fAnalysisContainer ; // List with analysis pointers
-  Bool_t  fMakeHisto ; // If true makes final analysis with histograms as output
-  Bool_t  fMakeAOD ; // If true makes analysis generating AODs
-  Int_t   fAnaDebug; // Debugging info.
- 
-  AliCaloTrackReader *  fReader ;   // Pointer to reader 
-  TList * fAODBranchList ;          //! List with AOD branches created and needed in analysis
+  Bool_t  fMakeHisto ;         // If true makes final analysis with histograms as output
+  Bool_t  fMakeAOD ;           // If true makes analysis generating AODs
+  Int_t   fAnaDebug;           // Debugging info.
+       
+  AliCaloTrackReader  *  fReader ;     //  Pointer to reader 
+  AliCalorimeterUtils *  fCaloUtils ;  //  Pointer to CalorimeterUtils
+
+  TList * fCuts ;                 //! List with analysis cuts
+
+  TH1I  * fhNEvents;         //! Number of events counter histogram
+  TH1I  * fhTrackMult;       //! Number of tracks per event histogram
 
-  ClassDef(AliAnaPartCorrMaker,2)
+  ClassDef(AliAnaPartCorrMaker,8)
 } ;