renames/tidy

mflike/EE.yaml

@@ -8,4 +8,4 @@ defaults:
   scales:
     EE: [ 30, 9000 ]
 
-params: !defaults [ calib_common, calib_E ]
+params: !defaults [ mflike_common, calib_E ]

mflike/TE.yaml

@@ -12,4 +12,4 @@ defaults:
   # instead of TE and ET separately.
   symmetrize: false
 
-params: !defaults [ calib_common, calib_T, calib_E ]
+params: !defaults [ mflike_common, calib_T, calib_E ]

mflike/TT.yaml

@@ -1,12 +1,12 @@
 # Specify default set of spectra and scale cuts
 # to be used
-requested_cls: [ "tt", "te", "ee" ]
+requested_cls: [ "tt" ]
 defaults:
   # Which spectra?
   polarizations: [ TT ]
   # Scale cuts (in ell) for each spectrum
   scales:
     TT: [ 30, 9000 ]
 
-params: !defaults [ calib_common, calib_T ]
+params: !defaults [ mflike_common, calib_T ]
 

mflike/TTTEEE.yaml

@@ -14,4 +14,4 @@ defaults:
   # instead of TE and ET separately.
   symmetrize: false
 
-params: !defaults [ calib_common, calib_T, calib_E ]
+params: !defaults [ mflike_common, calib_T, calib_E ]

mflike/foreground.py

@@ -39,10 +39,9 @@
 """
 
 import os
-
 import numpy as np
 from cobaya.log import LoggedError
-from cobaya.theory import Provider, Theory
+from cobaya.theory import Theory
 from cobaya.yaml import yaml_load
 from scipy import constants
 
@@ -81,13 +80,14 @@ class ForegroundParamsTheory(Theory):
 
     @classmethod
     def get_class_options(cls, input_options={}):
+
         options = super().get_class_options().copy()
         if cls is ForegroundParamsTheory and (
                 param_requested_cls := input_options.get('requested_cls', ['tt', 'te', 'ee'])) \
                 or ('requested_cls' not in input_options and (param_requested_cls := options.get('requested_cls'))):
-            params = yaml_load(cls.get_text_file_content('params_common.yaml'))
+            params = yaml_load(cls.get_text_file_content('fg_common.yaml'))
             for spec in param_requested_cls:
-                params |= yaml_load(cls.get_text_file_content('params_%s.yaml' % spec.upper()))
+                params |= yaml_load(cls.get_text_file_content('fg_%s.yaml' % spec.upper()))
             options["params"] = params
         return options
 

mflike/mflike.py

@@ -94,23 +94,6 @@ def initialize(self):
         # Read data
         self._prepare_data()
 
-        # Setting mode given likelihood name
-        likelihood_name = self.__class__.__name__
-        self.mode = likelihood_name.replace("MFLike_", "").lower()
-        if self.mode not in ["tt", "te", "ee", "ttteee"]:
-            raise LoggedError(
-                self.log,
-                f"This likelihood mode ({self.mode}) is not supported."
-            )
-
-        # State requisites to the theory code
-        requested_cls = {
-            "tt": ["tt"],
-            "te": ["te"],
-            "ee": ["ee"],
-            "ttteee": ["tt", "te", "ee"],
-        }
-        self.requested_cls = requested_cls[self.mode]
         self.lmax_theory = self.lmax_theory or 9000
         self.log.debug(f"Maximum multipole value: {self.lmax_theory}")