From 4d7b85d8f0d8ec7388ae05874eee1c9bf27201a1 Mon Sep 17 00:00:00 2001 From: Matthew Pitkin Date: Fri, 17 Nov 2017 21:49:53 +0000 Subject: [PATCH] Fix issue when specifying pulsars --- psrqpy/config.py | 2 +- psrqpy/search.py | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/psrqpy/config.py b/psrqpy/config.py index fd7bdacd..cb4ea8e1 100644 --- a/psrqpy/config.py +++ b/psrqpy/config.py @@ -14,7 +14,7 @@ PSRNAMES_QUERY = '&pulsar_names={psrnames}' SORT_QUERY = '&sort_attr={sortattr}&sort_order={sortorder}' EPHEMERIS_QUERY = '&submit_ephemeris={getephemeris}' -QUERY_FLUFF = '&ephemeris=long&coords_unit=raj%2Fdecj&radius=&coords_1=&coords_2=&style=Long+with+errors&no_value=*&nohead=nohead&state=query' +QUERY_FLUFF = '&ephemeris=long&coords_unit=raj%2Fdecj&radius=&coords_1=&coords_2=&style=Long+with+errors&no_value=*&nohead=nohead&state=query&table_bottom.x=30&table_bottom.y=22' QUERY_URL = ATNF_URL + PARAMS_QUERY + USERDEFINED_QUERY + SORT_QUERY + CONDITION_QUERY + PSRNAMES_QUERY + EPHEMERIS_QUERY + QUERY_FLUFF diff --git a/psrqpy/search.py b/psrqpy/search.py index 4966bcfb..b9fd4846 100644 --- a/psrqpy/search.py +++ b/psrqpy/search.py @@ -59,8 +59,6 @@ def __init__(self, params=None, condition=None, psrtype=None, assoc=None, sort_a """ self._psrs = psrs - print(self._psrs) - self._include_errs = include_errs self._include_refs = include_refs self._atnf_version = version @@ -185,8 +183,6 @@ def generate_query(self, version='', params=None, condition='', sortorder='asc', raise Exception('Error... input "psrnames" for generate_query() must be a list') self._psrs = list(psrnames) # reset self._psrs - print(self._psrs) - qpulsars = '' # pulsar name query string if self._psrs is not None: for psr in self._psrs: @@ -195,9 +191,7 @@ def generate_query(self, version='', params=None, condition='', sortorder='asc', else: qpulsars += psr qpulsars += '+' # seperator between pulsars - print(qpulsars) qpulsars = qpulsars.strip('+') # remove the trailing '+' - print(qpulsars) query_dict['psrnames'] = qpulsars # get pulsar ephemeris rather than table (parsing of this is not implemented yet) @@ -209,8 +203,6 @@ def generate_query(self, version='', params=None, condition='', sortorder='asc', # generate query URL self._query_url = QUERY_URL.format(**query_dict) - print(self._query_url) - # generate request psrrequest = requests.get(self._query_url)