Skip to content

[PWGEM/Dilepton] update table producer of muon #10772

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
Apr 5, 2025
Merged

[PWGEM/Dilepton] update table producer of muon #10772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb866e0
PWGEM/Dilepton: update table producer of muon
dsekihat Apr 5, 2025
2383480
Update EMTrackUtilities.h
dsekihat Apr 5, 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: 35 additions & 21 deletions PWGEM/Dilepton/Core/Dilepton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ using MyElectron = MyElectrons::iterator;
using FilteredMyElectrons = soa::Filtered<MyElectrons>;
using FilteredMyElectron = FilteredMyElectrons::iterator;

using MyMuons = soa::Join<aod::EMPrimaryMuons, aod::EMPrimaryMuonEMEventIds, aod::EMAmbiguousMuonSelfIds>;
using MyMuons = soa::Join<aod::EMPrimaryMuons, aod::EMPrimaryMuonEMEventIds, aod::EMAmbiguousMuonSelfIds, aod::EMGlobalMuonSelfIds>;
using MyMuon = MyMuons::iterator;
using FilteredMyMuons = soa::Filtered<MyMuons>;
using FilteredMyMuon = FilteredMyMuons::iterator;
Expand Down Expand Up @@ -771,8 +771,8 @@ struct Dilepton {
}
}

template <int ev_id, typename TCollision, typename TTrack1, typename TTrack2, typename TCut>
bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut)
template <int ev_id, typename TCollision, typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
bool fillPairInfo(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const& tracks)
{
if constexpr (ev_id == 1) {
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
Expand Down Expand Up @@ -813,6 +813,13 @@ struct Dilepton {
if (!cut.template IsSelectedTrack<false>(t1) || !cut.template IsSelectedTrack<false>(t2)) {
return false;
}

if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
return false;
}
if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
return false;
}
}
}

