Skip to content

Tng correctunits #115

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
alexalar merged 11 commits into from
May 6, 2026
Merged

Tng correctunits #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d81d301
Dividng MAHs in TNG by little h, since the units were incorrectly int…
alexalar Mar 19, 2026
b3f6748
Fitting import errors in diffstarpop scripts
alexalar Mar 19, 2026
3ed77dc
Updating diffstarpo scripts to use diffstar flatenned nametuple and m…
alexalar Mar 19, 2026
8871e7d
fixing shape of ms and q params to match past behaviour
alexalar Mar 19, 2026
312c82c
fixing shape of ms and q params to match past behaviour
alexalar Mar 19, 2026
63dc916
updating tng diffstarfits params after using the correct units for MAHS
alexalar Mar 19, 2026
fd95f32
Updating smdpl and galacticus diffstarpop scripts that create the dif…
alexalar Mar 20, 2026
957ed8e
fixing import typo in diffstarpop fitting script
alexalar Mar 20, 2026
c1a6b0e
Adding script that calculates diffstar quality fits hdf5 files.
alexalar Mar 20, 2026
d599d35
Fixing calculate_quality_diffstar_fits_mgash for the new diffstar par…
alexalar Mar 20, 2026
e583038
Updating TNG diffstarpopfits values after fitting to the corrected un…
alexalar May 4, 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/data_loaders/load_smah_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ def load_tng_data(data_drn=BEBOP):
log_smahs = np.log10(mstarh)

log_mahs = halos["mpeakh"]
log_mahs = log_mahs - np.log10(H_TNG)
log_mahs = np.maximum.accumulate(log_mahs, axis=1)
logmp0 = log_mahs[:, -1]

Expand Down
130 changes: 65 additions & 65 deletions diffstar/diffstarpop/kernels/params/params_diffstarfits_mgash_tng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,74 +9,74 @@

SFH_PDF_QUENCH_MU_PDICT = OrderedDict(
[
("mean_ulgm_mseq_xtp", 11.300),
("mean_ulgm_mseq_ytp", 11.300),
("mean_ulgm_mseq_lo", 1.296),
("mean_ulgm_mseq_hi", 0.336),
("mean_ulgy_mseq_xtp", 13.509),
("mean_ulgy_mseq_ytp", -9.297),
("mean_ulgy_mseq_lo", 0.543),
("mean_ulgy_mseq_hi", 0.247),
("mean_ul_mseq_int", -0.358),
("mean_ul_mseq_slp", 1.187),
("mean_uh_mseq_int", -0.807),
("mean_uh_mseq_slp", 0.066),
("mean_ulgm_qseq_xtp", 12.622),
("mean_ulgm_qseq_ytp", 11.767),
("mean_ulgm_qseq_lo", 0.289),
("mean_ulgm_qseq_hi", 0.297),
("mean_ulgy_qseq_xtp", 12.334),
("mean_ulgy_qseq_ytp", -9.655),
("mean_ulgy_qseq_lo", 0.572),
("mean_ulgy_qseq_hi", 0.388),
("mean_ul_qseq_int", -0.354),
("mean_ul_qseq_slp", 1.694),
("mean_uh_qseq_int", -0.924),
("mean_uh_qseq_slp", -0.869),
("mean_uqt_xtp", 13.226),
("mean_uqt_ytp", 0.929),
("mean_ulgm_mseq_xtp", 11.738),
("mean_ulgm_mseq_ytp", 11.530),
("mean_ulgm_mseq_lo", 1.144),
("mean_ulgm_mseq_hi", 0.321),
("mean_ulgy_mseq_xtp", 13.700),
("mean_ulgy_mseq_ytp", -9.450),
("mean_ulgy_mseq_lo", 0.514),
("mean_ulgy_mseq_hi", -0.689),
("mean_ul_mseq_int", -0.413),
("mean_ul_mseq_slp", 0.872),
("mean_uh_mseq_int", -1.221),
("mean_uh_mseq_slp", -0.443),
("mean_ulgm_qseq_xtp", 11.300),
("mean_ulgm_qseq_ytp", 11.362),
("mean_ulgm_qseq_lo", 1.505),
("mean_ulgm_qseq_hi", 0.340),
("mean_ulgy_qseq_xtp", 12.335),
("mean_ulgy_qseq_ytp", -9.903),
("mean_ulgy_qseq_lo", 0.533),
("mean_ulgy_qseq_hi", 0.400),
("mean_ul_qseq_int", -0.629),
("mean_ul_qseq_slp", 1.597),
("mean_uh_qseq_int", -0.877),
("mean_uh_qseq_slp", -1.015),
("mean_uqt_xtp", 12.141),
("mean_uqt_ytp", 1.035),
("mean_uqt_lo", -0.100),
("mean_uqt_hi", -0.100),
("mean_uqs_int", 0.144),
("mean_uqs_slp", -0.081),
("mean_udrop_int", -2.026),
("mean_udrop_slp", 0.543),
("mean_urej_int", -0.932),
("mean_urej_slp", 0.409),
("mean_uqs_int", 0.136),
("mean_uqs_slp", -0.008),
("mean_udrop_int", -2.077),
("mean_udrop_slp", 0.489),
("mean_urej_int", -1.012),
("mean_urej_slp", 0.420),
]
)

