Skip to content

[PWGEM] Add optional PCM material-budget weights in PCMPCM - #15139

Merged
mhemmer-cern merged 9 commits into
AliceO2Group:masterfrom
yelmardb:yelmard-pcmpcm-omega-mb-weights
Mar 12, 2026
Merged

[PWGEM] Add optional PCM material-budget weights in PCMPCM#15139
mhemmer-cern merged 9 commits into
AliceO2Group:masterfrom
yelmardb:yelmard-pcmpcm-omega-mb-weights

Conversation

@yelmardb

@yelmardbyelmardb commented Feb 24, 2026

Copy link
Copy Markdown
Contributor

Add a V0 photon material-budget weight table (Omega MB weights) and join it in the PCMPCM pi0/eta workflow. The weights are applied only when the joined column is available, using compile-time guarded access.

Introduce a configurable switch (runWithMBWeights) in MaterialBudgetWeights:

  • false: no CCDB query, write weight=1
  • true: require CCDB histogram and abort if missing

@github-actionsgithub-actionsBot changed the title Add optional PCM material-budget weights in PCMPCM[PWGEM] Add optional PCM material-budget weights in PCMPCMFeb 24, 2026
@alibuildalibuild mentioned this pull request Feb 24, 2026
Closed
@yelmardb
yelmardbforce-pushed the yelmard-pcmpcm-omega-mb-weights branch 3 times, most recently from af257e1 to 9476160CompareFebruary 24, 2026 13:03
@alibuildalibuild mentioned this pull request Feb 24, 2026
Closed
mhemmer-cern
mhemmer-cern requested changes Feb 24, 2026
View reviewed changes
Comment threadPWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h Outdated
Comment threadPWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h Outdated
Comment threadPWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h Outdated
Comment threadPWGEM/PhotonMeson/Utils/MaterialBudgetWeights.h Outdated
@alibuild

alibuild commented Feb 28, 2026•
edited
Loading

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/o2 for 811cfa0 at 2026-03-02 23:35:

## sw/BUILD/O2Physics-latest/log
c++: fatal error: Killed signal terminated program cc1plus
c++: fatal error: Killed signal terminated program cc1plus
ninja: build stopped: subcommand failed.

Full log here.

@yelmardb
yelmardbforce-pushed the yelmard-pcmpcm-omega-mb-weights branch from 811cfa0 to 12fbfb5CompareMarch 11, 2026 15:01
@github-actionsgithub-actionsBot added the photon Photon and neutral meson PAG label label Mar 11, 2026
@alibuildalibuild mentioned this pull request Mar 11, 2026
Merged
yelmardb added a commit to yelmardb/O2Physics that referenced this pull request Mar 11, 2026
@yelmardb
Merge pull request#4from alibuild/alibot-cleanup-15139
83952fd
Please consider the following formatting changes to AliceO2Group#15139
@mhemmer-cern
mhemmer-cern marked this pull request as draft March 11, 2026 15:19
@alibuildalibuild mentioned this pull request Mar 11, 2026
Closed
@yelmardb
yelmardbforce-pushed the yelmard-pcmpcm-omega-mb-weights branch from 2f485d9 to fed7576CompareMarch 11, 2026 15:38
Youssef El Mard Bouziani added 4 commits March 11, 2026 16:54
Youssef El Mard Bouziani
Add optional PCM material-budget weights in PCMPCM
81cc8a7
Add a V0 photon material-budget weight table (Omega MB weights) and join it
in the PCMPCM pi0/eta workflow. The weights are applied only when the joined
column is available, using compile-time guarded access.
Introduce a configurable switch (runWithMBWeights) in MaterialBudgetWeights:
- false: no CCDB query, write weight=1
- true: require CCDB histogram and abort if missing
Youssef El Mard Bouziani
Apply formatting fixes
d6ddbb5
Youssef El Mard Bouziani
Apply clang-format include ordering
96aa676
Youssef El Mard Bouziani
Apply clang-format
8b00868
@yelmardb
yelmardbforce-pushed the yelmard-pcmpcm-omega-mb-weights branch from fed7576 to 8b00868CompareMarch 11, 2026 15:54
@vkucera

