feat: encapsulate assignment of material interactions to material surfaces (MM1) #3015
Conversation
This file contains 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
📊: Physics performance monitoring for d120036physmon summary
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3015 +/- ##
=======================================
Coverage 48.98% 48.99%
=======================================
Files 489 490 +1
Lines 28947 28996 +49
Branches 13713 13743 +30
=======================================
+ Hits 14181 14206 +25
Misses 4951 4951
- Partials 9815 9839 +24 ☔ View full report in Codecov by Sentry. |
This was referenced Mar 11, 2024
andiwand
reviewed
Mar 12, 2024
| /// return true if the assignment should be vetoed | ||
| using LocalVeto = | ||
| std::function<bool(const MaterialInteraction&, | ||
| const std::tuple<const Surface*, Vector3, Vector3>&)>; |
There was a problem hiding this comment.
It's not time critical, so a function is good enough here, I added #include <functional> though.
There was a problem hiding this comment.
I meant the std::tuple<const Surface*, Vector3, Vector3>. The type looks quite cryptic to me
Co-authored-by: Andreas Stefl <[email protected]>
andiwand
approved these changes
Mar 27, 2024
|
shall we wait for @Corentin-Allaire to have a look as the expert here? |
I have finish all the things that have been draining my time the last few week, so I can have a look this afternoon |
Corentin-Allaire
approved these changes
Mar 27, 2024
asalzburger
added a commit
that referenced
this pull request
Apr 8, 2024
This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3, this PR, partly) 4) Steer that by a chained algorithm (MM4) This PR: It encapsulates the pure accumulation of the material for Surface based materials into a new module. The accumulation is now decoupled from the association, i.e. one can run the mapping with a navigator or with a trial and error method, and still use the exact same material mapper. The code is largely transferred from the 'SurfaceMaterialMapper' which will vanish to exist after this re-organization. @Corentin-Allaire - the State of this Mapper would have all the access to run the optimisation, I have not yet re-introduced the track variance, but that should be a five-line change. This PR is blocked by #3015 and #3016. All cases are showcased and tested in a set of UnitTests.
Ragansu
pushed a commit
to Ragansu/acts
that referenced
this pull request
Apr 19, 2024
) This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3, this PR, partly) 4) Steer that by a chained algorithm (MM4) This PR: It encapsulates the pure accumulation of the material for Surface based materials into a new module. The accumulation is now decoupled from the association, i.e. one can run the mapping with a navigator or with a trial and error method, and still use the exact same material mapper. The code is largely transferred from the 'SurfaceMaterialMapper' which will vanish to exist after this re-organization. @Corentin-Allaire - the State of this Mapper would have all the access to run the optimisation, I have not yet re-introduced the track variance, but that should be a five-line change. This PR is blocked by acts-project#3015 and acts-project#3016. All cases are showcased and tested in a set of UnitTests.
EleniXoch
pushed a commit
to EleniXoch/acts
that referenced
this pull request
May 6, 2024
…faces (MM1) (acts-project#3015) This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1, this PR) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3) 4) Steer that by a chained algorithm (MM4) This PR: The logic how to walk through material interactions and assign those is currently implemented in both the `SurfaceMaterialMapper` and `VolumeMaterialMapper` and consists of many If/else cases that are rather difficult to follow. This PR (after consultation with @Corentin-Allaire ) introduces a single logic for Surface based material that allows to define global and local vetos (global, e.g. for volume restrictions) and re-assignment policies for pre/post mapping directives. All cases are showcased and tested in a set of UnitTests.
EleniXoch
pushed a commit
to EleniXoch/acts
that referenced
this pull request
May 6, 2024
) This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3, this PR, partly) 4) Steer that by a chained algorithm (MM4) This PR: It encapsulates the pure accumulation of the material for Surface based materials into a new module. The accumulation is now decoupled from the association, i.e. one can run the mapping with a navigator or with a trial and error method, and still use the exact same material mapper. The code is largely transferred from the 'SurfaceMaterialMapper' which will vanish to exist after this re-organization. @Corentin-Allaire - the State of this Mapper would have all the access to run the optimisation, I have not yet re-introduced the track variance, but that should be a five-line change. This PR is blocked by acts-project#3015 and acts-project#3016. All cases are showcased and tested in a set of UnitTests.
asalzburger
added a commit
to asalzburger/acts
that referenced
this pull request
May 21, 2024
…faces (MM1) (acts-project#3015) This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1, this PR) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3) 4) Steer that by a chained algorithm (MM4) This PR: The logic how to walk through material interactions and assign those is currently implemented in both the `SurfaceMaterialMapper` and `VolumeMaterialMapper` and consists of many If/else cases that are rather difficult to follow. This PR (after consultation with @Corentin-Allaire ) introduces a single logic for Surface based material that allows to define global and local vetos (global, e.g. for volume restrictions) and re-assignment policies for pre/post mapping directives. All cases are showcased and tested in a set of UnitTests.
asalzburger
added a commit
to asalzburger/acts
that referenced
this pull request
May 21, 2024
) This is the first PR in a series that divides the Material Mapping into logical, unit testable modules: 1) Finding intersections with surfaces and associations to volumes (MM2) 2) Assigning material interactions to those intersections (MM1) 3) Mapping those onto dedicated Surface / Volume Material Mappers (MM3, this PR, partly) 4) Steer that by a chained algorithm (MM4) This PR: It encapsulates the pure accumulation of the material for Surface based materials into a new module. The accumulation is now decoupled from the association, i.e. one can run the mapping with a navigator or with a trial and error method, and still use the exact same material mapper. The code is largely transferred from the 'SurfaceMaterialMapper' which will vanish to exist after this re-organization. @Corentin-Allaire - the State of this Mapper would have all the access to run the optimisation, I have not yet re-introduced the track variance, but that should be a five-line change. This PR is blocked by acts-project#3015 and acts-project#3016. All cases are showcased and tested in a set of UnitTests.
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.
This is the first PR in a series that divides the Material Mapping into logical, unit testable modules:
This PR:
The logic how to walk through material interactions and assign those is currently implemented in both the
SurfaceMaterialMapperandVolumeMaterialMapperand consists of many If/else cases that are rather difficult to follow.This PR (after consultation with @Corentin-Allaire ) introduces a single logic for Surface based material that allows to define global and local vetos (global, e.g. for volume restrictions) and re-assignment policies for pre/post mapping directives.
All cases are showcased and tested in a set of UnitTests.