Skip to content

FIREFLY-2066: Consolidate the loading UI of Spectral Lines feature #2015

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
jaladh-singhal wants to merge 21 commits into
base: dev
Choose a base branch
from
Open

FIREFLY-2066: Consolidate the loading UI of Spectral Lines feature #2015

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
9ef0073
FIREFLY-2066: Move spectral lines option from SpectrumOptions to its …
jaladh-singhal Sep 5, 2026
65d94a7
FIREFLY-2066: Make a merged lines lists client-side table control cha…
jaladh-singhal Sep 5, 2026
9420d49
FIREFLY-2066: Add two line lists and make ui handle their merging
jaladh-singhal Aug 11, 2026
37a989c
FIREFLY-2066: Improve the UI of SpectralLinesPanel
jaladh-singhal Sep 5, 2026
ef21f0c
FIREFLY-2066: Add helper texts to make limbo states between loading a…
jaladh-singhal Aug 12, 2026
70ad512
FIREFLY-2066: Move spectral lines button to left side of chart toolbar
jaladh-singhal Aug 13, 2026
c8947d4
FIREFLY-2066: Minor wording/styling updates
jaladh-singhal Aug 22, 2026
780986e
FIREFLY-2066: Get recommended line lists from server-side only
jaladh-singhal Sep 4, 2026
6613d94
FIREFLY-2066: Get recommended line lists from app config
jaladh-singhal Sep 5, 2026
276ee64
FIREFLY-2066: Add Upload table UI to SpectralLinesPanel
jaladh-singhal Sep 9, 2026
5e38247
FIREFLY-2066: Wire line merging logic in the Upload table feature
jaladh-singhal Sep 9, 2026
8e90cd3
FIREFLY-2066: Polish the layout of SpectralLinesPanel
jaladh-singhal Sep 10, 2026
05cae64
FIREFLY-2066: Add a "Clear All" button
jaladh-singhal Sep 10, 2026
58831f0
FIREFLY-2066: Handle unit conversion at source to lines loading boundary
jaladh-singhal Sep 10, 2026
8c72644
FIREFLY-2066: Show a better empty table message
jaladh-singhal Sep 10, 2026
d32257d
FIREFLY-2066: Fix the resolveSpectralLinesRedshift when spectral opti…
jaladh-singhal Sep 11, 2026
b88ed8e
FIREFLY-2066: Cleanup redundant and hardcoded stuff in SpectrumOption…
jaladh-singhal Sep 11, 2026
0a7f553
Additional spectrum options and unit enhancements
jaladh-singhal Sep 11, 2026
96d1d1e
FIREFLY-2066: Replace placeholder line lists with actual ones
jaladh-singhal Sep 11, 2026
3f54042
FIREFLY-2066: Fix stale data issues in merged lines table
jaladh-singhal Sep 11, 2026
129765d
FIREFLY-2066: Fix empty checkbox group rendering with just label
jaladh-singhal Sep 12, 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
4 changes: 4 additions & 0 deletions config/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ visualize.fits.Security= true
// ehcahe replication port; suggest 4015-local, 5015-dev, 6015-test, 7015-ops, 7515-ops_int
ehcache.multicast.port = "7015"

// Recommended spectral line lists in the Spectral Lines panel: a JSON array of {label, src} objects, in order.
// Omit "src" to use one of Firefly's bundled lists - any other label with no src is dropped (logged as an error).
// Set to "[]" to offer no spectral line lists at startup.
charts.spectrum.linelists = "[{\"label\": \"SPHEREx line list\"}, {\"label\": \"Spitzer PAHFIT line list\"}, {\"label\": \"Herschel HSPOT line list\"}, {\"label\": \"JWST line list (remote)\", \"src\": \"https://gist.githubusercontent.com/jaladh-singhal/2b4230e2fc64586fbe7b51519d26ad3f/raw/21f503d13bc0e859d269d8acc782083f7fa84c7e/jwst_linelist.tbl\"}]"

