-
Notifications
You must be signed in to change notification settings - Fork 34
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
BUG Support branching fractions in xsplot #388
Merged
drewejohnson
merged 7 commits into
CORE-GATECH-GROUP:master
from
drewejohnson:xsplot-branch
Mar 18, 2020
Merged
BUG Support branching fractions in xsplot #388
drewejohnson
merged 7 commits into
CORE-GATECH-GROUP:master
from
drewejohnson:xsplot-branch
Mar 18, 2020
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
These are only printed if an isotope with energy-dependent branching yields is used in the problem. Related to GH CORE-GATECH-GROUP#387
Fixes GH CORE-GATECH-GROUP#387 by placing the branching fractions in a dedicated XSData instance in xsections, rather than in metadata. Since the line that signals the start of the branching data begins with i<iso>_<lib>_mt, a new XSData entry is added to xsections. But, when the bra_f data arrives, the intended target does not exist in metadata. Now, the target dictionary is xsections, giving a proper XSData instance that can plot energy-dependent branching ratios.
Oxygen reactions 91 and 103 were missing from the test, but reaction 3 was included in their place. Not sure how this didn't fail earlier... Also expanded the MTdescrip section for this isotope for clarity
On the review soon! I appreciate your review request! :D |
gridley
approved these changes
Mar 12, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It all looks great to me. I like how you created these “startswith” and “endswith” methods. Really expressive!
drewejohnson
added a commit
to drewejohnson/serpent-tools
that referenced
this pull request
May 23, 2020
Backport of features included since 0.9.3 release Includes the following PRs git log --online --pretty="%s" --merges 0.9.3... Merge pull request CORE-GATECH-GROUP#407 from drewejohnson/fix-readme Merge pull request CORE-GATECH-GROUP#406 from drewejohnson/r0.9.3 Merge pull request CORE-GATECH-GROUP#405 from nicoloabrate/master Merge pull request CORE-GATECH-GROUP#404 from drewejohnson/update-git-attr Merge pull request CORE-GATECH-GROUP#402 from drewejohnson/xsplot-labels Merge pull request CORE-GATECH-GROUP#400 from drewejohnson/lib2-notes Merge pull request CORE-GATECH-GROUP#399 from CORE-GATECH-GROUP/docs-sphinx-2.0 Merge pull request CORE-GATECH-GROUP#397 from drewejohnson/port-list-of-arrays Merge pull request CORE-GATECH-GROUP#398 from drewejohnson/det-supers Merge pull request CORE-GATECH-GROUP#396 from drewejohnson/df-arg-renaming Merge pull request CORE-GATECH-GROUP#394 from drewejohnson/0.9.3-update-docs Merge pull request CORE-GATECH-GROUP#395 from drewejohnson/hist-branch-dictlike Merge pull request CORE-GATECH-GROUP#393 from drewejohnson/less-metadata Merge pull request CORE-GATECH-GROUP#392 from drewejohnson/better-access Merge pull request CORE-GATECH-GROUP#391 from drewejohnson/dep-dataframe Merge pull request CORE-GATECH-GROUP#390 from drewejohnson/api-dep-attributes Merge pull request CORE-GATECH-GROUP#388 from drewejohnson/xsplot-branch Merge pull request CORE-GATECH-GROUP#378 from drewejohnson/better-build Merge pull request CORE-GATECH-GROUP#376 from drewejohnson/unbundle-data-files Merge pull request CORE-GATECH-GROUP#370 from drewejohnson/results-loa Merge pull request CORE-GATECH-GROUP#369 from drewejohnson/merge-0.9.1-develop
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.
Closes #387 by putting the
bra_f
branching fractions in thexsections
dictionary, where the key should exist, not in metadata. Unit test has been updated togit checkout 27d006b && pytest tests/test_xsplot.py
I did some minor touch ups on the parsing to (hopefully) make it more robust and readable too. I'm also sloooooooowly removing
serpentTools.messages
, at least the logging functions 🐌Also pinging @gridley as the OG xsplotter