Skip to content

Use elvlc data to compute energy spacing in upsilon calculation rather than scups data - #459

Merged
wtbarnes merged 4 commits into
mainfrom
replace-scups-de
Jul 23, 2026
Merged

Use elvlc data to compute energy spacing in upsilon calculation rather than scups data#459
wtbarnes merged 4 commits into
mainfrom
replace-scups-de

Conversation

@wtbarnes

Copy link
Copy Markdown
Owner

Fixes #448

@wtbarnes wtbarnes added bugfix Fixes a bug. PRs with this label may be backported. backport 0.8 on-merge: backport to 0.8 labels Jul 23, 2026
@wtbarnes
wtbarnes merged commit 1a19650 into main Jul 23, 2026
19 checks passed
@wtbarnes
wtbarnes deleted the replace-scups-de branch July 23, 2026 14:22
@lumberbot-app

lumberbot-app Bot commented Jul 23, 2026

Copy link
Copy Markdown

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.8
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 1a1965066b192360bdc3681e128dec91d1a4ead0
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #459: Use `elvlc` data to compute energy spacing in upsilon calculation rather than `scups` data'
  1. Push to a named branch:
git push YOURFORK 0.8:auto-backport-of-pr-459-on-0.8
  1. Create a PR against branch 0.8, I would have named this PR:

"Backport PR #459 on branch 0.8 (Use elvlc data to compute energy spacing in upsilon calculation rather than scups data)"

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 0.8 on-merge: backport to 0.8 bugfix Fixes a bug. PRs with this label may be backported.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Collisional excitation rate uses scups delta_energy in Boltzmann factor; IDL/ChiantiPy use observed elvlc energies (~6% G(T) discrepancy at low T)

1 participant