Skip to content

Add lines database from Francie Cashman #225

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.

Sign up for GitHub

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

Open
brittonsmith wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Add lines database from Francie Cashman #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
035cce3
Moving data subdirectory to trident source directory so that pip can …
chummels Apr 27, 2016
54dcc4a
updated oscillator strengths and gamma's for Si II 1206 and Si III 1260
peeples Dec 4, 2017
29e3f03
Merge pull request #38 from chummels/sph-viz
chummels Apr 12, 2018
b7a0207
Fix atomic data for Si II 1260 according to Morton 2003
qobilidop Jul 20, 2018
77f8929
Merge pull request #43 from qobilidop/SiII1260
chummels Jul 20, 2018
426d0aa
Fix atomic data for Si II 1260 according to Morton 2003
qobilidop Jul 20, 2018
e10efca
Merge pull request #40 from claytonstrawn/master
chummels Aug 30, 2018
bd3cdc7
Merge branch 'master' into sph-patch2
chummels Dec 19, 2018
8a0f16b
Merge pull request #60 from chummels/sph-patch2
chummels Dec 19, 2018
9f52ef4
Merge pull request #1 from trident-project/sph-viz
claytonstrawn Feb 4, 2019
a3be9d9
Merge pull request #81 from claytonstrawn/sph-viz
brittonsmith Jul 22, 2019
e263c04
Merge pull request #95 from trident-project/sph-viz
brittonsmith Sep 22, 2019
a0b3924
Update lines.txt
fcashman Jul 6, 2022
8a88ae9
Merge pull request #2 from fcashman/fcashman-patch-1
fcashman Jul 6, 2022
4039141
Merge pull request #11 from fcashman/main
peeples Jul 7, 2022
a883ac7
Merge branch 'cashman' of github.com:brittonsmith/trident into cashma…
brittonsmith Jun 5, 2026
df12092
Remove two incorrect Ar I lines and a duplicate O III line.
brittonsmith Jun 5, 2026
295bca7
Update two P II lines.
brittonsmith Jun 5, 2026
88c157b
Add three Ni II lines and some reference information.
brittonsmith Jun 5, 2026
3ea4e0f
Strip whitespace from lines file.
brittonsmith Jun 5, 2026
cf01c9b
Remove duplicate line in lines file.
brittonsmith Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion trident/data/line_lists/lines.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ O II 834.465400 8.610000e+08 1.350000e-01
O II 833.330300 8.650000e+08 9.010000e-02
O II 832.758300 8.670000e+08 4.510000e-02
O III 835.289000 5.990000e+08 8.770000e-02 O III* 835
O III 835.289000 5.990000e+08 8.770000e-02 O III* 835
O III 832.929000 3.410000e+08 1.060000e-01
O III 702.838000 1.830000e+09 4.520000e-02 O III* 703
O III 702.337000 6.060000e+08 1.340000e-01
Expand Down
Loading