Skip to content
Snippets Groups Projects
Commit 9db4c495 authored by Colm Talbot's avatar Colm Talbot
Browse files

fix logic about prior type

parent ae472456
No related branches found
No related tags found
1 merge request!59Updating priors
......@@ -39,9 +39,10 @@ class Sampler(object):
outdir='outdir', label='label', use_ratio=False, plot=False,
**kwargs):
self.likelihood = likelihood
if type(priors == dict):
priors = tupak.prior.PriorSet(priors)
self.priors = priors
if isinstance(priors, tupak.prior.PriorSet):
self.priors = priors
else:
self.priors = tupak.prior.PriorSet(priors)
self.label = label
self.outdir = outdir
self.use_ratio = use_ratio
......@@ -559,7 +560,7 @@ def run_sampler(likelihood, priors=None, label='label', outdir='outdir',
if type(priors) == dict:
priors = tupak.core.prior.PriorSet(priors)
elif type(priors) == tupak.core.prior.PriorSet:
elif isinstance(priors, tupak.core.prior.PriorSet):
pass
else:
raise ValueError
......@@ -569,7 +570,7 @@ def run_sampler(likelihood, priors=None, label='label', outdir='outdir',
if implemented_samplers.__contains__(sampler.title()):
sampler_class = globals()[sampler.title()]
sampler = sampler_class(likelihood, priors, sampler, outdir=outdir,
sampler = sampler_class(likelihood, priors=priors, external_sampler=sampler, outdir=outdir,
label=label, use_ratio=use_ratio, plot=plot,
**kwargs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment