including switch to set on/off iso-track core removal, cleaning and bug fix

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

diff --git a/PWGDQ/dielectron/AliDielectronPair.h b/PWGDQ/dielectron/AliDielectronPair.h
index 72edf68f690a7a914bb60f12397623edbcfe5949..6e49d77d4fb33997ea5c946fa5c9f3ab713f5a44 100644 (file)
--- a/PWGDQ/dielectron/AliDielectronPair.h
+++ b/PWGDQ/dielectron/AliDielectronPair.h
@@ -120,19 +120,33 @@ public:
   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;      }
+//   Double_t DeltaPhi()             const { Double_t dphi=TMath::Abs(fD1.GetPhi()-fD2.GetPhi());
+//                                           return (dphi>TMath::Pi())?dphi-TMath::Pi():dphi;      }
+  Double_t DeltaPhi()             const { return fD1.GetAngleXY(fD2);     }
 
   // 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);
+                                              Bool_t isHE, Bool_t isTheta);
 
   Double_t PsiPair(Double_t MagField)const; //Angle cut w.r.t. to magnetic field
   Double_t PhivPair(Double_t MagField)const; //Angle of ee plane w.r.t. to magnetic field
+
+  //Calculate the angle between ee decay plane and variables
+  Double_t GetPairPlaneAngle(Double_t kv0CrpH2, Int_t VariNum) const;
+
   Double_t GetCosPointingAngle(const AliVVertex *primVtx) const;
+  Double_t GetArmAlpha() const;
+  Double_t GetArmPt()    const;
+  void GetDCA(const AliVVertex *primVtx, Double_t d0z0[2]) const;
+
+  // Calculate inner product of strong magnetic field and ee plane
+  Double_t PairPlaneMagInnerProduct(Double_t ZDCrpH1) const;
+
+
   // internal KF particle
   const AliKFParticle& GetKFParticle()       const { return fPair; }
   const AliKFParticle& GetKFFirstDaughter()  const { return fD1;   }
@@ -142,8 +156,8 @@ public:
   void SetRefFirstDaughter(AliVParticle * const track)  {fRefD1 = track;}
   void SetRefSecondDaughter(AliVParticle * const track) {fRefD2 = track;}
   
-  AliVParticle* GetFirstDaughter()   const { return dynamic_cast<AliVParticle*>(fRefD1.GetObject()); }
-  AliVParticle* GetSecondDaughter()  const { return dynamic_cast<AliVParticle*>(fRefD2.GetObject()); }
+  AliVParticle* GetFirstDaughterP()   const { return dynamic_cast<AliVParticle*>(fRefD1.GetObject()); }
+  AliVParticle* GetSecondDaughterP()  const { return dynamic_cast<AliVParticle*>(fRefD2.GetObject()); }
 
   void SetKFUsage(Bool_t KFUsage) {fKFUsage = KFUsage;}
   Bool_t GetKFUsage() const {return fKFUsage;}
@@ -169,3 +183,4 @@ private:
 };
 
 #endif
+