diff --git a/AUTHORS.md b/AUTHORS.md index cdb687ce14e51fd223bf1e748eaabdc085ac9ec8..8acda7e024ce8d94b7c7e197367ff989b84f98ec 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 1d415f518009ae626d7180ca9e460f38e11198c8..e4e37b1d6c3a2481185f3fa9fd5114877286b5fd 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 d473f36045987efe5ad3ebef2281cca692d2c475..c7ba955216c6029f3c2817582b7d5049296cda79 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 7277033bbd25d8d230b57927266e56463c7d3697..cab9490003827aa18739930817a0260558aedbf7 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 d4735b5b8367d2b50c81824e072b909325944672..be103d1b0053e3028ce862fe074b74478d679056 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 1a85a52d0a1c1e2c104c0a1d25a5df4f531bdc69..edf0a609ad1e89fdd29b8cbfd059fb95de0253bb 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 )