diff --git a/bilby/gw/prior.py b/bilby/gw/prior.py
index 25c97b847558ba2df24652a88f718659ea848059..e3523a36f8ed098113b08dbbf11c88518593707c 100644
--- a/bilby/gw/prior.py
+++ b/bilby/gw/prior.py
@@ -411,10 +411,10 @@ class BBHPriorDict(CBCPriorDict):
"""
if dictionary is None and filename is None:
if aligned_spin:
- fname = 'aligned_spins_binary_black_holes.prior'
+ fname = 'aligned_spins_bbh.prior'
logger.info('Using aligned spin prior')
else:
- fname = 'precessing_spins_binary_black_holes.prior'
+ fname = 'precessing_spins_bbh.prior'
filename = os.path.join(DEFAULT_PRIOR_DIR, fname)
logger.info('No prior given, using default BBH priors in {}.'.format(filename))
elif filename is not None:
@@ -517,9 +517,9 @@ class BNSPriorDict(CBCPriorDict):
BNSPriorDict.default_conversion_function
"""
if aligned_spin:
- default_file = 'aligned_spins_waveform_tides_on.prior'
+ default_file = 'aligned_spins_bns_tides_on.prior'
else:
- default_file = 'precessing_spins_waveform_tides_on.prior'
+ default_file = 'precessing_spins_bns_tides_on.prior'
if dictionary is None and filename is None:
filename = os.path.join(DEFAULT_PRIOR_DIR, default_file)
logger.info('No prior given, using default BNS priors in {}.'.format(filename))
diff --git a/bilby/gw/prior_files/aligned_spins_binary_black_holes.prior b/bilby/gw/prior_files/aligned_spins_bbh.prior
similarity index 100%
rename from bilby/gw/prior_files/aligned_spins_binary_black_holes.prior
rename to bilby/gw/prior_files/aligned_spins_bbh.prior
index 9dda5d5bb367d3bfa1a7132279e203ddf3ffe2f2..4a15f7a3a14f85ee65385d6ca30263ed7c5c6ca9 100644
--- a/bilby/gw/prior_files/aligned_spins_binary_black_holes.prior
+++ b/bilby/gw/prior_files/aligned_spins_bbh.prior
@@ -6,11 +6,11 @@ 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)
-chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
-chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
diff --git a/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior b/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..4fc71953eacb34b364e6a55b6a3d521ee7609b81
--- /dev/null
+++ b/bilby/gw/prior_files/aligned_spins_bbh_tides_on.prior
@@ -0,0 +1,18 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/bilby/gw/prior_files/aligned_spins_bns.prior b/bilby/gw/prior_files/aligned_spins_bns.prior
new file mode 100644
index 0000000000000000000000000000000000000000..a524de77759b93fbaa7772b17fce573d35be69bd
--- /dev/null
+++ b/bilby/gw/prior_files/aligned_spins_bns.prior
@@ -0,0 +1,16 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
diff --git a/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior b/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..dcb30189b9c2867f35c98f8c9580b62c491d3dd4
--- /dev/null
+++ b/bilby/gw/prior_files/aligned_spins_bns_tides_on.prior
@@ -0,0 +1,18 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior b/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior
deleted file mode 100644
index b15bfa6c5019ede7bfcb0d353a1380c822e2e2e4..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/aligned_spins_waveform_tides_off.prior
+++ /dev/null
@@ -1,12 +0,0 @@
-chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
-chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
-chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
-luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
-ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra', boundary='periodic')
-dec = Cosine(name='dec')
-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')
diff --git a/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior b/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior
deleted file mode 100644
index 6c318f1b36147a17c8e1e01e9429a6778d7f0756..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/aligned_spins_waveform_tides_on.prior
+++ /dev/null
@@ -1,14 +0,0 @@
-chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
-chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
-chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
-luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
-ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra', boundary='periodic')
-dec = Cosine(name='dec')
-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')
-lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/prior_files/precessing_spins_binary_black_holes.prior b/bilby/gw/prior_files/precessing_spins_bbh.prior
similarity index 100%
rename from test/prior_files/precessing_spins_binary_black_holes.prior
rename to bilby/gw/prior_files/precessing_spins_bbh.prior
index 06549e63ed36ff159035ff1fd02ad7465df62f3d..27094d689666e2a6e195e36f4b795c9feb3347c3 100644
--- a/test/prior_files/precessing_spins_binary_black_holes.prior
+++ b/bilby/gw/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')
diff --git a/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior b/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..81da0482f26708a1cf5cb5d11fdd61f6fc2654b4
--- /dev/null
+++ b/bilby/gw/prior_files/precessing_spins_bbh_tides_on.prior
@@ -0,0 +1,22 @@
+# 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)
diff --git a/bilby/gw/prior_files/precessing_spins_bns.prior b/bilby/gw/prior_files/precessing_spins_bns.prior
new file mode 100644
index 0000000000000000000000000000000000000000..cb663dbbe1eb90badc3dcb066ecef85863a26801
--- /dev/null
+++ b/bilby/gw/prior_files/precessing_spins_bns.prior
@@ -0,0 +1,20 @@
+# 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')
diff --git a/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior b/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..d0c7e875c7d9ab8ad9dfd0fb1b41dc2562d43855
--- /dev/null
+++ b/bilby/gw/prior_files/precessing_spins_bns_tides_on.prior
@@ -0,0 +1,22 @@
+# 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)
diff --git a/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior b/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior
deleted file mode 100644
index 3bc8ebab2c97a1ab4b464511f53a10a5be726013..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/precessing_spins_waveform_tides_off.prior
+++ /dev/null
@@ -1,16 +0,0 @@
-chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=22.0)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.89)
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.05)
-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.UniformComovingVolume(name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
-ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra', boundary='periodic')
-dec = Cosine(name='dec')
-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')
diff --git a/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior b/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior
deleted file mode 100644
index d82a4f173bd265533c70261ee9ede10b5f298166..0000000000000000000000000000000000000000
--- a/bilby/gw/prior_files/precessing_spins_waveform_tides_on.prior
+++ /dev/null
@@ -1,18 +0,0 @@
-chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=22.0)
-a_1 = Uniform(name='a_1', minimum=0, maximum=0.89)
-a_2 = Uniform(name='a_2', minimum=0, maximum=0.05)
-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.UniformComovingVolume(name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
-ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra', boundary='periodic')
-dec = Cosine(name='dec')
-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')
-lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/gw_prior_test.py b/test/gw_prior_test.py
index 171977652bb001f3fb392cfebeca757a72349472..7e864bd65d08193d2a51a32ecfb6918c1e72545e 100644
--- a/test/gw_prior_test.py
+++ b/test/gw_prior_test.py
@@ -26,7 +26,7 @@ class TestBBHPriorDict(unittest.TestCase):
)
self.filename = 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.bbh_prior_dict = bilby.gw.prior.BBHPriorDict(filename=self.filename)
for key, value in self.bbh_prior_dict.items():
@@ -267,13 +267,13 @@ class TestPackagedPriors(unittest.TestCase):
""" Test that the prepackaged priors load """
def test_aligned(self):
- filename = "aligned_spins_binary_black_holes.prior"
+ filename = "aligned_spins_bbh.prior"
prior_dict = bilby.gw.prior.BBHPriorDict(filename=filename)
self.assertTrue("chi_1" in prior_dict)
self.assertTrue("chi_2" in prior_dict)
def test_binary_black_holes(self):
- filename = "precessing_spins_binary_black_holes.prior"
+ filename = "precessing_spins_bbh.prior"
prior_dict = bilby.gw.prior.BBHPriorDict(filename=filename)
self.assertTrue("a_1" in prior_dict)
@@ -298,7 +298,7 @@ class TestBNSPriorDict(unittest.TestCase):
)
self.filename = os.path.join(
os.path.dirname(os.path.realpath(__file__)),
- "prior_files/aligned_spins_waveform_tides_on.prior",
+ "prior_files/aligned_spins_bns_tides_on.prior",
)
self.bns_prior_dict = bilby.gw.prior.BNSPriorDict(filename=self.filename)
for key, value in self.bns_prior_dict.items():
diff --git a/test/prior_files/aligned_spins_bbh.prior b/test/prior_files/aligned_spins_bbh.prior
new file mode 100644
index 0000000000000000000000000000000000000000..4a15f7a3a14f85ee65385d6ca30263ed7c5c6ca9
--- /dev/null
+++ b/test/prior_files/aligned_spins_bbh.prior
@@ -0,0 +1,16 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
diff --git a/test/prior_files/aligned_spins_bbh_tides_on.prior b/test/prior_files/aligned_spins_bbh_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..4fc71953eacb34b364e6a55b6a3d521ee7609b81
--- /dev/null
+++ b/test/prior_files/aligned_spins_bbh_tides_on.prior
@@ -0,0 +1,18 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/prior_files/aligned_spins_bns.prior b/test/prior_files/aligned_spins_bns.prior
new file mode 100644
index 0000000000000000000000000000000000000000..a524de77759b93fbaa7772b17fce573d35be69bd
--- /dev/null
+++ b/test/prior_files/aligned_spins_bns.prior
@@ -0,0 +1,16 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
diff --git a/test/prior_files/aligned_spins_bns_tides_on.prior b/test/prior_files/aligned_spins_bns_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..dcb30189b9c2867f35c98f8c9580b62c491d3dd4
--- /dev/null
+++ b/test/prior_files/aligned_spins_bns_tides_on.prior
@@ -0,0 +1,18 @@
+# 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')
+chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.99))
+chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.99))
+lambda_1 = Uniform(name='lambda_1', minimum=0, maximum=5000)
+lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/test/prior_files/aligned_spins_waveform_tides_on.prior b/test/prior_files/aligned_spins_waveform_tides_on.prior
deleted file mode 100644
index 6c318f1b36147a17c8e1e01e9429a6778d7f0756..0000000000000000000000000000000000000000
--- a/test/prior_files/aligned_spins_waveform_tides_on.prior
+++ /dev/null
@@ -1,14 +0,0 @@
-chirp_mass = Uniform(name='chirp_mass', minimum=3.56, maximum=3.68)
-mass_ratio = Uniform(name='mass_ratio', minimum=0.05, maximum=1)
-mass_1 = Constraint(name='mass_1', minimum=1.00, maximum=22.0)
-mass_2 = Constraint(name='mass_2', minimum=1.00, maximum=2.95)
-chi_1 = bilby.gw.prior.AlignedSpin(name='chi_1', a_prior=Uniform(minimum=0, maximum=0.5))
-chi_2 = bilby.gw.prior.AlignedSpin(name='chi_2', a_prior=Uniform(minimum=0, maximum=0.05))
-luminosity_distance = bilby.core.prior.PowerLaw(alpha=2, name='luminosity_distance', minimum=1, maximum=750, unit='Mpc')
-ra = Uniform(minimum=0, maximum=2 * np.pi, name='ra', boundary='periodic')
-dec = Cosine(name='dec')
-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')
-lambda_1 = Uniform(name='lambda_2', minimum=0, maximum=5000)
-lambda_2 = Uniform(name='lambda_2', minimum=0, maximum=5000)
diff --git a/bilby/gw/prior_files/precessing_spins_binary_black_holes.prior b/test/prior_files/precessing_spins_bbh.prior
similarity index 100%
rename from bilby/gw/prior_files/precessing_spins_binary_black_holes.prior
rename to test/prior_files/precessing_spins_bbh.prior
index 06549e63ed36ff159035ff1fd02ad7465df62f3d..27094d689666e2a6e195e36f4b795c9feb3347c3 100644
--- a/bilby/gw/prior_files/precessing_spins_binary_black_holes.prior
+++ b/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')
diff --git a/test/prior_files/precessing_spins_bbh_tides_on.prior b/test/prior_files/precessing_spins_bbh_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..81da0482f26708a1cf5cb5d11fdd61f6fc2654b4
--- /dev/null
+++ b/test/prior_files/precessing_spins_bbh_tides_on.prior
@@ -0,0 +1,22 @@
+# 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)
diff --git a/test/prior_files/precessing_spins_bns.prior b/test/prior_files/precessing_spins_bns.prior
new file mode 100644
index 0000000000000000000000000000000000000000..cb663dbbe1eb90badc3dcb066ecef85863a26801
--- /dev/null
+++ b/test/prior_files/precessing_spins_bns.prior
@@ -0,0 +1,20 @@
+# 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')
diff --git a/test/prior_files/precessing_spins_bns_tides_on.prior b/test/prior_files/precessing_spins_bns_tides_on.prior
new file mode 100644
index 0000000000000000000000000000000000000000..d0c7e875c7d9ab8ad9dfd0fb1b41dc2562d43855
--- /dev/null
+++ b/test/prior_files/precessing_spins_bns_tides_on.prior
@@ -0,0 +1,22 @@
+# 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)
diff --git a/test/prior_test.py b/test/prior_test.py
index a0c57c49371ceadf19c21c21ca4a7fd592b68c41..6222752d40e1c314ede933e831c3d0177026169d 100644
--- a/test/prior_test.py
+++ b/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(