ATO-17 - reset cach matrix and current matrix after dumping to the tree (not before)

[u/mrichter/AliRoot.git] / TPC / AliH2F.cxx

diff --git a/TPC/AliH2F.cxx b/TPC/AliH2F.cxx
index 76e1c02140b124f00bcb10ead1c1adefc7d0d796..ec6143ce97f8a31dca7aaf9c405147b47dd54388 100644 (file)
--- a/TPC/AliH2F.cxx
+++ b/TPC/AliH2F.cxx
@@ -13,23 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.2.4.2  2000/06/26 07:39:42  kowal2
-Changes to obey the coding rules
-
-Revision 1.2.4.1  2000/06/25 08:38:41  kowal2
-Splitted from AliTPCtracking
-
-Revision 1.2  2000/04/17 09:37:33  kowal2
-removed obsolete AliTPCDigitsDisplay.C
-
-Revision 1.1.4.2  2000/04/10 11:32:37  kowal2
-
-"ROOT"-based class with some extra functionality
-
-*/
-//
+/* $Id$ */
 
 //----------------------------------------------------------------------------
 //  Author:   Marian Ivanov
@@ -38,15 +22,11 @@ Revision 1.1.4.2  2000/04/10 11:32:37  kowal2
 //
 //-----------------------------------------------------------------------------
 
-#include "AliH2F.h"
-#include "TClonesArray.h"
-#include "AliTPC.h"
-#include "TRandom.h"
-#include "AliCluster.h"
-#include "AliTPCClusterFinder.h"
-//*KEEP,TMath.
+#include <TClonesArray.h>
+#include <TMath.h>
+#include <TRandom.h>
 
-// other include files follow here
+#include "AliH2F.h"
 
 
 ClassImp(AliH2F)
@@ -74,18 +54,20 @@ AliH2F::~AliH2F()
   //
 }
 
-AliH2F::AliH2F(const AliH2F &his) 
+AliH2F::AliH2F(const AliH2F &his) :
+  TH2F(his)
 {
   //
   
 }
 
-AliH2F & AliH2F::operator = (const AliH2F & his) 
+AliH2F & AliH2F::operator = (const AliH2F & /*his*/) 
 {
   //
   return *this;
 }
 
+/*
 TClonesArray * AliH2F::FindPeaks(Float_t threshold, Float_t noise)
 {
   //find peaks and write it in form of AliTPCcluster to array
@@ -98,6 +80,7 @@ TClonesArray * AliH2F::FindPeaks(Float_t threshold, Float_t noise)
   cfinder.GetHisto(this);
   return cfinder.FindPeaks3();
 }
+*/
 
 void AliH2F::ClearSpectrum()
 {
@@ -107,8 +90,8 @@ void AliH2F::ClearSpectrum()
   for (Int_t i = 0 ;i<dimx;i++)
     for (Int_t j = 0 ;j<dimy;j++) 
       {
-       SetCellContent(i,j,0);
-       SetCellError(i,j,0);
+       SetBinContent(GetBin(i,j),0);
+       SetBinError(GetBin(i,j),0);
       }
 }
 
@@ -122,12 +105,12 @@ void AliH2F::AddNoise(Float_t sn)
     for (Int_t j = 0 ;j<dimy;j++) 
       {
         Float_t noise = gRandom->Gaus(0,sn);
-       Float_t oldv  =GetCellContent(i,j);
-       Float_t olds  =GetCellError(i,j);
+       Float_t oldv  =GetBinContent(GetBin(i,j));
+       Float_t olds  =GetBinError(GetBin(i,j));
        if (noise >0)
          {
-           SetCellContent(i,j,noise+oldv);
-           SetCellError(i,j,TMath::Sqrt((noise*noise+olds*olds)));
+           SetBinContent(GetBin(i,j),noise+oldv);
+           SetBinError(GetBin(i,j),TMath::Sqrt((noise*noise+olds*olds)));
          }
       }
 }
@@ -153,8 +136,8 @@ void AliH2F::AddGauss(Float_t x, Float_t y,
        Float_t dx2 = (x2-x)*(x2-x);
         Float_t dy2 = (y2-y)*(y2-y);
         Float_t amp =max*exp(-(dx2/(2*sx*sx)+dy2/(2*sy*sy)));
-       //Float_t oldv  =GetCellContent(i+1,j+1);
-       //      SetCellContent(i+1,j+1,amp+oldv);
+       //Float_t oldv  =GetBinContent(GetBin(i+1,j+1));
+       //      SetBinContent(GetBin(i+1,j+1),amp+oldv);
        Fill(x2,y2,amp);
       }
 }
@@ -167,9 +150,9 @@ void AliH2F::ClearUnderTh(Int_t threshold)
   for (Int_t i = 0 ;i<=dimx;i++)
     for (Int_t j = 0 ;j<=dimy;j++) 
       {        
-       Float_t oldv  =GetCellContent(i,j);
+       Float_t oldv  =GetBinContent(GetBin(i,j));
         if (oldv <threshold)
-         SetCellContent(i,j,0);
+         SetBinContent(GetBin(i,j),0);
       }
 }
 
@@ -181,9 +164,9 @@ void AliH2F::Round()
   for (Int_t i = 0 ;i<=dimx;i++)
     for (Int_t j = 0 ;j<=dimy;j++) 
       {        
-       Float_t oldv  =GetCellContent(i,j);
+       Float_t oldv  =GetBinContent(GetBin(i,j));
         oldv=(Int_t)oldv;
-       SetCellContent(i,j,oldv);
+       SetBinContent(GetBin(i,j),oldv);
       }
 }
 
@@ -232,7 +215,7 @@ AliH2F *AliH2F::GetSubrange2d(Float_t xmin, Float_t xmax,
        //        sub->SetBinContent(index2,val);
        //        Float_t err = GetBinError(index1);
         //sub->SetBinError(index2,GetBinError(index1));
-        sub->SetCellContent(i,j,val);
+        sub->SetBinContent(GetBin(i,j),val);
       }  
    return sub;
 }