Some cleaning and simplification in container-related classes and

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

diff --git a/CORRFW/AliCFFrame.h b/CORRFW/AliCFFrame.h
index 615e0b5284ce39268718c60059558d0cf79e8d38..597e153d400d33e8e51ad27bbe67e0bba314a5c7 100644 (file)
--- a/CORRFW/AliCFFrame.h
+++ b/CORRFW/AliCFFrame.h
@@ -10,22 +10,22 @@
 //                                                                    //
 //--------------------------------------------------------------------//
 
-#include <TNamed.h>
-class TCollection;
+#include "TNamed.h"
+
 class AliCFFrame : public TNamed
 {
  public:
   AliCFFrame();
   AliCFFrame(const Char_t* name,const Char_t* title);
-  AliCFFrame(const Char_t* name, const Char_t* title, const Int_t nVarIn, const Int_t* nBinIn, const Float_t  *binLimitsIn=0);
+  AliCFFrame(const Char_t* name, const Char_t* title, const Int_t nVarIn, const Int_t* nBinIn, const Double_t  *binLimitsIn=0);
   AliCFFrame(const AliCFFrame & c);
   
   virtual ~AliCFFrame();
   AliCFFrame& operator=(const AliCFFrame& corr);
   virtual void  PrintBinLimits();
   virtual void  PrintNBins();
-  virtual void  SetBinLimits(Int_t ivar, Float_t * array);
-  virtual void  GetBinLimits(Int_t ivar, Float_t * array) const;
+  virtual void  SetBinLimits(Int_t ivar, Double_t * array);
+  virtual void  GetBinLimits(Int_t ivar, Double_t * array) const;
   virtual Int_t GetBinIndex(Int_t *ibin) const;
   virtual void  GetBinIndex(Int_t iel, Int_t *ibin) const;
   virtual Int_t GetBinIndex(Int_t ivar, Int_t ind) const;
@@ -34,9 +34,11 @@ class AliCFFrame : public TNamed
   virtual Int_t GetNBins(Int_t ivar) const {return fNVarBins[ivar];};
   virtual Int_t GetNBinLimits() const {return fNVarBinLimits;};
   virtual Int_t   *GetNBins() const {return fNVarBins;};
-  virtual void    GetBinCenter(Int_t *ibin, Float_t *binCenter) const;
-  virtual Float_t *GetBinLimits() const {return fVarBinLimits;};
-  virtual Float_t GetBinCenter(Int_t ivar,Int_t ibin) const;
+  virtual Double_t *GetBinLimits() const {return fVarBinLimits;};
+  virtual Double_t GetBinCenter(Int_t ivar,Int_t ibin) const;
+  virtual Double_t GetBinSize(Int_t ivar,Int_t ibin) const;
+  virtual void    GetBinCenters(Int_t *ibin, Double_t *binCenter) const;
+  virtual void    GetBinSizes(Int_t *ibin, Double_t *binSizes) const;
 
   //basic operations
 
@@ -51,10 +53,10 @@ class AliCFFrame : public TNamed
   Int_t    *fIndex;//[fNVar] current N-dim index on the grid
   Int_t    *fProduct;//[fNVar] current N-dim index on the grid
   Int_t    *fOffset;//[fNVar] current N-dim index on the grid
-  Float_t  *fVarBinLimits;//[fNVarBinLimits] array defining the binLimits
+  Double_t  *fVarBinLimits;//[fNVarBinLimits] array defining the binLimits
 
   
-  ClassDef(AliCFFrame,1);
+  ClassDef(AliCFFrame,2);
 };
     
 #endif