bilby/core/result.py

@@ -20,7 +20,7 @@ from . import utils
 from .utils import (logger, infer_parameters_from_function,
                     check_directory_exists_and_if_not_mkdir,)
 from .utils import BilbyJsonEncoder, decode_bilby_json
-from .prior import Prior, PriorDict, DeltaFunction, ConditionalPriorDict
+from .prior import Prior, PriorDict, DeltaFunction
 
 
 def result_file_name(outdir, label, extension='json', gzip=False):
@@ -299,7 +299,7 @@ class Result(object):
     @priors.setter
     def priors(self, priors):
         if isinstance(priors, dict):
-            if isinstance(priors, ConditionalPriorDict):
+            if isinstance(priors, PriorDict):
                 self._priors = priors
             else:
                 self._priors = PriorDict(priors)

bilby/core/sampler/cpnest.py

@@ -38,7 +38,7 @@ class Cpnest(NestedSampler):
         {self.outdir}/cpnest_{self.label}/
 
     """
-    default_kwargs = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
+    default_kwargs = dict(verbose=3, nthreads=1, nlive=500, maxmcmc=1000,
                           seed=None, poolsize=100, nhamiltonian=0, resume=True,
                           output=None, proposals=None, n_periodic_checkpoint=8000)
 

bilby/core/sampler/dynesty.py

@@ -329,7 +329,6 @@ class Dynesty(NestedSampler):
         sampler_kwargs['add_live'] = True
         self.start_time = datetime.datetime.now()
         while True:
-            sampler_kwargs['maxcall'] += self.n_check_point
             self._run_nested_wrapper(sampler_kwargs)
             if self.sampler.ncall == old_ncall:
                 break

test/sampler_test.py

@@ -112,14 +112,14 @@ class TestCPNest(unittest.TestCase):
         del self.sampler
 
     def test_default_kwargs(self):
-        expected = dict(verbose=1, nthreads=1, nlive=500, maxmcmc=1000,
+        expected = dict(verbose=3, nthreads=1, nlive=500, maxmcmc=1000,
                         seed=None, poolsize=100, nhamiltonian=0, resume=True,
                         output='outdir/cpnest_label/', proposals=None,
                         n_periodic_checkpoint=8000)
         self.assertDictEqual(expected, self.sampler.kwargs)
 
     def test_translate_kwargs(self):
-        expected = dict(verbose=1, nthreads=1, nlive=250, maxmcmc=1000,
+        expected = dict(verbose=3, nthreads=1, nlive=250, maxmcmc=1000,
                         seed=None, poolsize=100, nhamiltonian=0, resume=True,
                         output='outdir/cpnest_label/', proposals=None,
                         n_periodic_checkpoint=8000)