X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HBTAN%2FAliHBTMonDistributionFctns.h;h=01e2c188ab58acff1b42acb80edfec61eaf69442;hb=b68c91e660030717bb2f3969f64906a98515ebeb;hp=539486614c8fe7e6f4c00a3e3bf54fe0e6e0e754;hpb=58ee85907c10d2b98c42969f27aa9e1b3b986f62;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HBTAN/AliHBTMonDistributionFctns.h b/HBTAN/AliHBTMonDistributionFctns.h
index 539486614c8..01e2c188ab5 100644
--- a/HBTAN/AliHBTMonDistributionFctns.h
+++ b/HBTAN/AliHBTMonDistributionFctns.h
@@ -1,5 +1,10 @@
 #ifndef ALIHBTMONDISTRIBUTIONFCTNS_H
 #define ALIHBTMONDISTRIBUTIONFCTNS_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
 //______________________________________________________________
 ////////////////////////////////////////////////////////////////
 //
@@ -42,6 +47,8 @@ class AliHBTMonRDistributionFctn;
 class AliHBTMonVyDistributionVsVxFctn;
 class AliHBTMonRtDistributionVsVzFctn;
 
+#include <TMath.h>
+
 #include "AliHBTMonitorFunction.h"
 /***********************************************************************/
 /***********************************************************************/
@@ -52,9 +59,8 @@ class AliHBTMonPxDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPxDistributionFctn(Int_t nbins = 200, Double_t maxXval = 1.4, Double_t minXval = -1.4);
    virtual ~AliHBTMonPxDistributionFctn(){};
-   TH1* GetResult(){return fResult;}
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Px();}
+   Double_t GetValue(AliVAODParticle * particle) const;
    ClassDef(AliHBTMonPxDistributionFctn,1)
 };
 /*************************************************************************************/ 
@@ -64,9 +70,8 @@ class AliHBTMonPyDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPyDistributionFctn(Int_t nbins = 200, Double_t maxXval = 1.4, Double_t minXval = -1.4);
    virtual ~AliHBTMonPyDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Py();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Py();}
    ClassDef(AliHBTMonPyDistributionFctn,1)
 };
 /*************************************************************************************/ 
@@ -76,9 +81,8 @@ class AliHBTMonPzDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPzDistributionFctn(Int_t nbins = 200, Double_t maxXval = 1.4, Double_t minXval = -1.4);
    virtual ~AliHBTMonPzDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Pz();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Pz();}
    ClassDef(AliHBTMonPzDistributionFctn,1)
  
 };
@@ -89,9 +93,8 @@ class AliHBTMonPDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPDistributionFctn(Int_t nbins = 200, Double_t maxXval = 1.4, Double_t minXval = 0.0);
    virtual ~AliHBTMonPDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->P();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->P();}
    ClassDef(AliHBTMonPDistributionFctn,1)
  
 };
@@ -102,9 +105,8 @@ class AliHBTMonPtDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPtDistributionFctn(Int_t nbins = 200, Double_t maxXval = 1.4, Double_t minXval = 0.0);
    virtual ~AliHBTMonPtDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Pt();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Pt();}
    ClassDef(AliHBTMonPtDistributionFctn,1)
 };
 
@@ -116,12 +118,11 @@ class AliHBTMonPxDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 1.4, Double_t minYval =-1.4);
    virtual ~AliHBTMonPxDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
       x = partparticle->Pt();
       y = partparticle->Px();
     }
-   TH1* GetResult(){return fResult;} 
    ClassDef(AliHBTMonPxDistributionVsPtFctn,1)
  };
 
@@ -133,12 +134,11 @@ class AliHBTMonPyDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 1.4, Double_t minYval =-1.4);
    virtual ~AliHBTMonPyDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
      x = partparticle->Pt();
      y = partparticle->Py();
     }
-  TH1* GetResult(){return fResult;} 
   ClassDef(AliHBTMonPyDistributionVsPtFctn,1)
  };
 /***********************************************************************/
@@ -149,12 +149,11 @@ class AliHBTMonPzDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 1.4, Double_t minYval =-1.4);
    virtual ~AliHBTMonPzDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
      x = partparticle->Pt();
      y = partparticle->Pz();
     }
-   TH1* GetResult(){return fResult;} 
    ClassDef(AliHBTMonPzDistributionVsPtFctn,1)
  };
 
@@ -166,12 +165,11 @@ class AliHBTMonPDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 1.4, Double_t minYval =-1.4);
    virtual ~AliHBTMonPDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
      x = partparticle->Pt();
      y = partparticle->P();
     }
-   TH1* GetResult(){return fResult;} 
    ClassDef(AliHBTMonPDistributionVsPtFctn,1)
  };
 
@@ -185,9 +183,8 @@ class AliHBTMonPhiDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonPhiDistributionFctn(Int_t nbins = 200, Double_t maxXval = 3.14, Double_t minXval = 0.0);
    virtual ~AliHBTMonPhiDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Phi();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Phi();}
    ClassDef(AliHBTMonPhiDistributionFctn,1)
 };
 
