From 78909fe30aaaa0446d506156aea74d1bd45f7aa6 Mon Sep 17 00:00:00 2001
From: Colm Talbot <colm.talbot@ligo.org>
Date: Tue, 2 Oct 2018 10:40:07 +1000
Subject: [PATCH] fix prior file reading tests
---
test/prior_test.py | 80 +++++++++++++++++++++++++++-------------------
1 file changed, 48 insertions(+), 32 deletions(-)
diff --git a/test/prior_test.py b/test/prior_test.py
index 890473087..c147d723e 100644
--- a/test/prior_test.py
+++ b/test/prior_test.py
@@ -347,22 +347,30 @@ class TestPriorSet(unittest.TestCase):
# shutil.rmtree(outdir_path)
def test_read_from_file(self):
- expected = dict(mass_1=tupak.core.prior.Uniform(name='mass_1', minimum=5, maximum=100),
- mass_2=tupak.core.prior.Uniform(name='mass_2', minimum=5, maximum=100),
- a_1=tupak.core.prior.Uniform(name='a_1', minimum=0, maximum=0.8),
- a_2=tupak.core.prior.Uniform(name='a_2', minimum=0, maximum=0.8),
- tilt_1=tupak.core.prior.Sine(name='tilt_1'),
- tilt_2=tupak.core.prior.Sine(name='tilt_2'),
- phi_12=tupak.core.prior.Uniform(name='phi_12', minimum=0, maximum=2 * np.pi),
- phi_jl=tupak.core.prior.Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi),
- luminosity_distance=tupak.gw.prior.UniformComovingVolume(name='luminosity_distance',
- minimum=1e2, maximum=5e3),
- dec=tupak.core.prior.Cosine(name='dec'),
- ra=tupak.core.prior.Uniform(name='ra', minimum=0, maximum=2 * np.pi),
- iota=tupak.core.prior.Sine(name='iota'),
- psi=tupak.core.prior.Uniform(name='psi', minimum=0, maximum=np.pi),
- phase=tupak.core.prior.Uniform(name='phase', minimum=0, maximum=2 * np.pi)
- )
+ expected = dict(
+ mass_1=tupak.core.prior.Uniform(
+ name='mass_1', minimum=5, maximum=100, unit='$M_{\\odot}$'),
+ mass_2=tupak.core.prior.Uniform(
+ name='mass_2', minimum=5, maximum=100, unit='$M_{\\odot}$'),
+ a_1=tupak.core.prior.Uniform(name='a_1', minimum=0, maximum=0.8),
+ a_2=tupak.core.prior.Uniform(name='a_2', minimum=0, maximum=0.8),
+ tilt_1=tupak.core.prior.Sine(name='tilt_1'),
+ tilt_2=tupak.core.prior.Sine(name='tilt_2'),
+ phi_12=tupak.core.prior.Uniform(
+ name='phi_12', minimum=0, maximum=2 * np.pi),
+ phi_jl=tupak.core.prior.Uniform(
+ name='phi_jl', minimum=0, maximum=2 * np.pi),
+ luminosity_distance=tupak.gw.prior.UniformComovingVolume(
+ name='luminosity_distance', minimum=1e2,
+ maximum=5e3, unit='Mpc'),
+ dec=tupak.core.prior.Cosine(name='dec'),
+ ra=tupak.core.prior.Uniform(
+ name='ra', minimum=0, maximum=2 * np.pi),
+ iota=tupak.core.prior.Sine(name='iota'),
+ psi=tupak.core.prior.Uniform(name='psi', minimum=0, maximum=np.pi),
+ phase=tupak.core.prior.Uniform(
+ name='phase', minimum=0, maximum=2 * np.pi)
+ )
self.assertDictEqual(expected, self.prior_set_from_file)
def test_convert_floats_to_delta_functions(self):
@@ -380,22 +388,30 @@ class TestPriorSet(unittest.TestCase):
def test_prior_set_from_dict_but_using_a_string(self):
prior_set = tupak.core.prior.PriorSet(dictionary=self.default_prior_file)
- expected = dict(mass_1=tupak.core.prior.Uniform(name='mass_1', minimum=5, maximum=100),
- mass_2=tupak.core.prior.Uniform(name='mass_2', minimum=5, maximum=100),
- a_1=tupak.core.prior.Uniform(name='a_1', minimum=0, maximum=0.8),
- a_2=tupak.core.prior.Uniform(name='a_2', minimum=0, maximum=0.8),
- tilt_1=tupak.core.prior.Sine(name='tilt_1'),
- tilt_2=tupak.core.prior.Sine(name='tilt_2'),
- phi_12=tupak.core.prior.Uniform(name='phi_12', minimum=0, maximum=2 * np.pi),
- phi_jl=tupak.core.prior.Uniform(name='phi_jl', minimum=0, maximum=2 * np.pi),
- luminosity_distance=tupak.gw.prior.UniformComovingVolume(name='luminosity_distance',
- minimum=1e2, maximum=5e3),
- dec=tupak.core.prior.Cosine(name='dec'),
- ra=tupak.core.prior.Uniform(name='ra', minimum=0, maximum=2 * np.pi),
- iota=tupak.core.prior.Sine(name='iota'),
- psi=tupak.core.prior.Uniform(name='psi', minimum=0, maximum=np.pi),
- phase=tupak.core.prior.Uniform(name='phase', minimum=0, maximum=2 * np.pi)
- )
+ expected = dict(
+ mass_1=tupak.core.prior.Uniform(
+ name='mass_1', minimum=5, maximum=100, unit='$M_{\\odot}$'),
+ mass_2=tupak.core.prior.Uniform(
+ name='mass_2', minimum=5, maximum=100, unit='$M_{\\odot}$'),
+ a_1=tupak.core.prior.Uniform(name='a_1', minimum=0, maximum=0.8),
+ a_2=tupak.core.prior.Uniform(name='a_2', minimum=0, maximum=0.8),
+ tilt_1=tupak.core.prior.Sine(name='tilt_1'),
+ tilt_2=tupak.core.prior.Sine(name='tilt_2'),
+ phi_12=tupak.core.prior.Uniform(
+ name='phi_12', minimum=0, maximum=2 * np.pi),
+ phi_jl=tupak.core.prior.Uniform(
+ name='phi_jl', minimum=0, maximum=2 * np.pi),
+ luminosity_distance=tupak.gw.prior.UniformComovingVolume(
+ name='luminosity_distance', minimum=1e2,
+ maximum=5e3, unit='Mpc'),
+ dec=tupak.core.prior.Cosine(name='dec'),
+ ra=tupak.core.prior.Uniform(
+ name='ra', minimum=0, maximum=2 * np.pi),
+ iota=tupak.core.prior.Sine(name='iota'),
+ psi=tupak.core.prior.Uniform(name='psi', minimum=0, maximum=np.pi),
+ phase=tupak.core.prior.Uniform(
+ name='phase', minimum=0, maximum=2 * np.pi)
+ )
self.assertDictEqual(expected, prior_set)
def test_dict_argument_is_not_string_or_dict(self):
--
GitLab