SFH_PDF_QUENCH_COV_MS_BLOCK_PDICT = OrderedDict(
[
("std_ulgm_mseq_int", 0.379),
("std_ulgm_mseq_slp", 0.025),
("std_ulgy_mseq_int", 0.283),
("std_ulgy_mseq_slp", 0.007),
("std_ul_mseq_int", 1.665),
("std_ul_mseq_slp", 0.337),
("std_uh_mseq_int", 1.588),
("std_uh_mseq_slp", -0.254),
("std_ulgm_qseq_int", 0.362),
("std_ulgm_qseq_slp", 0.001),
("std_ulgy_qseq_int", 0.274),
("std_ulgy_qseq_slp", -0.008),
("std_ul_qseq_int", 1.766),
("std_ul_qseq_slp", -0.476),
("std_uh_qseq_int", 1.306),
("std_uh_qseq_slp", -0.208),
("std_ulgm_mseq_int", 0.383),
("std_ulgm_mseq_slp", 0.053),
("std_ulgy_mseq_int", 0.276),
("std_ulgy_mseq_slp", -0.005),
("std_ul_mseq_int", 1.677),
("std_ul_mseq_slp", 0.017),
("std_uh_mseq_int", 1.673),
("std_uh_mseq_slp", -0.196),
("std_ulgm_qseq_int", 0.378),
("std_ulgm_qseq_slp", -0.091),
("std_ulgy_qseq_int", 0.281),
("std_ulgy_qseq_slp", -0.024),
("std_ul_qseq_int", 1.832),
("std_ul_qseq_slp", -0.537),
("std_uh_qseq_int", 1.448),
("std_uh_qseq_slp", -0.102),
]
)

SFH_PDF_QUENCH_COV_Q_BLOCK_PDICT = OrderedDict(
[
("std_uqt_int", 0.131),
("std_uqt_slp", 0.071),
("std_uqs_int", 0.590),
("std_uqs_slp", 0.184),
("std_udrop_int", 0.784),
("std_udrop_slp", -0.065),
("std_urej_int", 1.221),
("std_urej_slp", -0.111),
("std_uqt_int", 0.129),
("std_uqt_slp", 0.069),
("std_uqs_int", 0.560),
("std_uqs_slp", 0.175),
("std_udrop_int", 0.765),
("std_udrop_slp", 0.018),
("std_urej_int", 1.222),
("std_urej_slp", -0.118),
]
)

Expand All @@ -85,28 +85,28 @@
("frac_quench_cen_x0_tpeak", 7.000),
("frac_quench_cen_k_tpeak", 2.000),
("frac_quench_cen_x0_ylotpeak", 11.100),
("frac_quench_cen_x0_yhitpeak", 12.813),
("frac_quench_cen_x0_yhitpeak", 12.914),
("frac_quench_cen_ylo_ylotpeak", 0.990),
("frac_quench_cen_ylo_yhitpeak", 0.196),
("frac_quench_cen_ylo_yhitpeak", 0.185),
("frac_quench_cen_k", 3.848),
("frac_quench_cen_yhi", 0.971),
("frac_quench_sat_x0_tpeak", 7.000),
("frac_quench_sat_k_tpeak", 2.000),
("frac_quench_sat_x0_ylotpeak", 11.100),
("frac_quench_sat_x0_yhitpeak", 12.813),
("frac_quench_sat_x0_yhitpeak", 12.914),
("frac_quench_sat_ylo_ylotpeak", 0.990),
("frac_quench_sat_ylo_yhitpeak", 0.196),
("frac_quench_sat_ylo_yhitpeak", 0.185),
("frac_quench_sat_k", 3.848),
("frac_quench_sat_yhi", 0.971),
]
)
DELTA_UQT_PDICT = OrderedDict(
[
("delta_uqt_x0", 3.309),
("delta_uqt_k", 4.719),
("delta_uqt_ylo", -0.308),
("delta_uqt_yhi", 0.029),
("delta_uqt_slope", 0.009),
("delta_uqt_x0", 3.364),
("delta_uqt_k", 4.982),
("delta_uqt_ylo", -0.295),
("delta_uqt_yhi", 0.026),
("delta_uqt_slope", -0.003),
]
)
SFH_PDF_QUENCH_PDICT = SFH_PDF_FRAC_QUENCH_PDICT.copy()
Expand Down
151 changes: 74 additions & 77 deletions diffstar/diffstarpop/kernels/params/params_diffstarpopfits_mgash_tng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,113 +1,110 @@
from collections import OrderedDict, namedtuple