Expand Down Expand Up @@ -1112,8 +1119,8 @@ struct Dilepton {
std::vector<std::pair<int, int>> used_trackIds;
int ndf = 0;

template <bool isTriggerAnalysis, typename TCollisions, typename TLeptons, typename TPresilce, typename TCut>
void runPairing(TCollisions const& collisions, TLeptons const& posTracks, TLeptons const& negTracks, TPresilce const& perCollision, TCut const& cut)
template <bool isTriggerAnalysis, typename TCollisions, typename TLeptons, typename TPresilce, typename TCut, typename TAllTracks>
void runPairing(TCollisions const& collisions, TLeptons const& posTracks, TLeptons const& negTracks, TPresilce const& perCollision, TCut const& cut, TAllTracks const& tracks)
{
for (auto& collision : collisions) {
initCCDB<isTriggerAnalysis>(collision);
Expand Down Expand Up @@ -1190,19 +1197,19 @@ struct Dilepton {

int nuls = 0, nlspp = 0, nlsmm = 0;
for (auto& [pos, neg] : combinations(CombinationsFullIndexPolicy(posTracks_per_coll, negTracks_per_coll))) { // ULS
bool is_pair_ok = fillPairInfo<0>(collision, pos, neg, cut);
bool is_pair_ok = fillPairInfo<0>(collision, pos, neg, cut, tracks);
if (is_pair_ok) {
nuls++;
}
}
for (auto& [pos1, pos2] : combinations(CombinationsStrictlyUpperIndexPolicy(posTracks_per_coll, posTracks_per_coll))) { // LS++
bool is_pair_ok = fillPairInfo<0>(collision, pos1, pos2, cut);
bool is_pair_ok = fillPairInfo<0>(collision, pos1, pos2, cut, tracks);
if (is_pair_ok) {
nlspp++;
}
}
for (auto& [neg1, neg2] : combinations(CombinationsStrictlyUpperIndexPolicy(negTracks_per_coll, negTracks_per_coll))) { // LS--
bool is_pair_ok = fillPairInfo<0>(collision, neg1, neg2, cut);
bool is_pair_ok = fillPairInfo<0>(collision, neg1, neg2, cut, tracks);
if (is_pair_ok) {
nlsmm++;
}
Expand Down Expand Up @@ -1282,25 +1289,25 @@ struct Dilepton {

for (auto& pos : selected_posTracks_in_this_event) { // ULS mix
for (auto& neg : negTracks_from_event_pool) {
fillPairInfo<1>(collision, pos, neg, cut);
fillPairInfo<1>(collision, pos, neg, cut, tracks);
}
}

for (auto& neg : selected_negTracks_in_this_event) { // ULS mix
for (auto& pos : posTracks_from_event_pool) {
fillPairInfo<1>(collision, neg, pos, cut);
fillPairInfo<1>(collision, neg, pos, cut, tracks);
}
}

for (auto& pos1 : selected_posTracks_in_this_event) { // LS++ mix
for (auto& pos2 : posTracks_from_event_pool) {
fillPairInfo<1>(collision, pos1, pos2, cut);
fillPairInfo<1>(collision, pos1, pos2, cut, tracks);
}
}

for (auto& neg1 : selected_negTracks_in_this_event) { // LS-- mix
for (auto& neg2 : negTracks_from_event_pool) {
fillPairInfo<1>(collision, neg1, neg2, cut);
fillPairInfo<1>(collision, neg1, neg2, cut, tracks);
}
}
} // end of loop over mixed event pool
Expand All @@ -1315,8 +1322,8 @@ struct Dilepton {

} // end of DF

template <typename TCollision, typename TTrack1, typename TTrack2, typename TCut>
bool isPairOK(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut)
template <typename TCollision, typename TTrack1, typename TTrack2, typename TCut, typename TAllTracks>
bool isPairOK(TCollision const& collision, TTrack1 const& t1, TTrack2 const& t2, TCut const& cut, TAllTracks const& tracks)
{
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
if (dielectroncuts.cfg_pid_scheme == static_cast<int>(DielectronCut::PIDSchemes::kPIDML)) {
Expand All @@ -1332,6 +1339,13 @@ struct Dilepton {
if (!cut.IsSelectedTrack(t1) || !cut.IsSelectedTrack(t2)) {
return false;
}

if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t1, cut, tracks)) {
return false;
}
if (!o2::aod::pwgem::dilepton::utils::emtrackutil::isBestMatch(t2, cut, tracks)) {
return false;
}
}

if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
Expand Down Expand Up @@ -1398,17 +1412,17 @@ struct Dilepton {
auto negTracks_per_coll = negTracks.sliceByCached(perCollision, collision.globalIndex(), cache);

for (auto& [pos, neg] : combinations(CombinationsFullIndexPolicy(posTracks_per_coll, negTracks_per_coll))) { // ULS
if (isPairOK(collision, pos, neg, cut)) {
if (isPairOK(collision, pos, neg, cut, tracks)) {
passed_pairIds.emplace_back(std::make_pair(pos.globalIndex(), neg.globalIndex()));
}
}
for (auto& [pos1, pos2] : combinations(CombinationsStrictlyUpperIndexPolicy(posTracks_per_coll, posTracks_per_coll))) { // LS++
if (isPairOK(collision, pos1, pos2, cut)) {
if (isPairOK(collision, pos1, pos2, cut, tracks)) {
passed_pairIds.emplace_back(std::make_pair(pos1.globalIndex(), pos2.globalIndex()));
}
}
for (auto& [neg1, neg2] : combinations(CombinationsStrictlyUpperIndexPolicy(negTracks_per_coll, negTracks_per_coll))) { // LS--
if (isPairOK(collision, neg1, neg2, cut)) {
if (isPairOK(collision, neg1, neg2, cut, tracks)) {
passed_pairIds.emplace_back(std::make_pair(neg1.globalIndex(), neg2.globalIndex()));
}
}
Expand Down Expand Up @@ -1457,13 +1471,13 @@ struct Dilepton {
if (cfgApplyWeightTTCA) {
fillPairWeightMap<false>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut, electrons);
}
runPairing<false>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut);
runPairing<false>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut, electrons);
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
auto muons = std::get<0>(std::tie(args...));
if (cfgApplyWeightTTCA) {
fillPairWeightMap<false>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
}
runPairing<false>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut);
runPairing<false>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
}
map_weight.clear();
ndf++;
Expand All @@ -1478,13 +1492,13 @@ struct Dilepton {
if (cfgApplyWeightTTCA) {
fillPairWeightMap<true>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut, electrons);
}
runPairing<true>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut);
runPairing<true>(collisions, positive_electrons, negative_electrons, o2::aod::emprimaryelectron::emeventId, fDielectronCut, electrons);
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
auto muons = std::get<0>(std::tie(args...));
if (cfgApplyWeightTTCA) {
fillPairWeightMap<true>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
}
runPairing<true>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut);
runPairing<true>(collisions, positive_muons, negative_muons, o2::aod::emprimarymuon::emeventId, fDimuonCut, muons);
}
map_weight.clear();
ndf++;
Expand Down
Loading