Merge pull request #2578 from bsipocz/MAINT_remote_non_functional_alfalfa

MAINT: removal of non-functional Alfalfa.get_spetrum method

Author: bsipocz

CHANGES.rst

@@ -20,6 +20,11 @@ hsa
 Service fixes and enhancements
 ------------------------------
 
+alfalfa
+^^^^^^^
+
+- Removal of the non-functional ``get_spectrym`` method as that service has
+  disappeared. [#2578]
 
 esa.hubble
 ^^^^^^^^^^

astroquery/alfalfa/core.py

@@ -11,7 +11,7 @@
 import numpy.ma as ma
 from astropy import units as u
 from astropy import coordinates as coord
-from ..utils import commons, prepend_docstr_nosections
+from ..utils import commons
 from ..query import BaseQuery
 
 __all__ = ['Alfalfa', 'AlfalfaClass']
@@ -22,7 +22,6 @@
 
 class AlfalfaClass(BaseQuery):
 
-    FITS_PREFIX = "http://arecibo.tc.cornell.edu/hiarchive/alfalfa/spectraFITS"
     CATALOG_PREFIX = "http://egg.astro.cornell.edu/alfalfa/data/a40files/a40.datafile1.csv"
 
     PLACEHOLDER = -999999
@@ -159,48 +158,5 @@ def query_region(self, coordinates, radius=3. * u.arcmin,
         else:
             return None
 
-    def get_spectrum_async(self, agc, show_progress=True):
-        """
-        Download spectrum from ALFALFA catalogue.
-
-        Parameters
-        ----------
-        agc : int
-            Identification number for object in ALFALFA catalog.
-        ascii : bool
-            Download spectrum from remote server in ASCII or FITS format?
-
-        Returns
-        -------
-        result : A file context manager
-
-        See Also
-        --------
-        get_catalog : method that downloads ALFALFA catalog
-        query_region : find object in catalog closest to supplied
-            position (use this to determine AGC number first)
-
-        """
-
-        agc = str(agc).zfill(6)
-
-        link = "%s/A%s.fits" % (self.FITS_PREFIX, agc)
-        result = commons.FileContainer(link, show_progress=show_progress)
-        return result
-
-    @prepend_docstr_nosections(get_spectrum_async.__doc__)
-    def get_spectrum(self, agc, show_progress=True):
-        """
-        Returns
-        -------
-        spectrum : `~astropy.io.fits.HDUList`
-            Spectrum is in ``hdulist[0].data[0][2]``
-
-        """
-
-        result = self.get_spectrum_async(agc, show_progress=show_progress)
-        hdulist = result.get_fits()
-        return hdulist
-
 
 Alfalfa = AlfalfaClass()

astroquery/alfalfa/tests/test_alfalfa.py

@@ -75,10 +75,3 @@ def test_alfalfa_catalog(patch_get, patch_get_readable_fileobj, coords=coords):
 def test_alfalfa_crossID(patch_get, patch_get_readable_fileobj, coords=coords):
     agc = ALFALFA.query_region(coords, optical_counterpart=True)
     assert agc == 100051
-
-
-def test_alfalfa_spectrum(patch_get, patch_get_readable_fileobj,
-                          coords=coords):
-    agc = ALFALFA.query_region(coords, optical_counterpart=True)
-    sp = ALFALFA.get_spectrum(agc)
-    assert len(sp) == 3

docs/alfalfa/alfalfa.rst

@@ -24,17 +24,8 @@ This retrieves the AGC number of the object closest to the supplied ra and dec
 argument above tells the crossID function to look for matches using the
 positions of the optical counterparts of HI detected sources (painstakingly
 determined by members of the ALFALFA team), rather than their radio centroids.
-The AGC number is an identification number for objects in the ALFALFA survey,
-and once we know it, we can download spectra (if they are available) easily,
 
-.. Remove the skip once #2403 is fixed
-.. .. doctest-remote-data::
-.. doctest-skip::
-
-    >>> sp = Alfalfa.get_spectrum(agc)
-
-This returns a `~astropy.io.fits.HDUList` object.  If we want to have a look at the
-entire ALFALFA catalog as a dictionary, we can do that too:
+If we want to have a look at the entire ALFALFA catalog as a dictionary, we can do that too:
 
 .. doctest-remote-data::