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

Use total recombination data if available to calculate recombination rate #262

Merged
merged 4 commits into from
Feb 2, 2024

Conversation

wtbarnes
Copy link
Owner

@wtbarnes wtbarnes commented Feb 1, 2024

This fixes a bug where the total recombination rate data in the trparams files should be used if available. Previously, I was just assuming that the recombination rate is always the sum of the methods that calculate the radiative and dielectronic recombination rates and thus ignoring the trparams data altogether. However, if this total recombination rate data is available, it should take precedence as it is perceived as being more accurate (though there is some controversy around this).

@wtbarnes wtbarnes added Ion Anything related to the Ion object bugfix Fixes a bug. PRs with this label may be backported. backport 0.2 labels Feb 1, 2024
Copy link

codecov bot commented Feb 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (65130bb) 92.00% compared to head (04c674d) 92.12%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #262      +/-   ##
==========================================
+ Coverage   92.00%   92.12%   +0.12%     
==========================================
  Files          38       38              
  Lines        2752     2770      +18     
==========================================
+ Hits         2532     2552      +20     
+ Misses        220      218       -2     

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

@wtbarnes wtbarnes merged commit 9d531da into main Feb 2, 2024
18 checks passed
@wtbarnes wtbarnes deleted the recomb-trparams-fix branch February 2, 2024 17:35
Copy link

lumberbot-app bot commented Feb 2, 2024

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 0.2
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 9d531da3b0cf4691160491c14919b6deda31c91c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #262: Use total recombination data if available to calculate recombination rate'
  1. Push to a named branch:
git push YOURFORK 0.2:auto-backport-of-pr-262-on-0.2
  1. Create a PR against branch 0.2, I would have named this PR:

"Backport PR #262 on branch 0.2 (Use total recombination data if available to calculate recombination rate)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

wtbarnes added a commit that referenced this pull request Feb 2, 2024
wtbarnes added a commit that referenced this pull request Feb 2, 2024
…able to calculate recombination rate (#263)

* Backport PR #262: Use total recombination data if available to calculate recombination rate

* had to move pyarrow ignore to setup.cfg

* add hashes for rate files

* unpin sphinx to make rtd happy
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix Fixes a bug. PRs with this label may be backported. Ion Anything related to the Ion object Still Needs Manual Backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant