X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HBTAN%2FAliHBTMonitorFunction.h;h=3556a7652ba543b9c12e08e5bc81d25c6d096321;hb=33fa167d183b5346622f40589b9f688491519b5c;hp=a2b03e4d51757a5dee987cbd4d61be7bdda2f073;hpb=d289329c65c1f18a981891fc4d581a3c133bd69f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HBTAN/AliHBTMonitorFunction.h b/HBTAN/AliHBTMonitorFunction.h
index a2b03e4d517..3556a7652ba 100644
--- a/HBTAN/AliHBTMonitorFunction.h
+++ b/HBTAN/AliHBTMonitorFunction.h
@@ -41,12 +41,12 @@ Zbigniew.Chajecki@cern.ch
 */
 ///////////////////////////////////////////////////////////////////////
 
-#include "AliHBTParticleCut.h"
+#include "AliAODParticleCut.h"
 
 #include <TH2.h>
 #include <TH3.h>
 
-class AliHBTParticle;
+class AliVAODParticle;
 
 class AliHBTMonitorFunction: public TNamed
 //Abstract base class for HBT functions
@@ -64,25 +64,26 @@ class AliHBTMonitorFunction: public TNamed
 
     virtual void Write();
     virtual void Init();
+    virtual const char* Name(){return GetName();}
     void Rename(const Char_t * name); 
     void Rename(const Char_t * name, const Char_t * title); 
     
-    void SetParticleCut(AliHBTParticleCut* cut);
+    void SetParticleCut(AliAODParticleCut* cut);
 
-    virtual AliHBTParticle* CheckParticle(AliHBTParticle* particle) const;
+    virtual AliVAODParticle* CheckParticle(AliVAODParticle* particle) const;
 
   protected:
-    AliHBTParticleCut*      fParticleCut;//Particle cut
+    AliAODParticleCut*      fParticleCut;//Particle cut
     
   private:  
    ClassDef(AliHBTMonitorFunction,1)
 };
 /******************************************************************/
 /******************************************************************/
-inline AliHBTParticle* AliHBTMonitorFunction::CheckParticle(AliHBTParticle* particle) const
+inline AliVAODParticle* AliHBTMonitorFunction::CheckParticle(AliVAODParticle* particle) const
 {
   //check if particle meets the cut criteria
-  if(fParticleCut->Pass(particle)) //if the particle is BAD
+  if(fParticleCut->Rejected(particle)) //if the particle is BAD
    { 
      return 0x0;//it is BAD as well - so return
    }
@@ -103,7 +104,7 @@ class AliHBTMonOneParticleFctn: public AliHBTMonitorFunction
     
     AliHBTMonOneParticleFctn& operator=(const AliHBTMonOneParticleFctn& /*in*/){MayNotUse("operator=");return *this;} 
     
-    virtual void Process(AliHBTParticle* particle) = 0;
+    virtual void Process(AliVAODParticle* particle) = 0;
     
   protected:
   private:  
@@ -124,12 +125,12 @@ class AliHBTMonOneParticleFctn1D: public AliHBTMonOneParticleFctn
   virtual ~AliHBTMonOneParticleFctn1D();
   
   AliHBTMonOneParticleFctn1D& operator=(const AliHBTMonOneParticleFctn1D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
 
-  void Process(AliHBTParticle* particle);
+  void Process(AliVAODParticle* particle);
 
  protected:
-  virtual Double_t GetValue(AliHBTParticle* particle) = 0; 
+  virtual Double_t GetValue(AliVAODParticle* particle) const = 0; 
   TH1D* fResult;//histogram to be filled
  private:
   ClassDef(AliHBTMonOneParticleFctn1D,2)
@@ -146,12 +147,12 @@ class AliHBTMonOneParticleFctn2D: public AliHBTMonOneParticleFctn
   virtual ~AliHBTMonOneParticleFctn2D();
   
   AliHBTMonOneParticleFctn2D& operator=(const AliHBTMonOneParticleFctn2D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
   
-  void Process(AliHBTParticle* particle);
+  void Process(AliVAODParticle* particle);
 
  protected:
-  virtual void GetValues(AliHBTParticle* particle, Double_t&, Double_t&) = 0;
+  virtual void GetValues(AliVAODParticle* particle, Double_t&, Double_t&) const = 0;
 
   TH2D* fResult;//histogram to be filled
   
@@ -174,7 +175,7 @@ class AliHBTMonOneParticleFctn3D: public AliHBTMonOneParticleFctn
   virtual ~AliHBTMonOneParticleFctn3D();
 
   AliHBTMonOneParticleFctn3D& operator=(const AliHBTMonOneParticleFctn3D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
 
  protected:
   TH3D* fResult;//histogram to be filled
@@ -194,7 +195,7 @@ class AliHBTMonTwoParticleFctn: public AliHBTMonitorFunction
     AliHBTMonTwoParticleFctn& operator=(const AliHBTMonTwoParticleFctn& /*in*/){MayNotUse("operator=");return *this;} 
     
     virtual void 
-    Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle) = 0;
+    Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle) = 0;
 	     
   protected:
   private:  
@@ -214,12 +215,12 @@ class AliHBTMonTwoParticleFctn1D: public AliHBTMonTwoParticleFctn
   virtual ~AliHBTMonTwoParticleFctn1D();
   
   AliHBTMonTwoParticleFctn1D& operator=(const AliHBTMonTwoParticleFctn1D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
   
-  void Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle);
+  void Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle);
   
  protected:
-  virtual Double_t GetValue(AliHBTParticle* trackparticle, AliHBTParticle* partparticle) = 0;
+  virtual Double_t GetValue(AliVAODParticle* trackparticle, AliVAODParticle* partparticle) const = 0;
 
   TH1D* fResult;//histogram to be filled
 
@@ -237,12 +238,12 @@ class AliHBTMonTwoParticleFctn2D: public AliHBTMonTwoParticleFctn
   virtual ~AliHBTMonTwoParticleFctn2D();
   
   AliHBTMonTwoParticleFctn2D& operator=(const AliHBTMonTwoParticleFctn2D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
   
-  void Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle);
+  void Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle);
   
  protected:
