sparclclient 1.2.8b4__tar.gz → 1.3.0b1__tar.gz

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/.gitignore

@@ -71,7 +71,7 @@ instance/
 .scrapy
 
 # Sphinx documentation
-docs/_build/
+source/_build/
 
 # PyBuilder
 target/

sparclclient-1.3.0b1/.gitlab-ci.yml

@@ -0,0 +1,21 @@
+default:
+    image: python:3.13
+
+# install-job:
+#     stage: build
+#     script:
+#         - python -m pip install -r requirements.txt
+
+test-api:
+    stage: test
+    script:
+        - python -m pip install -r requirements.txt
+        - python -m unittest tests.tests_api
+
+
+test-sphinx:
+    stage: test
+    script:
+        - python -m pip install -r requirements.txt
+        - python -m pip install Sphinx sphinx-rtd-theme sphinx_mdinclude
+        - sphinx-build --jobs auto --builder html --fail-on-warning --show-traceback source source/_build/html

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sparclclient
-Version: 1.2.8b4
+Version: 1.3.0b1
 Summary: A client for getting spectra and meta-data from NOIRLab.
 Author-email: "S. Pothier" <datalab-spectro@noirlab.edu>
 Description-Content-Type: text/markdown

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/requirements-internal.txt

@@ -2,7 +2,7 @@
 #psutil==5.8.0  # for benchmarks
 #! speedtest # for benchmarks
 # packaging   # for noaodatalab
-#specutils==1.3.1
+specutils
 # jupyter-lab --ip=0.0.0.0
 jupyterlab # =3.1.17
 

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/source/conf.py

@@ -15,6 +15,7 @@ from sparcl import __version__
 import os
 import re
 import sys
+from importlib import import_module
 sys.path.insert(0, os.path.abspath(".."))
 
 # -- Project information -----------------------------------------------------
@@ -26,7 +27,7 @@ author = "S.Pothier, A.Jacques"
 #!version = client_version
 sver = __version__
 mo = re.match(
-    "^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$",  # noqa: E501, W605
+    r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$",  # noqa: E501, W605
     sver,
 )
 release = sver
@@ -41,14 +42,26 @@ version = mo.group("major") + "." + mo.group("minor")
 # ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
     "sphinx.ext.doctest",
     "sphinx.ext.todo",
     "sphinx.ext.coverage",
     "sphinx.ext.napoleon",
     "sphinx.ext.viewcode",
     "sphinx_mdinclude",
+    "sphinx_rtd_theme",
 ]
 
+# Configuration for intersphinx, copied from astropy.
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3/', None),
+    'numpy': ('https://numpy.org/doc/stable/', None),
+    'scipy': ('https://docs.scipy.org/doc/scipy/', None),
+    'matplotlib': ('https://matplotlib.org/stable/', None),
+    'astropy': ('https://docs.astropy.org/en/stable/', None),
+    'h5py': ('https://docs.h5py.org/en/latest/', None),
+    'specutils': ('https://specutils.readthedocs.io/en/latest/', None)
+    }
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
@@ -58,7 +71,7 @@ templates_path = ["_templates"]
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = "y"
+# language = "y"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -69,6 +82,16 @@ exclude_patterns = ["../sparcl/benchmarks/"]
 pygments_style = "sphinx"
 autosummary_generate = True
 
+# This value contains a list of modules to be mocked up. This is useful when
+# some external dependencies are not met at build time and break the
+# building process.
+autodoc_mock_imports = []
+for missing in ('jwt', ):
+    try:
+        foo = import_module(missing)
+    except ImportError:
+        autodoc_mock_imports.append(missing)
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -80,7 +103,7 @@ html_theme = "sphinx_rtd_theme"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+# html_static_path = ["_static"]
 
 # -- Extension configuration -------------------------------------------------
 

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/source/sparcl.rst

@@ -24,3 +24,11 @@ sparcl.Results module
    :members:
    :inherited-members:
    :show-inheritance:
+
+sparcl.specutils module
+-----------------------
+
+.. automodule:: sparcl.specutils
+   :members:
+   :inherited-members:
+   :show-inheritance:

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/sparcl/Results.py

@@ -9,6 +9,7 @@ from sparcl.utils import _AttrDict
 
 # from sparcl.gather_2d import bin_spectra_records
 import sparcl.exceptions as ex
