bilby/gw/prior_files/precessing_spins_binary_black_holes.prior → test/prior_files/precessing_spins_bbh.prior

@@ -6,15 +6,15 @@ mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
 mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
 mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
 chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
-tilt_1 = Sine(name='tilt_1')
-tilt_2 = Sine(name='tilt_2')
-phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
-phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
 luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
 dec = Cosine(name='dec')
 ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
 theta_jn = Sine(name='theta_jn')
 psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
 phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')

test/prior_files/precessing_spins_bbh_tides_on.prior

+# These are the default priors we use for BBH systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=5, maximum=100)
+mass_2 = Constraint(name='mass_2', minimum=5, maximum=100)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=25, maximum=100)
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)

test/prior_files/precessing_spins_bns.prior

+# These are the default priors we use for BNS systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
+mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')

test/prior_files/precessing_spins_bns_tides_on.prior

+# These are the default priors we use for BNS systems.
+# Note that you may wish to use more specific mass and distance parameters.
+# These commands are all known to bilby.gw.prior.
+# Lines beginning "#" are ignored.
+mass_1 = Constraint(name='mass_1', minimum=0.5, maximum=5)
+mass_2 = Constraint(name='mass_2', minimum=0.5, maximum=5)
+mass_ratio = Uniform(name='mass_ratio', minimum=0.125, maximum=1)
+chirp_mass = Uniform(name='chirp_mass', minimum=0.4, maximum=4.4)
+luminosity_distance = bilby.gw.prior.UniformSourceFrame(name='luminosity_distance', minimum=1e2, maximum=5e3)
+dec = Cosine(name='dec')
+ra = Uniform(name='ra', minimum=0, maximum=2 * np.pi, boundary='periodic')
+theta_jn = Sine(name='theta_jn')
+psi = Uniform(name='psi', minimum=0, maximum=np.pi, boundary='periodic')
+phase = Uniform(name='phase', minimum=0, maximum=2 * np.pi, boundary='periodic')
+a_1 = Uniform(name='a_1', minimum=0, maximum=0.99)
+a_2 = Uniform(name='a_2', minimum=0, maximum=0.99)
+tilt_1 = Sine(name='tilt_1')
+tilt_2 = Sine(name='tilt_2')
+phi_12 = Uniform(name='phi_12', minimum=0, maximum=2 * np.pi, boundary='periodic')
+phi_jl = Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi, boundary='periodic')
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)

test/prior_test.py

@@ -911,7 +911,7 @@ class TestPriorDict(unittest.TestCase):
         self.prior_set_from_dict = bilby.core.prior.PriorDict(dictionary=self.priors)
         self.default_prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/precessing_spins_binary_black_holes.prior",
+            "prior_files/precessing_spins_bbh.prior",
         )
         self.prior_set_from_file = bilby.core.prior.PriorDict(
             filename=self.default_prior_file
@@ -1252,7 +1252,7 @@ class TestFillPrior(unittest.TestCase):
         self.priors = bilby.core.prior.PriorDict(dictionary=self.priors)
         self.default_prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/precessing_spins_binary_black_holes.prior",
+            "prior_files/precessing_spins_bbh.prior",
         )
         self.priors.fill_priors(self.likelihood, self.default_prior_file)
 
@@ -1292,7 +1292,7 @@ class TestCreateDefaultPrior(unittest.TestCase):
     def test_bbh_params(self):
         prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/precessing_spins_binary_black_holes.prior",
+            "prior_files/precessing_spins_bbh.prior",
         )
         prior_set = bilby.core.prior.PriorDict(filename=prior_file)
         for prior in prior_set:
@@ -1306,7 +1306,7 @@ class TestCreateDefaultPrior(unittest.TestCase):
     def test_unknown_prior(self):
         prior_file = os.path.join(
             os.path.dirname(os.path.realpath(__file__)),
-            "prior_files/precessing_spins_binary_black_holes.prior",
+            "prior_files/precessing_spins_bbh.prior",
         )
         self.assertIsNone(
             bilby.core.prior.create_default_prior(

test/sampler_test.py

@@ -695,14 +695,16 @@ class TestPyMC3(unittest.TestCase):
             chains=2,
             cores=1,
             tune=500,
-            nuts_kwargs=None,
-            step_kwargs=None,
             progressbar=True,
             model=None,
+            nuts_kwargs=None,
+            step_kwargs=None,
             random_seed=None,
             discard_tuned_samples=True,
             compute_convergence_checks=True,
         )
+        expected.update(self.sampler.default_nuts_kwargs)
+        expected.update(self.sampler.default_step_kwargs)
         self.assertDictEqual(expected, self.sampler.kwargs)
 
     def test_translate_kwargs(self):
@@ -717,14 +719,16 @@ class TestPyMC3(unittest.TestCase):
             chains=2,
             cores=1,
             tune=500,
-            nuts_kwargs=None,
-            step_kwargs=None,
             progressbar=True,
             model=None,
+            nuts_kwargs=None,
+            step_kwargs=None,
             random_seed=None,
             discard_tuned_samples=True,
             compute_convergence_checks=True,
         )