from ..defaults_mgash import (
DiffstarPopParams,
get_unbounded_diffstarpop_params,
)
from ..defaults_mgash import DiffstarPopParams, get_unbounded_diffstarpop_params

from ..satquenchpop_model import DEFAULT_SATQUENCHPOP_PARAMS

SFH_PDF_QUENCH_MU_PDICT = OrderedDict(
[
("mean_ulgm_mseq_xtp", 11.934),
("mean_ulgm_mseq_ytp", 11.392),
("mean_ulgm_mseq_lo", 0.654),
("mean_ulgm_mseq_hi", 0.409),
("mean_ulgy_mseq_xtp", 12.716),
("mean_ulgy_mseq_ytp", -9.372),
("mean_ulgy_mseq_lo", 0.691),
("mean_ulgy_mseq_hi", 0.999),
("mean_ul_mseq_int", 0.350),
("mean_ul_mseq_slp", 2.462),
("mean_uh_mseq_int", -2.144),
("mean_uh_mseq_slp", -0.700),
("mean_ulgm_qseq_xtp", 13.590),
("mean_ulgm_qseq_ytp", 11.911),
("mean_ulgm_qseq_lo", 0.218),
("mean_ulgm_qseq_hi", 0.294),
("mean_ulgy_qseq_xtp", 12.038),
("mean_ulgy_qseq_ytp", -9.768),
("mean_ulgy_qseq_lo", 1.350),
("mean_ulgy_qseq_hi", 0.597),
("mean_ul_qseq_int", -1.536),
("mean_ul_qseq_slp", -0.132),
("mean_uh_qseq_int", -1.129),
("mean_uh_qseq_slp", -0.216),
("mean_uqt_xtp", 13.551),
("mean_uqt_ytp", 0.698),
("mean_uqt_lo", -0.332),
("mean_uqt_hi", -0.018),
("mean_uqs_int", 1.324),
("mean_uqs_slp", 0.301),
("mean_udrop_int", -2.997),
("mean_udrop_slp", 1.093),
("mean_urej_int", -9.199),
("mean_urej_slp", -0.854),
("mean_ulgm_mseq_xtp", 12.449),
("mean_ulgm_mseq_ytp", 11.897),
("mean_ulgm_mseq_lo", 0.992),
("mean_ulgm_mseq_hi", 0.039),
("mean_ulgy_mseq_xtp", 13.459),
("mean_ulgy_mseq_ytp", -8.471),
("mean_ulgy_mseq_lo", 1.249),
("mean_ulgy_mseq_hi", 0.465),
("mean_ul_mseq_int", -0.714),
("mean_ul_mseq_slp", 3.270),
("mean_uh_mseq_int", -4.088),
("mean_uh_mseq_slp", -4.347),
("mean_ulgm_qseq_xtp", 11.073),
("mean_ulgm_qseq_ytp", 11.002),
("mean_ulgm_qseq_lo", 3.635),
("mean_ulgm_qseq_hi", 0.551),
("mean_ulgy_qseq_xtp", 12.971),
("mean_ulgy_qseq_ytp", -9.536),
("mean_ulgy_qseq_lo", 0.638),
("mean_ulgy_qseq_hi", 0.266),
("mean_ul_qseq_int", -2.147),
("mean_ul_qseq_slp", -1.249),
("mean_uh_qseq_int", -1.392),
("mean_uh_qseq_slp", -0.790),
("mean_uqt_xtp", 12.107),
("mean_uqt_ytp", 1.084),
("mean_uqt_lo", -0.057),
("mean_uqt_hi", -0.519),
("mean_uqs_int", -0.019),
("mean_uqs_slp", -0.231),
("mean_udrop_int", -2.999),
("mean_udrop_slp", 2.113),
("mean_urej_int", -8.730),
("mean_urej_slp", -0.280),
]
)

