Skip to content

Commit

Permalink
Updated tests to parameter_prefix instead of sacc_tracer.
Browse files Browse the repository at this point in the history
  • Loading branch information
vitenti committed Sep 20, 2023
1 parent 8e83525 commit c6772cf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions firecrown/likelihood/likelihood.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class Likelihood(Updatable):
these methods, and provide other abstract methods for their subclasses to implement.
"""

def __init__(self) -> None:
def __init__(self, parameter_prefix: Optional[str] = None) -> None:
"""Default initialization for a base Likelihood object."""
super().__init__()
super().__init__(parameter_prefix=parameter_prefix)

self.predicted_data_vector: Optional[npt.NDArray[np.double]] = None
self.measured_data_vector: Optional[npt.NDArray[np.double]] = None
Expand Down
4 changes: 2 additions & 2 deletions tests/connector/cobaya/test_model_likelihood.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def test_sampler_parameter_likelihood_missing(fiducial_params):
"lk_connector": {
"external": LikelihoodConnector,
"firecrownIni": "tests/likelihood/lkdir/lk_sampler_parameter.py",
"build_parameters": NamedParameters({"sacc_tracer": "my_prefix"}),
"build_parameters": NamedParameters({"parameter_prefix": "my_prefix"}),
}
},
"theory": {
Expand All @@ -235,7 +235,7 @@ def test_sampler_parameter_likelihood(fiducial_params):
"lk_connector": {
"external": LikelihoodConnector,
"firecrownIni": "tests/likelihood/lkdir/lk_sampler_parameter.py",
"build_parameters": NamedParameters({"sacc_tracer": "my_prefix"}),
"build_parameters": NamedParameters({"parameter_prefix": "my_prefix"}),
}
},
"theory": {
Expand Down
2 changes: 1 addition & 1 deletion tests/likelihood/lkdir/lk_sampler_parameter.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""
Provides a trivial likelihood factory function for testing purposes.
The likelihood created requires a string parameter named "sacc_tracer"
The likelihood created requires a string parameter named "parameter_prefix"
and has a sampler parameter named "sampler_param0".
"""
from firecrown.likelihood.likelihood import NamedParameters
Expand Down
5 changes: 2 additions & 3 deletions tests/likelihood/lkdir/lkmodule.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ class SamplerParameterLikelihood(Likelihood):

def __init__(self, params: NamedParameters):
"""Initialize the SamplerParameterLikelihood by reading the specificed
sacc_tracer value and creates a sampler parameter called "sampler_param0".
parameter_prefix value and creates a sampler parameter called "sampler_param0".
"""
super().__init__()
self.sacc_tracer = params.get_string("sacc_tracer")
super().__init__(parameter_prefix=params.get_string("parameter_prefix"))
self.sampler_param0 = parameters.create()

def read(self, sacc_data: sacc.Sacc) -> None:
Expand Down

0 comments on commit c6772cf

Please sign in to comment.