From 269a51742db5891df3718a25ff3fb8ea8b280720 Mon Sep 17 00:00:00 2001 From: Isabel Kantak Date: Thu, 25 Sep 2025 13:35:29 +0200 Subject: [PATCH 1/3] Add photonsphiv with the variable PhiV as table and histogram to photonconversionbuild --- PWGEM/PhotonMeson/DataModel/gammaTables.h | 10 ++++++++++ .../TableProducer/photonconversionbuilder.cxx | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/PWGEM/PhotonMeson/DataModel/gammaTables.h b/PWGEM/PhotonMeson/DataModel/gammaTables.h index a6b7017f550..143aa0978aa 100644 --- a/PWGEM/PhotonMeson/DataModel/gammaTables.h +++ b/PWGEM/PhotonMeson/DataModel/gammaTables.h @@ -411,6 +411,16 @@ using EMPrimaryElectronsFromDalitz = EMPrimaryElectronsFromDalitz_001; // iterators using EMPrimaryElectronFromDalitz = EMPrimaryElectronsFromDalitz::iterator; +namespace v0photonsphiv +{ + DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! + DECLARE_SOA_COLUMN(PhiV, phiv, float); //! +} // namespace v0photonsphiv +DECLARE_SOA_TABLE(V0PhotonsPhiV, "AOD", "V0PHOTONPHIV", //! + o2::soa::Index<>, v0photonsphiv::PhiV); +// iterators +using V0PhotonsPhiV = V0PhotonsPhiV; + namespace dalitzee { DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index a1d1eb3ee5e..930c117e678 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -18,6 +18,7 @@ #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h" #include "PWGEM/PhotonMeson/Utils/TrackSelection.h" +#include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/TPCVDriftManager.h" @@ -73,6 +74,7 @@ struct PhotonConversionBuilder { Produces v0legs; Produces v0legsXYZ; Produces v0legsDeDxMC; + Produces v0photonsphiv; // Produces v0photonskfcov; // Produces events_ngpcm; @@ -166,6 +168,7 @@ struct PhotonConversionBuilder { {"V0/hRxy_minX_ITSTPC_TPC", "min trackiu X vs. R_{xy};trackiu X (cm);min trackiu X - R_{xy} (cm)", {HistType::kTH2F, {{100, 0.0f, 100.f}, {100, -50.0, 50.0f}}}}, {"V0/hRxy_minX_TPC_TPC", "min trackiu X vs. R_{xy};trackiu X (cm);min trackiu X - R_{xy} (cm)", {HistType::kTH2F, {{100, 0.0f, 100.f}, {100, -50.0, 50.0f}}}}, {"V0/hPCA_diffX", "PCA vs. trackiu X - R_{xy};distance btween 2 legs (cm);min trackiu X - R_{xy} (cm)", {HistType::kTH2F, {{500, 0.0f, 5.f}, {100, -50.0, 50.0f}}}}, + {"V0/hPhiV", "#phi_{V}; #phi_{V} (rad.)", {HistType::kTH1F, {{500, 0.0f, 2 * M_PI}}}}, {"V0Leg/hPt", "pT of leg at SV;p_{T,e} (GeV/c)", {HistType::kTH1F, {{1000, 0.0f, 10.0f}}}}, {"V0Leg/hEtaPhi", "#eta vs. #varphi of leg at SV;#varphi (rad.);#eta", {HistType::kTH2F, {{72, 0.0f, 2 * M_PI}, {200, -1, +1}}}}, {"V0Leg/hRelDeltaPt", "pT resolution;p_{T} (GeV/c);#Deltap_{T}/p_{T}", {HistType::kTH2F, {{1000, 0.f, 10.f}, {100, 0, 1}}}}, @@ -631,6 +634,8 @@ struct PhotonConversionBuilder { pca_map[std::make_tuple(v0.globalIndex(), collision.globalIndex(), pos.globalIndex(), ele.globalIndex())] = pca_kf; cospa_map[std::make_tuple(v0.globalIndex(), collision.globalIndex(), pos.globalIndex(), ele.globalIndex())] = cospa_kf; + float phiv = o2::aod::pwgem::dilepton::utils::pairutil::getPhivPair(pos.px(), pos.py(), pos.pz(), ele.px(), ele.py(), ele.pz(), pos.sign(), ele.sign(), d_bz); + if (filltable) { registry.fill(HIST("V0/hAP"), alpha, qt); registry.fill(HIST("V0/hConversionPointXY"), gammaKF_DecayVtx.GetX(), gammaKF_DecayVtx.GetY()); @@ -644,6 +649,7 @@ struct PhotonConversionBuilder { registry.fill(HIST("V0/hPCA_Rxy"), rxy, pca_kf); registry.fill(HIST("V0/hDCAxyz"), dca_xy_v0_to_pv, dca_z_v0_to_pv); registry.fill(HIST("V0/hPCA_diffX"), pca_kf, std::min(pTrack.getX(), nTrack.getX()) - rxy); // trackiu.x() - rxy should be positive + registry.fill(HIST("V0/hPhiV"), phiv); float cospaXY_kf = cospaXY_KF(gammaKF_DecayVtx, KFPV); float cospaRZ_kf = cospaRZ_KF(gammaKF_DecayVtx, KFPV); @@ -680,6 +686,7 @@ struct PhotonConversionBuilder { v0_sv.M(), dca_xy_v0_to_pv, dca_z_v0_to_pv, cospa_kf, cospaXY_kf, cospaRZ_kf, pca_kf, alpha, qt, chi2kf); + v0photonsphiv(phiv); // v0photonskfcov(gammaKF_PV.GetCovariance(9), gammaKF_PV.GetCovariance(14), gammaKF_PV.GetCovariance(20), gammaKF_PV.GetCovariance(13), gammaKF_PV.GetCovariance(19), gammaKF_PV.GetCovariance(18)); From 94f89c0af78f721dd430eece911df47f733e37f9 Mon Sep 17 00:00:00 2001 From: Isabel Kantak Date: Fri, 26 Sep 2025 09:14:19 +0200 Subject: [PATCH 2/3] Solve PR formatting clang --- PWGEM/PhotonMeson/DataModel/gammaTables.h | 4 ++-- PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PWGEM/PhotonMeson/DataModel/gammaTables.h b/PWGEM/PhotonMeson/DataModel/gammaTables.h index 143aa0978aa..712c24339e0 100644 --- a/PWGEM/PhotonMeson/DataModel/gammaTables.h +++ b/PWGEM/PhotonMeson/DataModel/gammaTables.h @@ -413,8 +413,8 @@ using EMPrimaryElectronFromDalitz = EMPrimaryElectronsFromDalitz::iterator; namespace v0photonsphiv { - DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! - DECLARE_SOA_COLUMN(PhiV, phiv, float); //! + DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! + DECLARE_SOA_COLUMN(PhiV, phiv, float); //! } // namespace v0photonsphiv DECLARE_SOA_TABLE(V0PhotonsPhiV, "AOD", "V0PHOTONPHIV", //! o2::soa::Index<>, v0photonsphiv::PhiV); diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx index 930c117e678..770cd6ad1c3 100644 --- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx +++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx @@ -15,10 +15,10 @@ // // \author Daiki Sekihata , Tokyo +#include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "PWGEM/PhotonMeson/DataModel/gammaTables.h" #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h" #include "PWGEM/PhotonMeson/Utils/TrackSelection.h" -#include "PWGEM/Dilepton/Utils/PairUtilities.h" #include "Common/Core/RecoDecay.h" #include "Common/Core/TPCVDriftManager.h" From e3b48be3ccfe4dbd735d2480ecbc9e4f16e19379 Mon Sep 17 00:00:00 2001 From: Isabel Kantak Date: Tue, 30 Sep 2025 11:31:10 +0200 Subject: [PATCH 3/3] Remove indentations inside v0photonsphiv namespaces --- PWGEM/PhotonMeson/DataModel/gammaTables.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGEM/PhotonMeson/DataModel/gammaTables.h b/PWGEM/PhotonMeson/DataModel/gammaTables.h index 712c24339e0..5f3392e1704 100644 --- a/PWGEM/PhotonMeson/DataModel/gammaTables.h +++ b/PWGEM/PhotonMeson/DataModel/gammaTables.h @@ -413,8 +413,8 @@ using EMPrimaryElectronFromDalitz = EMPrimaryElectronsFromDalitz::iterator; namespace v0photonsphiv { - DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! - DECLARE_SOA_COLUMN(PhiV, phiv, float); //! +DECLARE_SOA_INDEX_COLUMN(EMEvent, emevent); //! +DECLARE_SOA_COLUMN(PhiV, phiv, float); //! } // namespace v0photonsphiv DECLARE_SOA_TABLE(V0PhotonsPhiV, "AOD", "V0PHOTONPHIV", //! o2::soa::Index<>, v0photonsphiv::PhiV);