Should have moved the tests over to using erass rather than erosita

Signed-off-by: David Turner <[email protected]>

Author: David Turner

tests/__init__.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 ([email protected]) 4/27/26, 12:04 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:32 PM. Copyright (c) The Contributors.
 import numpy as np
 import pandas as pd
 from astropy.units import Quantity
@@ -24,7 +24,7 @@ def get_test_source(telescope: str = 'all', shared: bool = True) -> GalaxyCluste
     """
     A factory function to provide test sources. This is used to avoid instantiating them at import time.
 
-    :param str telescope: The telescope for which we want a source. Options are 'all', 'xmm', 'erosita'.
+    :param str telescope: The telescope for which we want a source. Options are 'all', 'xmm', 'erass'.
     :param bool shared: Whether to return a shared (cached) instance or a fresh one.
     :return: The requested source.
     :rtype: GalaxyCluster
@@ -39,17 +39,17 @@ def get_test_source(telescope: str = 'all', shared: bool = True) -> GalaxyCluste
     if telescope == 'all':
         src = GalaxyCluster(SRC_INFO['ra'], SRC_INFO['dec'], SRC_INFO['z'], r500=Quantity(500, 'kpc'),
                             name=SRC_INFO['name'], use_peak=False,
-                            search_distance={'erosita': Quantity(3.6, 'deg')},
+                            search_distance={'erass': Quantity(3.6, 'deg')},
                             load_profiles=False)
     elif telescope == 'xmm':
         src = GalaxyCluster(SRC_INFO['ra'], SRC_INFO['dec'], SRC_INFO['z'], r500=Quantity(500, 'kpc'),
                             name=SRC_INFO['name'], use_peak=False,
                             telescope='xmm', load_profiles=False)
-    elif telescope == 'erosita':
+    elif telescope == 'erass' or telescope == 'erosita':
         src = GalaxyCluster(SRC_INFO['ra'], SRC_INFO['dec'], SRC_INFO['z'], r500=Quantity(500, 'kpc'),
                             name=SRC_INFO['name'], use_peak=False,
-                            telescope='erosita',
-                            search_distance={'erosita': Quantity(3.6, 'deg')},
+                            telescope='erass',
+                            search_distance={'erass': Quantity(3.6, 'deg')},
                             load_profiles=False)
     else:
         raise ValueError(f"Unknown mission name: {telescope}")

tests/test_data/config/xga.cfg

@@ -18,13 +18,13 @@ mos1_expmap = {obs_id}/images/obsid{obs_id}-instM1-subexpALL-en{lo_en}_{hi_en}ke
 mos2_expmap = {obs_id}/images/obsid{obs_id}-instM2-subexpALL-en{lo_en}_{hi_en}keV-expmap.fits
 region_file = tests/test_data/src_regs/xmm/{obs_id}.reg
 
-[EROSITA_FILES]
-root_erosita_dir = tests/test_data/daxa_output/archives/xga_tests/processed_data/erosita_all_sky_de_dr1/
-clean_erosita_evts = {obs_id}/events/obsid{obs_id}-instTM1_TM2_TM3_TM4_TM5_TM6_TM7-subexpALL-en0.2_10.0keV-finalevents.fits
+[ERASS_FILES]
+root_erass_dir = tests/test_data/daxa_output/archives/xga_tests/processed_data/erosita_all_sky_de_dr1/
+clean_erass_evts = {obs_id}/events/obsid{obs_id}-instTM1_TM2_TM3_TM4_TM5_TM6_TM7-subexpALL-en0.2_10.0keV-finalevents.fits
 lo_en = ['0.5']
 hi_en = ['2.0']
-erosita_image = /this/is/optional/
-erosita_expmap = /this/is/optional/
+erass_image = /this/is/optional/
+erass_expmap = /this/is/optional/
 region_file = tests/test_data/src_regs/erosita/{obs_id}.reg
 
 [CHANDRA_FILES]
@@ -37,4 +37,4 @@ lo_en = ['0.5', '0.5', '1.2', 2.0, '0.2']
 hi_en = ['7.0', '1.2', '2.0', '7.0', '0.4']
 acis_image = {obs_id}/images/obsid{obs_id}-instACIS-subexpE001-en{lo_en}_{hi_en}keV-image.fits
 acis_expmap = {obs_id}/images/obsid{obs_id}-instACIS-subexpE001-en{lo_en}_{hi_en}keV-expmap.fits
-region_file = tests/test_data/src_regs/chandra/{obs_id}.reg
+region_file = tests/test_data/src_regs/chandra/{obs_id}.reg

tests/test_generate/test_esass_lightcurve.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 ([email protected]) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:38 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -12,7 +12,7 @@
 class TestEsassLcFuncs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.src = get_test_source('erosita')
+        cls.src = get_test_source('erass')
 
     @require_esass
     def test_srctool_lightcurve_combine_insts_f_combine_obs_f(self):
@@ -21,17 +21,17 @@ def test_srctool_lightcurve_combine_insts_f_combine_obs_f(self):
         """
         srctool_lightcurve(self.src, 'r500', combine_tm=False, combine_obs=False)
 
