From 3d5c2657b38457dda2a410aa67a3dfc188007918 Mon Sep 17 00:00:00 2001
From: Tomas Stolker <stolker@strw.leidenuniv.nl>
Date: Sat, 4 Nov 2023 08:44:50 +0100
Subject: [PATCH] Added Gaia RUWE to output table, fixed issues with selecting
 the correct Gaia source catalog

---
 calistar/calistar.py | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/calistar/calistar.py b/calistar/calistar.py
index b3f6487..7f2632a 100644
--- a/calistar/calistar.py
+++ b/calistar/calistar.py
@@ -386,8 +386,15 @@ def target_star(
             print(f"Metallicity = {gaia_result['mh_gspphot'][0]:.2f}")
             print(f"G-band extinction = {gaia_result['ag_gspphot'][0]:.2f}")
 
+        print(
+            f"\nAstrometric excess noise = {gaia_result['astrometric_excess_noise'][0]:.2f}"
+        )
+
+        if "ruwe" in gaia_result.columns:
+            print(f"RUWE = {gaia_result['ruwe'][0]:.2f}")
+
         if "non_single_star" in gaia_result.columns:
-            print(f"\nNon single star = {gaia_result['non_single_star'][0]}")
+            print(f"Non single star = {gaia_result['non_single_star'][0]}")
 
         if "classprob_dsc_combmod_star" in gaia_result.columns:
             print(
@@ -395,10 +402,6 @@ def target_star(
                 f"{gaia_result['classprob_dsc_combmod_star'][0]:.2f}"
             )
 
-        print(
-            f"Astrometric excess noise = {gaia_result['astrometric_excess_noise'][0]:.2f}"
-        )
-
         if "has_xp_continuous" in gaia_result.columns:
             print(f"\nXP continuous = {gaia_result['has_xp_continuous'][0]}")
 
@@ -627,7 +630,7 @@ def find_calib(
         gaia_query = f"""
         SELECT *, DISTANCE({target_dict['Gaia RA'][0]},
         {target_dict['Gaia Dec'][0]}, ra, dec) AS ang_sep
-        FROM gaiadr3.gaia_source
+        FROM gaia{self.gaia_release.lower()}.gaia_source
         WHERE DISTANCE({target_dict['Gaia RA'][0]},
         {target_dict['Gaia Dec'][0]}, ra, dec) < {search_radius}
         AND phot_g_mean_mag > {mag_low}
@@ -647,9 +650,10 @@ def find_calib(
             "Gaia ID",
             "SpT",
             "Separation",
+            "Astrometric excess noise",
+            "RUWE",
             "Non single star",
             "Single star probability",
-            "Astrometric excess noise",
         ]
 
         columns += self.all_filters
@@ -776,7 +780,7 @@ def find_calib(
                 # This query returns no sources?
                 # gaia_query = f"""
                 # SELECT *
-                # FROM gaiadr3.allwise_best_neighbour
+                # FROM gaia{self.gaia_release.lower()}.allwise_best_neighbour
                 # WHERE source_id = {self.gaia_source}
                 # """
                 # gaia_job = Gaia.launch_job_async(gaia_query,
@@ -786,18 +790,23 @@ def find_calib(
             else:
                 drop_indices.append(gaia_item.index)
 
-            cal_df.loc[gaia_item.index, "Non single star"] = gaia_item[
-                "non_single_star"
-            ]
-
-            cal_df.loc[gaia_item.index, "Single star probability"] = gaia_item[
-                "classprob_dsc_combmod_star"
-            ]
-
             cal_df.loc[gaia_item.index, "Astrometric excess noise"] = gaia_item[
                 "astrometric_excess_noise"
             ]
 
+            if "ruwe" in gaia_item:
+                cal_df.loc[gaia_item.index, "RUWE"] = gaia_item["ruwe"]
+
+            if "non_single_star" in gaia_item:
+                cal_df.loc[gaia_item.index, "Non single star"] = gaia_item[
+                    "non_single_star"
+                ]
+
+            if "classprob_dsc_combmod_star" in gaia_item:
+                cal_df.loc[gaia_item.index, "Single star probability"] = gaia_item[
+                    "classprob_dsc_combmod_star"
+                ]
+
             # Query The Washington Visual Double Star Catalog
 
             if simbad_result is not None: