Skip to content

Conversation

@mhemmer-cern
Copy link
Collaborator

…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

@github-actions
Copy link

github-actions bot commented Dec 10, 2025

O2 linter results: ❌ 807 errors, ⚠️ 1381 warnings, 🔕 30 disabled

@mhemmer-cern mhemmer-cern added the photon Photon and neutral meson PAG label label Dec 10, 2025
@mhemmer-cern mhemmer-cern enabled auto-merge (squash) December 10, 2025 13:45
alibuild
alibuild previously approved these changes Dec 10, 2025
Copy link
Collaborator

@alibuild alibuild left a comment

Choose a reason for hiding this comment

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

Auto-approving on behalf of @mhemmer-cern.

…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
@mhemmer-cern mhemmer-cern force-pushed the PWGEM-reducde-data-size branch from 000192c to 1b94614 Compare December 10, 2025 15:12
@mhemmer-cern mhemmer-cern enabled auto-merge (squash) December 10, 2025 16:01
Copy link
Collaborator

@alibuild alibuild left a comment

Choose a reason for hiding this comment

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

Auto-approving on behalf of @mhemmer-cern.

@alibuild
Copy link
Collaborator

Error while checking build/O2Physics/o2 for 000192c at 2025-12-10 17:28:

## sw/BUILD/O2Physics-latest/log
/sw/SOURCES/O2Physics/14160-slc9_x86-64/0/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h:559:13: error: declaration of 'auto cache' has no initializer
/sw/SOURCES/O2Physics/14160-slc9_x86-64/0/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h:559:13: error: declaration of 'auto cache' has no initializer
/sw/SOURCES/O2Physics/14160-slc9_x86-64/0/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h:559:62: error: no matching function for call to 'o2::soa::Table<o2::aod::Hash<1951484669>, o2::aod::Hash<2854390773>, o2::aod::Hash<2286545062> >::sliceByCached(o2::framework::expressions::BindingNode&, int64_t) const'
/sw/SOURCES/O2Physics/14160-slc9_x86-64/0/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h:559:62: error: no matching function for call to 'o2::soa::Table<o2::aod::Hash<1951484669>, o2::aod::Hash<2854390773>, o2::aod::Hash<2286545062> >::sliceByCached(o2::framework::expressions::BindingNode&, int64_t) const'
/sw/SOURCES/O2Physics/14160-slc9_x86-64/0/PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h:559:13: error: declaration of 'auto cache' has no initializer
ninja: build stopped: subcommand failed.

Full log here.

@mhemmer-cern mhemmer-cern merged commit 8996b6f into AliceO2Group:master Dec 10, 2025
12 of 13 checks passed
@mhemmer-cern mhemmer-cern deleted the PWGEM-reducde-data-size branch December 10, 2025 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

datamodel photon Photon and neutral meson PAG label pwgem

Development

Successfully merging this pull request may close these issues.

2 participants