+import sparcl.specutils as su
 from warnings import warn
 import re
 
@@ -139,9 +140,7 @@ class Results(UserList):
 
         Returns:
             reordered (:class:`~sparcl.Results.Retrieved`): Contains header and
-                                                            reordered records.
-            # none_idx (:obj:`list`): List of indices where record is None.
-
+            reordered records.
         """
         if len(ids_og) <= 0:
             msg = (
@@ -198,6 +197,14 @@ class Results(UserList):
                 warn(msg, stacklevel=2)
         return Results(reordered, client=self.client)
 
+    def to_specutils(self):
+        """Convert results to a `specutils` object.
+
+        Returns:
+            to_specutils (:class:`~specutils.Spectrum`): a `specutils` object.
+        """
+        return su.to_specutils(self)
+
 
 # For results of retrieve()
 class Retrieved(Results):
@@ -209,7 +216,6 @@ class Retrieved(Results):
     def __repr__(self):
         return f"Retrieved Results: {len(self.recs)} records"
 
-
 #!    def bin_spectra(self):
 #!        """Align flux from all records by common wavelength bin.
 #!

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/sparcl/__init__.py

@@ -37,4 +37,5 @@ __all__ = ["client", "align_records"]
 #__version__ = "1.2.5"
 #__version__ = "1.2.6"
 #__version__ = "1.2.7"
-__version__ = "1.2.8b4"
+#__version__ = "1.2.8"
+__version__ = "1.3.0b1"

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/sparcl/client.py

@@ -267,11 +267,12 @@ class SparclClient:  # was SparclApi()
 
     def token_expired(self, renew=False):
         """
-        POST http://localhost:8050/sparc/renew_token/
-        Content-Type: application/json
-        {
-          "refresh_token": "..."
-        }
+        ::
+            POST http://localhost:8050/sparc/renew_token/
+            Content-Type: application/json
+            {
+            "refresh_token": "..."
+            }
 
         Returns an 'access' token
         """
@@ -308,9 +309,8 @@ class SparclClient:  # was SparclApi()
             None.
 
         Example:
-            >>>
-            >> client = SparclClient(announcement=False)
-            >> client.login('test_user@noirlab.edu', 'testpw')
+            >>> client = SparclClient(announcement=False)
+            >>> client.login('test_user@noirlab.edu', 'pw') # doctest: +SKIP
             Logged in successfully with email='test_user@noirlab.edu'
         """
 
@@ -1021,11 +1021,9 @@ class SparclClient:  # was SparclApi()
 
         Example:
             >>> client = SparclClient(announcement=False)
-            >>> sids = [5840097619402313728, -8985592895187431424]
+            >>> sids = [4753625089450465280, 1254253099313293312]
             >>> inc = ['specid', 'flux', 'wavelength', 'model']
             >>> ret = client.retrieve_by_specid(specid_list=sids, include=inc)
-            >>> len(ret.records[0].wavelength)
-            4617
 
         """
         #!specid_list = list(specid_list)

sparclclient-1.3.0b1/sparcl/specutils.py

