From 7da422859e4f17dd8311a6b65957512368ad05b5 Mon Sep 17 00:00:00 2001
From: Aditya Vijaykumar <vijaykumar.aditya@gmail.com>
Date: Fri, 4 Nov 2022 11:44:56 -0500
Subject: [PATCH] relativebinning -> relative_binning; change AUTHORS.md
---
AUTHORS.md | 1 +
bilby/gw/source.py | 4 ++--
.../injection_examples/relative_binning.py | 4 ++--
test/gw/likelihood/relative_binning_test.py | 2 +-
test/gw/likelihood_test.py | 2 +-
test/gw/source_test.py | 24 +++++++++----------
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/AUTHORS.md b/AUTHORS.md
index cdb687ce1..8acda7e02 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -9,6 +9,7 @@ Aditya Vijaykumar
Andrew Kim
Andrew Miller
Antoni Ramos-Buades
+Apratim Ganguly
Avi Vajpeyi
Bruce Edelman
Carl-Johan Haster
diff --git a/bilby/gw/source.py b/bilby/gw/source.py
index 1d415f518..e4e37b1d6 100644
--- a/bilby/gw/source.py
+++ b/bilby/gw/source.py
@@ -444,7 +444,7 @@ def binary_neutron_star_roq(
phi_12=phi_12, lambda_1=lambda_1, lambda_2=lambda_2, **waveform_kwargs)
-def lal_binary_black_hole_relativebinning(
+def lal_binary_black_hole_relative_binning(
frequency_array, mass_1, mass_2, luminosity_distance, a_1, tilt_1,
phi_12, a_2, tilt_2, phi_jl, theta_jn, phase, fiducial, **kwargs):
@@ -471,7 +471,7 @@ def lal_binary_black_hole_relativebinning(
phi_12=phi_12, lambda_1=0.0, lambda_2=0.0, **waveform_kwargs)
-def lal_binary_neutron_star_relativebinning(
+def lal_binary_neutron_star_relative_binning(
frequency_array, mass_1, mass_2, luminosity_distance, a_1, tilt_1,
phi_12, a_2, tilt_2, phi_jl, lambda_1, lambda_2, theta_jn, phase,
fiducial, **kwargs):
diff --git a/examples/gw_examples/injection_examples/relative_binning.py b/examples/gw_examples/injection_examples/relative_binning.py
index d473f3604..c7ba95521 100644
--- a/examples/gw_examples/injection_examples/relative_binning.py
+++ b/examples/gw_examples/injection_examples/relative_binning.py
@@ -61,7 +61,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
duration=duration,
sampling_frequency=sampling_frequency,
# frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole,
- frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relativebinning,
+ frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relative_binning,
parameter_conversion=bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters,
waveform_arguments=waveform_arguments,
)
@@ -135,7 +135,7 @@ alt_waveform_generator = bilby.gw.WaveformGenerator(
duration=duration,
sampling_frequency=sampling_frequency,
frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole,
- # frequency_domain_source_model=lal_binary_black_hole_relativebinning,
+ # frequency_domain_source_model=lal_binary_black_hole_relative_binning,
parameter_conversion=bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters,
waveform_arguments=waveform_arguments,
)
diff --git a/test/gw/likelihood/relative_binning_test.py b/test/gw/likelihood/relative_binning_test.py
index 7277033bb..cab949000 100644
--- a/test/gw/likelihood/relative_binning_test.py
+++ b/test/gw/likelihood/relative_binning_test.py
@@ -77,7 +77,7 @@ class TestMBLikelihood(unittest.TestCase):
)
bin_wfg = bilby.gw.waveform_generator.WaveformGenerator(
duration=duration, sampling_frequency=sampling_frequency,
- frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relativebinning,
+ frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relative_binning,
waveform_arguments=dict(
reference_frequency=fmin, approximant=approximant, minimum_frequency=fmin)
)
diff --git a/test/gw/likelihood_test.py b/test/gw/likelihood_test.py
index d4735b5b8..be103d1b0 100644
--- a/test/gw/likelihood_test.py
+++ b/test/gw/likelihood_test.py
@@ -529,7 +529,7 @@ class TestMarginalizations(unittest.TestCase):
self.relbin_waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
duration=self.duration,
sampling_frequency=self.sampling_frequency,
- frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relativebinning,
+ frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole_relative_binning,
start_time=1126259640,
waveform_arguments=dict(
reference_frequency=20.0,
diff --git a/test/gw/source_test.py b/test/gw/source_test.py
index 1a85a52d0..edf0a609a 100644
--- a/test/gw/source_test.py
+++ b/test/gw/source_test.py
@@ -467,7 +467,7 @@ class TestRelbinBBH(unittest.TestCase):
def test_relbin_fiducial_bbh_works_runs_valid_parameters(self):
self.parameters.update(self.waveform_kwargs_fiducial)
self.assertIsInstance(
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **self.parameters
),
dict,
@@ -476,7 +476,7 @@ class TestRelbinBBH(unittest.TestCase):
def test_relbin_binned_bbh_works_runs_valid_parameters(self):
self.parameters.update(self.waveform_kwargs_binned)
self.assertIsInstance(
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **self.parameters
),
dict,
@@ -485,7 +485,7 @@ class TestRelbinBBH(unittest.TestCase):
def test_waveform_error_catching_fiducial(self):
self.bad_parameters.update(self.waveform_kwargs_fiducial)
self.assertIsNone(
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **self.bad_parameters
)
)
@@ -493,7 +493,7 @@ class TestRelbinBBH(unittest.TestCase):
def test_waveform_error_catching_binned(self):
self.bad_parameters.update(self.waveform_kwargs_binned)
self.assertIsNone(
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **self.bad_parameters
)
)
@@ -503,7 +503,7 @@ class TestRelbinBBH(unittest.TestCase):
raise_error_parameters.update(self.waveform_kwargs_fiducial)
raise_error_parameters["catch_waveform_errors"] = False
with self.assertRaises(Exception):
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **raise_error_parameters
)
@@ -512,13 +512,13 @@ class TestRelbinBBH(unittest.TestCase):
raise_error_parameters.update(self.waveform_kwargs_binned)
raise_error_parameters["catch_waveform_errors"] = False
with self.assertRaises(Exception):
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **raise_error_parameters
)
def test_relbin_bbh_fails_without_fiducial_option(self):
with self.assertRaises(TypeError):
- bilby.gw.source.lal_binary_black_hole_relativebinning(
+ bilby.gw.source.lal_binary_black_hole_relative_binning(
self.frequency_array, **self.parameters
)
@@ -577,7 +577,7 @@ class TestRelbinBNS(unittest.TestCase):
def test_relbin_fiducial_bns_runs_with_valid_parameters(self):
self.parameters.update(self.waveform_kwargs_fiducial)
self.assertIsInstance(
- bilby.gw.source.lal_binary_neutron_star_relativebinning(
+ bilby.gw.source.lal_binary_neutron_star_relative_binning(
self.frequency_array, **self.parameters
),
dict,
@@ -586,7 +586,7 @@ class TestRelbinBNS(unittest.TestCase):
def test_relbin_binned_bns_runs_with_valid_parameters(self):
self.parameters.update(self.waveform_kwargs_binned)
self.assertIsInstance(
- bilby.gw.source.lal_binary_neutron_star_relativebinning(
+ bilby.gw.source.lal_binary_neutron_star_relative_binning(
self.frequency_array, **self.parameters
),
dict,
@@ -594,7 +594,7 @@ class TestRelbinBNS(unittest.TestCase):
def test_relbin_bns_fails_without_fiducial_option(self):
with self.assertRaises(TypeError):
- bilby.gw.source.lal_binary_neutron_star_relativebinning(
+ bilby.gw.source.lal_binary_neutron_star_relative_binning(
self.frequency_array, **self.parameters
)
@@ -603,7 +603,7 @@ class TestRelbinBNS(unittest.TestCase):
self.parameters.pop("lambda_2")
self.parameters.update(self.waveform_kwargs_fiducial)
with self.assertRaises(TypeError):
- bilby.gw.source.lal_binary_neutron_star_relativebinning(
+ bilby.gw.source.lal_binary_neutron_star_relative_binning(
self.frequency_array, **self.parameters
)
@@ -612,7 +612,7 @@ class TestRelbinBNS(unittest.TestCase):
self.parameters.pop("lambda_2")
self.parameters.update(self.waveform_kwargs_binned)
with self.assertRaises(TypeError):
- bilby.gw.source.lal_binary_neutron_star_relativebinning(
+ bilby.gw.source.lal_binary_neutron_star_relative_binning(
self.frequency_array, **self.parameters
)
--
GitLab