AliRsnCut:

- added possibility to cut on ETA for tracks and pairs

AliRsnPairParticle:
- corrected functions for ETA
- corrected bug on function for ANGLE

AliRsnDaughter:
- corrected function fo ETA

diff --git a/PWG2/RESONANCES/AliRsnCut.cxx b/PWG2/RESONANCES/AliRsnCut.cxx
index b603da5d1da315969c61b10151e78bc7c69758c1..d7ac8fd7f5ef510e790eff2a33aedb2a6337b88c 100644 (file)
--- a/PWG2/RESONANCES/AliRsnCut.cxx
+++ b/PWG2/RESONANCES/AliRsnCut.cxx
@@ -352,10 +352,10 @@ Bool_t AliRsnCut::IsSelected(ETarget type, AliRsnPairParticle * pair)
       return IsBetween(pair->GetP());
     case kTransMomentum:
       return IsBetween(pair->GetPt());
-      /*
-      case kEta:
-          return IsBetween (daughter->Eta());
-      */
+    case kEta:
+      return IsBetween(pair->GetEta());
+    case kEtaMC:
+      return IsBetween(pair->GetEtaMC());
     case kMomentumMC:
       return IsBetween(pair->GetPMC());
     case kTransMomentumMC:

diff --git a/PWG2/RESONANCES/AliRsnDaughter.h b/PWG2/RESONANCES/AliRsnDaughter.h
index 010b89887913d45483ac9390298c101b65ecd79d..f25905301f2592e7a17e8b2f6d749be50b634dbc 100644 (file)
--- a/PWG2/RESONANCES/AliRsnDaughter.h
+++ b/PWG2/RESONANCES/AliRsnDaughter.h
@@ -99,7 +99,7 @@ class AliRsnDaughter : public AliVParticle
     virtual Double_t Phi() const {return TMath::ATan2(Py(), Px()) * TMath::RadToDeg();}   // degrees
     virtual Double_t Theta() const {return TMath::ATan2(Pt(), Pz()) * TMath::RadToDeg();} // degrees
     virtual Double_t Eta() const {return -TMath::Log(TMath::Tan(0.5*Theta()));}
-    virtual Double_t Y() const {return TMath::Log((E() + Pz()) / (E() - Pz()));}
+    virtual Double_t Y() const {return 0.5*TMath::Log((E() + Pz()) / (E() - Pz()));}
 
     // Charge
     virtual Short_t Charge() const {return fCharge;}

diff --git a/PWG2/RESONANCES/AliRsnPairParticle.cxx b/PWG2/RESONANCES/AliRsnPairParticle.cxx
index 8b593451df3d8301df7ce87490c2d32b197337a1..17f15707ddbc7a4cdf6980d5d0dbe6da401e6334 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPairParticle.cxx
+++ b/PWG2/RESONANCES/AliRsnPairParticle.cxx
@@ -208,7 +208,7 @@ Double_t AliRsnPairParticle::GetAngle() const
 
   Double_t dotProd = 0.0;
   dotProd += fDaughter[0]->Px() * fDaughter[1]->Px();
-  dotProd += fDaughter[0]->Py() * fDaughter[1]->Pz();
+  dotProd += fDaughter[0]->Py() * fDaughter[1]->Py();
   dotProd += fDaughter[0]->Pz() * fDaughter[1]->Pz();
 
   Double_t cosAngle = dotProd / (fDaughter[0]->P() * fDaughter[1]->P());

diff --git a/PWG2/RESONANCES/AliRsnPairParticle.h b/PWG2/RESONANCES/AliRsnPairParticle.h
index f82dae8a3b9c9abd55e04d0bed4108531b1ce619..0d0072c325c9a2b987b5526289164c81f4cd8099 100644 (file)
--- a/PWG2/RESONANCES/AliRsnPairParticle.h
+++ b/PWG2/RESONANCES/AliRsnPairParticle.h
@@ -41,7 +41,7 @@ class AliRsnPairParticle : public TObject
     Double_t          GetPhi() const {return TMath::Pi() + TMath::ATan2(-fPTot[1], -fPTot[0]);}
     Double_t          GetTheta() const {if (fPTot[2]==0.0){return TMath::PiOver2();}
       else{return TMath::ACos(fPTot[2]/GetP());}}
-    Double_t          GetEta() const {return -TMath::Log(TMath::ATan(0.5*GetTheta()));}
+    Double_t          GetEta() const {return -TMath::Log(TMath::Tan(0.5*GetTheta()));}
     Double_t          GetY(Double_t m1, Double_t m2) const {return 0.5*TMath::Log((GetEtot(m1,m2)+fPTot[2])/(GetEtot(m1,m2)-fPTot[2]));}
 
     Double_t          GetEtotMC(Double_t m1, Double_t m2) const;
@@ -55,7 +55,7 @@ class AliRsnPairParticle : public TObject
     Double_t          GetPhiMC() const {return TMath::Pi() + TMath::ATan2(-fPTotMC[1], -fPTotMC[0]);}
     Double_t          GetThetaMC() const {if (fPTotMC[2]==0.0){return TMath::PiOver2();}
       else{return TMath::ACos(fPTotMC[2]/GetPMC());}}
-    Double_t          GetEtaMC() const {return -TMath::Log(TMath::ATan(0.5*GetThetaMC()));}
+    Double_t          GetEtaMC() const {return -TMath::Log(TMath::Tan(0.5*GetThetaMC()));}
     Double_t          GetYMC(Double_t m1, Double_t m2) const {return 0.5*TMath::Log((GetEtotMC(m1,m2)+fPTotMC[2])/(GetEtotMC(m1,m2)-fPTotMC[2]));}
 
     Double_t          GetAngle() const;