@@ -0,0 +1,311 @@
+"""Functions for converting SPARCL results to specutils objects.
+"""
+import warnings
+import numpy as np
+try:
+    # specutils >= 2.0
+    from specutils import Spectrum
+except ImportError:
+    from specutils import Spectrum1D as Spectrum
+from specutils import SpectrumCollection, SpectrumList
+from astropy.nddata import InverseVariance
+import astropy.units as u
+
+def _validate_records(records, r0, collection):
+    """Validate that records can be converted to Spectrum.
+
+    Parameters
+    ----------
+    records : list of dict
+        All records to validate.
+    r0 : dict
+        First record, used as reference for validation.
+    collection: bool
+        If ``True``, attempt to convert to a
+        :class:`~specutils.SpectrumCollection` instead.
+
+    Raises
+    ------
+    ValueError
+        If records lack 'wavelength' attribute.
+        If records have different data releases.
+        If wavelength array lengths differ (suggests using SpectrumList).
+        If wavelength pixel values differ and collection=False
+        (suggests using SpectrumCollection).
+
+    Warnings
+    --------
+    UserWarning
+        If records come from different data releases.
+    """
+
+    # Check if the first record has wavelength data
+    if 'wavelength' not in r0:
+        raise ValueError("Results do not have a wavelength attribute. "
+                         "Conversion is not possible.")
+
+    # Check if all records come from the same data release
+    if not all([r.data_release == r0.data_release for r in records]):
+        warnings.warn("Results are not all from the same data release, "
+                      "conversion may not be possible.", UserWarning)
+
+    # Check if all records have the same number of wavelength points
+    if not all([len(r.wavelength) == len(r0.wavelength) for r in records]):
+        raise ValueError("Results do not have the same wavelength solution. "
+                         "Consider using .to_SpectrumList instead.")
+
+    # If not creating a SpectrumCollection, check that wavelength values
+    # are identical across all records
+    if not collection and not all([(r.wavelength == r0.wavelength).all()
+                                   for r in records]):
+        raise ValueError("Results do not have the same wavelength pixels. "
+                         "Consider using SpectrumCollection instead.")
+
+def _extract_record_data(records, flux, uncertainty, mask, model, redshift,
+                         meta, spectral_axis, has_model, has_redshift,
+                         collection, single_record):
+    """Extract all data from records into arrays. This function modifies
+    arrays in-place rather than returning values.
+
+    Parameters
+    ----------
+    records: list of dict
+        Records containing flux, ivar, mask, wavelength, and optional
+        model/redshift.
+    flux : np.ndarray
+        Pre-allocated array for flux values. Shape: (n_pixels,) if
+        single_record, else (n_records, n_pixels).
+    uncertainty : np.ndarray
+        Pre-allocated array for inverse variance.
+    mask : np.ndarray
+        Pre-allocated array for data quality masks.
+    model : np.ndarray or None
+        Pre-allocated array for model values if has_model=True.
+    redshift : list
+        Empty list to populate with redshift values.
+    meta : dict
+        Empty dict to populate with metadata.
+    spectral_axis : np.ndarray
+        For collections, pre-allocated 2D array to store wavelength grids.
+        For non-collections, this is just r0.wavelength (not modified).
+    has_model : bool
+        Whether records contain 'model' attribute.
+    has_redshift : bool
+        Whether records contain 'redshift' attribute.
+    collection : bool
+        If True, stores wavelength arrays for each record in spectral_axis.
+    single_record : bool
+        If True, treats arrays as 1D. If False, treats as 2D with row per
+        record.
+
+    Returns
+    -------
+    None
+        All outputs are written to the input arrays/containers in-place.
+    """
+    for k, record in enumerate(records):
+        if single_record:
+            # For single record, assign directly (1D)
+            flux[:] = record.flux
+            uncertainty[:] = record.ivar
+            mask[:] = record.mask
+            if has_model:
+                model[:] = record.model
+        else:
+            # For multiple records, assign to row (2D)
+            flux[k, :] = record.flux
+            uncertainty[k, :] = record.ivar
+            mask[k, :] = record.mask
+            if has_model:
+                model[k, :] = record.model
+
+        # Store redshift values if available
+        if has_redshift:
+            redshift.append(record.redshift)
+
+        # For collections, each record can have its own wavelength grid
+        if collection:
+            spectral_axis[k, :] = record.wavelength
+
+        # Extract all additional metadata attributes
+        for attribute, value in record.items():
+            if attribute not in ('flux', 'ivar', 'mask', 'model', 'redshift',
+                                 'wavelength'):
+                if single_record:
+                    # For single record, store metadata values as scalars
+                    meta[attribute] = value
+                else:
+                    # For multiple records, accumulate metadata values into
+                    # lists (creates list on first encounter, then appends)
+                    meta.setdefault(attribute, []).append(value)
+
+def to_Spectrum(results, *, collection=False):
+    """Convert `results` to :class:`specutils.Spectrum`.
+
+    Parameters
+    ----------
+    results : :class:`sparcl.Results.Retrieved`
+        Retrieved results, or a single record from a set of results.
+    collection : bool, optional
+        If ``True``, attempt to convert to a
+        :class:`~specutils.SpectrumCollection` instead.
+
+    Returns
+    -------
+    :class:`~specutils.Spectrum` or :class:`~specutils.SpectrumCollection`
+        The requested object.
+
+    Raises
+    ------
+    ValueError
+        If `results` can't be converted to a :class:`~specutils.Spectrum`
+        object in a valid way. For example, if some of the spectra have a
+        different wavelength solution.
+    """
+    # Prepare records
+    if isinstance(results, dict):
+        records = [results]
+        r0 = results
+    else:
+        try:
+            records = results.records
+            if len(records) == 0:
+                raise ValueError("No records found in results. Cannot "
+                                 "convert empty results to Spectrum.")
+            r0 = results.records[0]
+        except (IndexError, AttributeError) as e:
+            raise ValueError("No records found in results. Cannot "
+                             "convert empty results to Spectrum.") from e
+
+    # Validate
+    _validate_records(records, r0, collection)
+
+    # Determine which optional data components exist in records
+    has_redshift = 'redshift' in r0
+    has_model = 'model' in r0
+    n_pixels = r0.flux.shape[0]
+    single_record = len(records) == 1
+
+    # Set flux shape based on number of records
+    if single_record:
+        flux_shape = (n_pixels,)
+    else:
+        flux_shape = (len(records), n_pixels)
+
+    # Build spectral axis
+    if collection:
+        spectral_axis = np.empty((len(records), r0.wavelength.shape[0]),
+                                 dtype=r0.wavelength.dtype)
+    else:
+        spectral_axis = r0.wavelength
+
+    # Initialize arrays
+    flux = np.empty(flux_shape, dtype=r0.flux.dtype)
+    uncertainty = np.empty(flux_shape, dtype=r0.ivar.dtype)
+    mask = np.empty(flux_shape, dtype=r0.mask.dtype)
+    model = np.empty(flux_shape, dtype=r0.model.dtype) if has_model else None
+    redshift = []
+    meta = {}
+
+    # Populate arrays by iterating through records
+    _extract_record_data(records, flux, uncertainty, mask, model, redshift,
+                         meta, spectral_axis, has_model, has_redshift,
+                         collection, single_record)
+
+    # Convert redshift list to numpy array if exists
+    if has_redshift:
+        redshift = np.array(redshift)
+        if single_record and len(redshift) == 1:
+            # Convert to scalar if single record
+            redshift = redshift[0]
+    else:
+        redshift = None
+
+    # Add model to metadata if exists
+    if has_model:
+        meta['model'] = model
+
+    # Prepare arguments common to both Spectrum and SpectrumCollection
+    common_args = {
+        'flux': flux * 10**-17 * u.Unit('erg cm-2 s-1 AA-1'),
+        'spectral_axis': spectral_axis * u.AA,
+        'uncertainty': InverseVariance(uncertainty),
+        'mask': mask,
+        'meta': meta}
+
+    if collection:
+        return SpectrumCollection(**common_args)
+
+    return Spectrum(**common_args, redshift=redshift)
+
+def to_SpectrumList(results):
+    """Convert `results` to :class:`specutils.SpectrumList`.
+
+    Parameters
+    ----------
+    results : :class:`sparcl.Results.Retrieved`
+        Retrieved results.
+
+    Returns
+    -------
+    :class:`~specutils.SpectrumList`
+        The requested object.
+    """
+    s = SpectrumList()
+    if isinstance(results, dict):
+        records = [results]
+    else:
+        records = results.records
+    for r in records:
+        if 'redshift' in r:
+            redshift = r.redshift
+        else:
+            redshift = None
+        meta = dict()
+        for attribute in r:
+            if attribute not in ('flux', 'wavelength', 'ivar',
+                                 'redshift', 'mask'):
+                meta[attribute] = r[attribute]
+        s1 = Spectrum(flux=r.flux*10**-17*u.Unit('erg cm-2 s-1 AA-1'),
+                      spectral_axis=r.wavelength*u.AA,
+                      uncertainty=InverseVariance(r.ivar),
+                      redshift=redshift,
+                      mask=r.mask,
+                      meta=meta)
+        s.append(s1)
+    return s
+
+def to_specutils(results):
+    """Convert `results` to a specutils object.
+
+    Parameters
+    ----------
+    results : :class:`sparcl.Results.Retrieved`
+        Retrieved results.
+
+    Returns
+    -------
+    :class:`~specutils.Spectrum` or :class:`~specutils.SpectrumCollection`
+    or :class:`~specutils.SpectrumList`
+        The most natural conversion to a specutils object.
+
+    Raises
+    ------
+    ValueError
+        If no valid conversion can be performed.
+    """
+    try:
+        # Try standard Spectrum conversion first
+        s = to_Spectrum(results)
+    except ValueError as ve:
+        # Check the error message to determine appropriate alternative
+        if 'SpectrumList' in str(ve):
+            # Different wavelength array lengths use SpectrumList
+            s = to_SpectrumList(results)
+        elif 'SpectrumCollection' in str(ve):
+            # Same wavelength length but diff pixels use SpectrumCollection
+            s = to_Spectrum(results, collection=True)
+        else:
+            raise ValueError("Could not find a valid conversion to "
+                             "specutils objects!")
+    return s