vkucera commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

@yelmardb Why don't you just merge the automatic formatting PR instead of attempting to fix it manually?

mhemmer-cern
mhemmer-cern requested changes Mar 11, 2026
View reviewed changes

@mhemmer-cernmhemmer-cern left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Two minor comments

Comment threadPWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx Outdated
Comment threadPWGEM/PhotonMeson/Core/MaterialBudgetWeights.h
@mhemmer-cern
mhemmer-cern marked this pull request as ready for review March 11, 2026 20:13
mhemmer-cern
mhemmer-cern requested changes Mar 11, 2026
View reviewed changes

@mhemmer-cernmhemmer-cern left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

One more comment. The adaptAnalysisTask<MaterialBudgetWeights>(cfgc) lines in the Pi0EtaToGammaGammaXXX.cxx files should not be there. The materialBudgetWeights.cxx is already taking care of it.

Comment threadPWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaMCPCMPCM.cxx Outdated
Comment threadPWGEM/PhotonMeson/Tasks/Pi0EtaToGammaGammaPCMPCM.cxx Outdated
mhemmer-cern
mhemmer-cern approved these changes Mar 12, 2026
View reviewed changes

@mhemmer-cernmhemmer-cern left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should be okay now.

@mhemmer-cern
mhemmer-cern enabled auto-merge (squash) March 12, 2026 10:30
@mhemmer-cern
mhemmer-cern merged commit 31493dc into AliceO2Group:masterMar 12, 2026
13 checks passed
vkucera
vkucera reviewed Mar 12, 2026
View reviewed changes
Comment threadPWGEM/PhotonMeson/Core/MaterialBudgetWeights.h
scannito pushed a commit to scannito/O2Physics that referenced this pull request Mar 20, 2026
@yelmardbYoussef El Mard Bouziani@scannito
[PWGEM] Add optional PCM material-budget weights in PCMPCM (AliceO2Gr…
bc69d80
…oup#15139)
Co-authored-by: Youssef El Mard Bouziani <youssef.el.mard.bouziani@cern.ch>
hyungjun-lee pushed a commit to hyungjun-lee/O2Physics that referenced this pull request Apr 15, 2026
@yelmardbYoussef El Mard Bouziani@hyungjun-lee
[PWGEM] Add optional PCM material-budget weights in PCMPCM (AliceO2Gr…
5ba04da
…oup#15139)
Co-authored-by: Youssef El Mard Bouziani <youssef.el.mard.bouziani@cern.ch>
smaff92 pushed a commit to smaff92/O2Physics that referenced this pull request Apr 27, 2026
@yelmardbYoussef El Mard Bouziani@smaff92
[PWGEM] Add optional PCM material-budget weights in PCMPCM (AliceO2Gr…
b355698
…oup#15139)
Co-authored-by: Youssef El Mard Bouziani <youssef.el.mard.bouziani@cern.ch>
mtorresc15 pushed a commit to mtorresc15/O2Physics that referenced this pull request May 5, 2026
@yelmardbYoussef El Mard Bouziani@mtorresc15
[PWGEM] Add optional PCM material-budget weights in PCMPCM (AliceO2Gr…
b6b9252
…oup#15139)
Co-authored-by: Youssef El Mard Bouziani <youssef.el.mard.bouziani@cern.ch>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vkuceravkuceravkucera left review comments
@mhemmer-cernmhemmer-cernmhemmer-cern approved these changes
@alibuildalibuildAwaiting requested review from alibuildalibuild is a code owner
@mikesasmikesasAwaiting requested review from mikesas
@rbailhacrbailhacAwaiting requested review from rbailhac
@m-c-danischm-c-danischAwaiting requested review from m-c-danisch
@novitzkynovitzkyAwaiting requested review from novitzky
@dsekihatdsekihatAwaiting requested review from dsekihatdsekihat is a code owner
@jokonigjokonigAwaiting requested review from jokonigjokonig is a code owner

Assignees

No one assigned

Labels

datamodelphotonPhoton and neutral meson PAG labelpwgem

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yelmardb@alibuild@vkucera@mhemmer-cern