Skip to content

[PWGJE] EMCal correction task: apply MC cell corrections after cross-… #18727

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
mhemmer-cern merged 1 commit into from
Nov 13, 2026
Merged

[PWGJE] EMCal correction task: apply MC cell corrections after cross-… #18727

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
56 changes: 27 additions & 29 deletions PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ struct EmcalCorrectionTask {
emcCrossTalk.initObjects(emcCrossTalkConf);
if (emcCrossTalkConf.createHistograms.value) {
mHistManager.add<TH1>("hCellEnergyDistBefore", "Cell energy before cross-talk emulation", {o2::framework::HistType::kTH1D, {energyDenseAxis}});
mHistManager.add<TH1>("hCellEnergyDistAfter", "Cell energy after cross-talk emulation", {o2::framework::HistType::kTH1D, {energyDenseAxis}});
mHistManager.add<TH1>("hCellEnergyDistAfter", "Cell energy after cross-talk emulation and corrections", {o2::framework::HistType::kTH1D, {energyDenseAxis}});
}
}

Expand Down Expand Up @@ -825,19 +825,9 @@ struct EmcalCorrectionTask {
}
mHistManager.fill(HIST("hMCParticleEnergy"), cellparticle.e());
}
auto amplitude = cell.amplitude();
if (static_cast<bool>(hasShaperCorrection) && emcal::intToChannelType(cell.cellType()) == emcal::ChannelType_t::LOW_GAIN) { // Apply shaper correction to LG cells
amplitude = o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(amplitude);
}
if (mcCellEnergyShift != 1.) {
amplitude *= mcCellEnergyShift; // Fine tune the MC cell energy
}
if (mcCellEnergyResolutionBroadening != 0.) {
amplitude *= (1. + normalgaus(rdgen) * mcCellEnergyResolutionBroadening); // Fine tune the MC cell energy resolution
}
cellsBC.emplace_back(cell.cellNumber(),
amplitude,
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType()), mRunNumber),
cell.amplitude(),
cell.time(),
o2::emcal::intToChannelType(cell.cellType()));
cellIndicesBC.emplace_back(cell.globalIndex());
cellLabels.emplace_back(std::vector<int>{cell.mcParticleIds().begin(), cell.mcParticleIds().end()}, std::vector<float>{cell.amplitudeA().begin(), cell.amplitudeA().end()});
Expand Down Expand Up @@ -869,9 +859,18 @@ struct EmcalCorrectionTask {
} // if (isMC.value && emcCrossTalkConf.enableCrossTalk.value)
// shaper correction has to come AFTER cross talk
for (auto& cell : cellsBC) { // o2-linter: disable=const-ref-in-for-loop (we are changing a value here)
if (cell.getLowGain()) {
cell.setAmplitude(o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(cell.getAmplitude()));
auto amplitude = cell.getAmplitude();
if (static_cast<bool>(hasShaperCorrection) && cell.getLowGain()) { // Apply shaper correction to LG cells
amplitude = o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(amplitude);
}
if (mcCellEnergyShift != 1.) {
amplitude *= mcCellEnergyShift; // Fine tune the MC cell energy
}
if (mcCellEnergyResolutionBroadening != 0.) {
amplitude *= (1. + normalgaus(rdgen) * mcCellEnergyResolutionBroadening); // Fine tune the MC cell energy resolution
}
cell.setAmplitude(amplitude);
cell.setTimeStamp(cell.getTimeStamp() + getCellTimeShift(cell.getTower(), amplitude, cell.getType(), mRunNumber));
}
LOG(detail) << "Number of cells for BC (CF): " << cellsBC.size();
nCellsProcessed += cellsBC.size();
Expand Down Expand Up @@ -1020,19 +1019,9 @@ struct EmcalCorrectionTask {
}
mHistManager.fill(HIST("hMCParticleEnergy"), cellparticle.e());
}
auto amplitude = cell.amplitude();
if (static_cast<bool>(hasShaperCorrection) && emcal::intToChannelType(cell.cellType()) == emcal::ChannelType_t::LOW_GAIN) { // Apply shaper correction to LG cells
amplitude = o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(amplitude);
}
if (mcCellEnergyShift != 1.) {
amplitude *= mcCellEnergyShift; // Fine tune the MC cell energy
}
if (mcCellEnergyResolutionBroadening != 0.) {
amplitude *= (1. + normalgaus(rdgen) * mcCellEnergyResolutionBroadening); // Fine tune the MC cell energy resolution
}
cellsBC.emplace_back(cell.cellNumber(),
amplitude,
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType()), mRunNumber),
cell.amplitude(),
cell.time(),
o2::emcal::intToChannelType(cell.cellType()));
cellIndicesBC.emplace_back(cell.globalIndex());
cellLabels.emplace_back(std::vector<int>{cell.mcParticleIds().begin(), cell.mcParticleIds().end()}, std::vector<float>{cell.amplitudeA().begin(), cell.amplitudeA().end()});
Expand Down Expand Up @@ -1064,9 +1053,18 @@ struct EmcalCorrectionTask {
} // if (isMC.value && emcCrossTalkConf.enableCrossTalk.value)
// shaper correction has to come AFTER cross talk
for (auto& cell : cellsBC) { // o2-linter: disable=const-ref-in-for-loop (we are changing a value here)
if (cell.getLowGain()) {
cell.setAmplitude(o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(cell.getAmplitude()));
auto amplitude = cell.getAmplitude();
if (static_cast<bool>(hasShaperCorrection) && cell.getLowGain()) { // Apply shaper correction to LG cells
amplitude = o2::emcal::NonlinearityHandler::evaluateShaperCorrectionCellEnergy(amplitude);
}
if (mcCellEnergyShift != 1.) {
amplitude *= mcCellEnergyShift; // Fine tune the MC cell energy
}
if (mcCellEnergyResolutionBroadening != 0.) {
amplitude *= (1. + normalgaus(rdgen) * mcCellEnergyResolutionBroadening); // Fine tune the MC cell energy resolution
}
cell.setAmplitude(amplitude);
cell.setTimeStamp(cell.getTimeStamp() + getCellTimeShift(cell.getTower(), amplitude, cell.getType(), mRunNumber));
}
LOG(detail) << "Number of cells for BC (CF): " << cellsBC.size();
nCellsProcessed += cellsBC.size();
Expand Down
Loading