removed warning

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

diff --git a/CORRFW/AliCFContainer.cxx b/CORRFW/AliCFContainer.cxx
index c2da9e47cc71d642f75b905bc9039dc05f71a957..06cfeedc1edc46d3e935c8c49d67fa77fbbfb287 100644 (file)
--- a/CORRFW/AliCFContainer.cxx
+++ b/CORRFW/AliCFContainer.cxx
@@ -78,7 +78,11 @@ AliCFContainer::~AliCFContainer()
   //
   // destructor
   //
-  if (fGrid) delete [] fGrid;
+  if (fGrid) {
+    for ( Int_t istep=0; istep<fNStep; istep++ ) 
+      delete fGrid[istep];
+  }
+  delete [] fGrid;
 }
 //____________________________________________________________________
 AliCFContainer &AliCFContainer::operator=(const AliCFContainer &c)
@@ -183,10 +187,9 @@ AliCFContainer* AliCFContainer::MakeSlice(Int_t nSteps, const Int_t* steps,
   for (Int_t iVar=0; iVar<nVars; iVar++) {
     Int_t nBins = bins[iVar];
     Double_t *array = new Double_t[nBins+1];
-    for (Int_t iBin=1; iBin<=nBins; iBin++) {
+    for (Int_t iBin=1; iBin<=nBins+1; iBin++) {
       array[iBin-1] = axis[iVar]->GetBinLowEdge(iBin);
     }
-    array[nBins] = axis[iVar]->GetBinUpEdge(nBins);
     out->SetBinLimits(iVar,array);
     delete [] array;
   }
@@ -196,6 +199,7 @@ AliCFContainer* AliCFContainer::MakeSlice(Int_t nSteps, const Int_t* steps,
 
   delete [] bins;
   delete [] axis ;
+  delete [] grids;
   return out;
 }
 
@@ -212,11 +216,11 @@ Long64_t AliCFContainer::Merge(TCollection* list)
   if (list->IsEmpty())
     return 1;
 
-  TIterator* iter = list->MakeIterator();
+  TIter iter(list);
   TObject* obj;
   
   Int_t count = 0;
-  while ((obj = iter->Next())) {
+  while ((obj = iter())) {
     AliCFContainer* entry = dynamic_cast<AliCFContainer*> (obj);
     if (entry == 0) 
       continue;