diff --git a/bilby/gw/conversion.py b/bilby/gw/conversion.py index 57177a45524bb5506f663608e6ede77a287660fc..ea5853d55eeac0440eae8cae539898fe9030ac10 100644 --- a/bilby/gw/conversion.py +++ b/bilby/gw/conversion.py @@ -264,8 +264,8 @@ def convert_to_lal_binary_neutron_star_parameters(parameters): tilt = 'tilt_{}'.format(idx) if tilt in original_keys: converted_parameters['chi_{}'.format(idx)] = ( - converted_parameters[mag] * - np.cos(converted_parameters[tilt])) + converted_parameters[mag] * + np.cos(converted_parameters[tilt])) else: converted_parameters['chi_{}'.format(idx)] = ( converted_parameters[mag]) diff --git a/test/conversion_test.py b/test/conversion_test.py index b72ed2313a227ab0112abb71052b3d89758d523c..7ee6bda1d60d0572061473d00fb7bb42ffa4af67 100644 --- a/test/conversion_test.py +++ b/test/conversion_test.py @@ -129,13 +129,13 @@ class TestConvertToLALParams(unittest.TestCase): self.mass_parameters['total_mass'] = \ conversion.component_masses_to_total_mass(**self.component_mass_pars) self.component_tidal_parameters = dict(lambda_1=300, lambda_2=300) + self.all_component_pars = self.component_tidal_parameters.copy() + self.all_component_pars.update(self.component_mass_pars) self.tidal_parameters = self.component_tidal_parameters.copy() self.tidal_parameters['lambda_tilde'] = \ - conversion.lambda_1_lambda_2_to_lambda_tilde( - **self.component_tidal_parameters, **self.component_mass_pars) + conversion.lambda_1_lambda_2_to_lambda_tilde(**self.all_component_pars) self.tidal_parameters['delta_lambda'] = \ - conversion.lambda_1_lambda_2_to_delta_lambda( - **self.component_tidal_parameters, **self.component_mass_pars) + conversion.lambda_1_lambda_2_to_delta_lambda(**self.all_component_pars) def tearDown(self): del self.search_keys