Re-added eSASS version determination

Author: David Turner

xga/__init__.py

@@ -1,10 +1,10 @@
 #  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) 16/07/2025, 12:25. Copyright (c) The Contributors
+#  Last modified by David J Turner (turne540@msu.edu) 09/12/2025, 15:20. Copyright (c) The Contributors
 from . import _version
 __version__ = _version.get_versions()['version']
 
 from .utils import (xga_conf, CENSUS, OUTPUT, NUM_CORES, XGA_EXTRACT, BASE_XSPEC_SCRIPT, MODEL_PARS,
-    MODEL_UNITS, ABUND_TABLES, XSPEC_FIT_METHOD, COUNTRATE_CONV_SCRIPT, NHC, BLACKLIST, HY_MASS, MEAN_MOL_WEIGHT,
-    SAS_VERSION, XSPEC_VERSION, SAS_AVAIL, DEFAULT_COSMO, TELESCOPES, USABLE, DEFAULT_TELE_SEARCH_DIST, COMBINED_INSTS,
-    eSASS_AVAIL, SRC_REGION_COLOURS, check_telescope_choices, PRETTY_TELESCOPE_NAMES, CIAO_AVAIL, CIAO_VERSION, CALDB_AVAIL,
-    CALDB_VERSION, ESASS_VERSION, RAD_MATCH_PRECISION)
+                    MODEL_UNITS, ABUND_TABLES, XSPEC_FIT_METHOD, COUNTRATE_CONV_SCRIPT, NHC, BLACKLIST, HY_MASS, MEAN_MOL_WEIGHT,
+                    SAS_VERSION, XSPEC_VERSION, SAS_AVAIL, DEFAULT_COSMO, TELESCOPES, USABLE, DEFAULT_TELE_SEARCH_DIST, COMBINED_INSTS,
+                    ESASS_AVAIL, SRC_REGION_COLOURS, check_telescope_choices, PRETTY_TELESCOPE_NAMES, CIAO_AVAIL, CIAO_VERSION, CALDB_AVAIL,
+                    CALDB_VERSION, ESASS_VERSION, RAD_MATCH_PRECISION)

xga/generate/esass/run.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) 08/07/2025, 10:05. Copyright (c) The Contributors
+#  Last modified by David J Turner (turne540@msu.edu) 09/12/2025, 15:20. Copyright (c) The Contributors
 
 from functools import wraps
 from multiprocessing.dummy import Pool
@@ -9,7 +9,7 @@
 from tqdm import tqdm
 
 from ..common import execute_cmd
-from ... import eSASS_AVAIL
+from ... import ESASS_AVAIL
 from ...exceptions import eSASSNotFoundError, ProductGenerationError
 from ...products import BaseProduct, AnnularSpectra
 from ...samples.base import BaseSample
@@ -27,7 +27,7 @@ def esass_call(esass_func):
     @wraps(esass_func)
     def wrapper(*args, **kwargs):
         # Checking eSASS is installed and available on the system
-        if not eSASS_AVAIL:
+        if not ESASS_AVAIL:
             raise eSASSNotFoundError("No eSASS installation has been found on this machine.")
 
         # The first argument of all of these eSASS functions will be the source object (or a list of),

xga/utils.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) 25/08/2025, 15:50. Copyright (c) The Contributors
+#  Last modified by David J Turner (turne540@msu.edu) 09/12/2025, 15:20. Copyright (c) The Contributors
 
 import json
 import os
@@ -16,11 +16,10 @@
 import pkg_resources
 from astropy.constants import m_p, m_e
 from astropy.cosmology import LambdaCDM
+from astropy.io import fits
 from astropy.units import Quantity, def_unit, add_enabled_units
 from astropy.wcs import WCS
-from astropy.io import fits
 from fitsio import FITSHDR
-from fitsio import read_header
 from tqdm import tqdm
 
 from .exceptions import XGAConfigError, InvalidTelescopeError, NoTelescopeDataError
@@ -853,15 +852,25 @@ def check_telescope_choices(telescope: Union[str, List[str]]) -> List[str]:
 
 # --- eROSITA ---
 ESASS_VERSION = None
-eSASS_AVAIL = False
+ESASS_AVAIL = False
 if ('erosita' in USABLE and USABLE['erosita']) or ('erass' in USABLE and USABLE['erass']):
-    # TODO will have to handle the whole eSASS4DR1 and the original eSASS release thing at some point... sigh
+    # Run the 'which' command for evtool, one of the eSASS tasks
+    which_evtool = shutil.which("evtool")
+
     # This checks for an installation of eSASS
-    if shutil.which("evtool") is None:
+    if which_evtool is None:
         warn("No eSASS installation detected on system, as such all functions in xga.generate.esass will not work.",
              stacklevel=2)
     else:
-        eSASS_AVAIL = True
+        ESASS_AVAIL = True
+        if 'ESASS4EDR' in which_evtool.upper():
+            ESASS_VERSION = 'ESASS4EDR'
+        elif 'ESASS4DR1' in which_evtool.upper():
+            ESASS_VERSION = 'ESASS4DR1'
+        else:
+            warn(
+                "Unknown eSASS installation detected on system, as such some functions in xga.generate.esass may not work.",
+                stacklevel=2)
 # ---------------
 
 # --- Chandra ---