Cuts in 2 pair functions only on reconstructed pair

diff --git a/HBTAN/AliHBTCorrFitFctn.cxx b/HBTAN/AliHBTCorrFitFctn.cxx
index af14c6e7672c1885d863932039abd7ac6aeb8ab1..ab5f9a64a3993bfb65d2c0ea54772a9b0535a19b 100644 (file)
--- a/HBTAN/AliHBTCorrFitFctn.cxx
+++ b/HBTAN/AliHBTCorrFitFctn.cxx
@@ -26,7 +26,7 @@ AliHBTCorrFitFctn::AliHBTCorrFitFctn(Int_t nbins, Double_t maxXval, Double_t min
 void AliHBTCorrFitFctn::ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
  //Fills the numerator using pair from the same event
-   partpair = CheckPair(partpair);
+//   partpair = CheckPair(partpair);
    if(partpair == 0x0) return; 
    trackpair = CheckPair(trackpair);
    if(trackpair == 0x0) return; 
@@ -63,7 +63,7 @@ void  AliHBTCorrFitFctn::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBT
 {
   // Fills the denominator using mixed pairs
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)
   {
      fDenominator->Fill(trackpair->GetQInv());

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index a0a77470ad48a8e476ae0395a951f4b3ce8be010..adc49e3e410dbb57a4cae362030d85766914c41e 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -1078,8 +1078,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 +1089,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 +1144,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 +1156,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 +1215,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 +1228,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);

diff --git a/HBTAN/AliHBTFunction.h b/HBTAN/AliHBTFunction.h
index 0a03880350a0fdf7fde2857312576ce6ed3791fe..5f3fb638fd490f51feb486c9f6d4390d7aef5f0c 100644 (file)
--- a/HBTAN/AliHBTFunction.h
+++ b/HBTAN/AliHBTFunction.h
@@ -63,7 +63,7 @@ inline AliHBTPair* AliHBTFunction::CheckPair(AliHBTPair* pair)
   //check if pair and both particles meets the cut criteria
   if(fPairCut->Rejected(pair)) return 0x0; //if the pair is BAD
 
-//   It is notallowed to change the order here beacause analysis enforce the order
+//   It is not allowed to change the order here beacause analysis enforce the order
 
 //   {//it is BAD 
 //    pair = pair->GetSwappedPair();

diff --git a/HBTAN/AliHBTNonId3DCorrFctn.cxx b/HBTAN/AliHBTNonId3DCorrFctn.cxx
index 9006ec73a24cbc0a69b81f8a670b32b5b03f8062..0fcb0e8d079a2e5a99df883f8ac006b42c7f5626 100644 (file)
--- a/HBTAN/AliHBTNonId3DCorrFctn.cxx
+++ b/HBTAN/AliHBTNonId3DCorrFctn.cxx
@@ -11,6 +11,8 @@
 //                                                   //
 ///////////////////////////////////////////////////////
 
+AliHBTNonId3DCorrFctn x;
+
 ClassImp(AliHBTNonId3DCorrFctn)
 
 AliHBTNonId3DCorrFctn::AliHBTNonId3DCorrFctn(const char* name, const char* title):

diff --git a/HBTAN/AliHBTNonId3DCorrFctn.h b/HBTAN/AliHBTNonId3DCorrFctn.h
index 4fcc7fd952d5898150fd20f3260b75041d043be4..719b40b193e4dae222a82e52e26379598b859200 100644 (file)
--- a/HBTAN/AliHBTNonId3DCorrFctn.h
+++ b/HBTAN/AliHBTNonId3DCorrFctn.h
@@ -31,11 +31,11 @@ class AliHBTNonId3DCorrFctn: public AliHBTOnePairFctn1D
 
    void WriteFunction();
    
-      TH1*     GetResult();
+   TH1*     GetResult();
    
  protected:
 
-   Double_t GetValue(AliHBTPair* pair) {return pair->GetQInv();}
+   Double_t GetValue(AliHBTPair* pair) const {return pair->GetQInv();}
    void BuildHistos(Int_t nbins, Float_t max, Float_t min);
    
    TH1D* fNumOutP;

diff --git a/HBTAN/AliHBTPIDPurityFctns.cxx b/HBTAN/AliHBTPIDPurityFctns.cxx
index a4b48226aa6e17dc8f2bcf8ded7e27f2c9ba5f63..2e8f2e470589cc1d2cf1505d155f1fa32dacb8cb 100644 (file)
--- a/HBTAN/AliHBTPIDPurityFctns.cxx
+++ b/HBTAN/AliHBTPIDPurityFctns.cxx
@@ -405,7 +405,7 @@ void AliHBTQInvCorrelFctnPerfectPID::ProcessSameEventParticles(AliHBTPair* track
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   fNumerator->Fill(trackpair->GetQInv());
@@ -420,7 +420,7 @@ void AliHBTQInvCorrelFctnPerfectPID::ProcessDiffEventParticles(AliHBTPair* track
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   fDenominator->Fill(trackpair->GetQInv());
@@ -459,7 +459,7 @@ void AliHBTWeightQInvCorrelFctnPerfectPID::ProcessSameEventParticles(AliHBTPair*
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   fNumerator->Fill(trackpair->GetQInv(),partpair->GetWeight());
@@ -474,7 +474,7 @@ void AliHBTWeightQInvCorrelFctnPerfectPID::ProcessDiffEventParticles(AliHBTPair*
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
   
   fDenominator->Fill(trackpair->GetQInv());
@@ -517,7 +517,7 @@ void AliHBTWeightQOutSQideQLongFctnPerfectPID::ProcessSameEventParticles(AliHBTP
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   Double_t weight = partpair->GetWeight();
@@ -536,7 +536,7 @@ void AliHBTWeightQOutSQideQLongFctnPerfectPID::ProcessDiffEventParticles(AliHBTP
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   Double_t out = TMath::Abs(trackpair->GetQOutLCMS());
@@ -581,7 +581,7 @@ void AliHBTQOutSQideQLongFctnPerfectPID::ProcessSameEventParticles(AliHBTPair* t
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
   
   Double_t out = TMath::Abs(trackpair->GetQOutLCMS());
@@ -599,7 +599,7 @@ void AliHBTQOutSQideQLongFctnPerfectPID::ProcessDiffEventParticles(AliHBTPair* t
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
   
   Double_t out = TMath::Abs(trackpair->GetQOutLCMS());
@@ -748,7 +748,7 @@ void AliHBTTwoTrackEffFctnPtThetaPhiPerfectPID::ProcessSameEventParticles(AliHBT
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   Double_t x = TMath::Abs(trackpair->GetDeltaPt());
@@ -766,7 +766,7 @@ void AliHBTTwoTrackEffFctnPtThetaPhiPerfectPID::ProcessDiffEventParticles(AliHBT
 
   trackpair  = CheckPair(trackpair);
   if (trackpair == 0x0) return;
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if (partpair == 0x0) return;
 
   Double_t x = TMath::Abs(trackpair->GetDeltaPt());

diff --git a/HBTAN/AliHBTWeightFctn.cxx b/HBTAN/AliHBTWeightFctn.cxx
index 7ec2dc1423bd9b41d7656dc0bc8f420e31e1b5ec..c1672add3be249ff9448ee77e0e11daa7e0f556a 100644 (file)
--- a/HBTAN/AliHBTWeightFctn.cxx
+++ b/HBTAN/AliHBTWeightFctn.cxx
@@ -32,7 +32,7 @@ void  AliHBTWeightQInvFctn::ProcessSameEventParticles(AliHBTPair* trackpair, Ali
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -52,7 +52,7 @@ void  AliHBTWeightQInvFctn::ProcessDiffEventParticles(AliHBTPair* trackpair, Ali
 {
   // Fills the denominator using mixed pairs
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQInv());
@@ -89,7 +89,7 @@ void AliHBTWeightQOutFctn::ProcessSameEventParticles(AliHBTPair* trackpair, AliH
 {
   //process particles from same events (fills numerator)  
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -109,7 +109,7 @@ void AliHBTWeightQOutFctn::ProcessDiffEventParticles(AliHBTPair* trackpair, AliH
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQOutLCMS());
@@ -143,7 +143,7 @@ void AliHBTWeightQLongFctn::ProcessSameEventParticles(AliHBTPair* trackpair, Ali
 {
  //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -163,7 +163,7 @@ void AliHBTWeightQLongFctn::ProcessDiffEventParticles(AliHBTPair* trackpair, Ali
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQLongLCMS());
@@ -198,7 +198,7 @@ void AliHBTWeightQSideFctn::ProcessSameEventParticles(AliHBTPair* trackpair, Ali
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -218,7 +218,7 @@ void  AliHBTWeightQSideFctn::ProcessDiffEventParticles(AliHBTPair* trackpair, Al
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQSideLCMS());
@@ -253,7 +253,7 @@ void AliHBTWeightTwoKStarFctn::ProcessSameEventParticles(AliHBTPair* trackpair,
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -273,7 +273,7 @@ void  AliHBTWeightTwoKStarFctn::ProcessDiffEventParticles(AliHBTPair* trackpair,
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(2.0*(trackpair->GetKStar()));
@@ -310,7 +310,7 @@ void AliHBTWeightQOutQSideFctn::ProcessSameEventParticles(AliHBTPair* trackpair,
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -330,7 +330,7 @@ void AliHBTWeightQOutQSideFctn::ProcessDiffEventParticles(AliHBTPair* trackpair,
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQOutLCMS(),trackpair->GetQSideLCMS());
@@ -367,7 +367,7 @@ void AliHBTWeightQOutQLongFctn::ProcessSameEventParticles(AliHBTPair* trackpair,
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -387,7 +387,7 @@ void AliHBTWeightQOutQLongFctn::ProcessDiffEventParticles(AliHBTPair* trackpair,
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQOutLCMS(),trackpair->GetQLongLCMS());
@@ -424,7 +424,7 @@ void AliHBTWeightQSideQLongFctn::ProcessSameEventParticles(AliHBTPair* trackpair
 {
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -444,7 +444,7 @@ void AliHBTWeightQSideQLongFctn::ProcessDiffEventParticles(AliHBTPair* trackpair
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
   {
      fDenominator->Fill(trackpair->GetQSideLCMS(),trackpair->GetQLongLCMS());
@@ -481,7 +481,7 @@ void AliHBTWeightQOutSQideQLongFctn::ProcessSameEventParticles(AliHBTPair* track
 //Fills numerator
   //process particles from same events (fills numerator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)     
   {
 //    Double_t weightPID=1.;
@@ -496,16 +496,6 @@ void AliHBTWeightQOutSQideQLongFctn::ProcessSameEventParticles(AliHBTPair* track
     Double_t side = TMath::Abs(trackpair->GetQSideLCMS());
     Double_t lon = TMath::Abs(trackpair->GetQLongLCMS());
     
-    if (out < 0.005)
-     if (side < 0.005)
-       if (lon < 0.005)
-        {
-          trackpair->Particle1()->Print();
-          trackpair->Particle2()->Print();
-          Info("","Delta Theta %f, Delta Phi %f",
-              trackpair->GetDeltaTheta(),trackpair->GetDeltaPhi());
-        }
-    
     fNumerator->Fill(out,side,lon,weight);//here we fill in q's corresponding to track pair 
                                           //weight calculated for the simulated one
   }
@@ -516,7 +506,7 @@ void AliHBTWeightQOutSQideQLongFctn::ProcessDiffEventParticles(AliHBTPair* track
 {
   //process particles from diff events (fills denominator)
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
   if ( trackpair && partpair)  
    {
      Double_t out = TMath::Abs(trackpair->GetQOutLCMS());

diff --git a/HBTAN/AliHBTWeightNonId3DCorrFctn.cxx b/HBTAN/AliHBTWeightNonId3DCorrFctn.cxx
index 2a8b9e2c950e42965785e4c69fa92d78d50f204d..6e2b6a30a5480829dfc6baf2a999ea0115b29046 100644 (file)
--- a/HBTAN/AliHBTWeightNonId3DCorrFctn.cxx
+++ b/HBTAN/AliHBTWeightNonId3DCorrFctn.cxx
@@ -141,7 +141,9 @@ AliHBTWeightNonId3DCorrFctn::~AliHBTWeightNonId3DCorrFctn()
 void AliHBTWeightNonId3DCorrFctn::ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair)
 {
     //Fills the numerator using pair from the same event
-    partpair = CheckPair(partpair);
+    
+//    partpair = CheckPair(partpair);//why checking cuts on simulated?
+
     trackpair = CheckPair(trackpair);
     if(partpair == 0x0) return;
     if(trackpair == 0x0) return;
@@ -198,7 +200,7 @@ void AliHBTWeightNonId3DCorrFctn::ProcessDiffEventParticles(AliHBTPair* trackpai
 {
 
   trackpair = CheckPair(trackpair);
-  partpair  = CheckPair(partpair);
+//  partpair  = CheckPair(partpair);
 
   double tKStar = TMath::Abs(partpair->GetKStar());
   double tKStarOut = trackpair->GetKStarOut();