final updates and fixups in the container classes

[u/mrichter/AliRoot.git] / CORRFW / AliCFEffGrid.h

diff --git a/CORRFW/AliCFEffGrid.h b/CORRFW/AliCFEffGrid.h
index d1a67866503e83998b291606854eddc04dde1b8a..5394664c2654e37404a2ce6b3c9bc8bafd8f3a70 100644 (file)
--- a/CORRFW/AliCFEffGrid.h
+++ b/CORRFW/AliCFEffGrid.h
@@ -12,34 +12,33 @@
 
 #include "AliCFGrid.h"
 #include "AliCFContainer.h"
 
 #include "AliCFGrid.h"
 #include "AliCFContainer.h"

-#include <TNamed.h>

 #include <TTree.h>
 #include <TTree.h>

-#include <TH1F.h>
-#include <TH2F.h>
-#include <TH3F.h>
+class TH1D;
+class TH2D;
+class TH3D;

 
 class AliCFEffGrid : public AliCFGrid
 {
  public:
   AliCFEffGrid();
 
 class AliCFEffGrid : public AliCFGrid
 {
  public:
   AliCFEffGrid();

-  AliCFEffGrid(const Char_t* name,const Char_t* title, const Int_t nVarIn, const Int_t* nBinIn, const Float_t  *binLimitsIn=0);
+  AliCFEffGrid(const Char_t* name,const Char_t* title, const Int_t nVarIn, const Int_t* nBinIn, const Double_t  *binLimitsIn=0);

   AliCFEffGrid(const Char_t* name,const Char_t* title,const AliCFContainer &c);
   AliCFEffGrid(const AliCFEffGrid& eff);
   
   virtual ~AliCFEffGrid();
   AliCFEffGrid& operator=(const AliCFEffGrid& eff);
   AliCFEffGrid(const Char_t* name,const Char_t* title,const AliCFContainer &c);
   AliCFEffGrid(const AliCFEffGrid& eff);
   
   virtual ~AliCFEffGrid();
   AliCFEffGrid& operator=(const AliCFEffGrid& eff);

-  virtual Float_t GetAverage() const ;
-  virtual Float_t GetAverage(Float_t *varMin,Float_t *varMax) const ;
+  virtual Double_t GetAverage() const ;
+  virtual Double_t GetAverage(Double_t *varMin,Double_t *varMax) const ;

   virtual Int_t GetSelNumStep() const {return fSelNum;};
   virtual Int_t GetSelDenStep() const {return fSelDen;};
   virtual Int_t GetSelNumStep() const {return fSelNum;};
   virtual Int_t GetSelDenStep() const {return fSelDen;};

-  virtual TH1F* Project( Int_t ivar) const;
-  virtual TH2F* Project( Int_t ivar1, Int_t ivar2) const;
-  virtual TH3F* Project( Int_t ivar1, Int_t ivar2,Int_t ivar3) const;
+  virtual TH1D* Project( Int_t ivar) const;
+  virtual TH2D* Project( Int_t ivar1, Int_t ivar2) const;
+  virtual TH3D* Project( Int_t ivar1, Int_t ivar2,Int_t ivar3) const;

 
   //Efficiency calculation
   virtual void  CalculateEfficiency(Int_t istep1, Int_t istep2);
 
   //Efficiency calculation
   virtual void  CalculateEfficiency(Int_t istep1, Int_t istep2);

-  virtual const AliCFGrid*  GetNum() {return fContainer->GetGrid(fSelNum);};
-  virtual const AliCFGrid*  GetDen() {return fContainer->GetGrid(fSelDen);};
+  virtual const AliCFVGrid*  GetNum() {return (AliCFVGrid*)fContainer->GetGrid(fSelNum);};
+  virtual const AliCFVGrid*  GetDen() {return (AliCFVGrid*)fContainer->GetGrid(fSelDen);};

   virtual void  SetContainer(const AliCFContainer &c) {fContainer=&c;};
 
   //basic operations
   virtual void  SetContainer(const AliCFContainer &c) {fContainer=&c;};
 
   //basic operations