Skip to content

[PWGJE] Enhance GammaJetAnalysisTree with additional MC information#16981

Merged
fjonasALICE merged 3 commits into
AliceO2Group:masterfrom
fjonasALICE:gamma-jet-mc-extension
Jul 10, 2026
Merged

[PWGJE] Enhance GammaJetAnalysisTree with additional MC information#16981
fjonasALICE merged 3 commits into
AliceO2Group:masterfrom
fjonasALICE:gamma-jet-mc-extension

Conversation

@fjonasALICE

Copy link
Copy Markdown
Collaborator
  • Extend GjGammaMCInfos with generator-level kinematics (eta, phi, energy, pt) and MC isolation for the particle associated with each reconstructed cluster.
  • Update getClusterOrigin to return both the origin bitmap and the matched MC particle index (including special handling for merged π⁰/η and converted photons).
  • Add a new GjMCJetSubstructures table and fill substructure for particle-level jets when substructure calculation is enabled.
  • Consolidate PROCESS_SWITCH definitions at the end of the task with explicit ordering comments

@github-actions

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown

O2 linter results: ❌ 14 errors, ⚠️ 0 warnings, 🔕 10 disabled

@alibuild

alibuild commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for bf1f2cf at 2026-07-09 10:48:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'Found 44 errors and 8 warnings.'
Found 44 errors and 8 warnings.
++ [[ 44 -gt 0 ]]
++ cat /sw/BUILD/117aca31d491bd9f8b743ea218a701669c75882c/O2Physics-code-check/errors.txt
PWGJE/Tasks/gammaJetTreeProducer.cxx:77:8: error: constructor does not initialize these fields: pdg [cppcoreguidelines-pro-type-member-init,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:117:13: error: member 'kMaxRecursionDepth' of type 'const int' is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:146:15: error: member 'kInvalidValue' of type 'const float' is const qualified [cppcoreguidelines-avoid-const-or-ref-data-members,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:241:11: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:249:11: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:309:11: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:358:11: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:477:5: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:483:32: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:491:37: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:518:5: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:519:5: error: do not declare C-style arrays, use 'std::array' instead [modernize-avoid-c-arrays,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:528:32: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:529:32: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:539:37: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:540:37: error: 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,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:590:32: error: repeated branch body in conditional chain [bugprone-branch-clone,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:657:14: error: redundant boolean literal in conditional return statement [readability-simplify-boolean-expr,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:696:14: error: redundant boolean literal in conditional return statement [readability-simplify-boolean-expr,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:758:14: error: redundant boolean literal in conditional return statement [readability-simplify-boolean-expr,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:812:9: error: do not use 'else' after 'return' [readability-else-after-return,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:839:5: error: redundant return statement at the end of a function with a void return type [readability-redundant-control-flow,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1224:11: error: do not use 'else' after 'continue' [readability-else-after-return,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1256:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1260:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1264:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1268:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1272:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1276:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1280:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1284:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1288:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1292:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1369:9: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1424:9: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1507:11: error: boolean expression can be simplified by DeMorgan's theorem [readability-simplify-boolean-expr,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1535:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1538:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1541:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1544:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1547:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1550:11: error: implicit conversion 'int' -> 'bool' [readability-implicit-bool-conversion,-warnings-as-errors]
[0 more errors; see full log]

Full log here.

@fjonasALICE fjonasALICE requested a review from jaimenorman as a code owner July 9, 2026 11:38
@alibuild

alibuild commented Jul 9, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/code-check for d671b28 at 2026-07-09 14:00:

## sw/BUILD/O2Physics-code-check-latest/log
--
========== List of issues found ==========
++ echo 'Found 4 errors and 0 warnings.'
Found 4 errors and 0 warnings.
++ [[ 4 -gt 0 ]]
++ cat /sw/BUILD/668a4864289f63cc30744fd25768d737972879e4/O2Physics-code-check/errors.txt
PWGJE/Tasks/gammaJetTreeProducer.cxx:312:11: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:361:11: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1360:9: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
PWGJE/Tasks/gammaJetTreeProducer.cxx:1415:9: error: the 'empty' method should be used to check for emptiness instead of 'size' [readability-container-size-empty,-warnings-as-errors]
++ [[ 0 -gt 0 ]]
++ [[ 4 -gt 0 ]]
++ exit 1
--

Full log here.

@jaimenorman

Copy link
Copy Markdown
Collaborator

+1

@fjonasALICE fjonasALICE merged commit 6818f4b into AliceO2Group:master Jul 10, 2026
13 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

3 participants