Skip to content

[PWGEM/PhotonMeson] speed up pairing in DiphotonHadronMPC.h #13614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsekihat merged 2 commits into from
Oct 31, 2025
Merged

[PWGEM/PhotonMeson] speed up pairing in DiphotonHadronMPC.h #13614

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f37b8f
PWGEM/PhotonMeson: speed up pairing in DiphotonHadronMPC.h
dsekihat Oct 30, 2025
e4b0c51
Change make_tuple to make_pair for track IDs
dsekihat Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 31 additions & 25 deletions PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
#include <utility>
#include <vector>

using namespace o2;

Check failure on line 59 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::aod;

Check failure on line 60 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::framework;

Check failure on line 61 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::framework::expressions;

Check failure on line 62 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::soa;

Check failure on line 63 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::aod::pwgem::photonmeson::photonpair;

Check failure on line 64 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::aod::pwgem::photon;

Check failure on line 65 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::aod::pwgem::dilepton::utils::emtrackutil;

Check failure on line 66 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.
using namespace o2::aod::pwgem::dilepton::utils;

Check failure on line 67 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive] 

Do not put using directives at global scope in headers.

using MyCollisions = soa::Join<aod::EMEvents, aod::EMEventsMult, aod::EMEventsCent>;
using MyCollision = MyCollisions::iterator;
Expand Down Expand Up @@ -321,10 +321,12 @@
delete emh_ref;
emh_ref = 0x0;

used_photonIds.clear();
used_photonIds.shrink_to_fit();
used_dileptonIds.clear();
used_dileptonIds.shrink_to_fit();
used_photonIds_per_col.clear();
used_photonIds_per_col.shrink_to_fit();
used_dileptonIds_per_col.clear();
used_dileptonIds_per_col.shrink_to_fit();
used_diphotonIds_per_col.clear();
used_diphotonIds_per_col.shrink_to_fit();

map_mixed_eventId_to_globalBC.clear();
}
Expand Down Expand Up @@ -482,9 +484,9 @@
MyEMH_track* emh_diphoton = nullptr;
MyEMH_track* emh_ref = nullptr;

std::vector<std::pair<int, int>> used_photonIds; // <ndf, trackId>
std::vector<std::tuple<int, int, int, int>> used_dileptonIds; // <ndf, trackId>
std::vector<std::tuple<int, int, int, int>> used_diphotonIds; // <ndf, trackId>
std::vector<int> used_photonIds_per_col; // <ndf, trackId>
std::vector<std::pair<int, int>> used_dileptonIds_per_col; // <ndf, trackId>
std::vector<std::tuple<int, int, int>> used_diphotonIds_per_col; // <ndf, trackId>
std::map<std::pair<int, int>, uint64_t> map_mixed_eventId_to_globalBC;

template <bool isTriggerAnalysis, typename TCollisions, typename TPhotons1, typename TPhotons2, typename TSubInfos1, typename TSubInfos2, typename TPreslice1, typename TPreslice2, typename TCut1, typename TCut2, typename TRefTracks>
Expand Down Expand Up @@ -588,7 +590,7 @@
}

if (fEMTrackCut.IsSelected(track)) {
ROOT::Math::PtEtaPhiMVector v3(track.pt(), track.eta(), track.phi(), 0.139);

Check failure on line 593 in PWGEM/PhotonMeson/Core/DiphotonHadronMPC.h

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-mass] 

Avoid hard-coded particle masses. Use o2::constants::physics::Mass... instead.
float deta = v12.Eta() - v3.Eta();
float dphi = v12.Phi() - v3.Phi();
// o2::math_utils::bringTo02Pi(dphi);
Expand All @@ -599,22 +601,20 @@
} // end of ref track loop