-        lc = self.src.get_lightcurves('r500', telescope='erosita', inst='tm1')
-        
+        lc = self.src.get_lightcurves('r500', telescope='erass', inst='tm1')
+
         if isinstance(lc, list):
             for l in lc:
                 assert isinstance(l, LightCurve)
-                assert l.telescope == 'erosita'
+                assert l.telescope == 'erass'
                 assert l.obs_id != 'combined'
                 assert l.instrument == 'tm1'
         else:
             assert isinstance(lc, LightCurve)
-            assert lc.telescope == 'erosita'
+            assert lc.telescope == 'erass'
             assert lc.obs_id != 'combined'
             assert lc.instrument == 'tm1'
 
@@ -42,17 +42,17 @@ def test_srctool_lightcurve_combine_insts_t_combine_obs_f(self):
         """
         srctool_lightcurve(self.src, 'r500', combine_tm=True, combine_obs=False)
 
-        lc = self.src.get_lightcurves('r500', telescope='erosita', inst='combined')
+        lc = self.src.get_lightcurves('r500', telescope='erass', inst='combined')
 
         if isinstance(lc, list):
             for l in lc:
                 assert isinstance(l, LightCurve)
-                assert l.telescope == 'erosita'
+                assert l.telescope == 'erass'
                 assert l.obs_id != 'combined'
                 assert l.instrument == 'combined'
         else:
             assert isinstance(lc, LightCurve)
-            assert lc.telescope == 'erosita'
+            assert lc.telescope == 'erass'
             assert lc.obs_id != 'combined'
             assert lc.instrument == 'combined'
 
@@ -64,10 +64,10 @@ def test_srctool_lightcurve_combine_insts_f_combine_obs_t(self):
         """
         srctool_lightcurve(self.src, 'r500', combine_tm=False, combine_obs=True)
 
-        lc = self.src.get_combined_lightcurves('r500', telescope='erosita', inst='tm1')
+        lc = self.src.get_combined_lightcurves('r500', telescope='erass', inst='tm1')
 
         assert isinstance(lc, LightCurve)
-        assert lc.telescope == 'erosita'
+        assert lc.telescope == 'erass'
         assert lc.obs_id == 'combined'
         assert lc.instrument == 'tm1'
 
