Skip to content
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

Jump to bottom

Add description for Hillipop/Lollipop likelihoods #385

Merged
merged 5 commits into from
Oct 8, 2024
Merged

Add description for Hillipop/Lollipop likelihoods #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e440254
Add description for Hillipop/Lollipop likelihoods
mtristram Oct 8, 2024
a0785e3
correct trailing whitespace
mtristram Oct 8, 2024
5caa048
Update tests
mtristram Oct 8, 2024
3c12431
Put below the CamSpec NPIPE
mtristram Oct 8, 2024
ab1773a
Also below CamSpec for the gui
mtristram Oct 8, 2024
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
42 changes: 33 additions & 9 deletions cobaya/cosmo_input/input_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@

like_cmb: InfoDict = {
none: {},
"planck_NPIPE": {
"desc": "Planck NPIPE (native; polarized NPIPE CMB + lensing)",
"planck_NPIPE_CamSpec": {
"desc": "Planck NPIPE CamSpec (native; polarized NPIPE CMB + lensing)",
"sampler": cmb_sampler_recommended,
"theory": {theo: {"extra_args": cmb_precision[theo]}
for theo in ["camb", "classy"]},
Expand All @@ -427,6 +427,22 @@
"planckpr4lensing":
{'package_install': {'github_repository': 'carronj/planck_PR4_lensing',
'min_version': '1.0.2'}}}},
"planck_NPIPE_Hillipop": {
"desc": "Planck NPIPE Hillipop+Lollipop (polarized NPIPE CMB + lensing)",
"sampler": cmb_sampler_recommended,
"theory": {theo: {"extra_args": cmb_precision[theo]}
for theo in ["camb", "classy"]},
"likelihood": {
"planck_2018_lowl.TT": None,
"planck_2020_lollipop.lowlE":
{'package_install': {'pip': 'planck-npipe/lollipop',
'min_version': '4.1.1'}},
"planck_2020_hillipop.TTTEEE":
{'package_install': {'pip': 'planck-npipe/hillipop',
'min_version': '4.2.2'}},
"planckpr4lensing":
{'package_install': {'github_repository': 'carronj/planck_PR4_lensing',
'min_version': '1.0.2'}}}},
"planck_2018": {
"desc": "Planck 2018 (Polarized CMB + lensing)",
"sampler": cmb_sampler_recommended,
Expand Down Expand Up @@ -610,14 +626,22 @@
preset: InfoDict = dict([
(none, {"desc": "(No preset chosen)"}),
# Pure CMB #######################################################
("planck_NPIPE_camb", {
"desc": "Planck NPIPE with CAMB (all native Python)",
("planck_NPIPE_CamSpec_camb", {
"desc": "Planck NPIPE CamSpec with CAMB (all native Python)",
"theory": "camb",
"like_cmb": "planck_NPIPE_CamSpec"}),
("planck_NPIPE_CamSpec_classy", {
"desc": "Planck NPIPE CamSpec with CLASS (all native Python)",
"theory": "classy",
"like_cmb": "planck_NPIPE_CamSpec"}),
("planck_NPIPE_Hillipop_camb", {
"desc": "Planck NPIPE Hillipop+Lollipop with CAMB (all native Python)",
"theory": "camb",
"like_cmb": "planck_NPIPE"}),
("planck_NPIPE_classy", {
"desc": "Planck NPIPE with CLASS (all native Python)",
"like_cmb": "planck_NPIPE_Hillipop"}),
("planck_NPIPE_Hillipop_classy", {
"desc": "Planck NPIPE Hillipop+Lollipop with CLASS (all native Python)",
"theory": "classy",
"like_cmb": "planck_NPIPE"}),
"like_cmb": "planck_NPIPE_Hillipop"}),
("planck_2018_camb", {
"desc": "Planck 2018 with CAMB",
"theory": "camb",
Expand Down Expand Up @@ -745,7 +769,7 @@
# BASIC INSTALLATION #####################################################################
install_basic: InfoDict = {
"theory": theory,
"likelihood": dict(like_cmb["planck_NPIPE"]["likelihood"], **{
"likelihood": dict(like_cmb["planck_NPIPE_CamSpec"]["likelihood"], **{
# 2018 lensing ensured covmat database also installed
"planck_2018_lensing.native": None,
"sn.pantheon": None,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cosmo_docs_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

path = os.path.join(docs_folder, "src_examples", "cosmo_basic")
file_pre = "basic_"
preset_pre = "planck_NPIPE_"
preset_pre = "planck_NPIPE_CamSpec_"


def test_cosmo_docs_basic():
Expand Down
Loading