New version including TOF

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

diff --git a/HBTAN/AliHBTCorrelFctn.cxx b/HBTAN/AliHBTCorrelFctn.cxx
index 5fff9883c2011590e695dd927718ca6f21a70b8f..3992048730a83b0e85cb6545a7222b5f6354fb47 100644 (file)
--- a/HBTAN/AliHBTCorrelFctn.cxx
+++ b/HBTAN/AliHBTCorrelFctn.cxx
@@ -34,13 +34,38 @@ AliHBTQInvCorrelFctn::AliHBTQInvCorrelFctn(Int_t nbins, Double_t maxXval, Double
 /*************************************************************************************/ 
 
 TH1* AliHBTQInvCorrelFctn::GetResult()
-{  
- return GetRatio(Scale());
+{
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
 }
 /*************************************************************************************/ 
 /*************************************************************************************/ 
 /*************************************************************************************/ 
 
+ClassImp(AliHBTOutSideLongFctn)
+
+AliHBTOutSideLongFctn::AliHBTOutSideLongFctn(Int_t nXbins, Double_t maxXval, Double_t minXval,
+                                                   Int_t nYbins, Double_t maxYval, Double_t minYval,
+                                                   Int_t nZbins, Double_t maxZval, Double_t minZval):
+ AliHBTOnePairFctn3D(nXbins,maxXval,minXval,nYbins,maxYval,minYval,nZbins,maxZval,minZval)
+{
+//ctor
+  fWriteNumAndDen = kTRUE;//change default behaviour
+  Rename("qoslcf","Q_{out}-Q_{side}-Q_{long} Correlation Fctn");
+}
+/*************************************************************************************/ 
+
+TH1* AliHBTOutSideLongFctn::GetResult()
+{
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
+}
+/*************************************************************************************/ 
+
 ClassImp(AliHBTQOutCMSLCCorrelFctn)
     
 AliHBTQOutCMSLCCorrelFctn::AliHBTQOutCMSLCCorrelFctn(Int_t nbins, Double_t maxXval, Double_t minXval):
@@ -54,8 +79,10 @@ AliHBTQOutCMSLCCorrelFctn::AliHBTQOutCMSLCCorrelFctn(Int_t nbins, Double_t maxXv
     
 TH1* AliHBTQOutCMSLCCorrelFctn::GetResult()
 {
- //returns result of the function
- return GetRatio(Scale());
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
 }
 /*************************************************************************************/ 
 /*************************************************************************************/ 
@@ -74,8 +101,10 @@ AliHBTQLongCMSLCCorrelFctn::AliHBTQLongCMSLCCorrelFctn(Int_t nbins, Double_t max
     
 TH1* AliHBTQLongCMSLCCorrelFctn::GetResult()
 {
- //returns result of the function
- return GetRatio(Scale());
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
 }
 /*************************************************************************************/ 
 /*************************************************************************************/ 
@@ -94,8 +123,10 @@ AliHBTQSideCMSLCCorrelFctn::AliHBTQSideCMSLCCorrelFctn(Int_t nbins, Double_t max
     
 TH1* AliHBTQSideCMSLCCorrelFctn::GetResult()
 {
- //returns result
- return GetRatio(Scale());
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
 }
 
 
@@ -116,8 +147,7 @@ AliHBTInvMassCorrelFctn::AliHBTInvMassCorrelFctn(Int_t nbins, Double_t maxXval,
 TH1* AliHBTInvMassCorrelFctn::GetResult()
 {
  //returns result
- TString name = fName + " Result";
- return (TH1*)GetNumerator()->Clone(name.Data());
+ return GetNumerator();
 }
 /*************************************************************************************/ 
 /*************************************************************************************/ 
@@ -137,8 +167,33 @@ AliHBTTwoKStarCorrelFctn::AliHBTTwoKStarCorrelFctn(Int_t nbins, Double_t maxXval
 
 TH1* AliHBTTwoKStarCorrelFctn::GetResult()
 {  
- //returns result
- return GetRatio(Scale());
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
+}
+
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+/*************************************************************************************/ 
+ClassImp(AliHBTAvSeparCorrelFctn)
+
+AliHBTAvSeparCorrelFctn::AliHBTAvSeparCorrelFctn(Int_t nbins, Double_t maxXval, Double_t minXval):
+ AliHBTOnePairFctn1D(nbins,maxXval,minXval)
+{
+ //ctor 
+ fWriteNumAndDen = kTRUE;//change default behaviour
+ Rename("avsepcf","Avarage separation Correlation Function");
+}
+
+/*************************************************************************************/ 
+
+TH1* AliHBTAvSeparCorrelFctn::GetResult()
+{  
+ //returns the scaled ratio
+ delete fRatio;
+ fRatio = GetRatio(Scale());
+ return fRatio;
 }
 
 /*************************************************************************************/