Skip to content

Commit

Permalink
Fix typing of refcat entries; bump VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
Erik Jensen committed Jan 26, 2025
1 parent 99d1a0d commit a0edff3
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master-v1.2.0
master-v1.2.1
33 changes: 18 additions & 15 deletions flows/catalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@ def query_local_refcat2(coo_centre, radius=24 * u.arcmin):
.. codeauthor:: Erik Jensen
"""
if isinstance(radius, (float, int)):
radius *= u.deg

current_max_objid = 300_000_000_000_000_000
with AADC_DB() as db:
Expand All @@ -292,28 +294,29 @@ def query_local_refcat2(coo_centre, radius=24 * u.arcmin):
encoding="utf-8", capture_output=True, check=True)

# TODO: feel free to make this less awful!
OBJID = RA = DEC = PMRA = PMDEC = GAIA = BP = RP = DUPVAR = G = R = I = Z = J = H = K = np.array([])
OBJID = DUPVAR = np.array([], dtype='int')
RA = DEC = PMRA = PMDEC = GAIA = BP = RP = G = R = I = Z = J = H = K = np.array([], dtype='float')
for line in refcat_output.stdout.splitlines():
OBJID = np.append(OBJID, current_max_objid)
current_max_objid += 1

ra, dec, pmra, pmdec, gaia, bp, rp, dupvar, g, r, i, z, j, h, k = line.split()

RA = np.append(RA, ra)
DEC = np.append(DEC, dec)
PMRA = np.append(PMRA, pmra)
PMDEC = np.append(PMDEC, pmdec)
GAIA = np.append(GAIA, gaia)
BP = np.append(BP, bp)
RP = np.append(RP, rp)
RA = np.append(RA, ra)
DEC = np.append(DEC, dec)
PMRA = np.append(PMRA, pmra)
PMDEC = np.append(PMDEC, pmdec)
GAIA = np.append(GAIA, gaia)
BP = np.append(BP, bp)
RP = np.append(RP, rp)
DUPVAR = np.append(DUPVAR, dupvar)
G = np.append(G, g)
R = np.append(R, r)
I = np.append(I, i)
Z = np.append(Z, z)
J = np.append(J, j)
H = np.append(H, h)
K = np.append(K, k)
G = np.append(G, g)
R = np.append(R, r)
I = np.append(I, i)
Z = np.append(Z, z)
J = np.append(J, j)
H = np.append(H, h)
K = np.append(K, k)

# rename columns to match older java-based implementation which had different naming conventions
# TODO: refactor dependent functions to expect the default namings and get rid of these renamings
Expand Down
2 changes: 1 addition & 1 deletion run_catalogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def main():

targets = api.get_catalog_missing()
if args.target is not None:
if args.print is None:
if args.print is False:
# We want to download and possibly commit the target catalog
if int(args.target) in targets:
logger.info("Downloading catalog for target=%s (committing to db=%s)...", args.target, args.commit)
Expand Down

0 comments on commit a0edff3

Please sign in to comment.