{sparclclient-1.2.8b4 → sparclclient-1.3.0b1}/tests/tests_api.py

@@ -66,6 +66,8 @@ import sparcl.exceptions as ex
 import sparcl.gather_2d as sg
 import sparcl.client
 import sparcl.gather_2d
+import sparcl.specutils as su
+from sparcl.utils import _AttrDict
 
 #! import sparcl.utils as ut
 
@@ -125,12 +127,19 @@ def testcase_log_console(lggr):
 def load_tests(loader, tests, ignore):
     import doctest
 
+    IN_CI = os.getenv('CI') or os.getenv('GITLAB_CI')
+
+    if IN_CI:
+        print("Skipping doctests in CI environment.")
+        return tests
+
     if serverurl == _PROD:
         print(f"Arranging to run doctests against: sparcl.client")
         tests.addTests(doctest.DocTestSuite(sparcl.client))
 
-        print(f"Arranging to run doctests against: sparcl.gather_2d")
-        tests.addTests(doctest.DocTestSuite(sparcl.gather_2d))
+        # Commenting out until this package is revisited (02/02/2026)
+        #print(f"Arranging to run doctests against: sparcl.gather_2d")
+        #tests.addTests(doctest.DocTestSuite(sparcl.gather_2d))
     else:
         print(
             "Not running doctests since you are not running client"
@@ -170,15 +179,25 @@ class SparclClientTest(unittest.TestCase):
                 f"{str(datetime.datetime.now())}!"
             )
 
