Skip to content

Add DIFFSTARPOP_PBOUNDs namedtuple. #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvillanova merged 3 commits into from
May 19, 2026
Merged

Add DIFFSTARPOP_PBOUNDs namedtuple. #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6ea38e
Add BOUNDS_DIFFSTARPOP_PARAMS namedtuple.
nvillanova May 18, 2026
c055c0d
Change bounds namedtuple name for consistency.
nvillanova May 19, 2026
44eb9d8
Add test to ensure that default values are within the bounds.
nvillanova May 19, 2026
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
1 change: 1 addition & 0 deletions diffstar/diffstarpop/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from .defaults import (
DEFAULT_DIFFSTARPOP_PARAMS,
DEFAULT_DIFFSTARPOP_U_PARAMS,
DIFFSTARPOP_PBOUNDS,
DiffstarPopParams,
DiffstarPopUParams,
)
Expand Down
1 change: 1 addition & 0 deletions diffstar/diffstarpop/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from .kernels.defaults_mgash import (
DEFAULT_DIFFSTARPOP_PARAMS,
DEFAULT_DIFFSTARPOP_U_PARAMS,
DIFFSTARPOP_PBOUNDS,
DiffstarPopParams,
DiffstarPopUParams,
)
4 changes: 4 additions & 0 deletions diffstar/diffstarpop/kernels/defaults_mgash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
from .satquenchpop_model import (
DEFAULT_SATQUENCHPOP_PARAMS,
DEFAULT_SATQUENCHPOP_U_PARAMS,
SATQUENCHPOP_PBOUNDS,
get_bounded_satquenchpop_params,
get_unbounded_satquenchpop_params,
)
from .sfh_pdf_mgash import (
SFH_PDF_QUENCH_PARAMS,
SFH_PDF_QUENCH_U_PARAMS,
SFH_PDF_QUENCH_PBOUNDS,
get_bounded_sfh_pdf_params,
get_unbounded_sfh_pdf_params,
)
Expand All @@ -25,6 +27,8 @@
*SFH_PDF_QUENCH_PARAMS, *DEFAULT_SATQUENCHPOP_PARAMS
)

DIFFSTARPOP_PBOUNDS = DiffstarPopParams(*SFH_PDF_QUENCH_PBOUNDS, *SATQUENCHPOP_PBOUNDS)

_U_PNAMES = ["u_" + key for key in DEFAULT_DIFFSTARPOP_PARAMS._fields]
DiffstarPopUParams = namedtuple("DiffstarPopUParams", _U_PNAMES)

Expand Down
12 changes: 12 additions & 0 deletions diffstar/diffstarpop/kernels/tests/test_defaults_mgash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from ..defaults_mgash import (
DEFAULT_DIFFSTARPOP_PARAMS,
DEFAULT_DIFFSTARPOP_U_PARAMS,
DIFFSTARPOP_PBOUNDS,
get_bounded_diffstarpop_params,
get_unbounded_diffstarpop_params,
)
Expand All @@ -19,3 +20,14 @@ def test_get_bounded_diffstarpop_params():

for u_p, u_p2 in zip(DEFAULT_DIFFSTARPOP_U_PARAMS, u_params):
assert np.allclose(u_p, u_p2, rtol=5e-4)


def test_default_values_within_bounds():
values = DEFAULT_DIFFSTARPOP_PARAMS._asdict()
bounds = DIFFSTARPOP_PBOUNDS._asdict()

assert len(values) == len(bounds)

for param_name, val in values.items():
low, high = bounds[param_name]
assert low <= val <= high
Loading