All tests successful. Basic image meta data lookup

Author: zemogle

astroquery/lcogt/core.py

@@ -71,6 +71,7 @@
 
 import warnings
 import xml.etree.ElementTree as tree
+import logging
 
 from astropy.extern import six
 import astropy.units as u
@@ -90,13 +91,55 @@ class LcogtClass(BaseQuery):
     TIMEOUT = conf.timeout
     ROW_LIMIT = conf.row_limit
 
-    def query_region(self, coordinates=None, catalog=None, spatial='Cone',
-                     radius=10 * u.arcsec, width=None, polygon=None,
+    def query_object(self, objstr, catalog=None, verbose=False):
+        """
+        Queries the LCOGT public archive hosted at NASA/IPAC archive on target name
+        and returns the result as a `~astropy.table.Table`.
+        See examples below.
+
+        Parameters
+        ----------
+        objstr : str
+            name of object to be queried
+        catalog : str
+            name of the catalog to use. 'lco_img' for image meta data; 'lco_cat' for photometry.
+
+        Returns
+        -------
+        table : `~astropy.table.Table`
+            Query results table
+        """
+        response = self.query_object_async(objstr, catalog=catalog)
+        return self._parse_result(response, verbose=verbose)
+
+    def query_object_async(self, objstr, catalog=None):
+        """
+        Serves the same function as `query_object`, but
+        only collects the reponse from the LCOGT IPAC archive and returns.
+
+        Parameters
+        ----------
+        objstr : str
+            name of object to be queried
+
+        Returns
+        -------
+        response : `requests.Response`
+            Response of the query from the server
+        """
+        if catalog is None:
+            raise Exception("Catalogue name is required!")
+        request_payload = self._args_to_payload(catalog)
+        request_payload['objstr'] = objstr
+        response = commons.send_request(Lcogt.LCOGT_URL, request_payload,
+                                Lcogt.TIMEOUT, request_type='GET')
+        return response
+
+    def query_region(self, coordinates=None, catalog=None, spatial=None, radius=None, width=None, polygon=None,
                      get_query_payload=False, verbose=False):
         """
         This function can be used to perform either cone, box, polygon or
-        all-sky search in the LCOGT public archive hosted by the NASA/IPAC Infrared
-        Science Archive.
+        all-sky search in the LCOGT public archive hosted by the NASA/IPAC Archive.
 
         Parameters
         ----------
@@ -167,7 +210,7 @@ def query_region_async(self, coordinates=None, catalog=None,
             details). Required if spatial is ``'Cone'`` or ``'Box'``. Optional
             if spatial is ``'Polygon'``.
         catalog : str
-            The catalog to be used. Either ``lco_img`` for image metadata or ``lco_cat``
+            The catalog to be used. Either ``'lco_img'`` for image metadata or ``'lco_cat'``
             for photometry.
         spatial : str
             Type of spatial query: ``'Cone'``, ``'Box'``, ``'Polygon'``, and
@@ -195,7 +238,7 @@ def query_region_async(self, coordinates=None, catalog=None,
             The HTTP response returned from the service
         """
         if catalog is None:
-            raise Exception("Catalog name is required!")
+            raise Exception("Catalogue name is required!")
 
         request_payload = self._args_to_payload(catalog)
         request_payload.update(self._parse_spatial(spatial=spatial,
@@ -293,6 +336,7 @@ def _args_to_payload(self, catalog):
         """
         request_payload = dict(catalog=catalog,
                                outfmt=3,
+                               spatial=None,
                                outrows=Lcogt.ROW_LIMIT)
         return request_payload
 
@@ -317,10 +361,11 @@ def _parse_result(self, response, verbose=False):
             commons.suppress_vo_warnings()
 
         content = response.text
+        logging.debug(content)
 
         # Check if results were returned
-        if 'The catalog is not on the list' in content:
-            raise Exception("Catalog not found")
+        if 'The catalog is not in the list' in content:
+            raise Exception("Catalogue not found")
 
         # Check that object name was not malformed
         if 'Either wrong or missing coordinate/object name' in content:

astroquery/lcogt/tests/test_lcogt.py

@@ -72,41 +72,40 @@ def test_parse_coordinates(coordinates, expected):
 
 
 def test_args_to_payload():
-    out = lcogt.core.Lcogt._args_to_payload("fp_psc")
-    assert out == dict(catalog='fp_psc', outfmt=3, outrows=conf.row_limit)
-
+    out = lcogt.core.Lcogt._args_to_payload("lco_img")
+    assert out == dict(catalog='lco_img', outfmt=3, outrows=conf.row_limit, spatial=None)
 
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
 def test_query_region_cone_async(coordinates, patch_get):
-    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='fp_psc', spatial='Cone',
+    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='lco_img', spatial='Cone',
                                                  radius=2 * u.arcmin, get_query_payload=True)
     assert response['radius'] == 2
     assert response['radunits'] == 'arcmin'
-    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='fp_psc', spatial='Cone',
+    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='lco_img', spatial='Cone',
                                                  radius=2 * u.arcmin)
     assert response is not None
 
 
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
 def test_query_region_cone(coordinates, patch_get):
-    result = lcogt.core.Lcogt.query_region(coordinates, catalog='fp_psc', spatial='Cone',
+    result = lcogt.core.Lcogt.query_region(coordinates, catalog='lco_img', spatial='Cone',
                                          radius=2 * u.arcmin)
     assert isinstance(result, Table)
 
 
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
 def test_query_region_box_async(coordinates, patch_get):
-    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='fp_psc', spatial='Box',
+    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='lco_img', spatial='Box',
                                                  width=2 * u.arcmin, get_query_payload=True)
     assert response['size'] == 120
-    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='fp_psc', spatial='Box',
+    response = lcogt.core.Lcogt.query_region_async(coordinates, catalog='lco_img', spatial='Box',
                                                  width=2 * u.arcmin)
     assert response is not None
 
 
 @pytest.mark.parametrize(("coordinates"), OBJ_LIST)
 def test_query_region_box(coordinates, patch_get):
-    result = lcogt.core.Lcogt.query_region(coordinates, catalog='fp_psc', spatial='Box',
+    result = lcogt.core.Lcogt.query_region(coordinates, catalog='lco_img', spatial='Box',
                                          width=2 * u.arcmin)
     assert isinstance(result, Table)
 
@@ -121,7 +120,7 @@ def test_query_region_box(coordinates, patch_get):
                           poly2
                           ])
 def test_query_region_async_polygon(polygon, patch_get):
-    response = lcogt.core.Lcogt.query_region_async("m31", catalog="fp_psc", spatial="Polygon",
+    response = lcogt.core.Lcogt.query_region_async("m31", catalog="lco_img", spatial="Polygon",
                                                  polygon=polygon, get_query_payload=True)
 
     for a, b in zip(re.split("[ ,]", response["polygon"]),
@@ -131,7 +130,7 @@ def test_query_region_async_polygon(polygon, patch_get):
             b1 = float(b1)
             np.testing.assert_almost_equal(a1, b1)
 
-    response = lcogt.core.Lcogt.query_region_async("m31", catalog="fp_psc", spatial="Polygon",
+    response = lcogt.core.Lcogt.query_region_async("m31", catalog="lco_img", spatial="Polygon",
                                                  polygon=polygon)
     assert response is not None
 
@@ -141,7 +140,7 @@ def test_query_region_async_polygon(polygon, patch_get):
                           poly2,
                           ])
 def test_query_region_polygon(polygon, patch_get):
-    result = lcogt.core.Lcogt.query_region("m31", catalog="fp_psc", spatial="Polygon",
+    result = lcogt.core.Lcogt.query_region("m31", catalog="lco_img", spatial="Polygon",
                                          polygon=polygon)
     assert isinstance(result, Table)
 

astroquery/lcogt/tests/test_lcogt_remote.py

@@ -10,44 +10,52 @@
 import imp
 imp.reload(requests)
 
-from ... import irsa
+from ... import lcogt
 
 OBJ_LIST = ["m31", "00h42m44.330s +41d16m07.50s", coord.Galactic(l=121.1743, b=-21.5733, unit=(u.deg, u.deg))]
 
 
 @remote_data
-class TestIrsa:
+class TestLcogt:
+
+    def test_query_object_meta(self):
+        response = lcogt.core.Lcogt.query_object_async('M1', catalog='lco_img')
+        assert response is not None
+
+    def test_query_object_phot(self):
+        response = lcogt.core.Lcogt.query_object_async('M1', catalog='lco_cat')
+        assert response is not None
 
     def test_query_region_cone_async(self):
-        response = irsa.core.Irsa.query_region_async('m31', catalog='fp_psc', spatial='Cone',
+        response = lcogt.core.Lcogt.query_region_async('m31', catalog='lco_img', spatial='Cone',
                                                      radius=2 * u.arcmin)
         assert response is not None
 
     def test_query_region_cone(self):
-        result = irsa.core.Irsa.query_region('m31', catalog='fp_psc', spatial='Cone',
+        result = lcogt.core.Lcogt.query_region('m31', catalog='lco_img', spatial='Cone',
                                              radius=2 * u.arcmin)
         assert isinstance(result, Table)
 
     def test_query_region_box_async(self):
-        response = irsa.core.Irsa.query_region_async("00h42m44.330s +41d16m07.50s", catalog='fp_psc', spatial='Box',
+        response = lcogt.core.Lcogt.query_region_async("00h42m44.330s +41d16m07.50s", catalog='lco_img', spatial='Box',
                                                      width=2 * u.arcmin)
         assert response is not None
 
     def test_query_region_box(self):
-        result = irsa.core.Irsa.query_region("00h42m44.330s +41d16m07.50s", catalog='fp_psc', spatial='Box',
+        result = lcogt.core.Lcogt.query_region("00h42m44.330s +41d16m07.50s", catalog='lco_img', spatial='Box',
                                              width=2 * u.arcmin)
         assert isinstance(result, Table)
 
     def test_query_region_async_polygon(self):
         polygon = [coord.ICRS(ra=10.1, dec=10.1, unit=(u.deg, u.deg)),
                    coord.ICRS(ra=10.0, dec=10.1, unit=(u.deg, u.deg)),
                    coord.ICRS(ra=10.0, dec=10.0, unit=(u.deg, u.deg))]
-        response = irsa.core.Irsa.query_region_async("m31", catalog="fp_psc", spatial="Polygon",
+        response = lcogt.core.Lcogt.query_region_async("m31", catalog="lco_img", spatial="Polygon",
                                                  polygon=polygon)
         assert response is not None
 
     def test_query_region_polygon(self):
         polygon = [(10.1, 10.1), (10.0, 10.1), (10.0, 10.0)]
-        result = irsa.core.Irsa.query_region("m31", catalog="fp_psc", spatial="Polygon",
+        result = lcogt.core.Lcogt.query_region("m31", catalog="lco_img", spatial="Polygon",
                                              polygon=polygon)
         assert isinstance(result, Table)