Skip to content

[PWGCF] fix-ft0-gain-indexing-v3 #14496

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
victor-gonzalez merged 3 commits into from
Jan 15, 2026
+19 −9
Merged

[PWGCF] fix-ft0-gain-indexing-v3 #14496

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd2491f
Fix FT0 gain correction indexing in longRangeDihadronCor
MartijnLaarhoven Jan 14, 2026
26926ec
Fix FT0 gain indexing bug and resolve merge conflicts
MartijnLaarhoven Jan 15, 2026
c73886f
Merge pull request #5 from MartijnLaarhoven/fix-ft0-gain-indexing-v3
MartijnLaarhoven Jan 15, 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
28 changes: 19 additions & 9 deletions PWGCF/TwoParticleCorrelations/Tasks/longRangeDihadronCor.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,14 +671,16 @@ struct LongRangeDihadronCor {
if (cfgRemapFT0CDeadChannels) {
if (id == kFT0CRemapChannelInnerRing) {
int dead_id = id + kFT0CInnerMirror;
registry.fill(HIST("FT0Amp"), dead_id, ampl);
ampl = ampl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0AmpCorrect"), dead_id, ampl);
float mirroredAmpl = ampl;
float mirroredAmplCorrected = mirroredAmpl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0Amp"), dead_id, mirroredAmpl);
registry.fill(HIST("FT0AmpCorrect"), dead_id, mirroredAmplCorrected);
} else if (id >= kFT0CRemapChannelStart && id <= kFT0CRemapChannelEnd) {
int dead_id = id + kFT0COuterMirror;
registry.fill(HIST("FT0Amp"), dead_id, ampl);
ampl = ampl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0AmpCorrect"), dead_id, ampl);
float mirroredAmpl = ampl;
float mirroredAmplCorrected = mirroredAmpl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0Amp"), dead_id, mirroredAmpl);
registry.fill(HIST("FT0AmpCorrect"), dead_id, mirroredAmplCorrected);
}
}
if ((cfgRejectFT0CInside && (id >= kFT0CInnerRingMin && id <= kFT0CInnerRingMax)) || (cfgRejectFT0COutside && (id >= kFT0COuterRingMin && id <= kFT0COuterRingMax)))
Expand All @@ -692,9 +694,10 @@ struct LongRangeDihadronCor {
if (cfgRemapFT0ADeadChannels) {
if (id >= kFT0ARemapChannelStart && id <= kFT0ARemapChannelEnd) {
int dead_id = id - kFT0AOuterMirror;
registry.fill(HIST("FT0Amp"), dead_id, ampl);
ampl = ampl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0AmpCorrect"), dead_id, ampl);
float mirroredAmpl = ampl;
float mirroredAmplCorrected = mirroredAmpl / cstFT0RelGain[iCh];
registry.fill(HIST("FT0Amp"), dead_id, mirroredAmpl);
registry.fill(HIST("FT0AmpCorrect"), dead_id, mirroredAmplCorrected);
}
}
if ((cfgRejectFT0AInside && (id >= kFT0AInnerRingMin && id <= kFT0AInnerRingMax)) || (cfgRejectFT0AOutside && (id >= kFT0AOuterRingMin && id <= kFT0AOuterRingMax)))
Expand Down Expand Up @@ -751,6 +754,13 @@ struct LongRangeDihadronCor {
int chanelid = 0;
float ampl = 0.;
getChannel(ft0, iCh, chanelid, ampl, corType);
if (corType == kFT0C) {
if ((cfgRejectFT0CInside && (chanelid >= kFT0CInnerRingMin && chanelid <= kFT0CInnerRingMax)) || (cfgRejectFT0COutside && (chanelid >= kFT0COuterRingMin && chanelid <= kFT0COuterRingMax)))
continue;
} else if (corType == kFT0A) {
if ((cfgRejectFT0AInside && (chanelid >= kFT0AInnerRingMin && chanelid <= kFT0AInnerRingMax)) || (cfgRejectFT0AOutside && (chanelid >= kFT0AOuterRingMin && chanelid <= kFT0AOuterRingMax)))
continue;
}
Comment on lines +757 to +763
Copy link

Copilot AI Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This channel rejection logic duplicates the rejection already performed in getChannel (which sets ampl to 0). This creates maintainability concerns:

  1. The rejection conditions must be kept in sync between getChannel and this code
  2. The behavior is now inconsistent with fillCorrelationsFT0AFT0C (around line 810-833), which still processes channels where ampl=0

Consider either: (a) refactoring getChannel to return a boolean indicating whether to skip the channel, or (b) moving all rejection logic out of getChannel into the calling code and applying it consistently in both fillCorrelationsTPCFT0 and fillCorrelationsFT0AFT0C.

Suggested change
if (corType == kFT0C) {
if ((cfgRejectFT0CInside && (chanelid >= kFT0CInnerRingMin && chanelid <= kFT0CInnerRingMax)) || (cfgRejectFT0COutside && (chanelid >= kFT0COuterRingMin && chanelid <= kFT0COuterRingMax)))
continue;
} else if (corType == kFT0A) {
if ((cfgRejectFT0AInside && (chanelid >= kFT0AInnerRingMin && chanelid <= kFT0AInnerRingMax)) || (cfgRejectFT0AOutside && (chanelid >= kFT0AOuterRingMin && chanelid <= kFT0AOuterRingMax)))
continue;
}

Copilot uses AI. Check for mistakes.
auto phi = getPhiFT0(chanelid, corType);
auto eta = getEtaFT0(chanelid, corType);
if (cfgDrawEtaPhiDis && system == SameEvent) {
Expand Down
Loading