SFH_PDF_QUENCH_COV_MS_BLOCK_PDICT = OrderedDict(
[
("std_ulgm_mseq_int", 0.011),
("std_ulgm_mseq_slp", 0.001),
("std_ulgm_mseq_slp", 0.049),
("std_ulgy_mseq_int", 0.011),
("std_ulgy_mseq_slp", -0.184),
("std_ul_mseq_int", 0.085),
("std_ul_mseq_slp", 0.994),
("std_uh_mseq_int", 0.103),
("std_ulgy_mseq_slp", -0.123),
("std_ul_mseq_int", 0.768),
("std_ul_mseq_slp", 0.997),
("std_uh_mseq_int", 0.457),
("std_uh_mseq_slp", -0.999),
("std_ulgm_qseq_int", 0.011),
("std_ulgm_qseq_slp", -0.175),
("std_ulgy_qseq_int", 0.011),
("std_ulgy_qseq_slp", -0.122),
("std_ul_qseq_int", 0.014),
("std_ul_qseq_slp", -0.002),
("std_uh_qseq_int", 0.575),
("std_uh_qseq_slp", -0.469),
("std_ulgm_qseq_int", 0.108),
("std_ulgm_qseq_slp", -0.149),
("std_ulgy_qseq_int", 0.071),
("std_ulgy_qseq_slp", -0.077),
("std_ul_qseq_int", 0.392),
("std_ul_qseq_slp", -0.681),
("std_uh_qseq_int", 0.013),
("std_uh_qseq_slp", 0.432),
]
)

SFH_PDF_QUENCH_COV_Q_BLOCK_PDICT = OrderedDict(
[
("std_uqt_int", 0.073),
("std_uqt_slp", -0.009),
("std_uqs_int", 0.042),
("std_uqs_slp", -0.035),
("std_udrop_int", 0.011),
("std_udrop_slp", 0.753),
("std_urej_int", 0.127),
("std_urej_slp", -0.063),
("std_uqt_int", 0.028),
("std_uqt_slp", -0.013),
("std_uqs_int", 0.075),
("std_uqs_slp", -0.038),
("std_udrop_int", 0.463),
("std_udrop_slp", -0.824),
("std_urej_int", 0.131),
("std_urej_slp", 0.013),
]
)

SFH_PDF_FRAC_QUENCH_PDICT = OrderedDict(
[
("frac_quench_cen_x0_tpeak", 13.615),
("frac_quench_cen_k_tpeak", 9.240),
("frac_quench_cen_x0_ylotpeak", 13.966),
("frac_quench_cen_x0_yhitpeak", 11.541),
("frac_quench_cen_ylo_ylotpeak", 0.041),
("frac_quench_cen_ylo_yhitpeak", 0.737),
("frac_quench_cen_k", 4.995),
("frac_quench_cen_x0_tpeak", 13.080),
("frac_quench_cen_k_tpeak", 9.936),
("frac_quench_cen_x0_ylotpeak", 12.066),
("frac_quench_cen_x0_yhitpeak", 12.401),
("frac_quench_cen_ylo_ylotpeak", 0.999),
("frac_quench_cen_ylo_yhitpeak", 0.001),
("frac_quench_cen_k", 4.999),
("frac_quench_cen_yhi", 0.999),
("frac_quench_sat_x0_tpeak", 11.905),
("frac_quench_sat_k_tpeak", 4.158),
("frac_quench_sat_x0_ylotpeak", 12.469),
("frac_quench_sat_x0_yhitpeak", 12.456),
("frac_quench_sat_x0_tpeak", 9.388),
("frac_quench_sat_k_tpeak", 9.848),
("frac_quench_sat_x0_ylotpeak", 13.025),
("frac_quench_sat_x0_yhitpeak", 12.397),
("frac_quench_sat_ylo_ylotpeak", 0.999),
("frac_quench_sat_ylo_yhitpeak", 0.001),
("frac_quench_sat_k", 4.995),
("frac_quench_sat_yhi", 0.999),
("frac_quench_sat_k", 4.999),
("frac_quench_sat_yhi", 0.848),
]
)

DELTA_UQT_PDICT = OrderedDict(
[
("delta_uqt_x0", 2.532),
("delta_uqt_k", 0.454),
("delta_uqt_ylo", -0.977),
("delta_uqt_yhi", -0.002),
("delta_uqt_slope", -0.030),
("delta_uqt_x0", 4.191),
("delta_uqt_k", 0.577),
("delta_uqt_ylo", -0.496),
("delta_uqt_yhi", 0.094),
("delta_uqt_slope", -0.048),
]
)
SFH_PDF_QUENCH_PDICT = SFH_PDF_FRAC_QUENCH_PDICT.copy()
Expand Down
Loading
Loading