Skip to content

[PWGCF] correlations.cxx: prompt + non-prompt separation - #18432

Merged
jgrosseo merged 3 commits into
AliceO2Group:masterfrom
jaelpark:correlations_HF_Oct26_1
Oct 25, 2026
Merged

jgrosseo merged 3 commits into
AliceO2Group:masterfrom
jaelpark:correlations_HF_Oct26_1

Conversation

@jaelpark

Copy link
Copy Markdown
Collaborator
  • MC prompt + non-prompt separation
  • duplicates workaround for old derived datasets without proper 2-prong masks
  • local multiplicity weight loader
  • signal/reflection fixes

@github-actions github-actions Bot added the pwgcf label Oct 23, 2026
@github-actions github-actions Bot changed the title PWGCF: correlations.cxx: prompt + non-prompt separation [PWGCF] correlations.cxx: prompt + non-prompt separation Oct 23, 2026
@github-actions

Copy link
Copy Markdown

O2 linter results: ❌ 0 errors, ⚠️ 3 warnings, 🔕 5 disabled

@alibuild

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for 5221251 at 2026-10-23 14:08:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'To reproduce the results below locally, run: '\''aliBuild build O2Physics-code-check -e ALIBUILD_BASE_HASH=upstream/master'\''.'
To reproduce the results below locally, run: 'aliBuild build O2Physics-code-check -e ALIBUILD_BASE_HASH=upstream/master'.
++ echo 'To apply all automatic fixes, add the '\''-e O2PHYSICS_CHECKER_FIX=1'\'' option.'
To apply all automatic fixes, add the '-e O2PHYSICS_CHECKER_FIX=1' option.
++ echo 'See the documentation for more details at: <https://aliceo2group.github.io/analysis-framework/docs/tools/#running-with-o2physics-code-check>.'
See the documentation for more details at: <https://aliceo2group.github.io/analysis-framework/docs/tools/#running-with-o2physics-code-check>.
++ echo 'Found 1 errors and 26 warnings.'
Found 1 errors and 26 warnings.
++ [[ 1 -gt 0 ]]
++ cat /sw/BUILD/e3d71608bdecedd719703ca4f9275b1105a5ed99/O2Physics-code-check/errors.txt
PWGCF/Tasks/correlations.cxx:658:17: error: no header providing "std::set" is directly included [misc-include-cleaner,-warnings-as-errors]
++ [[ 26 -gt 0 ]]
++ cat /sw/BUILD/e3d71608bdecedd719703ca4f9275b1105a5ed99/O2Physics-code-check/warnings.txt
PWGCF/Tasks/correlations.cxx:227:111: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:229:11: warning: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty]
PWGCF/Tasks/correlations.cxx:229:47: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:231:11: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:233:11: warning: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty]
PWGCF/Tasks/correlations.cxx:233:50: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:262:11: warning: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion]
PWGCF/Tasks/correlations.cxx:265:11: warning: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion]
PWGCF/Tasks/correlations.cxx:268:11: warning: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion]
PWGCF/Tasks/correlations.cxx:271:11: warning: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion]
PWGCF/Tasks/correlations.cxx:274:11: warning: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion]
PWGCF/Tasks/correlations.cxx:673:38: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:951:47: warning: redundant boolean literal supplied to boolean operator [readability-simplify-boolean-expr]
PWGCF/Tasks/correlations.cxx:954:34: warning: do not use reinterpret_cast [cppcoreguidelines-pro-type-reinterpret-cast]
PWGCF/Tasks/correlations.cxx:963:50: warning: redundant boolean literal supplied to boolean operator [readability-simplify-boolean-expr]
PWGCF/Tasks/correlations.cxx:966:37: warning: do not use reinterpret_cast [cppcoreguidelines-pro-type-reinterpret-cast]
PWGCF/Tasks/correlations.cxx:975:40: warning: redundant boolean literal supplied to boolean operator [readability-simplify-boolean-expr]
PWGCF/Tasks/correlations.cxx:977:25: warning: do not use reinterpret_cast [cppcoreguidelines-pro-type-reinterpret-cast]
PWGCF/Tasks/correlations.cxx:985:5: warning: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays]
PWGCF/Tasks/correlations.cxx:990:31: warning: do not implicitly decay an array into a pointer; consider using gsl::array_view or an explicit cast instead [cppcoreguidelines-pro-bounds-array-to-pointer-decay]
PWGCF/Tasks/correlations.cxx:1008:60: warning: redundant boolean literal supplied to boolean operator [readability-simplify-boolean-expr]
PWGCF/Tasks/correlations.cxx:1118:78: warning: redundant boolean literal supplied to boolean operator [readability-simplify-boolean-expr]
PWGCF/Tasks/correlations.cxx:1309:5: warning: switching on non-enum value without default case may not cover all cases [bugprone-switch-missing-default-case]
PWGCF/Tasks/correlations.cxx:1322:7: warning: do not use 'else' after 'return' [readability-else-after-return]
PWGCF/Tasks/correlations.cxx:1437:38: warning: statement should be inside braces [readability-braces-around-statements]
PWGCF/Tasks/correlations.cxx:1474:39: warning: statement should be inside braces [readability-braces-around-statements]
++ [[ 1 -gt 0 ]]
++ exit 1
--

Full log here.

Comment on lines +659 to +660
static std::set<std::tuple<int, int>> duplicates; // workaround for old derived datasets involving 2prongs when cfgDecayParticleMask = 0
duplicates.clear();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This will be executed always, is it better to check one of the configs as below?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I could add if here to check the config. Maybe the if overhead is less than an empty clear op. Anyways I would remove these lines and the duplicate check below later when I finally rerun my HF datasets.

@jgrosseo
jgrosseo merged commit 2825a93 into AliceO2Group:master Oct 25, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

3 participants