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

BUG Support branching fractions in xsplot #388

Merged
merged 7 commits into from
Mar 18, 2020

Conversation

drewejohnson
Copy link
Collaborator

Closes #387 by putting the bra_f branching fractions in the xsections dictionary, where the key should exist, not in metadata. Unit test has been updated to

  1. Demonstrate / reproduce the bug with git checkout 27d006b && pytest tests/test_xsplot.py
  2. Test the existence and contents of branching data

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

Andrew Johnson added 7 commits March 11, 2020 15:28
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
@drewejohnson drewejohnson added this to the 0.10.0 milestone Mar 11, 2020
@drewejohnson drewejohnson linked an issue Mar 11, 2020 that may be closed by this pull request
@gridley
Copy link
Contributor

gridley commented Mar 11, 2020

On the review soon! I appreciate your review request! :D

Copy link
Contributor

@gridley gridley left a 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 drewejohnson merged commit 7d9dcd7 into CORE-GATECH-GROUP:master Mar 18, 2020
@drewejohnson drewejohnson modified the milestones: 0.10.0, 0.9.3 Apr 16, 2020
@drewejohnson drewejohnson deleted the xsplot-branch branch April 16, 2020 12:17
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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG reaction name not parsed with xsplot and branch data
2 participants