Major update of the framework

[u/mrichter/AliRoot.git] / PWG3 / dielectron / AliDielectronPair.h

diff --git a/PWG3/dielectron/AliDielectronPair.h b/PWG3/dielectron/AliDielectronPair.h
index 335c451150096f1209cd1ee06dd720f04820b55f..f9fe3d5afc33944c481772b8c5d0959b08b27be3 100644 (file)
--- a/PWG3/dielectron/AliDielectronPair.h
+++ b/PWG3/dielectron/AliDielectronPair.h
@@ -57,7 +57,7 @@ public:
   virtual Double_t Xv() const { return fPair.GetX(); }
   virtual Double_t Yv() const { return fPair.GetY(); }
   virtual Double_t Zv() const { return fPair.GetZ(); }
-  virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0]=Xv(); x[1]=Xv(); x[2]=Zv(); return kTRUE; }
+  virtual Bool_t   XvYvZv(Double_t x[3]) const { x[0]=Xv(); x[1]=Yv(); x[2]=Zv(); return kTRUE; }
   
   virtual Double_t OneOverPt() const { return Pt()>0.?1./Pt():0.; }  //TODO: check
   virtual Double_t Phi()       const { return fPair.GetPhi();}
@@ -87,16 +87,20 @@ public:
   void SetLabel(Int_t label) {fLabel=label;}
   
   //inter leg information
-  Double_t OpeningAngle()         const { return fD1.GetAngle(fD2);                   }
-  Double_t DistanceDaughters()    const { return fD1.GetDistanceFromParticle(fD2);    }
-  Double_t DistanceDaughtersXY()  const { return fD1.GetDistanceFromParticleXY(fD2);  }
-  Double_t DeviationDaughters()   const { return fD1.GetDeviationFromParticle(fD2);   }
-  Double_t DeviationDaughtersXY() const { return fD1.GetDeviationFromParticleXY(fD2); }
+  Double_t OpeningAngle()         const { return fD1.GetAngle(fD2);                             }
+  Double_t DistanceDaughters()    const { return fD1.GetDistanceFromParticle(fD2);              }
+  Double_t DistanceDaughtersXY()  const { return fD1.GetDistanceFromParticleXY(fD2);            }
+  Double_t DeviationDaughters()   const { return fD1.GetDeviationFromParticle(fD2);             }
+  Double_t DeviationDaughtersXY() const { return fD1.GetDeviationFromParticleXY(fD2);           }
+  Double_t DeltaEta()             const { return TMath::Abs(fD1.GetEta()-fD2.GetEta());         }
+  Double_t DeltaPhi()             const { Double_t dphi=TMath::Abs(fD1.GetPhi()-fD2.GetPhi());
+                                          return (dphi>TMath::Pi())?dphi-TMath::Pi():dphi;      }
   // calculate cos(theta*) and phi* in HE and CS pictures
+  void GetThetaPhiCM(Double_t &thetaHE, Double_t &phiHE, Double_t &thetaCS, Double_t &phiCS) const;
+  
   Double_t ThetaPhiCM(Bool_t isHE, Bool_t isTheta) const;
   static Double_t ThetaPhiCM(const AliVParticle* d1, const AliVParticle* d2, 
-                            const Bool_t isHE, const Bool_t isTheta);
-  
+                                              const Bool_t isHE, const Bool_t isTheta);
   // internal KF particle
   const AliKFParticle& GetKFParticle()       const { return fPair; }
   const AliKFParticle& GetKFFirstDaughter()  const { return fD1;   }