Merge pull request #1307 from DavidT3/bug/xmmRegionMatchNonFunctional

Bug/xmm region match non functional

Author: DavidT3

xga/sourcetools/match.py

@@ -1,5 +1,5 @@
 #  This code is a part of X-ray: Generate and Analyse (XGA), a module designed for the XMM Cluster Survey (XCS).
-#  Last modified by David J Turner (turne540@msu.edu) 26/07/2024, 10:56. Copyright (c) The Contributors
+#  Last modified by David J Turner (turne540@msu.edu) 14/02/2025, 09:46. Copyright (c) The Contributors
 import gc
 import os
 from copy import deepcopy
@@ -265,7 +265,7 @@ def _in_region(ra: Union[float, List[float], np.ndarray], dec: Union[float, List
         #               "search.".format(obs_id))
 
         # Reading in the region file using the Regions module
-        og_ds9_regs = Regions.read(reg_path, format='ds9').regions
+        og_ds9_regs = np.array(Regions.read(reg_path, format='ds9').regions)
 
         # Bodged declaration, the instrument and energy bounds don't matter - all I need this for is the
         #  nice way it extracts the WCS information that I need
@@ -601,6 +601,18 @@ def xmm_region_match(src_ra: Union[float, np.ndarray], src_dec: Union[float, np.
         raise XGAConfigError("This function requires at least one set of images (PN, MOS1, or MOS2) be referenced in "
                              "the XGA configuration file.")
 
+    # We ensure that the RA and Decs are in arrays, even if there is only one coordinate - also in the case of a
+    #  single coordinate we set the number of cores to one
+    if type(src_ra) != type(src_dec):
+        raise TypeError("'src_ra' and 'src_dec' arguments must be the same type; either floats or arrays.")
+    elif isinstance(src_ra, float):
+        src_ra = np.array([src_ra])
+        src_dec = np.array([src_dec])
+        num_cores = 1
+    elif isinstance(src_ra, list):
+        src_ra = np.array(src_ra)
+        src_dec = np.array(src_dec)
+
     # This runs the simple xmm match and gathers the results.
     s_match, s_match_bl = simple_xmm_match(src_ra, src_dec, num_cores=num_cores)
     # The initial results are then processed into some more useful formats.
@@ -666,7 +678,8 @@ def error_callback(err):
 
         # If any errors occurred during the matching process, they are all raised here as a grouped exception
         if len(search_errors) != 0:
-            ExceptionGroup("The following exceptions were raised in the multi-threaded region finder", search_errors)
+            raise ExceptionGroup("The following exceptions were raised in the multi-threaded "
+                                 "region finder", search_errors)
 
     # This formats the match and no-match information so that the output is the same length and order as the input
     #  source lists