From e440254346e7344e34c6827bc89df928df0081f0 Mon Sep 17 00:00:00 2001 From: Matthieu Tristram Date: Tue, 8 Oct 2024 10:58:50 +0200 Subject: [PATCH 1/5] Add description for Hillipop/Lollipop likelihoods --- cobaya/cosmo_input/input_database.py | 42 ++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/cobaya/cosmo_input/input_database.py b/cobaya/cosmo_input/input_database.py index 601265cc..c7c5a5ae 100644 --- a/cobaya/cosmo_input/input_database.py +++ b/cobaya/cosmo_input/input_database.py @@ -415,8 +415,24 @@ like_cmb: InfoDict = { none: {}, - "planck_NPIPE": { - "desc": "Planck NPIPE (native; polarized NPIPE CMB + lensing)", + "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_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"]}, @@ -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_Hillipop_camb", { + "desc": "Planck NPIPE Hillipop+Lollipop with CAMB (all native Python)", + "theory": "camb", + "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_Hillipop"}), + ("planck_NPIPE_CamSpec_camb", { + "desc": "Planck NPIPE CamSpec 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_CamSpec"}), + ("planck_NPIPE_CamSpec_classy", { + "desc": "Planck NPIPE CamSpec with CLASS (all native Python)", "theory": "classy", - "like_cmb": "planck_NPIPE"}), + "like_cmb": "planck_NPIPE_CamSpec"}), ("planck_2018_camb", { "desc": "Planck 2018 with CAMB", "theory": "camb", @@ -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, From a0785e30b416ae8b17f4b9b0a4bd29e2c2caa188 Mon Sep 17 00:00:00 2001 From: Matthieu Tristram Date: Tue, 8 Oct 2024 11:17:39 +0200 Subject: [PATCH 2/5] correct trailing whitespace --- cobaya/cosmo_input/input_database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobaya/cosmo_input/input_database.py b/cobaya/cosmo_input/input_database.py index c7c5a5ae..62afea78 100644 --- a/cobaya/cosmo_input/input_database.py +++ b/cobaya/cosmo_input/input_database.py @@ -425,7 +425,7 @@ "planck_2020_lollipop.lowlE": {'package_install': {'pip': 'planck-npipe/lollipop', 'min_version': '4.1.1'}}, - "planck_2020_hillipop.TTTEEE": + "planck_2020_hillipop.TTTEEE": {'package_install': {'pip': 'planck-npipe/hillipop', 'min_version': '4.2.2'}}, "planckpr4lensing": From 5caa048a3a5e40824931ff9dce886612648c4fbe Mon Sep 17 00:00:00 2001 From: Matthieu Tristram Date: Tue, 8 Oct 2024 11:27:07 +0200 Subject: [PATCH 3/5] Update tests --- tests/test_cosmo_docs_basic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cosmo_docs_basic.py b/tests/test_cosmo_docs_basic.py index 88805ab6..82104e71 100644 --- a/tests/test_cosmo_docs_basic.py +++ b/tests/test_cosmo_docs_basic.py @@ -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(): From 3c12431dbc667b8555b207dfbc3df6387dcf2d88 Mon Sep 17 00:00:00 2001 From: Matthieu Tristram Date: Tue, 8 Oct 2024 11:32:11 +0200 Subject: [PATCH 4/5] Put below the CamSpec NPIPE --- cobaya/cosmo_input/input_database.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cobaya/cosmo_input/input_database.py b/cobaya/cosmo_input/input_database.py index 62afea78..8d7f0fb9 100644 --- a/cobaya/cosmo_input/input_database.py +++ b/cobaya/cosmo_input/input_database.py @@ -415,31 +415,31 @@ like_cmb: InfoDict = { none: {}, - "planck_NPIPE_Hillipop": { - "desc": "Planck NPIPE Hillipop+Lollipop (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"]}, "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'}}, + "planck_2018_lowl.EE": None, + "planck_NPIPE_highl_CamSpec.TTTEEE": None, "planckpr4lensing": {'package_install': {'github_repository': 'carronj/planck_PR4_lensing', 'min_version': '1.0.2'}}}}, - "planck_NPIPE_CamSpec": { - "desc": "Planck NPIPE CamSpec (native; polarized NPIPE CMB + lensing)", + "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_2018_lowl.EE": None, - "planck_NPIPE_highl_CamSpec.TTTEEE": 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'}}}}, From ab1773ac9486d58bcfebe4bedc73831d63be96a6 Mon Sep 17 00:00:00 2001 From: Matthieu Tristram Date: Tue, 8 Oct 2024 11:39:36 +0200 Subject: [PATCH 5/5] Also below CamSpec for the gui --- cobaya/cosmo_input/input_database.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cobaya/cosmo_input/input_database.py b/cobaya/cosmo_input/input_database.py index 8d7f0fb9..8244386a 100644 --- a/cobaya/cosmo_input/input_database.py +++ b/cobaya/cosmo_input/input_database.py @@ -626,14 +626,6 @@ preset: InfoDict = dict([ (none, {"desc": "(No preset chosen)"}), # Pure CMB ####################################################### - ("planck_NPIPE_Hillipop_camb", { - "desc": "Planck NPIPE Hillipop+Lollipop with CAMB (all native Python)", - "theory": "camb", - "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_Hillipop"}), ("planck_NPIPE_CamSpec_camb", { "desc": "Planck NPIPE CamSpec with CAMB (all native Python)", "theory": "camb", @@ -642,6 +634,14 @@ "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_Hillipop"}), + ("planck_NPIPE_Hillipop_classy", { + "desc": "Planck NPIPE Hillipop+Lollipop with CLASS (all native Python)", + "theory": "classy", + "like_cmb": "planck_NPIPE_Hillipop"}), ("planck_2018_camb", { "desc": "Planck 2018 with CAMB", "theory": "camb",