feat(psp): Composite PSP #301
Merged
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
nstarman
force-pushed
the
stream-branches
branch
3 times, most recently
from
521adf3
to
9b130a3
Compare
|
Note to self: failing because of patrick-kidger/diffrax#412 |
nstarman
force-pushed
the
stream-branches
branch
2 times, most recently
from
feb7731
to
25cce1e
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #301 +/- ##
==========================================
+ Coverage 94.38% 94.88% +0.49%
==========================================
Files 60 62 +2
Lines 2351 2404 +53
==========================================
+ Hits 2219 2281 +62
+ Misses 132 123 -9 ☔ View full report in Codecov by Sentry. |
|
|
Signed-off-by: nstarman <nstarman@users.noreply.github.com>
|
The followup to this PR is to let the DF determine the PSP type. So FardalDF would produce MockStreamArm. A CoreSprayDF would produce a PSP (or some other class). The whole thing gets wrapped up into a MockStream composite object (which we might want to rename as well?). |
Signed-off-by: nstarman <nstarman@users.noreply.github.com>
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 PR allows for PhaseSpacePosition that are composites of other PSPs.
A composite PSP acts like a single PSP but is a dictionary of PSPs.
This is structurally similar to CompositePotential.
In particular I apply this to MockStream so that we have distinct leading and trailing arms. Rather than doing a stepped slice index to find each arm, it's just a
mockstream["leading"]getitem. When accessing the composite properties, e.g.qit's just interleaved in the concatenation by the release-time.Having a composite PSP means it will be easier to support other star ejection mechanisms from progenitors, e.g. 3-body encounters. Then we'd have
mockstream["threebody"].The alternative to this PR is to have a string label list on on the mockstream. I don't think that's as clean (since we will need to always ensure that slicing and ordering is maintained), but it is maybe simpler.Thinking more, perhaps the string label list approach is the best thing to start with? But then we should really clean up the df sampling logic happen in mockstreamgenerator.