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

refactor: Portal fusing and remove shared-from-this #2746

Merged
merged 8 commits into from
Nov 29, 2023

Conversation

paulgessinger
Copy link
Member

@paulgessinger paulgessinger commented Nov 29, 2023

The shared-from-this functionality in Portal is only needed because Portal::fuse uses it to reset the other fuse partner to itself. This PR changes Portal::fuse into a static symmetric function which returns a new merged portal.

The input portals are invalidated.

It then removes the shared-from-this functionality from portal, as it is no longer needed.

@paulgessinger paulgessinger added this to the next milestone Nov 29, 2023
@github-actions github-actions bot added Component - Core Affects the Core module Component - Plugins Affects one or more Plugins labels Nov 29, 2023
@paulgessinger paulgessinger marked this pull request as ready for review November 29, 2023 14:24
Copy link

codecov bot commented Nov 29, 2023

Codecov Report

Attention: 31 lines in your changes are missing coverage. Please review.

Comparison is base (cf84e21) 49.51% compared to head (b03e2ac) 49.52%.

Files Patch % Lines
Core/src/Detector/Portal.cpp 68.75% 1 Missing and 14 partials ⚠️
.../src/Detector/detail/CylindricalDetectorHelper.cpp 0.00% 0 Missing and 15 partials ⚠️
Core/src/Detector/PortalGenerators.cpp 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2746   +/-   ##
=======================================
  Coverage   49.51%   49.52%           
=======================================
  Files         475      474    -1     
  Lines       26965    26978   +13     
  Branches    12447    12453    +6     
=======================================
+ Hits        13352    13361    +9     
- Misses       4764     4767    +3     
- Partials     8849     8850    +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kodiakhq kodiakhq bot merged commit c676ac1 into acts-project:main Nov 29, 2023
51 checks passed
@acts-project-service
Copy link
Collaborator

kodiakhq bot pushed a commit that referenced this pull request Nov 30, 2023
This PR sets the fused portals correctly back to the former keep volumes that relied on keeping the same shared pointer.

This is an update after #2746 which omitted that.
@paulgessinger paulgessinger modified the milestones: next, v31.2.0 Dec 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component - Core Affects the Core module Component - Plugins Affects one or more Plugins
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants