Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate ORANGE geometry on insertion #956

Merged
merged 11 commits into from
Sep 27, 2023

Conversation

sethrj
Copy link
Member

@sethrj sethrj commented Sep 23, 2023

This adds deduplication for ORANGE parameter data. It uses the new deduplicating collection builder to reuse identical spans of data for surfaces, logic definitions, volume ID ranges, etc.

In the hex array test, the following simplifications occur:

- {"local_surface_ids":364,"local_volume_ids":364,"logic_ints":922,"reals":281}
+ {"local_surface_ids":191,"local_volume_ids":348,"logic_ints":585,"reals":272}

so mostly the logic and local surface IDs because so many hexes have the same definition.

@sethrj sethrj added enhancement New feature or request core Software engineering infrastructure orange Work on ORANGE geometry engine labels Sep 23, 2023
@sethrj sethrj marked this pull request as ready for review September 26, 2023 00:42
@elliottbiondo
Copy link
Contributor

@sethrj did you intend to commit the regenerated json files to this branch? Seems like that should be a separate PR.

@sethrj
Copy link
Member Author

sethrj commented Sep 26, 2023

Good point @elliottbiondo . I'll open it separately. It shouldn't affect the deduplication...

Copy link
Contributor

@amandalund amandalund left a comment

Choose a reason for hiding this comment

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

Looks good to me @sethrj!

src/orange/OrangeParamsOutput.cc Outdated Show resolved Hide resolved
@sethrj sethrj merged commit dba101f into celeritas-project:develop Sep 27, 2023
@sethrj sethrj deleted the geom-dedupe branch September 27, 2023 22:11
@sethrj sethrj added performance Changes for performance optimization and removed core Software engineering infrastructure orange Work on ORANGE geometry engine labels Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request performance Changes for performance optimization
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants