Skip to content

[PWGJE] Clean up EMCALClusters header and add `getClusterDefinitionFr… - #17843

Merged
mhemmer-cern merged 2 commits into
AliceO2Group:masterfrom
mhemmer-cern:pi0-flow
Sep 10, 2026
Merged

[PWGJE] Clean up EMCALClusters header and add `getClusterDefinitionFr…#17843
mhemmer-cern merged 2 commits into
AliceO2Group:masterfrom
mhemmer-cern:pi0-flow

Conversation

@mhemmer-cern

Copy link
Copy Markdown
Collaborator

…omString` function

  • Add Default value for algorithm of EMCALClusterDefinition
  • Update constructor with member initilizer
  • Add new function getClusterDefinitionFromID to obtain the cluster definition via the storage ID
  • Change function getClusterDefinitionFromString to use an unordered_map<std::string,int> instead of multiple if statements with string comparison
  • Rename ClusterAlgorithm_t to ClusterAlgorithm to fit naming conventions
  • Return type of both functions to get the ClusterDefinition is now const EMCALClusterDefinition&, was const EMCALClusterDefinition before (not a reference but a copy)
  • Add inline to the different EMCALClusterDefinition definitions to ensure they are only in memory ONCE and not per file that includes them.

…omString` function

- Add Default value for `algorithm` of `EMCALClusterDefinition`
- Update constructor with member initilizer
- Add new function `getClusterDefinitionFromID` to obtain the cluster definition via the storage ID
- Change function `getClusterDefinitionFromString` to use an `unordered_map<std::string,int>`  instead of multiple if statements with string comparison
- Rename `ClusterAlgorithm_t` to `ClusterAlgorithm` to fit naming conventions
- Return type of both functions to get the ClusterDefinition is now `const EMCALClusterDefinition&`, was `const EMCALClusterDefinition` before (not a reference but a copy)
- Add `inline` to the different `EMCALClusterDefinition` definitions to ensure they are only in memory ONCE and not per file that includes them.
@github-actions

github-actions Bot commented Sep 9, 2026

Copy link
Copy Markdown

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

@alibuild

alibuild commented Sep 9, 2026

Copy link
Copy Markdown
Collaborator

Error while checking build/O2Physics/o2 for 94f1295 at 2026-09-09 15:47:

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

Full log here.

fjonasALICE
fjonasALICE previously approved these changes Sep 9, 2026

@fjonasALICE fjonasALICE 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.

assuming build issue is transient, everything looks good to me! Most critical is probably renaming of ClusterAlgorithm_t to ClusterAlgorithm, but i did not find anything else in O2 and O2Physics that breaks due to this renaming

@fjonasALICE
fjonasALICE enabled auto-merge (squash) September 9, 2026 14:04
@mhemmer-cern

Copy link
Copy Markdown
Collaborator Author

assuming build issue is transient, everything looks good to me! Most critical is probably renaming of ClusterAlgorithm_t to ClusterAlgorithm, but i did not find anything else in O2 and O2Physics that breaks due to this renaming

I also checked for ClusterAlgorithm_t in the whole AliceO2Group to make sure it wasn't used somewhere else. So this renaming should be fine.

@mhemmer-cern
mhemmer-cern enabled auto-merge (squash) September 10, 2026 14:28

@alibuild alibuild 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.

Auto-approving on behalf of @mhemmer-cern.

@mhemmer-cern
mhemmer-cern merged commit e06aa77 into AliceO2Group:master Sep 10, 2026
14 of 15 checks passed
@mhemmer-cern
mhemmer-cern deleted the pi0-flow branch September 10, 2026 14:29
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