if (npair > 0) {
std::tuple<int, int, int, int> tuple_tmp_diphoton = std::make_tuple(ndf, g1.globalIndex(), g2.globalIndex(), -1);
if (std::find(used_diphotonIds.begin(), used_diphotonIds.end(), tuple_tmp_diphoton) == used_diphotonIds.end()) {
std::tuple<int, int, int> tuple_tmp_diphoton = std::make_tuple(g1.globalIndex(), g2.globalIndex(), -1);
if (std::find(used_diphotonIds_per_col.begin(), used_diphotonIds_per_col.end(), tuple_tmp_diphoton) == used_diphotonIds_per_col.end()) {
emh_diphoton->AddTrackToEventPool(key_df_collision, EMTrack(ndf, -1, collision.globalIndex(), -1, v12.Pt(), v12.Eta(), v12.Phi(), v12.M()));
used_diphotonIds.emplace_back(tuple_tmp_diphoton);
used_diphotonIds_per_col.emplace_back(tuple_tmp_diphoton);
}
}

std::pair<int, int> pair_tmp_id1 = std::make_pair(ndf, g1.globalIndex());
std::pair<int, int> pair_tmp_id2 = std::make_pair(ndf, g2.globalIndex());
if (std::find(used_photonIds.begin(), used_photonIds.end(), pair_tmp_id1) == used_photonIds.end()) {
if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) {
emh1->AddTrackToEventPool(key_df_collision, EMTrack(ndf, g1.globalIndex(), collision.globalIndex(), g1.globalIndex(), g1.pt(), g1.eta(), g1.phi(), 0));
used_photonIds.emplace_back(pair_tmp_id1);
used_photonIds_per_col.emplace_back(g1.globalIndex());
}
if (std::find(used_photonIds.begin(), used_photonIds.end(), pair_tmp_id2) == used_photonIds.end()) {
if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g2.globalIndex()) == used_photonIds_per_col.end()) {
emh1->AddTrackToEventPool(key_df_collision, EMTrack(ndf, g2.globalIndex(), collision.globalIndex(), g2.globalIndex(), g2.pt(), g2.eta(), g2.phi(), 0));
used_photonIds.emplace_back(pair_tmp_id2);
used_photonIds_per_col.emplace_back(g2.globalIndex());
}
ndiphoton++;
} // end of pairing loop
Expand Down Expand Up @@ -677,28 +677,34 @@
} // end of ref track loop

if (npair > 0) {
std::tuple<int, int, int, int> tuple_tmp_diphoton = std::make_tuple(ndf, g1.globalIndex(), pos2.trackId(), ele2.trackId());
if (std::find(used_diphotonIds.begin(), used_diphotonIds.end(), tuple_tmp_diphoton) == used_diphotonIds.end()) {
std::tuple<int, int, int> tuple_tmp_diphoton = std::make_tuple(g1.globalIndex(), pos2.trackId(), ele2.trackId());
if (std::find(used_diphotonIds_per_col.begin(), used_diphotonIds_per_col.end(), tuple_tmp_diphoton) == used_diphotonIds_per_col.end()) {
emh_diphoton->AddTrackToEventPool(key_df_collision, EMTrack(ndf, -1, collision.globalIndex(), -1, veeg.Pt(), veeg.Eta(), veeg.Phi(), veeg.M()));
used_diphotonIds.emplace_back(tuple_tmp_diphoton);
used_diphotonIds_per_col.emplace_back(tuple_tmp_diphoton);
}
}

std::pair<int, int> pair_tmp_id1 = std::make_pair(ndf, g1.globalIndex());
std::tuple<int, int, int, int> tuple_tmp_id2 = std::make_tuple(ndf, collision.globalIndex(), pos2.trackId(), ele2.trackId());
if (std::find(used_photonIds.begin(), used_photonIds.end(), pair_tmp_id1) == used_photonIds.end()) {
std::pair<int, int> tuple_tmp_id2 = std::make_pair(pos2.trackId(), ele2.trackId());
if (std::find(used_photonIds_per_col.begin(), used_photonIds_per_col.end(), g1.globalIndex()) == used_photonIds_per_col.end()) {
emh1->AddTrackToEventPool(key_df_collision, EMTrack(ndf, g1.globalIndex(), collision.globalIndex(), -1, g1.pt(), g1.eta(), g1.phi(), 0));
used_photonIds.emplace_back(pair_tmp_id1);
used_photonIds_per_col.emplace_back(g1.globalIndex());
}
if (std::find(used_dileptonIds.begin(), used_dileptonIds.end(), tuple_tmp_id2) == used_dileptonIds.end()) {
if (std::find(used_dileptonIds_per_col.begin(), used_dileptonIds_per_col.end(), tuple_tmp_id2) == used_dileptonIds_per_col.end()) {
emh2->AddTrackToEventPool(key_df_collision, EMTrack(ndf, -1, collision.globalIndex(), -1, v_ee.Pt(), v_ee.Eta(), v_ee.Phi(), v_ee.M()));
used_dileptonIds.emplace_back(tuple_tmp_id2);
used_dileptonIds_per_col.emplace_back(tuple_tmp_id2);
}
ndiphoton++;
} // end of dielectron loop
} // end of g1 loop
} // end of pairing in same event

used_photonIds_per_col.clear();
used_photonIds_per_col.shrink_to_fit();
used_dileptonIds_per_col.clear();
used_dileptonIds_per_col.shrink_to_fit();
used_diphotonIds_per_col.clear();
used_diphotonIds_per_col.shrink_to_fit();

if (ndiphoton > 0) {
emh_ref->ReserveNTracksPerCollision(key_df_collision, refTracks_per_collision.size());
for (const auto& track : refTracks_per_collision) {
Expand Down
Loading