-  virtual void GetValues(AliHBTParticle*,AliHBTParticle*, Double_t&, Double_t&) = 0;
+  virtual void GetValues(AliVAODParticle*,AliVAODParticle*, Double_t&, Double_t&) const = 0;
 
   TH2D* fResult;//histogram to be filled
   
@@ -255,20 +256,20 @@ class AliHBTMonTwoParticleFctn2D: public AliHBTMonTwoParticleFctn
 class AliHBTMonTwoParticleFctn3D: public AliHBTMonTwoParticleFctn
 {
  public:
-  AliHBTMonTwoParticleFctn3D(Int_t nXbins = 200, Double_t maxXval = 1.5, Double_t minXval = 0.0, 
-                       Int_t nYbins = 200, Double_t maxYval = .15, Double_t minYval =-0.15, 
-                       Int_t nZbins = 200, Double_t maxZval = .15, Double_t minZval =-0.15){}
+  AliHBTMonTwoParticleFctn3D(Int_t /*nXbins = 200*/, Double_t /*maxXval = 1.5*/, Double_t /*minXval = 0.0*/, 
+			     Int_t /*nYbins = 200*/, Double_t /*maxYval = .15*/, Double_t /*minYval =-0.15*/, 
+			     Int_t /*nZbins = 200*/, Double_t /*maxZval = .15*/, Double_t /*minZval =-0.15*/){}
   AliHBTMonTwoParticleFctn3D(const AliHBTMonTwoParticleFctn3D& in):
                AliHBTMonTwoParticleFctn(in),fResult(0x0){MayNotUse("Cpy Ctor");}
   virtual ~AliHBTMonTwoParticleFctn3D(){}
   
   AliHBTMonTwoParticleFctn3D& operator=(const AliHBTMonTwoParticleFctn3D& /*in*/){MayNotUse("operator=");return *this;}   
-  TH1* GetResult(){return fResult;}
+  TH1* GetResult(){return this->fResult;}
   
-  void Process(AliHBTParticle* trackparticle, AliHBTParticle* partparticle);
+  void Process(AliVAODParticle* trackparticle, AliVAODParticle* partparticle);
 
  protected:
-  virtual void GetValues(AliHBTParticle*,AliHBTParticle*, Double_t&, Double_t&,Double_t&) = 0;
+  virtual void GetValues(AliVAODParticle*,AliVAODParticle*, Double_t&, Double_t&,Double_t&) const = 0;
 
   TH3D* fResult; //histogram to be filled