Add description for Hillipop/Lollipop likelihoods (#385)

* Add description for Hillipop/Lollipop likelihoods * correct trailing whitespace * Update tests * Put below the CamSpec NPIPE * Also below CamSpec for the gui
CobayaSampler · Oct 8, 2024 · 2907ac7 · 2907ac7
1 parent 735f7a8
commit 2907ac7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/cobaya/cosmo_input/input_database.py b/cobaya/cosmo_input/input_database.py
@@ -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"]},
@@ -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,
@@ -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",
@@ -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,

diff --git 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():