added functions to define uniform axis binning

cf savannah https://savannah.cern.ch/bugs/?58112

diff --git a/CORRFW/AliCFContainer.h b/CORRFW/AliCFContainer.h
index aa79143b3df833116c91fe15388db75780fb808a..f014f235693e84904c3f9db6600de167775ec04c 100644 (file)
--- a/CORRFW/AliCFContainer.h
+++ b/CORRFW/AliCFContainer.h
@@ -34,7 +34,8 @@ class AliCFContainer : public AliCFFrame
   virtual Int_t      GetNVar()                                       const {return fGrid[0]->GetNVar();}
   virtual void       PrintBinLimits()                                const {fGrid[0]->PrintBinLimits();}
   virtual void       PrintNBins()                                    const {fGrid[0]->PrintNBins();}
-  virtual void       SetBinLimits(Int_t ivar, const Double_t * array) ;
+  virtual void       SetBinLimits(Int_t ivar, Double_t min, Double_t max) ; // for uniform bin width only
+  virtual void       SetBinLimits(Int_t ivar, const Double_t * array) ;     // for variable or uniform bin width
   virtual void       GetBinLimits(Int_t ivar, Double_t * array)      const {return fGrid[0]->GetBinLimits(ivar,array);}
   virtual Double_t * GetBinLimits(Int_t ivar)                        const {return fGrid[0]->GetBinLimits(ivar);}
   virtual Long_t     GetNBinsTotal()                                 const {return fGrid[0]->GetNBinsTotal()*fNStep;}
@@ -107,6 +108,12 @@ inline void AliCFContainer::SetBinLimits(Int_t ivar, const Double_t* array) {
   }
 }
 
+inline void AliCFContainer::SetBinLimits(Int_t ivar, Double_t min, Double_t max) {
+  for (Int_t iStep=0; iStep<GetNStep(); iStep++) {
+    fGrid[iStep]->SetBinLimits(ivar,min,max);
+  }
+}
+
 inline void AliCFContainer::SetVarTitle(Int_t ivar, const Char_t* title) {
   for (Int_t iStep=0; iStep<fNStep; iStep++) {
     GetAxis(ivar,iStep)->SetTitle(title);

diff --git a/CORRFW/AliCFGridSparse.cxx b/CORRFW/AliCFGridSparse.cxx
index d2861491bf0d42b32112950e05a93599320ee814..00843be9db7a191fe128cb16488a397afebf773d 100755 (executable)
--- a/CORRFW/AliCFGridSparse.cxx
+++ b/CORRFW/AliCFGridSparse.cxx
@@ -97,6 +97,19 @@ AliCFGridSparse& AliCFGridSparse::operator=(const AliCFGridSparse &c)
   return *this;
 } 
 
+//____________________________________________________________________
+void AliCFGridSparse::SetBinLimits(Int_t ivar, Double_t min, Double_t max)
+{
+  //
+  // set a uniform binning for variable ivar
+  //
+  Int_t nBins = GetNBins(ivar);
+  Double_t * array = new Double_t[nBins+1];
+  for (Int_t iEdge=0; iEdge<=nBins; iEdge++) array[iEdge] = min + iEdge * (max-min)/nBins ;
+  fData->SetBinEdges(ivar, array);
+  delete [] array ;
+} 
+
 //____________________________________________________________________
 void AliCFGridSparse::SetBinLimits(Int_t ivar, const Double_t *array)
 {

diff --git a/CORRFW/AliCFGridSparse.h b/CORRFW/AliCFGridSparse.h
index 1ebd098ed5510e1ab08c324dd4989a7a24b10a00..93a09a5ef36fb32d6318013c4f49d2a15fc3341d 100755 (executable)
--- a/CORRFW/AliCFGridSparse.h
+++ b/CORRFW/AliCFGridSparse.h
@@ -32,7 +32,8 @@ class AliCFGridSparse : public AliCFFrame
   virtual Int_t      GetNVar() const {return fData->GetNdimensions();}
   virtual void       PrintBinLimits() const ;
   virtual void       PrintNBins() const ; 
-  virtual void       SetBinLimits(Int_t ivar, const Double_t * array);
+  virtual void       SetBinLimits(Int_t ivar, Double_t min, Double_t max); // for uniform bin width only
+  virtual void       SetBinLimits(Int_t ivar, const Double_t * array);     // for variable or uniform bin width
   virtual void       GetBinLimits(Int_t ivar, Double_t * array) const ;
   virtual Double_t * GetBinLimits(Int_t ivar) const ;
   virtual Long_t     GetNBinsTotal() const ;