Record changes.

[u/mrichter/AliRoot.git] / HBTAN / AliHBTMonitorFunction.cxx

diff --git a/HBTAN/AliHBTMonitorFunction.cxx b/HBTAN/AliHBTMonitorFunction.cxx
index fd92c8930861b6d66e6661a3d09a1a018c98e897..7454ce13509e2864932020ebef304b68b5a43435 100644 (file)
--- a/HBTAN/AliHBTMonitorFunction.cxx
+++ b/HBTAN/AliHBTMonitorFunction.cxx
@@ -1,4 +1,23 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/* $Id$ */
+
+#include "AliLog.h"
 #include "AliHBTMonitorFunction.h"
+
 //__________________________________________________________________
 ////////////////////////////////////////////////////////////////////
 //
@@ -44,21 +63,21 @@ Zbigniew.Chajecki@cern.ch
 ClassImp( AliHBTMonitorFunction )
 
 AliHBTMonitorFunction::AliHBTMonitorFunction():
- fParticleCut(new AliHBTEmptyParticleCut())
+ fParticleCut(new AliAODParticleEmptyCut())
 {
   //ctor
 }
 /******************************************************************/
 AliHBTMonitorFunction::AliHBTMonitorFunction(const char* name,const char* title):
  TNamed(name,title),
- fParticleCut(new AliHBTEmptyParticleCut())
+ fParticleCut(new AliAODParticleEmptyCut())
 {
   //ctor
 }
 /******************************************************************/
 AliHBTMonitorFunction::AliHBTMonitorFunction(const AliHBTMonitorFunction& /*in*/):
  TNamed(),
- fParticleCut(new AliHBTEmptyParticleCut())
+ fParticleCut(new AliAODParticleEmptyCut())
 {
   //cpy ctor
   // We cannot copy because it is a mess with names (histogram and functions)
@@ -81,17 +100,18 @@ AliHBTMonitorFunction::~AliHBTMonitorFunction()
  }
 /******************************************************************/
 
-void AliHBTMonitorFunction::Write()
+Int_t AliHBTMonitorFunction::Write(const char*,Int_t, Int_t)
  {
    //Writes an function to disk
    if (GetResult()) GetResult()->Write();
+   return 0;
  }
 /******************************************************************/
 
 void AliHBTMonitorFunction::Init()
  {
    //Writes an function to disk
-   if (AliHBTParticle::GetDebug()>0) Info("Init","%s",GetName());
+   AliDebug(1,"Entering");
    
    if (GetResult() == 0x0)
     {
@@ -100,11 +120,11 @@ void AliHBTMonitorFunction::Init()
     }
    GetResult()->Reset();
    GetResult()->SetDirectory(0x0);
-   if (AliHBTParticle::GetDebug()>0) Info("Init","%s Done.",GetName());
+   AliDebug(1,"Done");
  }
 /******************************************************************/
 
-void AliHBTMonitorFunction::SetParticleCut(AliHBTParticleCut* cut)
+void AliHBTMonitorFunction::SetParticleCut(AliAODParticleCut* cut)
 {
 //Sets new Particle Cut. Old one is deleted
 //Note that it is created new object instead of simple pointer set
@@ -120,7 +140,7 @@ void AliHBTMonitorFunction::SetParticleCut(AliHBTParticleCut* cut)
      return;
    }
  delete fParticleCut;
- fParticleCut = (AliHBTParticleCut*)cut->Clone();
+ fParticleCut = (AliAODParticleCut*)cut->Clone();
  
 }
 /******************************************************************/
