search

wtbarnes / fiasco

Python interface to the CHIANTI atomic database
http://fiasco.readthedocs.io/
BSD 3-Clause "New" or "Revised" License
20 stars 15 forks source link

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

Closed wtbarnes closed 5 months ago

wtbarnes commented 5 months ago

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).

codecov[bot] commented 5 months ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

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

Additional details and impacted files ```diff @@ 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 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

lumberbot-app[bot] commented 5 months ago

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

  2. 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.