Merge pull request #984 from keflavich/eztean-vista-test

Refactor UKIDSS -> WFAU and add VSA

Author: keflavich

CHANGES

@@ -7,6 +7,8 @@
   [#1064, #1077]
 - New tool ``oac``: Open Astronomy Catalog API to obtain data products on
   supernovae, TDEs, and kilonovae. [#1053]
+- New tool ``wfau`` and ``vsa``: Refactor of the UKIDSS query tool add full
+  WFAU support.  [#984]
 - ALMA: Adding support for band and polarization selection. [#1108]
 - HEASARC: Add additional functionality and expand query capabilities. [#1047]
 - GAIA: Default URL switched to DR2 and made configurable. [#1112]
@@ -18,6 +20,7 @@
 - MAST: Added Catalogs class. [#1049]
 - MAST: Enable downloading MAST HST data from S3. [#1040]
 - SPLATALOGUE: Move to https as old HTTP post requests were broken. [#1076]
+- UKIDSS: Update to DR10 as default database. [#984]
 - utils.TAP: Add tool to check for phase of background job. [#1073]
 - utils.TAP: Added redirect handling to sync jobs. [#1099]
 - utils.TAP: Fix jobsIDs assignment. [#1105]

astroquery/ukidss/core.py

@@ -89,17 +89,6 @@ def get_mockreturn(method='GET', url='default_url',
     return MockResponse(content=content, url=url, **kwargs)
 
 
-@pytest.mark.parametrize(('dim', 'expected'),
-                         [(5 * u.arcmin, 5),
-                          (5 * u.degree, 300),
-                          ('0d0m30s', 0.5),
-                          ]
-                         )
-def test_parse_dimension(dim, expected):
-    out = ukidss.core._parse_dimension(dim)
-    npt.assert_approx_equal(out, expected, significant=3)
-
-
 def test_get_images(patch_get, patch_get_readable_fileobj):
     image = ukidss.core.Ukidss.get_images(
         commons.ICRSCoordGenerator(ra=83.633083, dec=22.0145,
@@ -113,15 +102,17 @@ def test_get_images_async_1():
     payload = ukidss.core.Ukidss.get_images_async(
         commons.ICRSCoordGenerator(ra=83.633083, dec=22.0145,
                                    unit=(u.deg, u.deg)),
-        radius=20 * u.arcmin, get_query_payload=True)
+        radius=20 * u.arcmin, get_query_payload=True,
+        programme_id='GPS')
 
     assert 'xsize' not in payload
     assert 'ysize' not in payload
 
     payload = ukidss.core.Ukidss.get_images_async(
         commons.ICRSCoordGenerator(ra=83.633083, dec=22.0145,
                                    unit=(u.deg, u.deg)),
-        get_query_payload=True)
+        get_query_payload=True,
+        programme_id='GPS')
     assert payload['xsize'] == payload['ysize']
     assert payload['xsize'] == 1
 
@@ -132,7 +123,8 @@ def test_get_images_async_2(patch_get, patch_get_readable_fileobj):
 
     image_urls = ukidss.core.Ukidss.get_images_async(
         commons.ICRSCoordGenerator(ra=83.633083, dec=22.0145,
-                                   unit=(u.deg, u.deg)))
+                                   unit=(u.deg, u.deg)),
+        programme_id='GPS')
 
     assert len(image_urls) == 1
 
@@ -141,7 +133,8 @@ def test_get_image_list(patch_get, patch_get_readable_fileobj):
     urls = ukidss.core.Ukidss.get_image_list(
         commons.ICRSCoordGenerator(ra=83.633083, dec=22.0145,
                                    unit=(u.deg, u.deg)),
-        frame_type='all', waveband='all')
+        frame_type='all', waveband='all',
+        programme_id='GPS')
     print(urls)
     assert len(urls) == 1
 
@@ -156,7 +149,8 @@ def test_query_region(patch_get, patch_get_readable_fileobj):
     table = ukidss.core.Ukidss.query_region(
         commons.GalacticCoordGenerator(l=10.625, b=-0.38,
                                        unit=(u.deg, u.deg)),
-        radius=6 * u.arcsec)
+        radius=6 * u.arcsec,
+        programme_id='GPS')
     assert isinstance(table, Table)
     assert len(table) > 0
 
@@ -165,13 +159,15 @@ def test_query_region_async(patch_get):
     response = ukidss.core.Ukidss.query_region_async(
         commons.GalacticCoordGenerator(l=10.625, b=-0.38,
                                        unit=(u.deg, u.deg)),
-        radius=6 * u.arcsec, get_query_payload=True)
+        radius=6 * u.arcsec, get_query_payload=True,
+        programme_id='GPS')
 
     assert response['radius'] == 0.1
     response = ukidss.core.Ukidss.query_region_async(
         commons.GalacticCoordGenerator(l=10.625, b=-0.38,
                                        unit=(u.deg, u.deg)),
-        radius=6 * u.arcsec)
+        radius=6 * u.arcsec,
+        programme_id='GPS')
     assert response is not None
 
 

astroquery/ukidss/tests/test_ukidss.py

@@ -41,12 +41,12 @@ def test_get_image_list(self):
     def test_query_region_async(self):
         response = ukidss.core.Ukidss.query_region_async(
             SkyCoord(l=10.625, b=-0.38, unit=(u.deg, u.deg), frame='galactic'),
-            radius=6 * u.arcsec)
+            radius=6 * u.arcsec, programme_id='GPS')
         assert response is not None
 
     def test_query_region(self):
         table = ukidss.core.Ukidss.query_region(
             SkyCoord(l=10.625, b=-0.38, unit=(u.deg, u.deg), frame='galactic'),
-            radius=6 * u.arcsec)
+            radius=6 * u.arcsec, programme_id='GPS')
         assert isinstance(table, Table)
         assert len(table) > 0

astroquery/ukidss/tests/test_ukidss_remote.py

@@ -0,0 +1,38 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+VSA Image and Catalog Query Tool
+--------------------------------
+.. topic:: Revision History
+
+    Refactored using common API as a part of Google Summer of Code 2013.
+    Modified for VSA by @eztean
+
+    :Originally contributed by:
+
+        Thomas Robitalle ([email protected])
+
+        Adam Ginsburg ([email protected])
+"""
+from astropy import config as _config
+
+
+class Conf(_config.ConfigNamespace):
+    """
+    Configuration parameters for `astroquery.vsa`.
+    """
+    server = _config.ConfigItem(
+        ['http://horus.roe.ac.uk:8080/vdfs/'],
+        'Name of the VSA mirror to use')
+
+    timeout = _config.ConfigItem(
+        30,
+        'Time limit for connecting to VSA server.')
+
+
+conf = Conf()
+
+from .core import Vsa, VsaClass, clean_catalog
+
+__all__ = ['Vsa', 'VsaClass', 'clean_catalog',
+           'Conf', 'conf',
+           ]

astroquery/vsa/__init__.py

@@ -0,0 +1,75 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+from __future__ import print_function
+
+from . import conf
+from ..wfau import BaseWFAUClass, clean_catalog
+
+__all__ = ['Vsa', 'VsaClass', 'clean_catalog']
+
+
+class VsaClass(BaseWFAUClass):
+
+    """
+    The VsaQuery class.  Must instantiate this class in order to make any
+    queries.  Allows registered users to login, but defaults to using the
+    public Vsa data sets.
+    """
+    BASE_URL = conf.server
+    LOGIN_URL = BASE_URL + "DBLogin"
+    IMAGE_URL = BASE_URL + "GetImage"
+    ARCHIVE_URL = BASE_URL + "ImageList"
+    REGION_URL = BASE_URL + "WSASQL"
+    CROSSID_URL = BASE_URL + "CrossID"
+    TIMEOUT = conf.timeout
+    IMAGE_FORM = 'VgetImage_form.jsp'
+    CROSSID_FORM = 'VcrossID_form.jsp'
+
+    filters = {'all': 'all', 'Z': 1, 'Y': 2, 'J': 3,
+               'H': 4, 'Ks': 5, 'NB118': 9, 'NB980': 10}
+
+    frame_types = {'tilestack': 'tilestack', 'stack': 'stack',
+                   'normal': 'normal', 'deep_stack': 'deep%stack',
+                   'confidence': 'conf', 'difference': 'diff',
+                   'all': 'all'}
+
+    programmes_short = {'VHS': 110,
+                        'VVV': 120,
+                        'VMC': 130,
+                        'VIKING': 140,
+                        'VIDEO': 150,
+                        'UltraVISTA': 160,
+                        'Calibration': 200}
+
+    programmes_long = {'VISTA Hemisphere Survey': 110,
+                       'VISTA Variables in the Via Lactea': 120,
+                       'VISTA Magellanic Clouds Survey': 130,
+                       'VISTA Kilo-degree Infrared Galaxy Survey': 140,
+                       'VISTA Deep Extragalactic Observations': 150,
+                       'An ultra-deep survey with VISTA': 160,
+                       'Calibration data': 200}
+
+    all_databases = ('VHSDR4', 'VHSDR3', 'VHSDR2', 'VHSDR1', 'VVVDR4',
+                     'VVVDR2', 'VVVDR1', 'VMCDR4', 'VMCDR3', 'VMCDR2',
+                     'VMCDR1', 'VIKINGDR4', 'VIKINGDR3', 'VIKINGDR2',
+                     'VIDEODR5', 'VIDEODR4', 'VIDEODR3', 'VIDEODR2',
+                     'VISTAOPENTIME')
+
+    # apparently needed for some queries
+    archive = 'VSA'
+
+    def __init__(self, username=None, password=None, community=None,
+                 database='VVVDR4', programme_id='all'):
+        super(VsaClass, self).__init__(database=database,
+                                       programme_id=programme_id,
+                                       username=username,
+                                       community=community,
+                                       password=password)
+
+        self.BASE_URL = 'http://horus.roe.ac.uk:8080/vdfs/'
+        self.LOGIN_URL = self.BASE_URL + "DBLogin"
+        self.IMAGE_URL = self.BASE_URL + "GetImage"
+        self.ARCHIVE_URL = self.BASE_URL + "ImageList"
+        self.REGION_URL = self.BASE_URL + "WSASQL"
+
+
+Vsa = VsaClass()

astroquery/vsa/core.py

@@ -0,0 +1,50 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+from __future__ import print_function
+
+from astropy.tests.helper import remote_data
+from astropy.table import Table
+from astropy.coordinates import SkyCoord
+import astropy.units as u
+import requests
+import imp
+
+from ... import vsa
+
+imp.reload(requests)
+
+
+vista = vsa.core.VsaClass()
+
+
+@remote_data
+class TestVista:
+
+    def test_get_images(self):
+
+        crd = SkyCoord(l=336.489, b=-1.48, unit=(u.deg, u.deg),
+                       frame='galactic')
+        images = vista.get_images(crd, frame_type='tilestack', image_width=5 *
+                                  u.arcmin, waveband='H')
+        assert images is not None
+
+    def test_get_images_async(self):
+        crd = SkyCoord(l=336.489, b=-1.48, unit=(u.deg, u.deg), frame='galactic')
+        images = vista.get_images_async(crd, frame_type='tilestack',
+                                        image_width=5 * u.arcmin, waveband='H')
+        assert images is not None
+
+    def test_get_image_list(self):
+        crd = SkyCoord(l=350.488, b=0.949, unit=(u.deg, u.deg), frame='galactic')
+        urls = vista.get_image_list(crd, frame_type='all', waveband='all')
+        assert len(urls) > 0
+
+    def test_query_region_async(self):
+        crd = SkyCoord(l=350.488, b=0.949, unit=(u.deg, u.deg), frame='galactic')
+        response = vista.query_region_async(crd, radius=6 * u.arcsec, programme_id='VVV')
+        assert response is not None
+
+    def test_query_region(self):
+        crd = SkyCoord(l=350.488, b=0.949, unit=(u.deg, u.deg), frame='galactic')
+        table = vista.query_region(crd, radius=6 * u.arcsec, programme_id='VVV')
+        assert isinstance(table, Table)
+        assert len(table) > 0

astroquery/vsa/tests/__init__.py

@@ -0,0 +1,19 @@
+# Licensed under a 3-clause BSD style license - see LICENSE.rst
+"""
+WFAU Image and Catalog Query Tool
+---------------------------------
+.. topic:: Revision History
+
+    The UKIDSS query tool was refactored using common API as a part of Google
+    Summer of Code 2013.  It was then refactored again to generically apply
+    to any WFAU archives in late 2017.
+
+    :Originally contributed by:
+
+        Thomas Robitalle ([email protected])
+
+        Adam Ginsburg ([email protected])
+"""
+from .core import BaseWFAUClass, clean_catalog
+
+__all__ = ['BaseWFAUClass', 'clean_catalog', ]