@@ -197,9 +194,8 @@ class AliHBTMonThetaDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonThetaDistributionFctn(Int_t nbins = 200, Double_t maxXval = 3.14, Double_t minXval = 0.0);
    virtual ~AliHBTMonThetaDistributionFctn(){};
-   TH1* GetResult(){return fResult;} 
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Theta();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Theta();}
    ClassDef(AliHBTMonThetaDistributionFctn,1)
  
 };
@@ -212,12 +208,11 @@ class AliHBTMonPhiDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 3.14, Double_t minYval =0.0);
    virtual ~AliHBTMonPhiDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
      x = partparticle->Pt();
      y = partparticle->Phi();
     }
-  TH1* GetResult(){return fResult;}
   ClassDef(AliHBTMonPhiDistributionVsPtFctn,1)
  };
 
@@ -229,12 +224,11 @@ class AliHBTMonThetaDistributionVsPtFctn: public AliHBTMonOneParticleFctn2D
                              Int_t nYbins = 200, Double_t maxYval = 3.14, Double_t minYval =0.0);
    virtual ~AliHBTMonThetaDistributionVsPtFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
       x = partparticle->Pt();
       y = partparticle->Theta();
     }
-   TH1* GetResult(){return fResult;} 
    ClassDef(AliHBTMonThetaDistributionVsPtFctn,1)
  };
 
@@ -244,9 +238,8 @@ class AliHBTMonVxDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonVxDistributionFctn(Int_t nbins = 200, Double_t maxXval = 500, Double_t minXval = -500);
    virtual ~AliHBTMonVxDistributionFctn(){};
-   TH1* GetResult(){return fResult;}
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Vx();}
+   Double_t GetValue(AliVAODParticle * particle)  const{ return particle->Vx();}
    ClassDef(AliHBTMonVxDistributionFctn,1)
 };
 /***********************************************************************/
@@ -255,9 +248,8 @@ class AliHBTMonVyDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonVyDistributionFctn(Int_t nbins = 200, Double_t maxXval = 500, Double_t minXval = -500);
    virtual ~AliHBTMonVyDistributionFctn(){};
-   TH1* GetResult(){return fResult;}
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Vy();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Vy();}
    ClassDef(AliHBTMonVyDistributionFctn,1)
 };
 /***********************************************************************/
@@ -266,9 +258,8 @@ class AliHBTMonVzDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonVzDistributionFctn(Int_t nbins = 200, Double_t maxXval = 300, Double_t minXval = -300);
    virtual ~AliHBTMonVzDistributionFctn(){};
-   TH1* GetResult(){return fResult;}
  protected:
-   Double_t GetValue(AliHBTParticle * particle) { return particle->Vz();}
+   Double_t GetValue(AliVAODParticle * particle) const { return particle->Vz();}
    ClassDef(AliHBTMonVzDistributionFctn,1)
 };
 /***********************************************************************/
@@ -277,9 +268,8 @@ class AliHBTMonRDistributionFctn: public AliHBTMonOneParticleFctn1D
  public:
    AliHBTMonRDistributionFctn(Int_t nbins = 200, Double_t maxXval = 500, Double_t minXval = -500);
    virtual ~AliHBTMonRDistributionFctn(){};
-   TH1* GetResult(){return fResult;}
  protected:
-   Double_t GetValue(AliHBTParticle * p) { return TMath::Sqrt(p->Vx()*p->Vx() + p->Vy()*p->Vy() + p->Vz()*p->Vz());}
+   Double_t GetValue(AliVAODParticle * p) const { return TMath::Sqrt(p->Vx()*p->Vx() + p->Vy()*p->Vy() + p->Vz()*p->Vz());}
    ClassDef(AliHBTMonRDistributionFctn,1)
 };
 
@@ -291,12 +281,11 @@ class AliHBTMonVyDistributionVsVxFctn: public AliHBTMonOneParticleFctn2D
                                    Int_t nYbins = 200, Double_t maxYval = 10.0, Double_t minYval =-10.0);
    virtual ~AliHBTMonVyDistributionVsVxFctn(){}
 
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
       x = partparticle->Vx();
       y = partparticle->Vy();
     }
-   TH1* GetResult(){return fResult;} 
    ClassDef(AliHBTMonVyDistributionVsVxFctn,1)
  };
 
@@ -308,17 +297,15 @@ class AliHBTMonRtDistributionVsVzFctn: public AliHBTMonOneParticleFctn2D
                                    Int_t nYbins = 100, Double_t maxYval = 10.0, Double_t minYval = 0.0);
    virtual ~AliHBTMonRtDistributionVsVzFctn(){}
  
-   void GetValues(AliHBTParticle* partparticle,  Double_t& x, Double_t& y)
+   void GetValues(AliVAODParticle* partparticle,  Double_t& x, Double_t& y) const
     {
       x = partparticle->Vz();
       y = TMath::Hypot(partparticle->Vx(),partparticle->Vy());
     }
-   TH1* GetResult(){return fResult;}
    ClassDef(AliHBTMonRtDistributionVsVzFctn,1)
  };
 
 /***********************************************************************/
 /***********************************************************************/
-/***********************************************************************/
 
 #endif