Skip to content

Commit

Permalink
Fix issue when specifying pulsars
Browse files Browse the repository at this point in the history
  • Loading branch information
mattpitkin committed Nov 17, 2017
1 parent c6393b9 commit 4d7b85d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion psrqpy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions psrqpy/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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)
Expand All @@ -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)

Expand Down

0 comments on commit 4d7b85d

Please sign in to comment.