Added default output columns. Changed name for target RA and DEC

columns to target_ra and target_dec.

Author: Raul Gutierrez

astroquery/jwst/__init__.py

@@ -27,14 +27,25 @@ class Conf(_config.ConfigNamespace):
     JWST_MAIN_TABLE = _config.ConfigItem("jwst.main",
                                          "JWST main table, combination of \
                                          observation and plane tables.")
+
+    JWST_MAIN_TABLE_RA = _config.ConfigItem("target_ra",
+                                            "Name of RA parameter in table")
+
+    JWST_MAIN_TABLE_DEC = _config.ConfigItem("target_dec",
+                                             "Name of Dec parameter in table")
+
     JWST_ARTIFACT_TABLE = _config.ConfigItem("jwst.artifact",
                                          "JWST artifacts (data files) table.")
+
     JWST_OBSERVATION_TABLE = _config.ConfigItem("jwst.observation",
                                          "JWST observation table")
+
     JWST_PLANE_TABLE = _config.ConfigItem("jwst.plane",
                                          "JWST plane table")
+
     JWST_OBSERVATION_TABLE_RA = _config.ConfigItem("targetposition_coordinates_cval1",
                                             "Name of RA parameter in table")
+
     JWST_OBSERVATION_TABLE_DEC = _config.ConfigItem("targetposition_coordinates_cval2",
                                              "Name of Dec parameter in table")
 

astroquery/jwst/core.py

@@ -32,14 +32,12 @@ class JwstClass(object):
     Proxy class to default TapPlus object (pointing to JWST Archive)
     """
     JWST_MAIN_TABLE = conf.JWST_MAIN_TABLE
-    JWST_ARTIFACT_TABLE = conf.JWST_ARTIFACT_TABLE
-    JWST_OBSERVATION_TABLE = conf.JWST_OBSERVATION_TABLE
-    JWST_OBSERVATION_TABLE_RA = conf.JWST_OBSERVATION_TABLE_RA
-    JWST_OBSERVATION_TABLE_DEC = conf.JWST_OBSERVATION_TABLE_DEC
-    JWST_PLANE_TABLE = conf.JWST_PLANE_TABLE
+    JWST_MAIN_TABLE_RA = conf.JWST_MAIN_TABLE_RA
+    JWST_MAIN_TABLE_DEC = conf.JWST_MAIN_TABLE_DEC
 
     JWST_DEFAULT_COLUMNS = ['observationid', 'calibrationlevel', 'public',
-                            'dataproducttype', 'instrument_name', 'position_bounds_center',
+                            'dataproducttype', 'instrument_name', 'energy_bandpassname',
+                            'target_name', 'target_ra', 'target_dec', 'position_bounds_center',
                             'position_bounds_spoly']
 
     PLANE_DATAPRODUCT_TYPES = ['image', 'cube', 'measurements', 'spectrum']
@@ -558,12 +556,12 @@ def __cone_search(self, coordinate, radius,
             radius_deg = commons.radius_to_unit(radius_quantity, unit='deg')
 
         query = "SELECT DISTANCE(POINT('ICRS'," +\
-            str(self.JWST_OBSERVATION_TABLE_RA) + "," +\
-            str(self.JWST_OBSERVATION_TABLE_DEC) + "), \
+            str(self.JWST_MAIN_TABLE_RA) + "," +\
+            str(self.JWST_MAIN_TABLE_DEC) + "), \
             POINT('ICRS'," + str(ra) + "," + str(dec) +")) AS dist, "+columns+" \
             FROM " + str(self.JWST_MAIN_TABLE) + " WHERE CONTAINS(\
-            POINT('ICRS'," + str(self.JWST_OBSERVATION_TABLE_RA) + "," +\
-            str(self.JWST_OBSERVATION_TABLE_DEC)+"),\
+            POINT('ICRS'," + str(self.JWST_MAIN_TABLE_RA) + "," +\
+            str(self.JWST_MAIN_TABLE_DEC)+"),\
             CIRCLE('ICRS'," + str(ra)+"," + str(dec) + ", " +\
             str(radius_deg)+"))=1" +\
             observationid_condition +\