@@ -181,6 +201,7 @@ AliHBTMonOneParticleFctn1D::AliHBTMonOneParticleFctn1D(Int_t nbins, Double_t max
    TString numstr = fName + " Result";  //title and name of the 
                                            //result histogram
    fResult   = new TH1D(numstr.Data(),numstr.Data(),nbins,minXval,maxXval);
+   fResult->Sumw2();
  }
 
 AliHBTMonOneParticleFctn1D::AliHBTMonOneParticleFctn1D(const Char_t *name, const Char_t *title,
@@ -192,6 +213,9 @@ AliHBTMonOneParticleFctn1D::AliHBTMonOneParticleFctn1D(const Char_t *name, const
                                            //result histogram
          
    fResult   = new TH1D(numstr.Data(),numstr.Data(),nbins,minXval,maxXval);
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
+   
 }
 /******************************************************************/
 AliHBTMonOneParticleFctn1D::~AliHBTMonOneParticleFctn1D()
@@ -201,7 +225,7 @@ AliHBTMonOneParticleFctn1D::~AliHBTMonOneParticleFctn1D()
 }
 /******************************************************************/
 
-void AliHBTMonOneParticleFctn1D::Process(AliHBTParticle* particle)
+void AliHBTMonOneParticleFctn1D::Process(AliVAODParticle* particle)
 {
  //Fills the result
    particle = CheckParticle(particle);
@@ -223,6 +247,8 @@ AliHBTMonOneParticleFctn2D::AliHBTMonOneParticleFctn2D(Int_t nXbins, Double_t ma
    fResult   = new TH2D(numstr.Data(),numstr.Data(),
                            nXbins,minXval,maxXval,
               nYbins,minYval,maxYval);
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
 }        
 /******************************************************************/
 
@@ -231,7 +257,7 @@ AliHBTMonOneParticleFctn2D::~AliHBTMonOneParticleFctn2D()
   //dtor
   delete fResult;
 }
-void AliHBTMonOneParticleFctn2D::Process(AliHBTParticle* particle)
+void AliHBTMonOneParticleFctn2D::Process(AliVAODParticle* particle)
 {
   //fills the function for one particle
   particle = CheckParticle(particle);
@@ -263,6 +289,8 @@ AliHBTMonOneParticleFctn3D(Int_t nXbins, Double_t maxXval, Double_t minXval,
                            nXbins,minXval,maxXval,
               nYbins,minYval,maxYval,
               nZbins,minZval,maxZval);
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
 
 }        
 /******************************************************************/
@@ -289,7 +317,8 @@ AliHBTMonTwoParticleFctn1D(Int_t nbins, Double_t maxval, Double_t minval)
          
    fResult   = new TH1D(numstr.Data(),numstr.Data(),
                            nbins,minval,maxval);
-              
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
  }
 
 AliHBTMonTwoParticleFctn1D::
@@ -303,7 +332,8 @@ AliHBTMonTwoParticleFctn1D(const Char_t* name, const Char_t* title,
 
    fResult   = new TH1D(numstr.Data(),numstr.Data(),
                            nbins,minval,maxval);
-              
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
  }
 
 
@@ -315,7 +345,7 @@ AliHBTMonTwoParticleFctn1D::~AliHBTMonTwoParticleFctn1D()
 }
 /******************************************************************/
 void AliHBTMonTwoParticleFctn1D::
-Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle)
+Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle)
 {
   //fills the function for one particle
   partparticle  = CheckParticle(partparticle);
@@ -344,7 +374,8 @@ AliHBTMonTwoParticleFctn2D(Int_t nXbins, Double_t maxXval, Double_t minXval ,
    fResult   = new TH2D(numstr.Data(),numstr.Data(),
                            nXbins,minXval,maxXval,
               nYbins,minYval,maxYval);
-              
+   fResult->Sumw2();
+   fResult->SetDirectory(0x0);
 }        
 /******************************************************************/
 AliHBTMonTwoParticleFctn2D::~AliHBTMonTwoParticleFctn2D()
@@ -354,7 +385,7 @@ AliHBTMonTwoParticleFctn2D::~AliHBTMonTwoParticleFctn2D()
 }
 /******************************************************************/
 void AliHBTMonTwoParticleFctn2D::
-Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle)
+Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle)
 {
   //fills the function for one particle
   partparticle  = CheckParticle(partparticle);
@@ -372,7 +403,7 @@ Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle)
 ClassImp(AliHBTMonTwoParticleFctn3D)
 
 void AliHBTMonTwoParticleFctn3D::
-Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle)
+Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle)
 {
   //fills the function for one particle
   partparticle  = CheckParticle(partparticle);