Skip to content

Commit 21a5baa

Browse files
rileythairileythai
committed
fix: formatting
1 parent cc86b70 commit 21a5baa

File tree

2 files changed

+57
-46
lines changed

2 files changed

+57
-46
lines changed

‎specutils/io/default_loaders/sdss_v.py‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Register reader functions for various spectral formats."""
2+
23
import warnings
34
from typing import Optional
45

@@ -85,20 +86,20 @@ def mwm_identify(origin, *args, **kwargs):
8586
return (("V_ASTRA" in hdulist[0].header.keys()) and len(hdulist) > 0
8687
and ("SDSS_ID" in hdulist[0].header.keys())
8788
and (isinstance(hdulist[i], BinTableHDU) for i in range(1, 5))
88-
and all('model_flux' not in hdulist[i].columns.names
89+
and all("model_flux" not in hdulist[i].columns.names
8990
for i in range(1, 5)))
9091

9192

9293
def astra_identify(origin, *args, **kwargs):
9394
"""
94-
Check whether given input is FITS and has SDSS-V astra model spectra
95+
Check whether given input is FITS and has SDSS-V astra model spectra
9596
BINTABLE in all 4 extensions. This is used for Astropy I/O Registry.
9697
"""
9798
with read_fileobj_or_hdulist(*args, **kwargs) as hdulist:
9899
return (("V_ASTRA" in hdulist[0].header.keys()) and len(hdulist) > 0
99100
and ("SDSS_ID" in hdulist[0].header.keys())
100101
and (isinstance(hdulist[i], BinTableHDU) for i in range(1, 5))
101-
and all('model_flux' in hdulist[i].columns.names
102+
and all("model_flux" in hdulist[i].columns.names
102103
for i in range(1, 5)))
103104

104105

@@ -355,7 +356,7 @@ def load_sdss_spec_1D(file_obj, *args, hdu: Optional[int] = None, **kwargs):
355356
"""
356357
if hdu is None:
357358
# TODO: how should we handle this -- multiple things in file, but the user cannot choose.
358-
warnings.warn('HDU not specified. Loading coadd spectrum (HDU1)',
359+
warnings.warn("HDU not specified. Loading coadd spectrum (HDU1)",
359360
AstropyUserWarning)
360361
hdu = 1 # defaulting to coadd
361362
# raise ValueError("HDU not specified! Please specify a HDU to load.")
@@ -488,8 +489,10 @@ def load_sdss_mwm_1d(file_obj,
488489
if hdulist[i].header.get("DATASUM") != "0":
489490
hdu = i
490491
warnings.warn(
491-
'HDU not specified. Loading spectrum at (HDU{})'.
492-
format(i), AstropyUserWarning)
492+
"HDU not specified. Loading spectrum at (HDU{})".
493+
format(i),
494+
AstropyUserWarning,
495+
)
493496
break
494497

495498
# load spectra and return
@@ -608,15 +611,15 @@ def _load_mwmVisit_or_mwmStar_hdu(hdulist: HDUList, hdu: int, **kwargs):
608611

609612
# choose between mwmVisit/Star via KeyError except
610613
try:
611-
meta['mjd'] = hdulist[hdu].data['mjd']
614+
meta["mjd"] = hdulist[hdu].data["mjd"]
612615
meta["datatype"] = "mwmVisit"
613616
except KeyError:
614617
meta["min_mjd"] = str(hdulist[hdu].data["min_mjd"][0])
615618
meta["max_mjd"] = str(hdulist[hdu].data["max_mjd"][0])
616619
meta["datatype"] = "mwmStar"
617620
finally:
618621
meta["name"] = hdulist[hdu].name
619-
meta["sdss_id"] = hdulist[hdu].data['sdss_id']
622+
meta["sdss_id"] = hdulist[hdu].data["sdss_id"]
620623

621624
# drop back a list of Spectrum1Ds to unpack
622625
return Spectrum1D(
@@ -664,8 +667,10 @@ def load_astra_1d(file_obj, hdu: Optional[int] = None, **kwargs):
664667
if hdulist[i].header.get("DATASUM") != "0":
665668
hdu = i
666669
warnings.warn(
667-
'HDU not specified. Loading spectrum at (HDU{})'.
668-
format(i), AstropyUserWarning)
670+
"HDU not specified. Loading spectrum at (HDU{})".
671+
format(i),
672+
AstropyUserWarning,
673+
)
669674
break
670675

671676
return _load_astra_hdu(hdulist, hdu, **kwargs)
@@ -752,7 +757,7 @@ def _load_astra_hdu(hdulist: HDUList, hdu: int, **kwargs):
752757
# NOTE:: flux info is not written
753758
flux_unit = Unit("1e-17 erg / (Angstrom cm2 s)") # NOTE: hardcoded unit
754759
flux = Quantity(hdulist[hdu].data["model_flux"] *
755-
hdulist[hdu].data['continuum'],
760+
hdulist[hdu].data["continuum"],
756761
unit=flux_unit)
757762
e_flux = InverseVariance(array=hdulist[hdu].data["ivar"])
758763

@@ -781,15 +786,15 @@ def _load_astra_hdu(hdulist: HDUList, hdu: int, **kwargs):
781786

782787
# choose between mwmVisit/Star via KeyError except
783788
try:
784-
meta['mjd'] = hdulist[hdu].data['mjd']
789+
meta["mjd"] = hdulist[hdu].data["mjd"]
785790
meta["datatype"] = "astraVisit"
786791
except KeyError:
787792
meta["min_mjd"] = str(hdulist[hdu].data["min_mjd"][0])
788793
meta["max_mjd"] = str(hdulist[hdu].data["max_mjd"][0])
789794
meta["datatype"] = "astraStar"
790795
finally:
791796
meta["name"] = hdulist[hdu].name
792-
meta["sdss_id"] = hdulist[hdu].data['sdss_id']
797+
meta["sdss_id"] = hdulist[hdu].data["sdss_id"]
793798

794799
# drop back a list of Spectrum1Ds to unpack
795800
return Spectrum1D(

‎specutils/io/default_loaders/tests/test_sdss_v.py‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ def generate_apogee_hdu(observatory="APO",
2424

2525
columns = [
2626
fits.Column(name="spectrum_pk_id", array=[159783564], format="K"),
27-
fits.Column(name="release", array=[b"sdss5"]*nvisits, format="5A"),
28-
fits.Column(name="v_astra", array=[b"0.5.0"]*nvisits, format="5A"),
27+
fits.Column(name="release", array=[b"sdss5"] * nvisits, format="5A"),
28+
fits.Column(name="v_astra", array=[b"0.5.0"] * nvisits, format="5A"),
2929
fits.Column(name="healpix", array=[3], format="J"),
30-
fits.Column(name="sdss_id", array=[42]*nvisits, format="K"),
31-
fits.Column(name="apred", array=[b"1.2"]*nvisits, format="3A"),
30+
fits.Column(name="sdss_id", array=[42] * nvisits, format="K"),
31+
fits.Column(name="apred", array=[b"1.2"] * nvisits, format="3A"),
3232
fits.Column(name="obj", array=[b"2M19534321+6705175"], format="18A"),
33-
fits.Column(name="telescope", array=[b"apo25m"]*nvisits, format="6A"),
34-
fits.Column(name="snr", array=[50]*nvisits, format="E"),
33+
fits.Column(name="telescope", array=[b"apo25m"] * nvisits,
34+
format="6A"),
35+
fits.Column(name="snr", array=[50] * nvisits, format="E"),
3536
]
3637
if with_wl:
3738
columns.append(
@@ -47,7 +48,7 @@ def generate_apogee_hdu(observatory="APO",
4748
columns += [
4849
fits.Column(name="mjd", array=[59804], format="J"),
4950
]
50-
flux_col = 'model_flux' if astra else 'flux'
51+
flux_col = "model_flux" if astra else "flux"
5152

5253
columns += [
5354
fits.Column(name=flux_col, array=flux, format="8575E", dim="(8575)"),
@@ -98,14 +99,14 @@ def generate_boss_hdu(observatory="APO",
9899
continuum = np.array([np.zeros_like(wl)] * nvisits)
99100
nmf_rectified_model_flux = np.array([np.zeros_like(wl)] * nvisits)
100101
columns = [
101-
fits.Column(name="spectrum_pk_id", array=[0]*nvisits, format="K"),
102-
fits.Column(name="release", array=["sdss5"]*nvisits, format="5A"),
102+
fits.Column(name="spectrum_pk_id", array=[0] * nvisits, format="K"),
103+
fits.Column(name="release", array=["sdss5"] * nvisits, format="5A"),
103104
fits.Column(name="v_astra", array=["0.5.0"], format="5A"),
104105
fits.Column(name="healpix", array=[34], format="J"),
105106
fits.Column(name="sdss_id", array=[42], format="K"),
106107
fits.Column(name="run2d", array=["6_1_2"], format="6A"),
107-
fits.Column(name="telescope", array=["apo25m"]*nvisits, format="6A"),
108-
fits.Column(name="snr", array=[50]*nvisits, format="E"),
108+
fits.Column(name="telescope", array=["apo25m"] * nvisits, format="6A"),
109+
fits.Column(name="snr", array=[50] * nvisits, format="E"),
109110
]
110111

111112
if with_wl:
@@ -122,7 +123,7 @@ def generate_boss_hdu(observatory="APO",
122123
columns += [
123124
fits.Column(name="mjd", array=[59804], format="J"),
124125
]
125-
flux_col = 'model_flux' if astra else 'flux'
126+
flux_col = "model_flux" if astra else "flux"
126127
columns += [
127128
fits.Column(name=flux_col, array=flux, format="4648E", dim="(4648)"),
128129
fits.Column(name="ivar", array=ivar, format="4648E", dim="(4648)"),
@@ -471,9 +472,9 @@ def test_mwm_1d_nohdu(file_obj, hdu, with_wl, hduflags, nvisits):
471472
if nvisits > 1:
472473
assert data.flux.value.shape[0] == nvisits
473474
if with_wl:
474-
assert data.meta['datatype'].lower() == 'mwmstar'
475-
else:
476-
assert data.meta['datatype'].lower() == 'mwmvisit'
475+
assert data.meta["datatype"].lower() == "mwmstar"
476+
else:
477+
assert data.meta["datatype"].lower() == "mwmvisit"
477478
assert data.spectral_axis.unit == Angstrom
478479
assert data.flux.unit == Unit("1e-17 erg / (s cm2 Angstrom)")
479480
os.remove(tmpfile)
@@ -511,9 +512,9 @@ def test_astra_nohdu(file_obj, hdu, with_wl, hduflags, nvisits):
511512
if nvisits > 1:
512513
assert data.flux.value.shape[0] == nvisits
513514
if with_wl:
514-
assert data.meta['datatype'].lower() == 'astrastar'
515-
else:
516-
assert data.meta['datatype'].lower() == 'astravisit'
515+
assert data.meta["datatype"].lower() == "astrastar"
516+
else:
517+
assert data.meta["datatype"].lower() == "astravisit"
517518
assert data.spectral_axis.unit == Angstrom
518519
assert data.flux.unit == Unit("1e-17 erg / (s cm2 Angstrom)")
519520
os.remove(tmpfile)
@@ -550,9 +551,9 @@ def test_mwm_1d(file_obj, hdu, with_wl, hduflags, nvisits):
550551
if nvisits > 1:
551552
assert data.flux.value.shape[0] == nvisits
552553
if with_wl:
553-
assert data.meta['datatype'].lower() == 'mwmstar'
554-
else:
555-
assert data.meta['datatype'].lower() == 'mwmvisit'
554+
assert data.meta["datatype"].lower() == "mwmstar"
555+
else:
556+
assert data.meta["datatype"].lower() == "mwmvisit"
556557
assert data.spectral_axis.unit == Angstrom
557558
assert data.flux.unit == Unit("1e-17 erg / (s cm2 Angstrom)")
558559
os.remove(tmpfile)
@@ -589,9 +590,9 @@ def test_astra_1d(file_obj, hdu, with_wl, hduflags, nvisits):
589590
assert data.flux.value.shape[0] == nvisits
590591

591592
if with_wl:
592-
assert data.meta['datatype'].lower() == 'astrastar'
593-
else:
594-
assert data.meta['datatype'].lower() == 'astravisit'
593+
assert data.meta["datatype"].lower() == "astrastar"
594+
else:
595+
assert data.meta["datatype"].lower() == "astravisit"
595596

596597
assert data.spectral_axis.unit == Angstrom
597598
assert data.flux.unit == Unit("1e-17 erg / (s cm2 Angstrom)")
@@ -631,9 +632,9 @@ def test_mwm_list(file_obj, with_wl, hduflags):
631632
raise ValueError(
632633
"INSTRMNT tag in test HDU header is not set properly.")
633634
if with_wl:
634-
assert data[i].meta['datatype'].lower() == 'mwmstar'
635+
assert data[i].meta["datatype"].lower() == "mwmstar"
635636
else:
636-
assert data[i].meta['datatype'].lower() == 'mwmvisit'
637+
assert data[i].meta["datatype"].lower() == "mwmvisit"
637638
assert len(data[i].spectral_axis.value) == length
638639
assert data[i].flux.value.shape[-1] == length
639640
if nvisits > 1:
@@ -642,6 +643,7 @@ def test_mwm_list(file_obj, with_wl, hduflags):
642643
assert data[i].flux.unit == Unit("1e-17 erg / (s cm2 Angstrom)")
643644
os.remove(tmpfile)
644645

646+
645647
@pytest.mark.parametrize(
646648
"file_obj, with_wl, hduflags",
647649
[
@@ -659,8 +661,8 @@ def test_astra_list(file_obj, with_wl, hduflags):
659661
"""Test astra SpectrumList loader"""
660662
tmpfile = str(file_obj) + ".fits"
661663
nvisits = 1 if with_wl else 3
662-
mwm_HDUList(hduflags, with_wl, nvisits=nvisits,astra=True).writeto(tmpfile,
663-
overwrite=True)
664+
mwm_HDUList(hduflags, with_wl, nvisits=nvisits,
665+
astra=True).writeto(tmpfile, overwrite=True)
664666

665667
data = SpectrumList.read(tmpfile)
666668
assert isinstance(data, SpectrumList)
@@ -675,9 +677,9 @@ def test_astra_list(file_obj, with_wl, hduflags):
675677
raise ValueError(
676678
"INSTRMNT tag in test HDU header is not set properly.")
677679
if with_wl:
678-
assert data[i].meta['datatype'].lower() == 'astrastar'
679-
else:
680-
assert data[i].meta['datatype'].lower() == 'astravisit'
680+
assert data[i].meta["datatype"].lower() == "astrastar"
681+
else:
682+
assert data[i].meta["datatype"].lower() == "astravisit"
681683
assert len(data[i].spectral_axis.value) == length
682684
assert data[i].flux.value.shape[-1] == length
683685
if nvisits > 1:
@@ -721,6 +723,7 @@ def test_mwm_1d_fail(file_obj, with_wl):
721723
Spectrum1D.read(tmpfile)
722724
os.remove(tmpfile)
723725

726+
724727
@pytest.mark.parametrize(
725728
"file_obj, with_wl",
726729
[
@@ -731,7 +734,8 @@ def test_mwm_1d_fail(file_obj, with_wl):
731734
def test_astra_1d_fail(file_obj, with_wl):
732735
"""Test astra Spectrum1D loader fail on empty"""
733736
tmpfile = str(file_obj) + ".fits"
734-
mwm_HDUList([0, 0, 0, 0], with_wl,astra=True).writeto(tmpfile, overwrite=True)
737+
mwm_HDUList([0, 0, 0, 0], with_wl, astra=True).writeto(tmpfile,
738+
overwrite=True)
735739

736740
with pytest.raises(ValueError):
737741
Spectrum1D.read(tmpfile)
@@ -754,6 +758,7 @@ def test_mwm_list_fail(file_obj, with_wl):
754758
SpectrumList.read(tmpfile)
755759
os.remove(tmpfile)
756760

761+
757762
@pytest.mark.parametrize(
758763
"file_obj, with_wl",
759764
[
@@ -764,7 +769,8 @@ def test_mwm_list_fail(file_obj, with_wl):
764769
def test_astra_list_fail(file_obj, with_wl):
765770
"""Test astra SpectrumList loader fail on empty"""
766771
tmpfile = str(file_obj) + ".fits"
767-
mwm_HDUList([0, 0, 0, 0], with_wl,astra=True).writeto(tmpfile, overwrite=True)
772+
mwm_HDUList([0, 0, 0, 0], with_wl, astra=True).writeto(tmpfile,
773+
overwrite=True)
768774

769775
with pytest.raises(ValueError):
770776
SpectrumList.read(tmpfile)

0 commit comments

Comments
 (0)