New correlation fuctions added

diff --git a/HBTAN/AliHBTCorrelFctn.cxx b/HBTAN/AliHBTCorrelFctn.cxx
index aa761706aad0ff6db7c004381aead469ffdd15c4..8b8f9bd30961737ecdf3875c85c411c822473da7 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.cxx
+++ b/HBTAN/AliHBTCorrelFctn.cxx
@@ -1,6 +1,9 @@
 #include "AliHBTCorrelFctn.h"
-
-
+//Set of Correlation fuctions
+//AliHBTQInvCorrelFctn - Q Invariant correlatyion function
+//
+//
+//
 
 ClassImp(AliHBTQInvCorrelFctn)
 
@@ -9,11 +12,50 @@ ClassImp(AliHBTQInvCorrelFctn)
 //by 
 //  of particles from different events
 
+AliHBTQInvCorrelFctn::
+AliHBTQInvCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
+                     AliHBTTwoPartFctn1D(nbins,maxXval,minXval)
+{
+ Rename("qinvcf","Q_{inv} Correlation Function");
+}
+
+
 TH1* AliHBTQInvCorrelFctn::GetResult()
+{  
+ return GetRatio(Scale());
+}
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+
+ClassImp(AliHBTQOutCMSLCCorrelFctn)
+TH1* AliHBTQOutCMSLCCorrelFctn::GetResult()
 {
- return GetRatio(GetDenominator()->GetMaximum()/GetNumerator()->GetMaximum());
+ return GetRatio(Scale());
 }
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+
+ClassImp(AliHBTQLongCMSLCCorrelFctn)
+TH1* AliHBTQLongCMSLCCorrelFctn::GetResult()
+{
+ return GetRatio(Scale());
+}
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+
+ClassImp(AliHBTQSideCMSLCCorrelFctn)
+TH1* AliHBTQSideCMSLCCorrelFctn::GetResult()
+{
+ return GetRatio(Scale());
+}
+
 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
 
 ClassImp(AliHBTInvMassCorrelFctn)
 
@@ -26,5 +68,6 @@ AliHBTInvMassCorrelFctn(Int_t nbins, Double_t maxXval, Double_t minXval):
 
 TH1* AliHBTInvMassCorrelFctn::GetResult()
 {
- return GetRatio(GetDenominator()->GetMaximum()/GetNumerator()->GetMaximum());
+ TString name = fName + " Result";
+ return (TH1*)GetNumerator()->Clone(name.Data());
 }

diff --git a/HBTAN/AliHBTCorrelFctn.h b/HBTAN/AliHBTCorrelFctn.h
index b34919c12b9d1bd0cecf74900e289031cb3c1068..8b4ee79c483a550b73b6cf7f0af08791d5ba7895 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.h
+++ b/HBTAN/AliHBTCorrelFctn.h
@@ -3,6 +3,7 @@
 
 #include "AliHBTFunction.h"
 #include "AliHBTParticle.h"
+#include <iostream.h>
 //Set of functions:
 //   Q Invaraint Correlation Function
 //   Invariant Mass Function
@@ -10,14 +11,13 @@
 //more info: http://alisoft.cern.ch/people/skowron/analyzer/index.html
 //Piotr.Skowronski@cern.ch
 
-
+/*************************************************************************************/ 
 class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
 {
 //Q Invaraint Correlation Function
 //1D two particle function 
  public:
-   AliHBTQInvCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0):
-                        AliHBTTwoPartFctn1D(nbins,maxXval,minXval){}
+   AliHBTQInvCorrelFctn(Int_t nbins = 100, Double_t maxXval = 0.15, Double_t minXval = 0.0);
    virtual ~AliHBTQInvCorrelFctn(){};
    TH1* GetResult();
  protected:
@@ -26,7 +26,58 @@ class AliHBTQInvCorrelFctn: public AliHBTTwoPartFctn1D
     ClassDef(AliHBTQInvCorrelFctn,1)
  
 };
+/*************************************************************************************/ 
+
+class AliHBTQOutCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+{
+//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){}
+   virtual ~AliHBTQOutCMSLCCorrelFctn(){};
+   TH1* GetResult();
+ protected:
+   Double_t GetValue(AliHBTPair * pair){return pair->GetQOutCMSLC();}
+  public:
+    ClassDef(AliHBTQOutCMSLCCorrelFctn,1)
+ 
+};
+/*************************************************************************************/ 
 
+class AliHBTQLongCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+{
+//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){}
+   virtual ~AliHBTQLongCMSLCCorrelFctn(){};
+   TH1* GetResult();
+ protected:
+   Double_t GetValue(AliHBTPair * pair){return pair->GetQLongCMSLC();}
+  public:
+    ClassDef(AliHBTQLongCMSLCCorrelFctn,1)
+ 
+};
+/*************************************************************************************/ 
+
+class AliHBTQSideCMSLCCorrelFctn: public AliHBTTwoPartFctn1D
+{
+//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(){};
+   TH1* GetResult();
+ protected:
+   Double_t GetValue(AliHBTPair * pair){return pair->GetQSideCMSLC();}
+  public:
+    ClassDef(AliHBTQSideCMSLCCorrelFctn,1)
+ 
+};
+/*************************************************************************************/ 
 
 class AliHBTInvMassCorrelFctn: public AliHBTTwoPartFctn1D
 {