@jaladh-singhal jaladh-singhal Sep 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: Last option "JWST line list (remote)" is just a test for recommended/pre-installed line list coming from a remote server rather than bundling with firefly static resources.

I plan to remove it when merging this PR.


/* ------------------------ IRSA services --------------------------------- */
GatorHost = "https://irsa.ipac.caltech.edu"
Expand Down
2 changes: 1 addition & 1 deletion src/firefly/config/app.prop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ignore.auth=@ignore.auth@
visualize.fits.Security= @visualize.fits.Security@

python.exe= @python.exe@

charts.spectrum.linelists=@charts.spectrum.linelists@

# IRSA Periodogram API
irsa.gator.service.periodogram.url=@irsa.gator.service.periodogram.url@
Expand Down
113 changes: 113 additions & 0 deletions src/firefly/java/edu/caltech/ipac/firefly/resources/hspot_lines.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
wavelength,label,description
520.227,CO,5-4
433.553,CO,6-5
371.647,CO,7-6
325.222,CO,8-7
289.118,CO,9-8
260.238,CO,10-9
236.611,CO,11-10
200.271,CO,13-12
185.998,CO,14-13
173.63,CO,15-14
162.81,CO,16-15
612.127,CS,10-9
556.518,CS,11-10
510.18,CS,12-11
470.974,CS,13-12
437.371,CS,14-13
408.252,CS,15-14
382.775,CS,16-15
360.298,CS,17-16
340.32,CS,18-17
322.448,CS,19-18
306.364,CS,20-19
291.815,CS,21-20
278.59,CS,22-21
266.516,CS,23-22
255.451,CS,24-23
245.28,CS,25-24
235.887,CS,26-25
211.591,CS,29-28
204.578,CS,30-29
198.018,CS,31-30
191.87,CS,32-31
186.095,CS,33-32
180.662,CS,34-33
175.54,CS,35-34
170.703,CS,36-35
166.129,CS,37-36
161.797,CS,38-37
157.689,CS,39-38
613.706,H20,624-717
538.284,H20,110-101
482.986,H20,532-441
398.639,H20,211-202
327.22,H20,422-331
308.962,H20,524-431
303.454,H20,202-111
273.191,H20,312-303
269.27,H20,111-000
259.98,H20,312-221
258.814,H20,634-541
257.793,H20,321-312
255.679,H20,744-651
248.245,H20,422-413
243.972,H20,220-211
212.524,H20,523-514
208.075,H20,726-633
194.421,H20,633-542
190.436,H20,643-716
187.109,H20,413-404
180.487,H20,221-212
179.525,H20,212-101
174.919,H20,432-505
174.624,H20,303-212
174.605,H20,533-606
170.138,H20,633-624
169.737,H20,735-642
167.034,H20,624-615
166.813,H20,734-725
160.509,H20,532-523
159.399,H20,634-707
158.31,H20,331-404
563.816,HCN,6-5
483.295,HCN,7-6
422.908,HCN,8-7
375.944,HCN,9-8
338.375,HCN,10-9
307.639,HCN,11-10
282.028,HCN,12-11
260.359,HCN,13-12
241.788,HCN,14-13
199.192,HCN,17-16
188.152,HCN,18-17
178.275,HCN,19-18
169.387,HCN,20-21
161.347,HCN,21-20
358.972,CH+,J=1-0
644.383,CH3D,JK=21-11_E
478.96,HCl,J=1-0
644.814,HDO,JKaKc=101-000
335.471,HDO,JkaKc=111-000
243.242,HF,J=1-0
307.642,NH,3?-N=1-0
637.483,NH2D,JKaKc=110-000
523.652,NH3,JK=10-00
181.051,o-H3O+,JK=11+-11-
318.373,OD,2pi1/2J=3/2-1/2
215.58,OD,2pi3/2J=5/2-3/2
163.123,OH,2pi1/2J=3/2-1/2
304.449,p-H3O+,JK=10-00
216.782,SH,2pi3/2J=5/2-3/2
169.41,Halpha,H15alpha
204.41,Halpha,H16alpha
243.923,Halpha,H17alpha
288.223,Halpha,H18alpha
337.583,Halpha,H19alpha
392.277,Halpha,H20alpha
452.579,Halpha,H21alpha
518.761,Halpha,H22alpha
591.097,Halpha,H23alpha
609.13,CI,1-0
370.412,CI,2-1
157.74,CII,C+
45 changes: 0 additions & 45 deletions src/firefly/java/edu/caltech/ipac/firefly/resources/linelist_combined.csv
View file
Open in desktop