+        expected.update(self.sampler.default_nuts_kwargs)
+        expected.update(self.sampler.default_step_kwargs)
         self.sampler.kwargs["draws"] = 123
         for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs:
             new_kwargs = self.sampler.kwargs.copy()
@@ -767,7 +771,8 @@ class TestPymultinest(unittest.TestCase):
                         n_iter_before_update=100, null_log_evidence=-1e90,
                         max_modes=100, mode_tolerance=-1e90, seed=-1,
                         context=0, write_output=True, log_zero=-1e100,
-                        max_iter=0, init_MPI=False, dump_callback=None)
+                        max_iter=0, init_MPI=False, dump_callback='dumper')
+        self.sampler.kwargs['dump_callback'] = 'dumper'  # Check like the dynesty print_func
         self.assertListEqual([1, 0], self.sampler.kwargs['wrapped_params'])  # Check this separately
         self.sampler.kwargs['wrapped_params'] = None  # The dict comparison can't handle lists
         self.assertDictEqual(expected, self.sampler.kwargs)
@@ -782,7 +787,7 @@ class TestPymultinest(unittest.TestCase):
                         n_iter_before_update=100, null_log_evidence=-1e90,
                         max_modes=100, mode_tolerance=-1e90, seed=-1,
                         context=0, write_output=True, log_zero=-1e100,
-                        max_iter=0, init_MPI=False, dump_callback=None)
+                        max_iter=0, init_MPI=False, dump_callback='dumper')
 
         for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs:
             new_kwargs = self.sampler.kwargs.copy()
@@ -790,6 +795,7 @@ class TestPymultinest(unittest.TestCase):
             new_kwargs[
                 "wrapped_params"
             ] = None  # The dict comparison can't handle lists
+            new_kwargs['dump_callback'] = 'dumper'  # Check this like Dynesty print_func
             new_kwargs[equiv] = 123
             self.sampler.kwargs = new_kwargs
             self.assertDictEqual(expected, self.sampler.kwargs)
@@ -834,7 +840,7 @@ class TestUltranest(unittest.TestCase):
             dlogz=None,
             max_iters=None,
             update_interval_iter_fraction=0.2,
-            viz_callback="auto",
+            viz_callback=None,
             dKL=0.5,
             frac_remain=0.01,
             Lepsilon=0.001,
@@ -848,6 +854,7 @@ class TestUltranest(unittest.TestCase):
         self.assertListEqual([1, 0], self.sampler.kwargs["wrapped_params"])  # Check this separately
         self.sampler.kwargs["wrapped_params"] = None  # The dict comparison can't handle lists
         self.sampler.kwargs["derived_param_names"] = None
+        self.sampler.kwargs["viz_callback"] = None
         self.assertDictEqual(expected, self.sampler.kwargs)
 
     def test_translate_kwargs(self):
@@ -868,7 +875,7 @@ class TestUltranest(unittest.TestCase):
             dlogz=None,
             max_iters=None,
             update_interval_iter_fraction=0.2,
-            viz_callback="auto",
+            viz_callback=None,
             dKL=0.5,
             frac_remain=0.01,
             Lepsilon=0.001,
@@ -882,10 +889,11 @@ class TestUltranest(unittest.TestCase):
         for equiv in bilby.core.sampler.base_sampler.NestedSampler.npoints_equiv_kwargs:
             new_kwargs = self.sampler.kwargs.copy()
             del new_kwargs['num_live_points']
-            new_kwargs['wrapped_params'] = None  # The dict comparison can't handle lists
-            new_kwargs["derived_param_names"] = None
             new_kwargs[equiv] = 123
             self.sampler.kwargs = new_kwargs
+            self.sampler.kwargs["wrapped_params"] = None
+            self.sampler.kwargs["derived_param_names"] = None
+            self.sampler.kwargs["viz_callback"] = None
             self.assertDictEqual(expected, self.sampler.kwargs)
 
 

test/waveform_generator_test.py

@@ -73,7 +73,7 @@ class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestC
                 self.waveform_generator.start_time,
                 self.waveform_generator.frequency_domain_source_model.__name__,
                 self.waveform_generator.time_domain_source_model,
-                None,
+                bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters.__name__,
                 self.waveform_generator.waveform_arguments,
             )
         )
@@ -92,7 +92,7 @@ class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestC
                 self.waveform_generator.start_time,
                 self.waveform_generator.frequency_domain_source_model,
                 self.waveform_generator.time_domain_source_model.__name__,
-                None,
+                bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters.__name__,
                 self.waveform_generator.waveform_arguments,
             )
         )