Made these classes derive from AliCFGridSparse.

diff --git a/CORRFW/AliCFDataGrid.cxx b/CORRFW/AliCFDataGrid.cxx
index d307e173bfde612550112082078887b086c1023e..bac33c33090fa177d2f22b1f2a4cc2cc6b70ba6f 100644 (file)
--- a/CORRFW/AliCFDataGrid.cxx
+++ b/CORRFW/AliCFDataGrid.cxx
@@ -34,7 +34,7 @@ ClassImp(AliCFDataGrid)
 
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid() : 
-  AliCFGrid(),
+  AliCFGridSparse(),
   fSelData(-1),
   fContainer(0x0)
 {
@@ -46,7 +46,7 @@ AliCFDataGrid::AliCFDataGrid() :
 
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name,const Char_t* title) : 
-  AliCFGrid(name,title),
+  AliCFGridSparse(name,title),
   fSelData(-1),
   fContainer(0x0)
 {
@@ -58,7 +58,7 @@ AliCFDataGrid::AliCFDataGrid(const Char_t* name,const Char_t* title) :
 
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const Int_t nVarIn, const Int_t * nBinIn, const Double_t *binLimitsIn) :  
-  AliCFGrid(name,title,nVarIn,nBinIn,binLimitsIn),
+  AliCFGridSparse(name,title,nVarIn,nBinIn,binLimitsIn),
   fSelData(-1),
   fContainer(0x0)
 {
@@ -69,7 +69,7 @@ AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const Int_
 }
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const AliCFContainer &c) :  
-  AliCFGrid(name,title,c.GetNVar(),c.GetNBins(),c.GetBinLimits()),
+  AliCFGridSparse(name,title,c.GetNVar(),c.GetNBins(),c.GetBinLimits()),
   fSelData(-1),
   fContainer(0x0)
 {
@@ -82,7 +82,7 @@ AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const AliC
 
 }
 //____________________________________________________________________
-AliCFDataGrid::AliCFDataGrid(const AliCFDataGrid& data) :   AliCFGrid(),
+AliCFDataGrid::AliCFDataGrid(const AliCFDataGrid& data) :   AliCFGridSparse(),
   fSelData(-1),
   fContainer(0x0)
 {
@@ -126,7 +126,11 @@ void AliCFDataGrid::SetMeasured(Int_t istep)
     SetElementError(i,dmeas);
     if(meas <=0)nEmptyBins++;
   }
-  fNentriesTot=fNDim;
+
+  //fNentriesTot=fNDim;
+  GetGrid()->SetEntries(GetData()->GetEntries());
+  //
+
   AliInfo(Form("retrieving measured data from Container %s at selection step %i: %i empty bins were found.",fContainer->GetName(),fSelData,nEmptyBins));
 } 
 //____________________________________________________________________
@@ -155,6 +159,7 @@ void AliCFDataGrid::ApplyEffCorrection(const AliCFEffGrid &c)
     deff =c.GetElementError(i);    
     unc =GetElement(i);    
     dunc =GetElementError(i);    
+    
     if(eff>0 && unc>0){      
       ncorr++;
       corr=unc/eff;

diff --git a/CORRFW/AliCFDataGrid.h b/CORRFW/AliCFDataGrid.h
index 3bbcbba4fcc823aaad574cb6a317d606723ced5d..5fc272dd570339451ce71423ee717ca5d37c7b9a 100644 (file)
--- a/CORRFW/AliCFDataGrid.h
+++ b/CORRFW/AliCFDataGrid.h
@@ -10,11 +10,11 @@
 //                                                                    //
 //--------------------------------------------------------------------//
 
-#include "AliCFGrid.h"
+#include "AliCFGridSparse.h"
 #include "AliCFEffGrid.h"
 #include "AliCFContainer.h"
 
-class AliCFDataGrid : public AliCFGrid
+class AliCFDataGrid : public AliCFGridSparse
 {
  public:
   AliCFDataGrid();

diff --git a/CORRFW/AliCFEffGrid.cxx b/CORRFW/AliCFEffGrid.cxx
index bec4afbe2f525bd05d279b3ea522131d50f8fba2..e360155e71178396ded1a842d3f90557f9f76858 100644 (file)
--- a/CORRFW/AliCFEffGrid.cxx
+++ b/CORRFW/AliCFEffGrid.cxx
@@ -37,7 +37,7 @@ ClassImp(AliCFEffGrid)
 
 //____________________________________________________________________
 AliCFEffGrid::AliCFEffGrid() : 
-  AliCFGrid(),
+  AliCFGridSparse(),
   fContainer(0x0),
   fSelNum(-1),
   fSelDen(-1)
@@ -49,7 +49,7 @@ AliCFEffGrid::AliCFEffGrid() :
 
 //____________________________________________________________________
 AliCFEffGrid::AliCFEffGrid(const Char_t* name, const Char_t* title, const Int_t nVarIn, const Int_t * nBinIn, const Double_t *binLimitsIn) :  
-  AliCFGrid(name,title,nVarIn,nBinIn,binLimitsIn),
+  AliCFGridSparse(name,title,nVarIn,nBinIn,binLimitsIn),
   fContainer(0x0),
   fSelNum(-1),
   fSelDen(-1)
@@ -61,7 +61,7 @@ AliCFEffGrid::AliCFEffGrid(const Char_t* name, const Char_t* title, const Int_t
 }
 //____________________________________________________________________
 AliCFEffGrid::AliCFEffGrid(const Char_t* name, const Char_t* title, const AliCFContainer &c) :  
-  AliCFGrid(name,title,c.GetNVar(),c.GetNBins(),c.GetBinLimits()),
+  AliCFGridSparse(name,title,c.GetNVar(),c.GetNBins(),c.GetBinLimits()),
   fContainer(0x0),
   fSelNum(-1),
   fSelDen(-1)
@@ -74,7 +74,7 @@ AliCFEffGrid::AliCFEffGrid(const Char_t* name, const Char_t* title, const AliCFC
   fContainer=&c;
 }
 //____________________________________________________________________
-AliCFEffGrid::AliCFEffGrid(const AliCFEffGrid& eff) :   AliCFGrid(),
+AliCFEffGrid::AliCFEffGrid(const AliCFEffGrid& eff) : AliCFGridSparse(),
   fContainer(0x0),
   fSelNum(-1),
   fSelDen(-1)

diff --git a/CORRFW/AliCFEffGrid.h b/CORRFW/AliCFEffGrid.h
index 61e63bb9c1ea69e083348a298a7015ffcf046d31..0e3560d58bbdc5dac3bfced285b3b8ade036e953 100644 (file)
--- a/CORRFW/AliCFEffGrid.h
+++ b/CORRFW/AliCFEffGrid.h
@@ -10,13 +10,13 @@
 //                                                                    //
 //--------------------------------------------------------------------//
 
-#include "AliCFGrid.h"
+#include "AliCFGridSparse.h"
 #include "AliCFContainer.h"
 class TH1D;
 class TH2D;
 class TH3D;
 
-class AliCFEffGrid : public AliCFGrid
+class AliCFEffGrid : public AliCFGridSparse
 {
  public:
   AliCFEffGrid();