Skip to content

[PWGJE] additional EMCal time calibration (fix) #11325

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
May 27, 2025
Merged

[PWGJE] additional EMCal time calibration (fix) #11325

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cf168a
[PWGJE] additional EMCal time calibration (fix)
fjonasALICE May 23, 2025
7448356
Please consider the following formatting changes
alibuild May 23, 2025
afa9f82
Merge pull request #8 from alibuild/alibot-cleanup-11325
fjonasALICE May 23, 2025
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
43 changes: 39 additions & 4 deletions PWGJE/TableProducer/emcalCorrectionTask.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ struct EmcalCorrectionTask {
// EMCal geometry
o2::emcal::Geometry* geometry;

std::vector<std::pair<int, int>> mExtraTimeShiftRunRanges;

// Current run number
int runNumber{0};

void init(InitContext const&)
{
LOG(debug) << "Start init!";
Expand Down Expand Up @@ -250,6 +255,16 @@ struct EmcalCorrectionTask {
mHistManager.add("hContributors", "hContributors;contributor per cell hit;#it{counts}", O2HistType::kTH1I, {{20, 0, 20}});
mHistManager.add("hMCParticleEnergy", "hMCParticleEnergy;#it{E} (GeV/#it{c});#it{counts}", O2HistType::kTH1F, {energyAxis});
}

// For some runs, LG cells require an extra time shift of 2 * 8.8ns due to problems in the time calibration
// Affected run ranges (inclusive) are initialised here (min,max)
mExtraTimeShiftRunRanges.emplace_back(535365, 535645); // LHC23g-LHC23h
mExtraTimeShiftRunRanges.emplace_back(535725, 536126); // LHC23h-LHC23l
mExtraTimeShiftRunRanges.emplace_back(536199, 536202); // LHC23l-LHC23m
mExtraTimeShiftRunRanges.emplace_back(536239, 536346); // LHC23m-LHC23n
mExtraTimeShiftRunRanges.emplace_back(536565, 536590); // Commisioning-LHC23r
mExtraTimeShiftRunRanges.emplace_back(542280, 543854); // LHC23zv-LHC23zy
mExtraTimeShiftRunRanges.emplace_back(559544, 559856); // PbPb 2024
}

// void process(aod::Collision const& collision, soa::Filtered<aod::Tracks> const& fullTracks, aod::Calos const& cells)
Expand All @@ -268,6 +283,10 @@ struct EmcalCorrectionTask {
std::unordered_map<uint64_t, int> numberCellsInBC; // Number of cells mapped to the global BC index of all BCs to check whether EMCal was readout
for (const auto& bc : bcs) {
LOG(debug) << "Next BC";

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

// Convert aod::Calo to o2::emcal::Cell which can be used with the clusterizer.
// In particular, we need to filter only EMCAL cells.

Expand Down Expand Up @@ -297,7 +316,7 @@ struct EmcalCorrectionTask {
}
cellsBC.emplace_back(cell.cellNumber(),
amplitude,
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType())),
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType()), runNumber),
o2::emcal::intToChannelType(cell.cellType()));
cellIndicesBC.emplace_back(cell.globalIndex());
}
Expand Down Expand Up @@ -396,6 +415,9 @@ struct EmcalCorrectionTask {
// Convert aod::Calo to o2::emcal::Cell which can be used with the clusterizer.
// In particular, we need to filter only EMCAL cells.

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

// Get the collisions matched to the BC using foundBCId of the collision
auto collisionsInFoundBC = collisions.sliceBy(collisionsPerFoundBC, bc.globalIndex());
auto cellsInBC = cells.sliceBy(mcCellsPerFoundBC, bc.globalIndex());
Expand Down Expand Up @@ -425,7 +447,7 @@ struct EmcalCorrectionTask {
}
cellsBC.emplace_back(cell.cellNumber(),
amplitude,
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType())),
cell.time() + getCellTimeShift(cell.cellNumber(), amplitude, o2::emcal::intToChannelType(cell.cellType()), runNumber),
o2::emcal::intToChannelType(cell.cellType()));
cellIndicesBC.emplace_back(cell.globalIndex());
cellLabels.emplace_back(cell.mcParticleIds(), cell.amplitudeA());
Expand Down Expand Up @@ -514,13 +536,18 @@ struct EmcalCorrectionTask {
int previousCollisionId = 0; // Collision ID of the last unique BC. Needed to skip unordered collisions to ensure ordered collisionIds in the cluster table
int nBCsProcessed = 0;
int nCellsProcessed = 0;

for (const auto& bc : bcs) {
LOG(debug) << "Next BC";
// Convert aod::Calo to o2::emcal::Cell which can be used with the clusterizer.
// In particular, we need to filter only EMCAL cells.

// Get the collisions matched to the BC using global bc index of the collision
// since we do not have event selection available here!

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

auto collisionsInBC = collisions.sliceBy(collisionsPerBC, bc.globalIndex());
auto cellsInBC = cells.sliceBy(cellsPerFoundBC, bc.globalIndex());

Expand All @@ -536,7 +563,7 @@ struct EmcalCorrectionTask {
for (const auto& cell : cellsInBC) {
cellsBC.emplace_back(cell.cellNumber(),
cell.amplitude(),
cell.time() + getCellTimeShift(cell.cellNumber(), cell.amplitude(), o2::emcal::intToChannelType(cell.cellType())),
cell.time() + getCellTimeShift(cell.cellNumber(), cell.amplitude(), o2::emcal::intToChannelType(cell.cellType()), runNumber),
o2::emcal::intToChannelType(cell.cellType()));
cellIndicesBC.emplace_back(cell.globalIndex());
}
Expand Down Expand Up @@ -873,7 +900,7 @@ struct EmcalCorrectionTask {
// Apply shift of the cell time in data and MC
// In MC this has to be done to shift the cell time, which is not calibrated to 0 due to the flight time of the particles to the EMCal surface (~15ns)
// In data this is done to correct for the time walk effect
float getCellTimeShift(const int16_t cellID, const float cellEnergy, const emcal::ChannelType_t cellType)
float getCellTimeShift(const int16_t cellID, const float cellEnergy, const emcal::ChannelType_t cellType, const int runNumber)
{
if (!applyCellTimeCorrection) {
return 0.f;
Expand Down Expand Up @@ -909,6 +936,14 @@ struct EmcalCorrectionTask {
else // Very high energy regime
timeshift = 1.9; // Parameters extracted from LHC24aj (pp), but also usable for other periods
}
// Temporary extra shift for bug in time calibraiton of apass4 Pb-Pb 2024, requires pos shift of 2*8.8 ns for low gain cells
if (cellType == emcal::ChannelType_t::LOW_GAIN) {
for (const auto& range : mExtraTimeShiftRunRanges) {
if (runNumber >= range.first && runNumber <= range.second) {
timeshift += 2 * 8.8;
}
}
}
LOG(debug) << "Shift the cell time by " << timeshift << " + " << timesmear << " ns";
}
return timeshift + timesmear;
Expand Down