Add a check on afeindx when updating parameters, and add zmet and afeindx to tests of the parameter checking.

Author: bd-j

src/fsps/fsps.py

@@ -1409,18 +1409,21 @@ def check_params(self):
         NZ = driver.get_nz()
         assert self._params["zmet"] in range(
             1, NZ + 1
-        ), "zmet={0} out of range [1, {1}]".format(self._params["zmet"], NZ)
+        ), f"zmet={self._params['zmet']} out of range [1, {NZ}]"
+        NAFE = driver.get_nafe()
+        assert self._params["afeindx"] in range(
+            1, NAFE + 1
+        ), f"afeindx={self._params['afeindx']} out of range [1, {NAFE}]"
         assert self._params["dust_type"] in range(
             7
-        ), "dust_type={0} out of range [0, 6]".format(self._params["dust_type"])
+        ), f"dust_type={self._params['dust_type']} out of range [0, 6]"
         assert self._params["imf_type"] in range(
             6
-        ), "imf_type={0} out of range [0, 5]".format(self._params["imf_type"])
+        ), f"imf_type={self._params['imf_type']} out of range [0, 5]"
         assert (self._params["tage"] <= 0) | (
             self._params["tage"] > self._params["sf_start"]
-        ), "sf_start={0} is greater than tage={1}".format(
-            self._params["sf_start"], self._params["tage"]
-        )
+        ), (f"sf_start={self._params['sf_start']} is greater than "
+            f"tage={self._params['tage']}")
         assert (
             self._params["const"] + self._params["fburst"]
         ) <= 1, "const + fburst > 1"

tests/tests.py

@@ -91,6 +91,18 @@ def test_param_checks(pop_and_params):
     pop.params["sf_start"] = 0.1
     w, s = pop.get_spectrum(tage=pop.params["tage"])
 
+    pop.params["zmet"] = 100
+    with pytest.raises(AssertionError):
+        w, s = pop.get_spectrum(tage=pop.params["tage"])
+    pop.params["zmet"] = 1
+    w, s = pop.get_spectrum(tage=pop.params["tage"])
+
+    pop.params["afeindx"] = pop.n_afe + 1
+    with pytest.raises(AssertionError):
+        w, s = pop.get_spectrum(tage=pop.params["tage"])
+    pop.params["afeindx"] = 1
+    w, s = pop.get_spectrum(tage=pop.params["tage"])
+
 
 def test_smooth_lsf(pop_and_params):
     # recomputes SSPs