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.

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

Jump to bottom

Fix APOGEE loaders #560

Merged
merged 2 commits into from
Dec 15, 2019
Merged

Fix APOGEE loaders #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff6b90
fix apogee loaders to use spectral_axis kwarg
adrn Dec 14, 2019
62b28e3
add tests of apogee loaders
adrn Dec 14, 2019
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
8 changes: 4 additions & 4 deletions specutils/io/default_loaders/apogee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def apVisit_loader(file_name, **kwargs):

return Spectrum1D(data=data * unit,
uncertainty=uncertainty,
dispersion=dispersion * dispersion_unit,
spectral_axis=dispersion * dispersion_unit,
meta=meta)


Expand Down Expand Up @@ -135,7 +135,7 @@ def apStar_loader(file_name, **kwargs):

return Spectrum1D(data=data * unit,
uncertainty=uncertainty,
dispersion=dispersion * dispersion_unit,
spectral_axis=dispersion * dispersion_unit,
meta=meta,
wcs=wcs)

Expand All @@ -162,7 +162,7 @@ def aspcapStar_loader(file_name, **kwargs):
meta = {'header': header}
wcs = WCS(hdulist[1].header)

data = hdulist[1].data # spectrum in the first extension
data = hdulist[1].data # spectrum in the first extension
unit = def_unit('arbitrary units')

uncertainty = StdDevUncertainty(hdulist[2].data)
Expand All @@ -174,6 +174,6 @@ def aspcapStar_loader(file_name, **kwargs):

return Spectrum1D(data=data * unit,
uncertainty=uncertainty,
dispersion=dispersion * dispersion_unit,
spectral_axis=dispersion * dispersion_unit,
meta=meta,
wcs=wcs)
36 changes: 36 additions & 0 deletions specutils/io/default_loaders/tests/test_apogee.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Third-party
from astropy.utils.data import download_file
from astropy.config import set_temp_cache
import pytest

# Package
from specutils.io.default_loaders.apogee import (apStar_loader, apVisit_loader,
aspcapStar_loader)


@pytest.mark.remote_data
def test_apStar_loader(tmpdir):
apstar_url = ("https://data.sdss.org/sas/dr16/apogee/spectro/redux/r12/"
"stars/apo25m/N7789/apStar-r12-2M00005414+5522241.fits")
with set_temp_cache(path=str(tmpdir)):
filename = download_file(apstar_url, cache=True)
spectrum = apStar_loader(filename)


@pytest.mark.remote_data
def test_apVisit_loader(tmpdir):
apvisit_url = ("https://data.sdss.org/sas/dr16/apogee/spectro/redux/r12/"
"visit/apo25m/N7789/5094/55874/"
"apVisit-r12-5094-55874-123.fits")
with set_temp_cache(path=str(tmpdir)):
filename = download_file(apvisit_url, cache=True)
spectrum = apVisit_loader(filename)


@pytest.mark.remote_data
def test_aspcapStar_loader(tmpdir):
aspcap_url = ("https://data.sdss.org/sas/dr16/apogee/spectro/aspcap/r12/"
"l33/apo25m/N7789/aspcapStar-r12-2M00005414+5522241.fits")
with set_temp_cache(path=str(tmpdir)):
filename = download_file(aspcap_url, cache=True)
spectrum = aspcapStar_loader(filename)