code cleaning

[u/mrichter/AliRoot.git] / HBTAN / AliHBTCorrelFctn.h

diff --git a/HBTAN/AliHBTCorrelFctn.h b/HBTAN/AliHBTCorrelFctn.h
index 8b4ee79c483a550b73b6cf7f0af08791d5ba7895..407e1358ffbb440c68c6b217896f1481eba2b7a2 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.h
+++ b/HBTAN/AliHBTCorrelFctn.h
@@ -1,18 +1,22 @@
 #ifndef ALIHBTCORRELFUNCTION_H
 #define ALIHBTCORRELFUNCTION_H
-
-#include "AliHBTFunction.h"
-#include "AliHBTParticle.h"
-#include <iostream.h>
+//_________________________________________________________________
+///////////////////////////////////////////////////////////////////
+//
 //Set of functions:
 //   Q Invaraint Correlation Function
 //   Invariant Mass Function
 //
 //more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
 //Piotr.Skowronski@cern.ch
+//
+///////////////////////////////////////////////////////////////////
+#include "AliHBTFunction.h"
+
+class AliHBTParticle;
 
 /*************************************************************************************/ 
-class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQInvCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q Invaraint Correlation Function
 //1D two particle function 
@@ -28,58 +32,58 @@ class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
 };
 /*************************************************************************************/ 
 
-class AliHBTQOutCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQOutCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q OutCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQOutCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
    virtual ~AliHBTQOutCMSLCCorrelFctn(){};
    TH1* GetResult();
  protected:
-   Double_t GetValue(AliHBTPair * pair){return pair->GetQOutCMSLC();}
+   Double_t GetValue(AliHBTPair * pair){return TMath::Abs(pair->GetQOutCMSLC());}
   public:
     ClassDef(AliHBTQOutCMSLCCorrelFctn,1)
  
 };
 /*************************************************************************************/ 
 
-class AliHBTQLongCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQLongCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q LongCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQLongCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
    virtual ~AliHBTQLongCMSLCCorrelFctn(){};
    TH1* GetResult();
  protected:
-   Double_t GetValue(AliHBTPair * pair){return pair->GetQLongCMSLC();}
+   Double_t GetValue(AliHBTPair * pair){return TMath::Abs(pair->GetQLongCMSLC());}
   public:
     ClassDef(AliHBTQLongCMSLCCorrelFctn,1)
  
 };
 /*************************************************************************************/ 
 
-class AliHBTQSideCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTQSideCMSLCCorrelFctn: public AliHBTOnePairFctn1D
 {
 //Q SideCMSLCaraint Correlation Function
 //1D two particle function 
  public:
    AliHBTQSideCMSLCCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
-   virtual ~AliHBTQSideCMSLCCorrelFctn(){};
+                        AliHBTOnePairFctn1D(nbins,maxXval,minXval){}
+   virtual ~AliHBTQSideCMSLCCorrelFctn(){}
    TH1* GetResult();
  protected:
-   Double_t GetValue(AliHBTPair * pair){return pair->GetQSideCMSLC();}
+   Double_t GetValue(AliHBTPair * pair){return TMath::Abs(pair->GetQSideCMSLC());}
   public:
     ClassDef(AliHBTQSideCMSLCCorrelFctn,1)
  
 };
 /*************************************************************************************/ 
 
-class AliHBTInvMassCorrelFctn: public AliHBTTwoPartFctn1D
+class AliHBTInvMassCorrelFctn: public AliHBTOnePairFctn1D
 {
 //   Invariant Mass Function 
  public:
@@ -93,6 +97,21 @@ class AliHBTInvMassCorrelFctn: public AliHBTTwoPartFctn1D
  
 };
 
+/*************************************************************************************/ 
+
+class AliHBTTwoKStarCorrelFctn: public AliHBTOnePairFctn1D
+{
+//   Correlation Function of 2*KStar
+ public:
+   AliHBTTwoKStarCorrelFctn(Int_t nbins = 200, Double_t maxXval = 0.15, Double_t minXval = 0.0);
+   virtual ~AliHBTTwoKStarCorrelFctn(){};
+   TH1* GetResult();
+ protected:
+   Double_t GetValue(AliHBTPair * pair) { return 2.0*pair->GetKStar();}
+  public:
+    ClassDef(AliHBTTwoKStarCorrelFctn,1)
+ 
+};
 
 
 #endif