From 576c41f223820fb7ffb0bedc85c67b89443be6c2 Mon Sep 17 00:00:00 2001 From: Daiki Sekihata Date: Wed, 26 Nov 2025 12:56:49 +0100 Subject: [PATCH] PWGEM/Dilepton: fix for #13937 v2 --- .../TableProducer/skimmerPrimaryElectron.cxx | 30 +++++---- .../TableProducer/skimmerPrimaryMuon.cxx | 63 +++++++++++-------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx index 2ddf0120f5c..f28cf0b8755 100644 --- a/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx +++ b/PWGEM/Dilepton/TableProducer/skimmerPrimaryElectron.cxx @@ -636,8 +636,9 @@ struct skimmerPrimaryElectron { 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++) { @@ -684,8 +685,9 @@ struct skimmerPrimaryElectron { 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++) { @@ -735,8 +737,9 @@ struct skimmerPrimaryElectron { 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++) { @@ -786,8 +789,9 @@ struct skimmerPrimaryElectron { 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++) { @@ -840,8 +844,9 @@ struct skimmerPrimaryElectron { 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++) { @@ -891,8 +896,9 @@ struct skimmerPrimaryElectron { 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++) { diff --git a/PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx b/PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx index baa297bec1a..9de70407e65 100644 --- a/PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx +++ b/PWGEM/Dilepton/TableProducer/skimmerPrimaryMuon.cxx @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) { @@ -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++) {