Add test for unknown catalog name in FHD file

Improve error message, update changelog

CHANGELOG.md

@@ -6,6 +6,7 @@
 - A memo describing the SkyH5 format in docs/references.
 
 ### Changed
+- Added support for more types of FHD catalog files and better error messages.
 - Added support (and testing) for python 3.12, dropped support for python 3.8
 - Moved the optional data-sized arrays (stokes_error and beam_amp) from the Header
 datagroup to the Data datagroup in SkyH5 files.

src/pyradiosky/skymodel.py

@@ -4357,7 +4357,10 @@ def read_fhd_catalog(
         elif "source_array" in catalog.keys():
             catalog = catalog["source_array"]
         else:
-            raise KeyError(f"File {filename_sav} does not contain a known catalog name")
+            raise KeyError(
+                f"File {filename_sav} does not contain a known catalog name. "
+                f"File variables include {list(catalog.keys())}"
+            )
         ids = catalog["id"].astype(str)
         ra = catalog["ra"]
         dec = catalog["dec"]

tests/test_skymodel.py

@@ -2941,21 +2941,21 @@ def test_read_votable_errors():
         )
 
 
-def test_fhd_catalog_reader():
-    for fname in ["catalog", "source_array"]:
-        catfile = os.path.join(SKY_DATA_PATH, f"fhd_{fname}.sav")
+@pytest.mark.parametrize("fname", ["catalog", "source_array"])
+def test_fhd_catalog_reader(fname):
+    catfile = os.path.join(SKY_DATA_PATH, f"fhd_{fname}.sav")
 
-        if fname == "catalog":
-            with uvtest.check_warnings(
-                UserWarning, match="Source IDs are not unique. Defining unique IDs."
-            ):
-                skyobj = SkyModel.from_fhd_catalog(catfile, expand_extended=False)
-        else:
+    if fname == "catalog":
+        with uvtest.check_warnings(
+            UserWarning, match="Source IDs are not unique. Defining unique IDs."
+        ):
             skyobj = SkyModel.from_fhd_catalog(catfile, expand_extended=False)
+    else:
+        skyobj = SkyModel.from_fhd_catalog(catfile, expand_extended=False)
 
-        assert skyobj.filename == [f"fhd_{fname}.sav"]
-        catalog = scipy.io.readsav(catfile)[fname]
-        assert skyobj.Ncomponents == len(catalog)
+    assert skyobj.filename == [f"fhd_{fname}.sav"]
+    catalog = scipy.io.readsav(catfile)[fname]
+    assert skyobj.Ncomponents == len(catalog)
 
     assert np.all(skyobj.reference_frequency > 50 * units.MHz)
 
@@ -3042,6 +3042,19 @@ def test_fhd_catalog_reader_labeling_extended_sources():
         assert skyobj.name[comp] == expected_name[comp]
 
 
+def test_fhd_catalog_reader_errors():
+    catfile = os.path.join(SKY_DATA_PATH, "fhd_catalog_bad.sav")
+
+    with pytest.raises(
+        KeyError,
+        match=re.escape(
+            f"File {catfile} does not contain a known catalog name. "
+            "File variables include ['src_arr']"
+        ),
+    ):
+        SkyModel.from_fhd_catalog(catfile)
+
+
 def test_point_catalog_reader():
     catfile = os.path.join(SKY_DATA_PATH, "pointsource_catalog.txt")
     skyobj = SkyModel.from_file(catfile)