diff --git a/prospect/kernels/base_kernel.py b/prospect/kernels/base_kernel.py index abb8b63..059cf72 100644 --- a/prospect/kernels/base_kernel.py +++ b/prospect/kernels/base_kernel.py @@ -11,6 +11,9 @@ def __init__(self, config_kernel, task_id, output_folder=None): self.set_default_errors() self.id = task_id self.initialise(config_kernel, output_folder) + + if config_kernel.ignore_prior: + self.logprior = lambda x: 0.0 self.param = { 'varying': {}, @@ -109,7 +112,7 @@ def logprior(self, position): pass def logpost(self, position): - return self.loglkl(position)*self.logprior(position) + return self.loglkl(position) + self.logprior(position) @abstractmethod def get_default_initial_position(self): @@ -178,9 +181,15 @@ class debug(InputArgument): val_type = bool def get_default(self, config_yaml: dict[str, Any]): return False + + class ignore_prior(InputArgument): + val_type = bool + def get_default(self, config_yaml: dict[str, Any]): + return False type: type param: param conf: conf path: path debug: debug + ignore_prior: ignore_prior diff --git a/prospect/profile.py b/prospect/profile.py index e471bad..5ca6db4 100644 --- a/prospect/profile.py +++ b/prospect/profile.py @@ -360,6 +360,3 @@ def validate(self, config: dict[str, Any]) -> None: start_from_covmat: start_from_covmat start_from_position: start_from_position start_from_profile: start_from_profile - - - diff --git a/prospect/tasks/initialise_profile_task.py b/prospect/tasks/initialise_profile_task.py index 753f7f7..d055491 100644 --- a/prospect/tasks/initialise_profile_task.py +++ b/prospect/tasks/initialise_profile_task.py @@ -2,7 +2,6 @@ from prospect.input import Configuration from prospect.tasks.base_task import BaseTask from prospect.tasks.initialise_optimiser_task import InitialiseOptimiserTask -from prospect.tasks.initialise_optimiser_task import InitialiseOptimiserTask class InitialiseProfileTask(BaseTask): """