Skip to content

Commit 4f3c8ae

Browse files
jespinosaar“Javier
authored andcommitted
HAP removed until official release
1 parent bcb0ff5 commit 4f3c8ae

File tree

1 file changed

+3
-45
lines changed

1 file changed

+3
-45
lines changed

astroquery/esa/hubble/core.py

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ def cone_search_criteria(self, target=None, coordinates=None,
307307
308308
Parameters
309309
----------
310-
coordinates : astropy.coordinate, mandatory
310+
target : str, mandatory if no coordinates is provided
311+
name of the target, that will act as center in the cone search
312+
coordinates : astropy.coordinate, mandatory if no target is provided
311313
coordinates of the center in the cone search
312314
radius : float, default 0
313315
radius in arcmin of the cone_search
@@ -607,50 +609,6 @@ def __check_list_strings(self, list):
607609
raise ValueError("One of the lists is empty or there are "
608610
"elements that are not strings")
609611

610-
def get_hap_observations(self, async_job=True, output_file=None,
611-
output_format="votable",
612-
verbose=False):
613-
"""Launches a synchronous or asynchronous job to extract ALL HAP
614-
observations
615-
616-
Parameters
617-
----------
618-
async_job : bool, optional, default 'False'
619-
executes the query (job) in asynchronous/synchronous mode (default
620-
synchronous)
621-
output_file : str, optional, default None
622-
file name where the results are saved if dumpToFile is True.
623-
If this parameter is not provided, the jobid is used instead
624-
output_format : str, optional, default 'votable'
625-
results format
626-
verbose : bool, optional, default 'False'
627-
flag to display information about the process
628-
629-
Returns
630-
-------
631-
A table object
632-
"""
633-
query = "select o.*, p.proposal_type from ehst.observation as o LEFT "\
634-
"JOIN ehst.proposal as p on o.proposal_id = p.proposal_id "\
635-
"LEFT JOIN ehst.plane as pl on pl.observation_uuid = "\
636-
"o.observation_uuid where (o.observation_id like '%hst%' AND "\
637-
"p.proposal_type like '%HAP%' AND (o.obs_type like '%HST "\
638-
"Simple%' OR o.obs_type like '%HST Composite%' OR o.obs_type "\
639-
"like '%HST Singleton%') AND o.collection LIKE '%HST%' AND "\
640-
"pl.main_science_plane = 'true') ORDER BY o.observation_id"
641-
if verbose:
642-
print(query)
643-
job = self.query_hst_tap(query=query, async_job=async_job,
644-
output_file=output_file,
645-
output_format=output_format,
646-
verbose=verbose)
647-
try:
648-
table = job.get_results()
649-
except Exception:
650-
raise ValueError('There are not HAP observations in this DB')
651-
652-
return table
653-
654612
def get_hap_proposals(self, async_job=True, output_file=None,
655613
output_format="votable",
656614
verbose=False):

0 commit comments

Comments
 (0)