@@ -78,17 +78,17 @@ def test_srctool_lightcurve_combine_insts_t_combine_obs_t(self):
         """
         srctool_lightcurve(self.src, 'r500', combine_tm=True, combine_obs=True)
 
-        lc = self.src.get_combined_lightcurves('r500', telescope='erosita', inst='combined')
+        lc = self.src.get_combined_lightcurves('r500', telescope='erass', inst='combined')
 
         if isinstance(lc, list):
             for l in lc:
                 assert isinstance(l, LightCurve)
-                assert l.telescope == 'erosita'
+                assert l.telescope == 'erass'
                 assert l.obs_id == 'combined'
                 assert l.instrument == 'combined'
         else:
             assert isinstance(lc, LightCurve)
-            assert lc.telescope == 'erosita'
+            assert lc.telescope == 'erass'
             assert lc.obs_id == 'combined'
             assert lc.instrument == 'combined'
 

tests/test_generate/test_esass_misc.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 ([email protected]) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:51 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -11,15 +11,15 @@
 class TestEsassMiscFuncs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.src = get_test_source('erosita')
+        cls.src = get_test_source('erass')
 
     @require_esass
     def test_evtool_combine_evts(self):
         evtool_combine_evts(self.src)
 
-        evtlist = self.src.get_products("combined_events", just_obj=False, telescope='erosita')[0][-1]
-        assert evtlist.telescope == 'erosita'
-        assert set(evtlist.obs_ids) == set(self.src.obs_ids['erosita'])
+        evtlist = self.src.get_products("combined_events", just_obj=False, telescope='erass')[0][-1]
+        assert evtlist.telescope == 'erass'
+        assert set(evtlist.obs_ids) == set(self.src.obs_ids['erass'])
 
 if __name__ == "__main__":
      unittest.main()

tests/test_generate/test_esass_phot.py

@@ -1,84 +1,84 @@
 #  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 ([email protected]) 4/29/26, 9:39 AM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:35 PM. Copyright (c) The Contributors.
 
 import unittest
 
 from astropy.units import Quantity
+
 from xga.generate.esass.phot import evtool_image, expmap
 from xga.samples import ClusterSample
-
 from .. import get_test_source, CLUSTER_SMP
 from ..utils import require_esass
 
 
 class TestEsassPhotFuncs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.src = get_test_source('erosita')
+        cls.src = get_test_source('erass')
 
     @require_esass
     def test_evtool_image(self):
         evtool_image(self.src, Quantity(0.4, 'keV'), Quantity(3, 'keV'))
 
-        im = self.src.get_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                      telescope='erosita')[0]
+        im = self.src.get_images(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                      telescope='erass')[0]
         if isinstance(im, list):
             for i in im:
-                assert i.telescope == 'erosita'
+                assert i.telescope == 'erass'
                 assert i.energy_bounds[0] == Quantity(0.4, 'keV')
                 assert i.energy_bounds[1] == Quantity(3, 'keV')
         else:
-            assert im.telescope == 'erosita'
+            assert im.telescope == 'erass'
             assert im.energy_bounds[0] == Quantity(0.4, 'keV')
             assert im.energy_bounds[1] == Quantity(3, 'keV')
 
     @require_esass
     def test_evtool_image_combined_obs(self):
         evtool_image(self.src, Quantity(0.5, 'keV'), Quantity(3, 'keV'), combine_obs=True)
 
-        im = self.src.get_combined_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                      telescope='erosita')
+        im = self.src.get_combined_images(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'),
+                                      telescope='erass')
 
-        assert im.telescope == 'erosita'
+        assert im.telescope == 'erass'
         assert im.energy_bounds[0] == Quantity(0.5, 'keV')
         assert im.energy_bounds[1] == Quantity(3, 'keV')
 
     @require_esass
     def test_expmap(self):
         expmap(self.src, Quantity(0.4, 'keV'), Quantity(3, 'keV'))
 
-        exp = self.src.get_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                      telescope='erosita')
+        exp = self.src.get_expmaps(lo_en=Quantity(0.4, 'keV'), hi_en=Quantity(3, 'keV'),
+                                      telescope='erass')
 
         for e in exp:
-            assert e.telescope == 'erosita'
+            assert e.telescope == 'erass'
             assert e.energy_bounds[0] == Quantity(0.4, 'keV')
             assert e.energy_bounds[1] == Quantity(3, 'keV')
 
     @require_esass
     def test_expmap_combined_obs(self):
         expmap(self.src, Quantity(0.5, 'keV'), Quantity(3, 'keV'), combine_obs=True)
 
-        exp = self.src.get_combined_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'), 
-                                      telescope='erosita')
+        exp = self.src.get_combined_expmaps(lo_en=Quantity(0.5, 'keV'), hi_en=Quantity(3, 'keV'),
+                                      telescope='erass')
 
-        assert exp.telescope == 'erosita'
+        assert exp.telescope == 'erass'
         assert exp.energy_bounds[0] == Quantity(0.5, 'keV')
         assert exp.energy_bounds[1] == Quantity(3, 'keV')
-    
+
     @require_esass
     def test_evtool_image_w_sample_w_odd_telescopes(self):
         """
         There was an old bug that occured when product generation functions were run with samples
         with sources that didn't all have the same telescopes. So this is testing that this bug has
         been fixed!
         """
-        test_smp = ClusterSample(CLUSTER_SMP["ra"].values, CLUSTER_SMP["dec"].values, 
-                                 CLUSTER_SMP["z"].values, CLUSTER_SMP["name"].values, 
+        test_smp = ClusterSample(CLUSTER_SMP["ra"].values, CLUSTER_SMP["dec"].values,
+                                 CLUSTER_SMP["z"].values, CLUSTER_SMP["name"].values,
                                  r500=Quantity(CLUSTER_SMP["r500"].values, 'kpc'), use_peak=False,
-                                 search_distance={'erosita': Quantity(3.6, 'deg')})
+                                 search_distance={'erass': Quantity(3.6, 'deg')})
 
-        test_smp[0].disassociate_obs('erosita')
+        test_smp[0].disassociate_obs('erass')
         evtool_image(test_smp)
 
 if __name__ == "__main__":

tests/test_generate/test_esass_spec.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 ([email protected]) 4/27/26, 5:17 PM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:34 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -12,7 +12,7 @@
 class TestEsassSpecFuncs(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
-        cls.src = get_test_source('erosita')
+        cls.src = get_test_source('erass')
 
     @require_esass
     def test_srctool_spectrum_combine_insts_f_combine_obs_f(self):
@@ -21,9 +21,9 @@ def test_srctool_spectrum_combine_insts_f_combine_obs_f(self):
         """
         srctool_spectrum(self.src, 'r500', combine_tm=False, combine_obs=False)
 
