From 1f7d6af25e14b6950c4f4292618c486960eb8bde Mon Sep 17 00:00:00 2001 From: David Sanmartim Date: Tue, 28 Jan 2025 13:01:47 -0300 Subject: [PATCH] Improving query based on CDS developer comments --- python/lsst/ts/observatory/control/base_tcs.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/python/lsst/ts/observatory/control/base_tcs.py b/python/lsst/ts/observatory/control/base_tcs.py index 2d8d4e51..f6c30fa0 100644 --- a/python/lsst/ts/observatory/control/base_tcs.py +++ b/python/lsst/ts/observatory/control/base_tcs.py @@ -1683,14 +1683,14 @@ async def find_target_simbad( customSimbad = Simbad() - customSimbad.add_votable_fields("mesdistance", "V") + customSimbad.add_votable_fields("V", "rvz_redshift", "ident") customSimbad.TIMEOUT = self.long_long_timeout radec = self.radec_from_azel(az=az, el=el) # Build the ADQL-like criteria for V magnitude + HD catalog criteria = ( - f"V>{mag_limit} AND V<{mag_limit + mag_range} " f"AND main_id LIKE 'HD%'" + f"V>{mag_limit} AND V<{mag_limit + mag_range} AND ident.id LIKE 'HD%'" ) query_callable = partial( @@ -1700,7 +1700,6 @@ async def find_target_simbad( criteria=criteria, ) - # Execute the query_region asynchrnously loop = asyncio.get_event_loop() try: result_table = await loop.run_in_executor(None, query_callable) @@ -1715,16 +1714,16 @@ async def find_target_simbad( result_table.sort("V") # Pick the first (brightest) match - target_main_id = str(result_table["main_id"][0]) + target_ident_id = str(result_table["id"][0]) radec_icrs = ICRS( ra=Angle(result_table[0]["ra"], unit=u.deg), dec=Angle(result_table[0]["dec"], unit=u.deg), ) - self.object_list_add(f"{target_main_id}".rstrip(), radec_icrs) + self.object_list_add(f"{target_ident_id}".rstrip(), radec_icrs) - return f"{target_main_id}".rstrip() + return f"{target_ident_id}".rstrip() async def find_target_local_catalog( self,