Skip to content

[PWGEM/Dilepton] remove unused argument #12511

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 1 commit into from
Aug 10, 2025
Merged

[PWGEM/Dilepton] remove unused argument #12511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions PWGEM/Dilepton/Core/Dilepton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@
#include <utility>
#include <vector>

using namespace o2;

Check failure on line 63 in PWGEM/Dilepton/Core/Dilepton.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 64 in PWGEM/Dilepton/Core/Dilepton.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 65 in PWGEM/Dilepton/Core/Dilepton.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 66 in PWGEM/Dilepton/Core/Dilepton.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 67 in PWGEM/Dilepton/Core/Dilepton.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 68 in PWGEM/Dilepton/Core/Dilepton.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 69 in PWGEM/Dilepton/Core/Dilepton.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::pairutil;

Check failure on line 70 in PWGEM/Dilepton/Core/Dilepton.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, aod::EMEventsQvec>;
using MyCollision = MyCollisions::iterator;
Expand Down Expand Up @@ -113,7 +113,7 @@
Configurable<uint64_t> ndiff_bc_mix{"ndiff_bc_mix", 594, "difference in global BC required in mixed events"};
ConfigurableAxis ConfVtxBins{"ConfVtxBins", {VARIABLE_WIDTH, -10.0f, -8.f, -6.f, -4.f, -2.f, 0.f, 2.f, 4.f, 6.f, 8.f, 10.f}, "Mixing bins - z-vertex"};
ConfigurableAxis ConfCentBins{"ConfCentBins", {VARIABLE_WIDTH, 0.0f, 5.0f, 10.0f, 20.0f, 30.0f, 40.0f, 50.0f, 60.0f, 70.0f, 80.0f, 90.0f, 100.f, 999.f}, "Mixing bins - centrality"};
ConfigurableAxis ConfEPBins{"ConfEPBins", {16, -M_PI / 2, +M_PI / 2}, "Mixing bins - event plane angle"};

Check failure on line 116 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi] 

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
ConfigurableAxis ConfOccupancyBins{"ConfOccupancyBins", {VARIABLE_WIDTH, -1, 1e+10}, "Mixing bins - occupancy"};
Configurable<std::string> cfg_swt_name{"cfg_swt_name", "fHighTrackMult", "desired software trigger name"}; // 1 trigger name per 1 task. fHighTrackMult, fHighFt0Mult
// Configurable<int> cfgNtracksPV08Min{"cfgNtracksPV08Min", -1, "min. multNTracksPV"};
Expand Down Expand Up @@ -549,7 +549,7 @@

if (cfgAnalysisType == static_cast<int>(o2::aod::pwgem::dilepton::utils::pairutil::DileptonAnalysisType::kQC)) {
fRegistry.add("Pair/same/uls/hs", "dilepton", kTHnSparseD, {axis_mass, axis_pt, axis_dca}, true);
fRegistry.add("Pair/same/uls/hDeltaEtaDeltaPhi", "#Delta#eta-#Delta#varphi between 2 tracks;#Delta#varphi (rad.);#Delta#eta;", kTH2D, {{180, -M_PI, M_PI}, {400, -2, +2}}, true);

Check failure on line 552 in PWGEM/Dilepton/Core/Dilepton.h

View workflow job for this annotation

GitHub Actions / O2 linter

[external-pi] 

Use the PI constant (and its multiples and fractions) defined in o2::constants::math.
fRegistry.add("Pair/same/uls/hDeltaEtaDeltaPhiPosition", "#Delta#eta-#Delta#varphi^{*} between 2 tracks;#Delta#varphi^{*} (rad.);#Delta#eta;", kTH2D, {{180, -M_PI, M_PI}, {400, -2, +2}}, true);

if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
Expand Down Expand Up @@ -1344,25 +1344,25 @@

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

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

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

for (const auto& neg1 : selected_negTracks_in_this_event) { // LS-- mix
for (const auto& neg2 : negTracks_from_event_pool) {
fillPairInfo<1>(collision, neg1, neg2, cut, tracks);
fillPairInfo<1>(collision, neg1, neg2, cut, nullptr);
}
}
} // end of loop over mixed event pool
Expand Down
18 changes: 9 additions & 9 deletions PWGEM/Dilepton/Core/DileptonHadronMPC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,6 @@ struct DileptonHadronMPC {
}
}
}

// possibleIds1.clear();
// possibleIds1.shrink_to_fit();
// possibleIds2.clear();
// possibleIds2.shrink_to_fit();
}
return true;
}
Expand Down Expand Up @@ -1186,6 +1181,8 @@ struct DileptonHadronMPC {

auto collisionIds_in_mixing_pool = emh_pos->GetCollisionIdsFromEventPool(key_bin); // pos/neg does not matter.

// LOGF(info, "selected_posTracks_in_this_event.size() = %d, selected_negTracks_in_this_event.size() = %d, collisionIds_in_mixing_pool.size() = %d", selected_posTracks_in_this_event.size(), selected_negTracks_in_this_event.size(), collisionIds_in_mixing_pool.size());

// perform event mixing, only if at least 1 dilepton exists.

for (const auto& mix_dfId_collisionId : collisionIds_in_mixing_pool) {
Expand All @@ -1204,35 +1201,37 @@ struct DileptonHadronMPC {

auto posTracks_from_event_pool = emh_pos->GetTracksPerCollision(mix_dfId_collisionId);
auto negTracks_from_event_pool = emh_neg->GetTracksPerCollision(mix_dfId_collisionId);
// LOGF(info, "posTracks_from_event_pool.size() = %d, negTracks_from_event_pool.size() = %d", posTracks_from_event_pool.size(), negTracks_from_event_pool.size());

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

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

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

for (const auto& neg1 : selected_negTracks_in_this_event) { // LS-- mix
for (const auto& neg2 : negTracks_from_event_pool) {
fillDilepton<1>(collision, neg1, neg2, cut, tracks);
fillDilepton<1>(collision, neg1, neg2, cut, nullptr);
}
}
} // end of loop over mixed event pool for lepton-lepton

if (cfgAnalysisType == static_cast<int>(o2::aod::pwgem::dilepton::utils::pairutil::DileptonHadronAnalysisType::kAzimuthalCorrelation)) {
auto selected_refTracks_in_this_event = emh_ref->GetTracksPerCollision(key_df_collision);
auto collisionIds_in_mixing_pool_hadron = emh_ref->GetCollisionIdsFromEventPool(key_bin);
// LOGF(info, "selected_refTracks_in_this_event.size() = %d, collisionIds_in_mixing_pool_hadron.size() = %d", selected_refTracks_in_this_event.size(), collisionIds_in_mixing_pool_hadron.size());

for (const auto& mix_dfId_collisionId : collisionIds_in_mixing_pool_hadron) {
int mix_dfId = mix_dfId_collisionId.first;
Expand All @@ -1249,6 +1248,7 @@ struct DileptonHadronMPC {
}

auto refTracks_from_event_pool = emh_ref->GetTracksPerCollision(mix_dfId_collisionId);
// LOGF(info, "refTracks_from_event_pool.size() = %d", refTracks_from_event_pool.size());
for (const auto& ref1 : selected_refTracks_in_this_event) { // ref-ref mix
for (const auto& ref2 : refTracks_from_event_pool) {
fillHadronHadron<1>(collision, ref1, ref2, nullptr, nullptr);
Expand Down
Loading