[PWGEM,PhotonMeson] Adapt IsSelected function from cut librarires a…#14160
Merged
mhemmer-cern merged 1 commit intoAliceO2Group:masterfrom Dec 10, 2025
Merged
Conversation
|
O2 linter results: ❌ 807 errors, |
alibuild
previously approved these changes
Dec 10, 2025
Collaborator
alibuild
left a comment
There was a problem hiding this comment.
Auto-approving on behalf of @mhemmer-cern.
768e5e7 to
000192c
Compare
…nd add new cluster tables for reduced derived data size - The `IsSelected` function defined in `DalitzEECut`, `EMCPhotonCut`, `PHOSPhotonCut` and `V0PhotonCut` was changed to always have as first argument the photon and then additional arguments and template arguments specifilcy for that photon reconstruction method, e.g. matchedtrack tables for EMC or type of the legs for V0. For `DalitzEECut` the arguments are now track1, track2, B_z instead of one argument that basically packed those three into a tuple. - Based on the change above many tasks where changed accordingly where `IsSelected` was called. This was mostly just making sure the correct template arguments are given. - Changed `Pi0EtaToGammaGamma` header files to make them more readable (hopefully). Main change here is the addition of Tags for PCM, EMC, PHOS and DalitzEE and streamlining the template parameters of the main struct and the `runPairing` function - Add new EMCal cluster tables: - `EmEmcClusters_000` to store just the cluster information - `EmEmcMTracks` to store just the matched global tracks in a flat table linked to the EmEmcClusters_000 index - EmEmcMSTracks to store just the matched secondary tracks in a flat table linked to the EmEmcClusters_000 index - `MinClusters` just like `EmEmcClusters_000` but with reduced data size by compression to int16_t where possible - `MinMTracks` similar to above for `EmEmcMTracks` - `MinMSTracks` similar to above for `EmEmcMSTracks` - Changed includes to follow IWYU for all touched files - Changed `M_PI` calls where I saw them to use the o2 constants equivalent, since they are `constexpr` instead of just `const`. - Optimize compile time by using `is_table` and `is_iterator` instead of `typename` for templates in Pi0EtaToGammaGamma task and photon cuts. - Fix cpplint errors on all touched files and specifically for `gammaConversions.h` and `gammaConversionsTruthOnlyMc.cxx` - increment ClassDef of photon cuts
000192c to
1b94614
Compare
alibuild
approved these changes
Dec 10, 2025
Collaborator
alibuild
left a comment
There was a problem hiding this comment.
Auto-approving on behalf of @mhemmer-cern.
Collaborator
|
Error while checking build/O2Physics/o2 for 000192c at 2025-12-10 17:28: Full log here. |
sigurdnese
pushed a commit
to sigurdnese/O2Physics
that referenced
this pull request
Jan 9, 2026
MattOckleton
pushed a commit
to MattOckleton/O2Physics
that referenced
this pull request
Jan 14, 2026
mapalhares
pushed a commit
to mapalhares/O2Physics
that referenced
this pull request
Jan 20, 2026
fcolamar
pushed a commit
to fcolamar/O2Physics
that referenced
this pull request
Feb 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…nd add new cluster tables for reduced derived data size
The
IsSelectedfunction defined inDalitzEECut,EMCPhotonCut,PHOSPhotonCutandV0PhotonCutwas changed to always have as first argument the photon and then additional arguments and template arguments specifilcy for that photon reconstruction method, e.g. matchedtrack tables for EMC or type of the legs for V0. ForDalitzEECutthe arguments are now track1, track2, B_z instead of one argument that basically packed those three into a tuple.Based on the change above many tasks where changed accordingly where
IsSelectedwas called. This was mostly just making sure the correct template arguments are given.Changed
Pi0EtaToGammaGammaheader files to make them more readable (hopefully). Main change here is the addition of Tags for PCM, EMC, PHOS and DalitzEE and streamlining the template parameters of the main struct and therunPairingfunctionAdd new EMCal cluster tables:
EmEmcClusters_000to store just the cluster informationEmEmcMTracksto store just the matched global tracks in a flat table linked to theEmEmcClusters_000indexEmEmcMSTracksto store just the matched secondary tracks in a flat table linked to theEmEmcClusters_000indexMinClustersjust likeEmEmcClusters_000but with reduced data size by compression to int16_t where possibleMinMTrackssimilar to above forEmEmcMTracksMinMSTrackssimilar to above forEmEmcMSTracksChanged includes to follow IWYU for all touched files
Changed
M_PIcalls where I saw them to use the o2 constants equivalent, since they areconstexprinstead of justconst.Optimize compile time by using
is_tableandis_iteratorinstead oftypenamefor templates in Pi0EtaToGammaGamma task and photon cuts.Fix cpplint errors on all touched files and specifically for
gammaConversions.handgammaConversionsTruthOnlyMc.cxxIncrement ClassDef of photon cuts