From c07dec8d882ca050fca4821b60423bde10fa36eb Mon Sep 17 00:00:00 2001 From: Shunsuke-Kurita Date: Thu, 21 Dec 2023 14:29:25 +0900 Subject: [PATCH 1/6] add kDeltaPhiPair Histogram --- PWGDQ/Core/HistogramsLibrary.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 808ac8f622a..51c71d0d729 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -519,6 +519,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Mass_Pt", "", false, 750, 0.0, 30.0, VarManager::kMass, 120, 0.0, 30.0, VarManager::kPt); hm->AddHistogram(histClass, "Mass_Rapidity", "", false, 750, 0.0, 30.0, VarManager::kMass, 500, -1.0, 4.0, VarManager::kRap); hm->AddHistogram(histClass, "Mass_VtxZ", "", true, 30, -15.0, 15.0, VarManager::kVtxZ, 750, 0.0, 30.0, VarManager::kMass); + hm->AddHistogram(histClass, "DeltaPhiPair", "", false, 130, -6.5, 6.5, VarManager::kDeltaPhiPair); } if (subGroupStr.Contains("dielectrons")) { if (subGroupStr.Contains("phiv")) { From 28ccc0c53f520fb18786dff384bf8d181d9385bc Mon Sep 17 00:00:00 2001 From: Shunsuke-Kurita Date: Mon, 29 Jul 2024 15:59:56 +0200 Subject: [PATCH 2/6] Calculation for deltaphi: folding in procedure --- PWGDQ/Core/VarManager.cxx | 2 ++ PWGDQ/Core/VarManager.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx index 8628a64972e..6c76c2747d8 100644 --- a/PWGDQ/Core/VarManager.cxx +++ b/PWGDQ/Core/VarManager.cxx @@ -837,6 +837,8 @@ void VarManager::SetDefaultVarNames() fgVariableUnits[kCosThetaCS] = ""; fgVariableNames[kPhiCS] = "#varphi_{CS}"; fgVariableUnits[kPhiCS] = "rad."; + fgVariableNames[kDeltaPhiPair2] = "#Delta#phi"; + fgVariableUnits[kDeltaPhiPair2] = "rad."; fgVariableNames[kPsiPair] = "#Psi_{pair}"; fgVariableUnits[kPsiPair] = "rad."; fgVariableNames[kDeltaPhiPair] = "#Delta#phi"; diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 23a81644c7d..e8b2ed5ed09 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -569,6 +569,7 @@ class VarManager : public TObject kCosThetaCS, kPhiHE, kPhiCS, + kDeltaPhiPair2, kPsiPair, kDeltaPhiPair, kOpeningAngle, @@ -2347,6 +2348,12 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values) double Ptot2 = TMath::Sqrt(v2.Px() * v2.Px() + v2.Py() * v2.Py() + v2.Pz() * v2.Pz()); values[kDeltaPtotTracks] = Ptot1 - Ptot2; + if (fgUsedVars[kDeltaPhiPair2]) { + double phipair2 = v1.Phi() - v2.Phi(); + if (phipair2 > 3 * TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); + if (phipair2 < - TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); + } + if (fgUsedVars[kPsiPair]) { values[kDeltaPhiPair] = (t1.sign() * fgMagField > 0.) ? (v1.Phi() - v2.Phi()) : (v2.Phi() - v1.Phi()); double xipair = TMath::ACos((v1.Px() * v2.Px() + v1.Py() * v2.Py() + v1.Pz() * v2.Pz()) / v1.P() / v2.P()); From ad5fdb3620d967f0cf4b1527f417acc7f9689652 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 29 Jul 2024 14:06:57 +0000 Subject: [PATCH 3/6] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index e8b2ed5ed09..27c38bff1ee 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -2350,8 +2350,10 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values) if (fgUsedVars[kDeltaPhiPair2]) { double phipair2 = v1.Phi() - v2.Phi(); - if (phipair2 > 3 * TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); - if (phipair2 < - TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); + if (phipair2 > 3 * TMath::Pi() / 2) + values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); + if (phipair2 < -TMath::Pi() / 2) + values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); } if (fgUsedVars[kPsiPair]) { From 9fc9daa3185e2f484c9109e1d70c377aef31c3ff Mon Sep 17 00:00:00 2001 From: Shunsuke-Kurita Date: Mon, 29 Jul 2024 16:39:22 +0200 Subject: [PATCH 4/6] Fixing the code --- PWGDQ/Core/VarManager.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index e8b2ed5ed09..4313c73f92b 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -2350,8 +2350,12 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values) if (fgUsedVars[kDeltaPhiPair2]) { double phipair2 = v1.Phi() - v2.Phi(); - if (phipair2 > 3 * TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); - if (phipair2 < - TMath::Pi()/2) values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); + if (phipair2 > 3 * TMath::Pi()/2) { + values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); + } + if (phipair2 < - TMath::Pi()/2) { + values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); + } } if (fgUsedVars[kPsiPair]) { From f339bed95740c05bce938d2e6bdf091c07af5765 Mon Sep 17 00:00:00 2001 From: Shunsuke-Kurita Date: Mon, 29 Jul 2024 16:53:42 +0200 Subject: [PATCH 5/6] Fixing the code again --- PWGDQ/Core/VarManager.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 27c38bff1ee..4313c73f92b 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -2350,10 +2350,12 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values) if (fgUsedVars[kDeltaPhiPair2]) { double phipair2 = v1.Phi() - v2.Phi(); - if (phipair2 > 3 * TMath::Pi() / 2) + if (phipair2 > 3 * TMath::Pi()/2) { values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); - if (phipair2 < -TMath::Pi() / 2) + } + if (phipair2 < - TMath::Pi()/2) { values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); + } } if (fgUsedVars[kPsiPair]) { From 2594b4982dd88c4a9e54b002629812803125c546 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 29 Jul 2024 14:57:00 +0000 Subject: [PATCH 6/6] Please consider the following formatting changes --- PWGDQ/Core/VarManager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Core/VarManager.h b/PWGDQ/Core/VarManager.h index 4313c73f92b..62f90ae21a8 100644 --- a/PWGDQ/Core/VarManager.h +++ b/PWGDQ/Core/VarManager.h @@ -2350,10 +2350,10 @@ void VarManager::FillPair(T1 const& t1, T2 const& t2, float* values) if (fgUsedVars[kDeltaPhiPair2]) { double phipair2 = v1.Phi() - v2.Phi(); - if (phipair2 > 3 * TMath::Pi()/2) { + if (phipair2 > 3 * TMath::Pi() / 2) { values[kDeltaPhiPair2] = phipair2 - 2 * TMath::Pi(); } - if (phipair2 < - TMath::Pi()/2) { + if (phipair2 < -TMath::Pi() / 2) { values[kDeltaPhiPair2] = phipair2 + 2 * TMath::Pi(); } }