Skip to content

[PWGJE] [EMCAL] fix zorro event selection in emc correction framework #15047

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 3 commits into from
Feb 20, 2026
+33 −44
Merged

[PWGJE] [EMCAL] fix zorro event selection in emc correction framework #15047

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
542677d
[EMCAL] fix zorro event selection in emc correction framework
fjonasALICE Feb 19, 2026
987cb2d
Please consider the following formatting changes
alibuild Feb 19, 2026
c30ec32
Merge pull request #14 from alibuild/alibot-cleanup-15047
fjonasALICE Feb 19, 2026
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
77 changes: 33 additions & 44 deletions PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,6 @@ struct EmcalCorrectionTask {

initZorroCCDB(bc);

if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

// get run number
runNumber = bc.runNumber();

Expand All @@ -441,6 +435,14 @@ struct EmcalCorrectionTask {
}
// Counters for BCs with matched collisions
countBC(collisionsInFoundBC.size(), true);

// do not do the next part if we do not fulfill the software trigger selection
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

std::vector<o2::emcal::Cell> cellsBC;
std::vector<int64_t> cellIndicesBC;
for (const auto& cell : cellsInBC) {
Expand Down Expand Up @@ -525,12 +527,8 @@ struct EmcalCorrectionTask {
} // end of bc loop

// Loop through all collisions and fill emcalcollisionmatch with a boolean stating, whether the collision was ambiguous (not the only collision in its BC)
// NOTE: we can not do zorro selection here since emcalcollisionmatch needs to alway be filled to be joinable with collision table
for (const auto& collision : collisions) {
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(collision.foundBC_as<BcEvSels>().globalBC())) {
continue;
}
}
auto globalbcid = collision.foundBC_as<BcEvSels>().globalIndex();
auto foundColls = numberCollsInBC.find(globalbcid);
auto foundCells = numberCellsInBC.find(globalbcid);
Expand Down Expand Up @@ -559,12 +557,6 @@ struct EmcalCorrectionTask {

initZorroCCDB(bc);

if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

// get run number
runNumber = bc.runNumber();

Expand All @@ -590,6 +582,14 @@ struct EmcalCorrectionTask {
}
// Counters for BCs with matched collisions
countBC(collisionsInFoundBC.size(), true);

// do not do the next part if we do not fulfill the software trigger selection
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

std::vector<o2::emcal::Cell> cellsBC;
std::vector<int64_t> cellIndicesBC;
for (const auto& cell : cellsInBC) {
Expand Down Expand Up @@ -678,12 +678,8 @@ struct EmcalCorrectionTask {
} // end of bc loop

// Loop through all collisions and fill emcalcollisionmatch with a boolean stating, whether the collision was ambiguous (not the only collision in its BC)
// NOTE: we can not do zorro selection here since emcalcollisionmatch needs to alway be filled to be joinable with collision table
for (const auto& collision : collisions) {
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(collision.foundBC_as<BcEvSels>().globalBC())) {
continue;
}
}
auto globalbcid = collision.foundBC_as<BcEvSels>().globalIndex();
auto foundColls = numberCollsInBC.find(globalbcid);
auto foundCells = numberCellsInBC.find(globalbcid);
Expand Down Expand Up @@ -714,12 +710,6 @@ struct EmcalCorrectionTask {

initZorroCCDB(bc);

if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

// get run number
runNumber = bc.runNumber();

Expand All @@ -737,6 +727,14 @@ struct EmcalCorrectionTask {
}
// Counters for BCs with matched collisions
countBC(collisionsInFoundBC.size(), true);

// do not do the next part if we do not fulfill the software trigger selection
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

std::vector<o2::emcal::Cell> cellsBC;
std::vector<int64_t> cellIndicesBC;
std::vector<o2::emcal::CellLabel> cellLabels;
Expand Down Expand Up @@ -860,11 +858,6 @@ struct EmcalCorrectionTask {

// Loop through all collisions and fill emcalcollisionmatch with a boolean stating, whether the collision was ambiguous (not the only collision in its BC)
for (const auto& collision : collisions) {
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(collision.foundBC_as<BcEvSels>().globalBC())) {
continue;
}
}
auto globalbcid = collision.foundBC_as<BcEvSels>().globalIndex();
auto foundColls = numberCollsInBC.find(globalbcid);
auto foundCells = numberCellsInBC.find(globalbcid);
Expand Down Expand Up @@ -895,12 +888,6 @@ struct EmcalCorrectionTask {

initZorroCCDB(bc);

if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

// get run number
runNumber = bc.runNumber();

Expand All @@ -918,6 +905,13 @@ struct EmcalCorrectionTask {
}
// Counters for BCs with matched collisions
countBC(collisionsInFoundBC.size(), true);

if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(bc.globalBC())) {
continue;
}
}

std::vector<o2::emcal::Cell> cellsBC;
std::vector<int64_t> cellIndicesBC;
std::vector<o2::emcal::CellLabel> cellLabels;
Expand Down Expand Up @@ -1045,11 +1039,6 @@ struct EmcalCorrectionTask {

// Loop through all collisions and fill emcalcollisionmatch with a boolean stating, whether the collision was ambiguous (not the only collision in its BC)
for (const auto& collision : collisions) {
if (applySoftwareTriggerSelection) {
if (!zorro.isSelected(collision.foundBC_as<BcEvSels>().globalBC())) {
continue;
}
}
auto globalbcid = collision.foundBC_as<BcEvSels>().globalIndex();
auto foundColls = numberCollsInBC.find(globalbcid);
auto foundCells = numberCellsInBC.find(globalbcid);
Expand Down
Loading