This file was deleted.

45 changes: 45 additions & 0 deletions src/firefly/java/edu/caltech/ipac/firefly/resources/pahfit_lines.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
wavelength,label
5.5115,H2_S(7)
6.1088,H2_S(6)
6.9091,H2_S(5)
8.0258,H2_S(4)
9.6649,H2_S(3)
12.2785,H2_S(2)
17.0346,H2_S(1)
28.2207,H2_S(0)
6.985274,[ArII]
8.99138,[ArIII]
10.5105,[SIV]
12.813,[NeII]
14.3217,[NeV]
15.555,[NeIII]
18.713,[SIII]
25.91,[OIV]
25.989,[FeII]
33.480,[SIII]
34.8152,[SiII]
35.349,[FeII]
5.27,PAH_5.3
5.7,PAH_5.7
6.22,PAH_6.2
6.69,PAH_6.7
7.42,PAH_7.7a
7.6,PAH_7.7b
7.85,PAH_7.7c
8.33,PAH_8.3
8.61,PAH_8.6
10.68,PAH_10.7
11.23,PAH_11.3a
11.33,PAH_11.3b
11.99,PAH_12
12.62,PAH_12.6a
12.69,PAH_12.6b
13.48,PAH_13.48
14.04,PAH_14.04
14.19,PAH_14.19
15.9,PAH_15.9
16.45,PAH_17a
17.04,PAH_17b
17.37,PAH_17c
17.87,PAH_17d
33.1,PAH_33.1
53 changes: 53 additions & 0 deletions src/firefly/java/edu/caltech/ipac/firefly/resources/spherex_lines.tbl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
\
|label |wavelength |
|char |double |
| |micron |
| | |
Lyman Break 0.0912
Ly alpha 0.1216
Balmer Break 0.3646
[O II] 0.3727
H Beta 0.4861
[O III] 0.5007
H alpha 0.6563
Paschen ionize 0.8206
Paschen delta 1.0052
Paschen gamma 1.0941
Paschen beta 1.2822
Bracket ionize 1.4588
1.6 um bump 1.6
Paschen alpha 1.8756
Bracket delta 1.9451
Bracket gamma 2.1661
Pfund ionize 2.2794
Bracket beta 2.6258
NH3 2.96
H2O 3.05
H2 nu1-0 O(5) 3.235
Humphreys ionize 3.2823
PAH 3.3 um 3.29
Pfund delta 3.297
-CH2,-CH3 3.47
H2 nu1-0 O(6) 3.5008
CH3OH 3.53
Pfund gamma 3.7405
H2 nu1-0 O(7) 3.8074
H2 nu0-0 S(13) 3.8472
CH3OH 3.95
H2S 3.95
H2 nu0-0 S(12) 3.9969
Bracket alpha 4.0522
H2 nu0-0 S(11) 4.1815
CO2 4.27
13CO2 4.38
H2 nu0-0 S(10) 4.41
H2O 4.5
CO nu-1-0 4.6
XCN 4.62
Pfund beta 4.6537
CO 4.67
H2 nu0-0 S(9) 4.6947
13CO 4.78
OCS 4.91
H2 nu0-0 S(8) 5.0531
Humphreys delta 5.1286
Loading