Skip to content

[PWGEM/Dilepton] fix for #13937 v2 #13985

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
Nov 26, 2025
Merged

[PWGEM/Dilepton] fix for #13937 v2 #13985

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
30 changes: 18 additions & 12 deletions PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@
}

// In case override, don't proceed, please - no CCDB access required
if (d_bz_input > -990) {

Check failure on line 225 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
d_bz = d_bz_input;
o2::parameters::GRPMagField grpmag;
if (std::fabs(d_bz) > 1e-5) {

Check failure on line 228 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
grpmag.setL3Current(30000.f / (d_bz / 5.0f));
}
o2::base::Propagator::initFieldFromGRP(&grpmag);
Expand Down Expand Up @@ -273,7 +273,7 @@
}
if (storeOnlyTrueElectronMC) {
const auto& mcParticle = track.template mcParticle_as<aod::McParticles>();
if (std::abs(mcParticle.pdgCode()) != 11) {

Check failure on line 276 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.

Check failure on line 276 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[pdg/explicit-code] 

Avoid hard-coded PDG codes. Use named values from PDG_t or o2::constants::physics::Pdg instead.
return false;
}
}
Expand Down Expand Up @@ -361,7 +361,7 @@
}

int total_cluster_size = 0, nl = 0;
for (unsigned int layer = 0; layer < 7; layer++) {

Check failure on line 364 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
int cluster_size_per_layer = track.itsClsSizeInLayer(layer);
if (cluster_size_per_layer > 0) {
nl++;
Expand Down Expand Up @@ -413,7 +413,7 @@
int pbin = lower_bound(binsMl.value.begin(), binsMl.value.end(), binningFeature) - binsMl.value.begin() - 1;
if (pbin < 0) {
pbin = 0;
} else if (static_cast<int>(binsMl.value.size()) - 2 < pbin) {

Check failure on line 416 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
pbin = static_cast<int>(binsMl.value.size()) - 2;
}
// LOGF(info, "track.tpcInnerParam() = %f (GeV/c), pbin = %d", track.tpcInnerParam(), pbin);
Expand Down Expand Up @@ -531,7 +531,7 @@
if (fillQAHistogram) {
// uint32_t itsClusterSizes = track.itsClusterSizes();
int total_cluster_size = 0, nl = 0;
for (unsigned int layer = 0; layer < 7; layer++) {

Check failure on line 534 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
int cluster_size_per_layer = track.itsClsSizeInLayer(layer);
if (cluster_size_per_layer > 0) {
nl++;
Expand All @@ -540,7 +540,7 @@
}

int total_cluster_size_ib = 0, nl_ib = 0;
for (unsigned int layer = 0; layer < 3; layer++) {

Check failure on line 543 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
int cluster_size_per_layer = track.itsClsSizeInLayer(layer);
if (cluster_size_per_layer > 0) {
nl_ib++;
Expand All @@ -549,7 +549,7 @@
}

int total_cluster_size_ob = 0, nl_ob = 0;
for (unsigned int layer = 3; layer < 7; layer++) {

Check failure on line 552 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
int cluster_size_per_layer = track.itsClsSizeInLayer(layer);
if (cluster_size_per_layer > 0) {
nl_ob++;
Expand Down Expand Up @@ -636,8 +636,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -684,8 +685,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -735,8 +737,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -786,8 +789,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -840,8 +844,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -891,8 +896,9 @@

for (const auto& collision : collisions) {
int count_electrons = multiMapTracksPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("Track/hNe"), count_electrons);

if (fillQAHistogram) {
fRegistry.fill(HIST("Track/hNe"), count_electrons);
}
if (count_electrons >= minNelectron) {
auto range_electrons = multiMapTracksPerCollision.equal_range(collision.globalIndex());
for (auto it = range_electrons.first; it != range_electrons.second; it++) {
Expand Down Expand Up @@ -1002,7 +1008,7 @@
}

// In case override, don't proceed, please - no CCDB access required
if (d_bz_input > -990) {

Check failure on line 1011 in PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
d_bz = d_bz_input;
o2::parameters::GRPMagField grpmag;
if (std::fabs(d_bz) > 1e-5) {
Expand Down
63 changes: 36 additions & 27 deletions PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,9 +562,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -635,9 +636,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -712,9 +714,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -782,9 +785,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -857,9 +861,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -936,9 +941,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -1007,9 +1013,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -1085,9 +1092,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down Expand Up @@ -1167,9 +1175,10 @@ struct skimmerPrimaryMuon {
for (const auto& collision : collisions) {
int count_samuons = multiMapSAMuonsPerCollision.count(collision.globalIndex());
int count_glmuons = multiMapGLMuonsPerCollision.count(collision.globalIndex());
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);

if (fillQAHistograms) {
fRegistry.fill(HIST("MCHMID/hNmu"), count_samuons);
fRegistry.fill(HIST("MFTMCHMID/hNmu"), count_glmuons);
}
if (count_samuons >= minNmuon) {
auto range_samuons = multiMapSAMuonsPerCollision.equal_range(collision.globalIndex());
for (auto it = range_samuons.first; it != range_samuons.second; it++) {
Expand Down
Loading