Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/fsps/fsps.py
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ def __init__(
self._libraries = None

def _update_params(self):
self.params.check_params()
if self.params.dirtiness == 2:
driver.set_ssp_params(*[self.params[k] for k in self.params.ssp_params])
if self.params.dirtiness >= 1:
Expand Down Expand Up @@ -1334,4 +1335,3 @@ def __setitem__(self, k, v):
self.dirtiness = max(1, self.dirtiness)

self._params[k] = v
self.check_params()
31 changes: 29 additions & 2 deletions tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,32 @@ def test_libraries(pop_and_params):
assert dlib == pop.duste_library


def test_param_checks(pop_and_params):
pop, params = pop_and_params
_reset_default_params(pop, params)
pop.params["sfh"] = 1
pop.params["tage"] = 2
pop.params["sf_start"] = 0.5
# this should never raise an error:
w, s = pop.get_spectrum(tage=pop.params["tage"])
# this used to raise an assertion error in the setter:
pop.params["sf_start"] = pop.params["tage"] + 0.1
# this also used to raise an assertion error in the setter:
pop.params["imf_type"] = 8
# fix the invalid IMF but leave the invalid sf_start > tage
pop.params["imf_type"] = 1
try:
# This *should* still raise an AssertionError
w, s = pop.get_spectrum(tage=pop.params["tage"])
# Hacky way to make sure the AssertionError still got thrown
raise ValueError("Did not throw exception for invalid sf_start > tage")
except(AssertionError):
pass
pop.params["tage"] = 1.0
pop.params["sf_start"] = 0.1
w, s = pop.get_spectrum(tage=pop.params["tage"])


def test_filters():
"""Test all the filters got transmission data loaded."""
flist = filters.list_filters()
Expand All @@ -73,10 +99,11 @@ def test_filters():
def test_get_mags(pop_and_params):
"""Basic test for supplying filter names to get_mags"""
pop, params = pop_and_params
_reset_default_params(pop, params)
fuv1 = pop.get_mags(bands=["galex_fuv"])[:, 0]
mags = pop.get_mags()
fuv2 = mags[:, 61]
fuv3 = mags[:, 62]
fuv2 = mags[:, 61] # this should be galex_FUV
fuv3 = mags[:, 62] # this should *not* be galex_FUV
assert np.all(fuv1 == fuv2)
assert np.all(fuv1 != fuv3)

Expand Down