Skip to content

Commit df21444

Browse files
committed
update config
1 parent e86a036 commit df21444

3 files changed

Lines changed: 42 additions & 9 deletions

File tree

scripts/config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ epoch:
1515
feniks_n_centroids: 500
1616

1717
num_halos: 300
18+
19+
defaults:
20+
diffstarpop: False
21+
spspop: False
22+
ssperr: False
23+
merging: False

scripts/config_diagnostics.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ ssp_file: /Users/kumail/diffdir/ssp_data/ssp_w_emlines/fsps_v0.4.7_mist_c3k_a_kr
99

1010
plots:
1111
num_halos : 1000
12-
plot_colors_mags: True
13-
plot_mags: True
14-
plot_ssperr: True
15-
plot_massive_cen_colors: True
16-
plot_satquench: True
17-
plot_satquench_model: True
18-
plot_insitu_smhm: True
19-
plot_uvj: True
12+
plot_colors_mags: False
13+
plot_mags: False
14+
plot_ssperr: False
15+
plot_massive_cen_colors: False
16+
plot_satquench: False
17+
plot_satquench_model: False
18+
plot_insitu_smhm: False
19+
plot_uvj: False
2020
plot_exsitu_frac: True
21-
plot_avpop: True
21+
plot_avpop: False

scripts/fit_diffsky.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
import numpy as np
99
import yaml
1010
from diffsky.data_loaders.hacc_utils import lc_mock
11+
from diffsky.merging.merging_model import DEFAULT_MERGE_PARAMS
12+
from diffsky.param_utils.spspop_param_utils import DEFAULT_SPSPOP_PARAMS
13+
from diffsky.ssp_err_model.defaults import ZERO_SSPERR_PARAMS
14+
from diffstar.diffstarpop.kernels.params.params_diffstarpopfits_mgash import (
15+
DiffstarPop_Params_Diffstarpopfits_mgash,
16+
)
1117
from dsps import load_ssp_templates
1218
from dsps.data_loaders import load_emline_info as lemi
1319
from jax import random as jran
@@ -18,6 +24,10 @@
1824
from diffhtwo.experimental.latin_hypercube import lh_utils as lhu
1925
from diffhtwo.experimental.optimizers import Np_specphot_opt
2026

27+
DIFFSTARPOP_GALACTICUS_exsitu = DiffstarPop_Params_Diffstarpopfits_mgash[
28+
"galacticus_in_plus_ex_situ"
29+
]
30+
2131
if __name__ == "__main__":
2232
p = argparse.ArgumentParser()
2333
p.add_argument("--config", default="config.yaml")
@@ -52,6 +62,23 @@
5262
fit_start_drn,
5363
cfg["start_runid"] + "_" + cfg["start_fit_type"],
5464
)
65+
if cfg["defaults"]["diffstarpop"]:
66+
param_collection_fit = param_collection_fit._replace(
67+
diffstarpop_params=DIFFSTARPOP_GALACTICUS_exsitu
68+
)
69+
if cfg["defaults"]["spspop"]:
70+
param_collection_fit = param_collection_fit._replace(
71+
spspop_params=DEFAULT_SPSPOP_PARAMS
72+
)
73+
if cfg["defaults"]["ssperr"]:
74+
param_collection_fit = param_collection_fit._replace(
75+
ssperr_params=ZERO_SSPERR_PARAMS
76+
)
77+
if cfg["defaults"]["merging"]:
78+
param_collection_fit = param_collection_fit._replace(
79+
merging_params=DEFAULT_MERGE_PARAMS
80+
)
81+
5582
u_theta_fit = pu.get_u_theta_from_param_collection(param_collection_fit)
5683

5784
# fit dirs

0 commit comments

Comments
 (0)