Skip to content

Commit 927478b

Browse files
author
Erik Jensen
committed
stick to astroquery 0.4.7 for now
1 parent 2102e1d commit 927478b

4 files changed

Lines changed: 5 additions & 18 deletions

File tree

.github/workflows/tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
env:
101101
FLOWS_CONFIG: ${{ secrets.FLOWS_CONFIG }}
102102
FLOWS_API_TOKEN: ${{ secrets.FLOWS_API_TOKEN }}
103-
CASSJOBS_WSID: ${{ secrets.CASSJOBS_WSID }}
104-
CASSJOBS_PASSWORD: ${{ secrets.CASSJOBS_PASSWORD }}
105103
run: |
106104
python -m pip install --upgrade pip wheel
107105
pip install -r requirements.txt

README.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,6 @@ Text coming soon...
8080
# pipeline = False
8181
token = None
8282

83-
# casjobs:
84-
# wsid and password required for run_catalogs.py,
85-
# user registration at
86-
# https://galex.stsci.edu/casjobs/CreateAccount.aspx
87-
# wsid can be found at
88-
# https://galex.stsci.edu/casjobs/changedetails.aspx
89-
# after login
90-
[casjobs]
91-
# wsid = $CASJOBS_WSID/None
92-
# password = $CASJOBS_PASSWORD/None
93-
9483
# database:
9584
# username and password required for run_catalogs.py,
9685
# the user is a registered user in the flows database

flows/catalogs.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
157157

158158
s = Simbad()
159159
s.ROW_LIMIT = 0
160-
s.add_votable_fields('ra', 'dec', 'pmra', 'pmdec')
160+
s.add_votable_fields('ra(d;A;ICRS;J2000)', 'dec(d;D;ICRS;2000)', 'pmra', 'pmdec')
161161
s.add_votable_fields('otype')
162162
s.add_votable_fields('flux(B)', 'flux(V)', 'flux(R)', 'flux(I)', 'flux(J)', 'flux(H)', 'flux(K)')
163163
s.add_votable_fields('flux(u)', 'flux(g)', 'flux(r)', 'flux(i)', 'flux(z)')
@@ -174,8 +174,8 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
174174

175175
# Rename columns:
176176
results.rename_column('MAIN_ID', 'main_id')
177-
results.rename_column('RA', 'ra')
178-
results.rename_column('DEC', 'dec')
177+
results.rename_column('RA_d_A_ICRS_J2000', 'ra')
178+
results.rename_column('DEC_d_D_ICRS_2000', 'dec')
179179
results.rename_column('PMRA', 'pmra')
180180
results.rename_column('PMDEC', 'pmdec')
181181
results.rename_column('FLUX_B', 'B_mag')
@@ -203,7 +203,7 @@ def query_simbad(coo_centre, radius=24 * u.arcmin):
203203

204204
# Build sky coordinates object:
205205
simbad = SkyCoord(ra=results['ra'], dec=results['dec'], pm_ra_cosdec=results['pmra'], pm_dec=results['pmdec'],
206-
frame='icrs', obstime='J2000', unit=u.deg)
206+
frame='icrs', obstime='J2000')
207207

208208
return results, simbad
209209

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ pytz >= 2024.2
1717
sep-pjw >= 1.3.5
1818
astroalign >= 2.5.1
1919
networkx >= 3.3
20-
astroquery >= 0.4.7
20+
astroquery == 0.4.7 # TODO version >= 0.4.9 brings changes which messes with catalogs.py:query_simbad() - any expert want to have a crack at this?
2121
tendrils >= 0.3.2
2222
healpy >= 1.17.3

0 commit comments

Comments
 (0)