From 4b176d48f5b78145ae985c735b81afedd6c6ddc7 Mon Sep 17 00:00:00 2001
From: Giacomo Galloni <giacomo.galloni@unife.it>
Date: Thu, 8 Aug 2024 19:01:26 +0200
Subject: [PATCH] Decouple again calibration parameters

---
 mflike/EE.yaml              | 2 ++
 mflike/TE.yaml              | 2 ++
 mflike/TT.yaml              | 2 ++
 mflike/TTTEEE.yaml          | 2 ++
 mflike/_MFLike.yaml         | 1 -
 mflike/tests/test_mflike.py | 3 +++
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mflike/EE.yaml b/mflike/EE.yaml
index b1b1f35..9e1683e 100644
--- a/mflike/EE.yaml
+++ b/mflike/EE.yaml
@@ -7,4 +7,6 @@ defaults:
   scales:
     EE: [30, 9000]
 
+params: !defaults [calib_common, calib_E, params_common, params_TT, params_TE, params_EE]
+
 supported_params: !defaults [calib_common, calib_E, params_common, params_EE]
\ No newline at end of file
diff --git a/mflike/TE.yaml b/mflike/TE.yaml
index 47736ef..37ca6ea 100644
--- a/mflike/TE.yaml
+++ b/mflike/TE.yaml
@@ -11,4 +11,6 @@ defaults:
   # instead of TE and ET separately.
   symmetrize: false
 
+params: !defaults [calib_common, calib_T, calib_E, params_common, params_TT, params_TE, params_EE]
+
 supported_params: !defaults [calib_common, calib_T, calib_E, params_common, params_TE]
\ No newline at end of file
diff --git a/mflike/TT.yaml b/mflike/TT.yaml
index bfe9519..1e09709 100644
--- a/mflike/TT.yaml
+++ b/mflike/TT.yaml
@@ -7,4 +7,6 @@ defaults:
   scales:
     TT: [30, 9000]
 
+params: !defaults [calib_common, calib_T, params_common, params_TT, params_TE, params_EE]
+
 supported_params: !defaults [calib_common, calib_T, params_common, params_TT]
diff --git a/mflike/TTTEEE.yaml b/mflike/TTTEEE.yaml
index e0dca5f..579f299 100644
--- a/mflike/TTTEEE.yaml
+++ b/mflike/TTTEEE.yaml
@@ -13,4 +13,6 @@ defaults:
   # instead of TE and ET separately.
   symmetrize: false
 
+params: !defaults [calib_common, calib_T, calib_E, params_common, params_TT, params_TE, params_EE]
+
 supported_params: !defaults [calib_common, calib_T, calib_E, params_common, params_TT, params_TE, params_EE]
\ No newline at end of file
diff --git a/mflike/_MFLike.yaml b/mflike/_MFLike.yaml
index 18b8e25..8f1e848 100644
--- a/mflike/_MFLike.yaml
+++ b/mflike/_MFLike.yaml
@@ -45,4 +45,3 @@ data:
 systematics_template:
 #  rootname: "test_template"
 
-params: !defaults [calib_common, calib_T, calib_E, params_common, params_TT, params_TE, params_EE]
diff --git a/mflike/tests/test_mflike.py b/mflike/tests/test_mflike.py
index 3ed74ec..c9d2794 100644
--- a/mflike/tests/test_mflike.py
+++ b/mflike/tests/test_mflike.py
@@ -120,6 +120,7 @@ def test_mflike(self):
 
     def test_cobaya_TT(self):
         nuis_params = common_nuis_params | TT_nuis_params | TE_nuis_params | EE_nuis_params
+        nuis_params = {k: v for k, v in nuis_params.items() if "calE" not in k}
         info = {
             "likelihood": {
                 "mflike.TT": {
@@ -160,6 +161,7 @@ def test_cobaya_TE(self):
 
     def test_cobaya_EE(self):
         nuis_params = common_nuis_params | TT_nuis_params | TE_nuis_params | EE_nuis_params
+        nuis_params = {k: v for k, v in nuis_params.items() if "calT" not in k}
         info = {
             "likelihood": {
                 "mflike.EE": {
@@ -171,6 +173,7 @@ def test_cobaya_EE(self):
                        "mflike.BandpowerForeground": {}},
             "params": cosmo_params | nuis_params,
             "packages_path": packages_path,
+            "debug": True,
         }
 
         model = get_model(info)