-        spec = self.src.get_spectra('r500', telescope='erosita', inst='tm1', obs_id='227093')
+        spec = self.src.get_spectra('r500', telescope='erass', inst='tm1', obs_id='227093')
         assert isinstance(spec, Spectrum)
-        assert spec.telescope == 'erosita'
+        assert spec.telescope == 'erass'
         assert spec.obs_id != 'combined'
         assert spec.instrument == 'tm1'
 
@@ -34,11 +34,11 @@ def test_srctool_spectrum_combine_insts_t_combine_obs_f(self):
         """
         srctool_spectrum(self.src, 'r500', combine_tm=True, combine_obs=False)
 
-        spec = self.src.get_spectra('r500', telescope='erosita', inst='combined', 
+        spec = self.src.get_spectra('r500', telescope='erass', inst='combined',
                                         obs_id='227093')
 
         assert isinstance(spec, Spectrum)
-        assert spec.telescope == 'erosita'
+        assert spec.telescope == 'erass'
         assert spec.obs_id != 'combined'
         assert spec.instrument == 'combined'
 
@@ -49,10 +49,10 @@ def test_srctool_spectrum_combine_insts_f_combine_obs_t(self):
         """
         srctool_spectrum(self.src, 'r500', combine_tm=False, combine_obs=True)
 
-        spec = self.src.get_combined_spectra('r500', telescope='erosita', inst='tm1')
+        spec = self.src.get_combined_spectra('r500', telescope='erass', inst='tm1')
 
         assert isinstance(spec, Spectrum)
-        assert spec.telescope == 'erosita'
+        assert spec.telescope == 'erass'
         assert spec.obs_id == 'combined'
         assert spec.instrument == 'tm1'
 
@@ -63,13 +63,13 @@ def test_srctool_spectrum_combine_insts_t_combine_obs_t(self):
         """
         srctool_spectrum(self.src, 'r500', combine_tm=True, combine_obs=True)
 
-        spec = self.src.get_combined_spectra('r500', telescope='erosita', inst='combined')
+        spec = self.src.get_combined_spectra('r500', telescope='erass', inst='combined')
 
         if isinstance(spec, list):
             spec = spec[0]
 
         assert isinstance(spec, Spectrum)
-        assert spec.telescope == 'erosita'
+        assert spec.telescope == 'erass'
         assert spec.obs_id == 'combined'
         assert spec.instrument == 'combined'
 

tests/test_generate/test_sas_phot.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 ([email protected]) 4/28/26, 11:56 AM. Copyright (c) The Contributors.
+#  Last modified by David J Turner ([email protected]) 5/5/26, 11:56 PM. Copyright (c) The Contributors.
 
 import unittest
 
@@ -19,7 +19,7 @@ def setUpClass(cls):
         cls.src = get_test_source('xmm')
 
         # Additionally, grab one that we know DOESN'T have any XMM
-        cls.no_xmm_src = get_test_source('erosita')
+        cls.no_xmm_src = get_test_source('erass')
 
     @require_sas
     def test_evselect_image_no_tel_error(self):