AliHBTWeightasCorrFctn removed

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

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index 3b645510fea368dff1891d168e215a9bb263ffd1..ed8841b5004c51a57d88874d39bb017f662e6afa 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -41,8 +41,9 @@
 ClassImp( AliHBTFunction )
 
 AliHBTFunction::AliHBTFunction():
- fPairCut(new AliAODEmptyPairCut()), //dummy cut  
- fWriteNumAndDen(kFALSE)
+ fPairCut(new AliAODPairEmptyCut()), //dummy cut  
+ fWriteNumAndDen(kFALSE),
+ fAbs(kFALSE)
 {
 //Default constructor
 }
@@ -50,8 +51,9 @@ AliHBTFunction::AliHBTFunction():
 
 AliHBTFunction::AliHBTFunction(const char* name,const char* title):
  TNamed(name,title),
- fPairCut(new AliAODEmptyPairCut()), //dummy cut  
- fWriteNumAndDen(kFALSE)
+ fPairCut(new AliAODPairEmptyCut()), //dummy cut  
+ fWriteNumAndDen(kFALSE),
+ fAbs(kFALSE)
 {
 //Constructor  
 }
@@ -60,7 +62,8 @@ AliHBTFunction::AliHBTFunction(const char* name,const char* title):
 AliHBTFunction::AliHBTFunction(const AliHBTFunction & source):
  TNamed(source),
  fPairCut((AliAODPairCut*)source.fPairCut->Clone()),
- fWriteNumAndDen(source.fWriteNumAndDen)
+ fWriteNumAndDen(source.fWriteNumAndDen),
+ fAbs(source.fAbs)
 {
 // Copy constructor needed by the coding conventions
 }
@@ -81,6 +84,7 @@ AliHBTFunction & AliHBTFunction::operator= (const AliHBTFunction & source)
  // Assignment needed by the coding conventions
   delete fPairCut;
   fPairCut = (AliAODPairCut*)source.fPairCut->Clone();
+  fAbs = source.fAbs;
   return * this;
 }
 
@@ -395,8 +399,8 @@ Double_t AliHBTFunction1D::Scale(TH1D* num,TH1D* den)
    {
     if ( num->GetBinContent(i) > 0.0 )
      {
-       densum += fDenominator->GetBinContent(i);
-       numsum += fNumerator->GetBinContent(i);
+       densum += den->GetBinContent(i);
+       numsum += num->GetBinContent(i);
      }
    }
   
@@ -729,6 +733,21 @@ void AliHBTFunction3D::BuildHistos(Int_t nxbins, Float_t xmax, Float_t xmin,
                       Int_t nzbins, Float_t zmax, Float_t zmin)
 {
   //Builds numerator and denominator histograms (3d-case)
+  
+   if (AliVAODParticle::GetDebug()>1) Info("BuildHistos","Enetered AliHBTFunction3D::BuildHistos(...)");
+   
+   if (fNumerator )
+    {
+      delete fNumerator;
+      fNumerator = 0x0;
+    }
+
+   if (fDenominator )
+    {
+      delete fDenominator;
+      fDenominator = 0x0;
+    }
+   
    TString numstr = fName + " Numerator";  //title and name of the 
                                            //numerator histogram
    TString denstr = fName + " Denominator";//title and name of the 
@@ -1078,8 +1097,8 @@ AliHBTTwoPairFctn1D::AliHBTTwoPairFctn1D(const Char_t *name, const Char_t *title
 void AliHBTTwoPairFctn1D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   // Fills the numerator using pairs from the same event
-  partpair  = CheckPair(partpair);
-  if( partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
     
   Double_t x = GetValue(trackpair,partpair);
   fNumerator->Fill(x);
@@ -1089,8 +1108,8 @@ void AliHBTTwoPairFctn1D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHB
 void AliHBTTwoPairFctn1D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   // Fills the denumerator usin mixed pairs
-  partpair  = CheckPair(partpair);
-  if( partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
   
   Double_t x = GetValue(trackpair,partpair);
   fDenominator->Fill(x);
@@ -1144,8 +1163,8 @@ AliHBTTwoPairFctn2D::AliHBTTwoPairFctn2D(const Char_t *name, const Char_t *title
 void AliHBTTwoPairFctn2D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
 //processes pair of particles coming from a same events (real pair)
-  partpair  = CheckPair(partpair);  //check cuts
-  if (partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
   
   Double_t x,y;
   GetValues(trackpair,partpair,x,y);
@@ -1156,8 +1175,8 @@ void AliHBTTwoPairFctn2D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHB
 void AliHBTTwoPairFctn2D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
 //processes pair of particles coming from a different events (mixed pair)
-  partpair  = CheckPair(partpair);
-  if (partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
   
   Double_t x,y;
   GetValues(trackpair,partpair,x,y);
@@ -1215,8 +1234,8 @@ AliHBTTwoPairFctn3D::AliHBTTwoPairFctn3D(const Char_t *name, const Char_t *title
 void AliHBTTwoPairFctn3D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   // Fills th numerator using pairs from the same event
-  partpair  = CheckPair(partpair);
-  if( partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
   
   Double_t x,y,z;
   GetValues(trackpair,partpair,x,y,z);
@@ -1228,8 +1247,8 @@ void AliHBTTwoPairFctn3D::ProcessSameEventParticles(AliHBTPair* trackpair, AliHB
 void AliHBTTwoPairFctn3D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
   // Fills the denumerator using mixed pairs
-  partpair  = CheckPair(partpair);
-  if( partpair == 0x0) return;
+  trackpair  = CheckPair(trackpair);
+  if( trackpair == 0x0) return;
   
   Double_t x,y,z;
   GetValues(trackpair,partpair,x,y,z);