diff --git a/astrodb_utils/spectra.py b/astrodb_utils/spectra.py index 3eecee6..1033260 100644 --- a/astrodb_utils/spectra.py +++ b/astrodb_utils/spectra.py @@ -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 @@ -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}" @@ -152,7 +152,7 @@ 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: @@ -160,7 +160,7 @@ def check_spectrum_plottable(spectrum_path, raise_error=True, show_plot=False): 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) diff --git a/astrodb_utils/tests/test_spectra.py b/astrodb_utils/tests/test_spectra.py index 32eef9c..a04c5dc 100644 --- a/astrodb_utils/tests/test_spectra.py +++ b/astrodb_utils/tests/test_spectra.py @@ -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 ( @@ -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( diff --git a/pyproject.toml b/pyproject.toml index 0c9f221..e0bf437 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ dependencies = [ "tqdm", "ads", "dateparser", + "specutils>=2.0.0rc1" ] dynamic = ["version"]