corrected bad default constructor (A. Gheata)

[u/mrichter/AliRoot.git] / CORRFW / AliCFDataGrid.cxx

diff --git a/CORRFW/AliCFDataGrid.cxx b/CORRFW/AliCFDataGrid.cxx
index 95fd2d538b762142d3472b75bb0a5ec6a8ccd2ec..c24271455bb855c809524ddc89e527f8537cf749 100644 (file)
--- a/CORRFW/AliCFDataGrid.cxx
+++ b/CORRFW/AliCFDataGrid.cxx
@@ -25,10 +25,8 @@
 //--------------------------------------------------------------------//
 //
 //
-#include <TROOT.h>
-#include <TMath.h>
-#include <TFile.h>
-#include <AliLog.h>
+#include "TMath.h"
+#include "AliLog.h"
 #include "AliCFDataGrid.h"
 
 //____________________________________________________________________
@@ -36,31 +34,29 @@ ClassImp(AliCFDataGrid)
 
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid() : 
-  AliCFGrid(),
+  AliCFGridSparse(),
   fSelData(-1),
   fContainer(0x0)
 {
   //
   // default constructor
   //
-  SumW2(); //errors saved
 }
 
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name,const Char_t* title) : 
-  AliCFGrid(name,title),
+  AliCFGridSparse(name,title),
   fSelData(-1),
   fContainer(0x0)
 {
   //
   // default constructor
   //
-  SumW2(); //errors saved
 }
 
 //____________________________________________________________________
 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)
 {
@@ -71,7 +67,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)
 {
@@ -84,7 +80,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)
 {
@@ -128,7 +124,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));
 } 
 //____________________________________________________________________
@@ -157,6 +157,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;
@@ -205,7 +206,6 @@ void AliCFDataGrid::ApplyBGCorrection(const AliCFDataGrid &c)
       
   }
 }
-
 //____________________________________________________________________
 void AliCFDataGrid::Copy(TObject& eff) const
 {