+        if os.getenv('CI'):
+            try:
+                requests.get(serverurl, timeout=2)
+            except (requests.ConnectionError, requests.Timeout):
+                raise unittest.SkipTest(
+                    f"Cannot reach {serverurl} from CI environment. "
+                    "Run these tests locally or on a network-enabled "
+                    "runner.")
+
         # Client object creation compares the version from the Server
         # against the one expected by the Client. Raise error if
         # the Client is at least one major version behind.
-
+        connect_timeout = 3.1 if os.getenv('CI') else 1.1
         cls.client = sparcl.client.SparclClient(
             url=serverurl,
             verbose=clverb,
             show_curl=showcurl,
             announcement=False,
+            connect_timeout=connect_timeout,
         )
         cls.timing = dict()
         cls.doc = dict()
@@ -1060,3 +1079,109 @@ class AuthTest(unittest.TestCase):
         warnings.filterwarnings("ignore")
         exp = "exp.auth_retrieve_8"
         self.auth_retrieve(None, self.Pub, exp)
+
+class MockRetrieved(object):
+    """Create an object with a .records attribute."""
+    def __init__(self, user_list):
+        self.records = user_list
+
+class SpecutilsTest(unittest.TestCase):
+    """Test the SPARCL to_specutils method"""
+
+    def setUp(self):
+        """Create a dummy Results object."""
+        self.w = numpy.linspace(3000.0, 10000.0, dtype=numpy.float32)
+        self.f = numpy.ones(self.w.shape, dtype=self.w.dtype)
+        self.i = 1.0/(0.1*self.f)**2
+        self.m = numpy.zeros(self.w.shape, dtype=numpy.int32)
+        self.r0 = _AttrDict({'redshift': 1.23,
+                             'wavelength': self.w,
+                             'flux': self.f,
+                             'ivar': self.i,
+                             'mask': self.m,
+                             'data_release': 'DR12'})
+        self.r = MockRetrieved([self.r0,
+                                _AttrDict(self.r0.copy()),
+                                _AttrDict(self.r0.copy()),
+                                _AttrDict(self.r0.copy()),
+                                _AttrDict(self.r0.copy())])
+
+    def test_to_specutils_one_result(self):
+        """Test the to_specutils() method with one result."""
+        s = su.to_specutils(self.r0)
+        self.assertTrue(isinstance(s, su.Spectrum))
+        self.assertTrue((s.mask == 0).all())
+
+    def test_to_specutils_multiple_results(self):
+        """Test the to_specutils() method with more than one result."""
+        s = su.to_specutils(self.r)
+        self.assertTrue(isinstance(s, su.Spectrum))
+        self.assertTrue((s.mask == 0).all())
+
+    def test_to_specutils_bad_results(self):
+        """Test the to_specutils() method with a bad result."""
+        del self.r0['wavelength']
+        with self.assertRaises(ValueError) as ex:
+            su.to_specutils(self.r0)
+        self.assertEqual(ex.exception.args[0],
+                         "Could not find a valid conversion to specutils "
+                         "objects!")
+
+    def test_to_specutils_different_release(self):
+        """Test for the presence of a warning if multiple releases are
+        present."""
+        self.r.records[1]['data_release'] = 'DR11'
+        with self.assertWarns(UserWarning) as wn:
+            su.to_specutils(self.r)
+        self.assertEqual(wn.warning.args[0],
+                         "Results are not all from the same data release, "
+                         "conversion may not be possible.")
+
+    def test_to_specutils_spectrum_list(self):
+        """Test conversion to SpectrumList."""
+        self.r.records[1]['wavelength'] = numpy.linspace(3000.0,
+                                                         10000.0,
+                                                         100,
+                                                         dtype=numpy.float32)
+        self.r.records[2]['wavelength'] = numpy.linspace(3000.0,
+                                                         10000.0,
+                                                         150,
+                                                         dtype=numpy.float32)
+        self.r.records[3]['wavelength'] = numpy.linspace(3000.0,
+                                                         10000.0,
+                                                         200,
+                                                         dtype=numpy.float32)
+        self.r.records[4]['wavelength'] = numpy.linspace(3000.0,
+                                                         10000.0,
+                                                         250,
+                                                         dtype=numpy.float32)
+        self.r.records[1]['flux'] = numpy.ones((100, ), dtype=numpy.float32)
+        self.r.records[2]['flux'] = numpy.ones((150, ), dtype=numpy.float32)
+        self.r.records[3]['flux'] = numpy.ones((200, ), dtype=numpy.float32)
+        self.r.records[4]['flux'] = numpy.ones((250, ), dtype=numpy.float32)
+        self.r.records[1]['ivar'] = numpy.ones((100, ), dtype=numpy.float32)
+        self.r.records[2]['ivar'] = numpy.ones((150, ), dtype=numpy.float32)
+        self.r.records[3]['ivar'] = numpy.ones((200, ), dtype=numpy.float32)
+        self.r.records[4]['ivar'] = numpy.ones((250, ), dtype=numpy.float32)
+        self.r.records[1]['mask'] = numpy.zeros((100, ), dtype=numpy.int32)
+        self.r.records[2]['mask'] = numpy.zeros((150, ), dtype=numpy.int32)
+        self.r.records[3]['mask'] = numpy.zeros((200, ), dtype=numpy.int32)
+        self.r.records[4]['mask'] = numpy.zeros((250, ), dtype=numpy.int32)
+        s = su.to_specutils(self.r)
+        self.assertTrue(isinstance(s, su.SpectrumList))
+        self.assertTrue(isinstance(s[0], su.Spectrum))
+        self.assertEqual(s[0].spectral_axis.shape, (50,))
+
+    def test_to_specutils_spectrum_collection(self):
+        """Test conversion to SpectrumCollection."""
+        self.r.records[1]['wavelength'] = self.w.copy() + 10.0
+        self.r.records[2]['wavelength'] = self.w.copy() + 20.0
+        self.r.records[3]['wavelength'] = self.w.copy() + 30.0
+        self.r.records[4]['wavelength'] = self.w.copy() + 40.0
+        s = su.to_specutils(self.r)
+        self.assertTrue(isinstance(s, su.SpectrumCollection))
+        self.assertEqual(s.spectral_axis.shape, (5, 50))
+        self.assertEqual(s.spectral_axis[0, :].shape, (50, ))
+        self.assertTrue(numpy.allclose(s.spectral_axis.value[0, :], self.w))
+        self.assertTrue(numpy.allclose(s.spectral_axis.value[4, :],
+                                       self.w + 40))