From: rvernet <rvernet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 24 Sep 2010 14:45:23 +0000 (+0000)
Subject: cleanup of some ctors and fucntions
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=9dea3c79b0e7b719d5ab94453d10c130ac3f3d00;p=u%2Fmrichter%2FAliRoot.git

cleanup of some ctors and fucntions
---

diff --git a/CORRFW/AliCFDataGrid.cxx b/CORRFW/AliCFDataGrid.cxx
index ffbed353260..30a9f5122d1 100644
--- a/CORRFW/AliCFDataGrid.cxx
+++ b/CORRFW/AliCFDataGrid.cxx
@@ -43,18 +43,6 @@ AliCFDataGrid::AliCFDataGrid() :
   //
 }
 
-//____________________________________________________________________
-AliCFDataGrid::AliCFDataGrid(const Char_t* name,const Char_t* title) : 
-  AliCFGridSparse(name,title),
-  fSelData(-1),
-  fContainer(0x0)
-{
-  //
-  // named constructor
-  //
-  AliInfo("Deprecated, will be removed soon !!");
-}
-
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const Int_t nVarIn, const Int_t * nBinIn) :
   AliCFGridSparse(name,title,nVarIn,nBinIn),
@@ -67,18 +55,6 @@ AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const Int_
   SumW2();// errors saved
 }
 
-//____________________________________________________________________
-AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const AliCFContainer &c) :  
-  AliCFGridSparse(name,title),
-  fSelData(-1),
-  fContainer(&c)
-{
-  //
-  // main constructor
-  //
-  AliInfo("Deprecated, will be removed soon !!\nUse AliCFDataGrid(name,title,container,step) instead");
-}
-
 //____________________________________________________________________
 AliCFDataGrid::AliCFDataGrid(const Char_t* name, const Char_t* title, const AliCFContainer &c, Int_t step) :  
   AliCFGridSparse(name,title),
@@ -126,20 +102,6 @@ AliCFDataGrid &AliCFDataGrid::operator=(const AliCFDataGrid &c)
   return *this;
 } 
 
-//____________________________________________________________________
-void AliCFDataGrid::SetMeasured(Int_t istep)
-{
-  //
-  // Deposit observed data over the grid
-  //
-  AliInfo("Deprecated, will be removed soon !!\nPlease specify selection step in constructor.");
-  
-  fSelData = istep ;
-  //simply clones the container's data at specified step
-  fData = (THnSparse*) fContainer->GetGrid(istep)->GetGrid()->Clone();
-  SumW2();
-  AliInfo(Form("retrieving measured data from Container %s at selection step %i.",fContainer->GetName(),fSelData));
-} 
 //____________________________________________________________________
 void AliCFDataGrid::ApplyEffCorrection(const AliCFEffGrid &c)
 {
diff --git a/CORRFW/AliCFDataGrid.h b/CORRFW/AliCFDataGrid.h
index 331689652f0..9d318a3081b 100644
--- a/CORRFW/AliCFDataGrid.h
+++ b/CORRFW/AliCFDataGrid.h
@@ -18,8 +18,6 @@ class AliCFDataGrid : public AliCFGridSparse
 {
  public:
   AliCFDataGrid();
-  AliCFDataGrid(const Char_t* name,const Char_t* title);    // deprecated
-  AliCFDataGrid(const Char_t* name,const Char_t* title, const AliCFContainer &c);                  //deprecated !!!!
   AliCFDataGrid(const Char_t* name,const Char_t* title, const AliCFContainer &c, Int_t step);      //create data grid from container
   AliCFDataGrid(const Char_t* name,const Char_t* title, const Int_t nVarIn, const Int_t* nBinIn);  //create empty data grid to fill it yourself
   AliCFDataGrid(const AliCFDataGrid& c);
@@ -30,11 +28,9 @@ class AliCFDataGrid : public AliCFGridSparse
 
   // Methods for handling/correcting data 
 
-  virtual void  SetMeasured(Int_t istep); // deprecated
   virtual const AliCFGridSparse*  GetData() {return fContainer->GetGrid(fSelData);};
   virtual void  ApplyEffCorrection(const AliCFEffGrid &eff);
   virtual void  ApplyBGCorrection(const AliCFDataGrid &c);
-  /*   virtual void  SetContainer(const AliCFContainer &c) {fContainer=&c;}; */
   //basic operations
   virtual void   Copy(TObject& data) const;