Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 astrodb_utils/spectra.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import astropy.units as u
import numpy as np
from specutils import Spectrum1D
from specutils import Spectrum

from astrodb_utils import AstroDBError

Expand All @@ -22,7 +22,7 @@

def check_spectrum_class(spectrum, raise_error=True):
try:
Spectrum1D.read(spectrum)
Spectrum.read(spectrum)
return True
except Exception as error_message:
msg = f"Unable to load file as Spectrum1D object:{spectrum}"
Expand Down Expand Up @@ -152,15 +152,15 @@ def check_spectrum_plottable(spectrum_path, raise_error=True, show_plot=False):

"""
# load the spectrum and make sure it's readable as a Spectrum1D object, has units, is not all NaNs.
if isinstance(spectrum_path, Spectrum1D):
if isinstance(spectrum_path, Spectrum):
spectrum = spectrum_path
class_check = True
else:
class_check = check_spectrum_class(spectrum_path, raise_error=raise_error)
if not class_check:
return False
else:
spectrum = Spectrum1D.read(spectrum_path)
spectrum = Spectrum.read(spectrum_path)

# checking spectrum has good units
wave_unit_check = check_spectrum_wave_units(spectrum, raise_error=raise_error)
Expand Down
4 changes: 2 additions & 2 deletions astrodb_utils/tests/test_spectra.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os

import pytest
from specutils import Spectrum1D
from specutils import Spectrum

from astrodb_utils import AstroDBError
from astrodb_utils.spectra import (
Expand All @@ -20,7 +20,7 @@ def good_spectrum_path():

@pytest.fixture(scope="module")
def good_spectrum(good_spectrum_path):
return Spectrum1D.read(good_spectrum_path)
return Spectrum.read(good_spectrum_path)


@pytest.mark.filterwarnings(
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ dependencies = [
"tqdm",
"ads",
"dateparser",
"specutils>=2.0.0rc1"
]
dynamic = ["version"]

Expand Down