Updated utils, BaseSource, and functions in sourcetools.match to a) support T or True in census file columns (to support censuses originating from different XGA versions), and made sure that blacklist exclude_... columns are converted to booleans.

Signed-off-by: David Turner <djturner@umbc.edu>

Author: David Turner

xga/sources/base.py

@@ -1,5 +1,5 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/20/26, 12:15 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/21/26, 12:59 PM. Copyright (c) The Contributors.
 
 import contextlib
 import gc
@@ -264,9 +264,9 @@ def __init__(self, ra: float, dec: float, redshift: float = None, name: str = No
                     # Extract the exact row of the current telescope's blacklist that is relevant to the current
                     #  ObsID
                     bl_row = BLACKLIST[tel][BLACKLIST[tel]['ObsID'] == row['ObsID']].iloc[0]
-                    # Find the instruments that we need to exclude because the 'EXCLUDE_{INST}' column was marked 'T'
+                    # Find the instruments that we need to exclude because the 'EXCLUDE_{INST}' column was marked True
                     excl_inst = [col.split('_')[-1].lower() for col in BLACKLIST[tel].columns
-                                 if 'EXCLUDE' in col and bl_row[col] == 'T']
+                                 if 'EXCLUDE' in col and bl_row[col]]
                     # Add the partially excluded observation to the blacklist, with the excluded instrument
                     blacklisted_obs[tel][row['ObsID']] = excl_inst
 

xga/sourcetools/match.py

@@ -1,5 +1,5 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/18/26, 4:45 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/21/26, 1:01 PM. Copyright (c) The Contributors.
 from __future__ import annotations
 
 import gc
@@ -87,7 +87,7 @@ def _separation_search(ra: float, dec: float, telescope: str, search_rad: float)
     #  the ObsID shouldn't be returned - firstly we locate the 'exclude_{INST NAME}' columns for this telescope's
     #  blacklist
     excl_col = [col for col in in_bl.columns if 'EXCLUDE' in col]
-    all_excl = in_bl[np.logical_and.reduce([in_bl[excl] == 'T' for excl in excl_col])]
+    all_excl = in_bl[np.logical_and.reduce([in_bl[excl] for excl in excl_col])]
 
     # These are the observations that a) match (within our criteria) to the supplied coordinates, and b) have at
     #  least some usable data.
@@ -410,7 +410,7 @@ def census_match(telescope: Union[str, list] = None, obs_ids: Union[List[str], d
                                                                                               )]['ObsID'])]
         # Firstly we locate the 'exclude_{INST NAME}' columns for this telescope's blacklist
         excl_col = [col for col in in_bl.columns if 'EXCLUDE' in col]
-        all_excl = in_bl[np.logical_and.reduce([in_bl[excl] == 'T' for excl in excl_col])]
+        all_excl = in_bl[np.logical_and.reduce([in_bl[excl] for excl in excl_col])]
 
         # These are the observations that have at  least some usable data.
         all_incl = rel_census[~rel_census["ObsID"].isin(all_excl["ObsID"])]

xga/utils.py

@@ -1,5 +1,5 @@
 #  This code is part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (djturner@umbc.edu) 5/21/26, 11:54 AM. Copyright (c) The Contributors.
+#  Last modified by David J Turner (djturner@umbc.edu) 5/21/26, 12:59 PM. Copyright (c) The Contributors.
 
 import importlib.resources
 import json
@@ -745,7 +745,11 @@ def build_observation_census(tel: str, num_cores: int) -> Tuple[pd.DataFrame, pd
 
     # Adding in columns for the instruments
     rel_inst_cols = ["USE_{}".format(inst.upper()) for inst in rel_insts]
-    obs_lookup[rel_inst_cols] = obs_lookup[rel_inst_cols].apply(lambda x: x == 'T')
+    obs_lookup[rel_inst_cols] = obs_lookup[rel_inst_cols].apply(lambda x: x.isin(['T', 'True', 't', 'true']))
+
+    # Also convert the blacklist columns to boolean
+    rel_bl_cols = [col for col in blacklist.columns if 'EXCLUDE' in col]
+    blacklist[rel_bl_cols] = blacklist[rel_bl_cols].apply(lambda x: x.isin(['T', 'True', 't', 'true']))
 
     # Finally we return the census and the blacklist
     return obs_lookup, blacklist