Skip to content
Snippets Groups Projects
Commit cc009ad7 authored by Colm Talbot's avatar Colm Talbot
Browse files

fix flake problems

parent 54167331
No related branches found
No related tags found
1 merge request!187Resolve "add neutron star merger to examples"
Pipeline #30613 passed
......@@ -453,20 +453,20 @@ def lambda_tilde_delta_lambda_to_lambda_1_lambda_2(
eta = component_masses_to_symmetric_mass_ratio(mass_1, mass_2)
coefficient_1 = (1 + 7 * eta - 31 * eta**2)
coefficient_2 = (1 - 4 * eta)**0.5 * (1 + 9 * eta - 11 * eta**2)
coefficient_3 = (1 - 4 * eta)**0.5\
* (1 - 13272 / 1319 * eta + 8944 / 1319 * eta**2)
coefficient_4 = (1 - 15910 / 1319 * eta + 32850 / 1319 * eta**2
+ 3380 / 1319 * eta**3)
coefficient_3 = (1 - 4 * eta)**0.5 *\
(1 - 13272 / 1319 * eta + 8944 / 1319 * eta**2)
coefficient_4 = (1 - 15910 / 1319 * eta + 32850 / 1319 * eta**2 +
3380 / 1319 * eta**3)
lambda_1 =\
(13 * lambda_tilde / 8 * (coefficient_3 - coefficient_4)
- 2 * delta_lambda * (coefficient_1 - coefficient_2))\
/ ((coefficient_1 + coefficient_2) * (coefficient_3 - coefficient_4)
- (coefficient_1 - coefficient_2) * (coefficient_3 + coefficient_4))
(13 * lambda_tilde / 8 * (coefficient_3 - coefficient_4) -
2 * delta_lambda * (coefficient_1 - coefficient_2))\
/ ((coefficient_1 + coefficient_2) * (coefficient_3 - coefficient_4) -
(coefficient_1 - coefficient_2) * (coefficient_3 + coefficient_4))
lambda_2 =\
(13 * lambda_tilde / 8 * (coefficient_3 + coefficient_4)
- 2 * delta_lambda * (coefficient_1 + coefficient_2)) \
/ ((coefficient_1 - coefficient_2) * (coefficient_3 + coefficient_4)
- (coefficient_1 + coefficient_2) * (coefficient_3 - coefficient_4))
(13 * lambda_tilde / 8 * (coefficient_3 + coefficient_4) -
2 * delta_lambda * (coefficient_1 + coefficient_2)) \
/ ((coefficient_1 - coefficient_2) * (coefficient_3 + coefficient_4) -
(coefficient_1 + coefficient_2) * (coefficient_3 - coefficient_4))
return lambda_1, lambda_2
......@@ -497,9 +497,8 @@ def lambda_tilde_to_lambda_1_lambda_2(
eta = component_masses_to_symmetric_mass_ratio(mass_1, mass_2)
q = mass_2 / mass_1
lambda_1 = 13 / 8 * lambda_tilde / (
(1 + 7 * eta - 31 * eta**2) * (1 + q**-5)
+ (1 - 4 * eta)**0.5 * (1 + 9 * eta - 11 * eta**2) * (1 - q**-5)
)
(1 + 7 * eta - 31 * eta**2) * (1 + q**-5) +
(1 - 4 * eta)**0.5 * (1 + 9 * eta - 11 * eta**2) * (1 - q**-5))
lambda_2 = lambda_1 / q**5
return lambda_1, lambda_2
......
......@@ -253,6 +253,7 @@ def supernova_pca_model(
return {'plus': h_plus, 'cross': h_cross}
def lal_binary_neutron_star(
frequency_array, mass_1, mass_2, luminosity_distance, a_1, a_2,
iota, phase, lambda_1, lambda_2, ra, dec, geocent_time, psi, **kwargs):
......@@ -271,7 +272,7 @@ def lal_binary_neutron_star(
a_1: float
Dimensionless spin magnitude
a_2: float
Dimensionless secondary spin magnitude.
Dimensionless secondary spin magnitude
iota: float
Orbital inclination
phase: float
......@@ -288,7 +289,7 @@ def lal_binary_neutron_star(
Dimensionless tidal deformability of mass_1
lambda_2: float
Dimensionless tidal deformability of mass_2
kwargs: dict
Optional keyword arguments
......@@ -321,7 +322,7 @@ def lal_binary_neutron_star(
longitude_ascending_nodes = 0.0
eccentricity = 0.0
mean_per_ano = 0.0
waveform_dictionary = lal.CreateDict()
lalsim.SimInspiralWaveformParamsInsertTidalLambda1(waveform_dictionary, lambda_1)
lalsim.SimInspiralWaveformParamsInsertTidalLambda2(waveform_dictionary, lambda_2)
......@@ -340,7 +341,7 @@ def lal_binary_neutron_star(
h_plus = hplus.data.data
h_cross = hcross.data.data
h_plus = h_plus[:len(frequency_array)]
h_cross = h_cross[:len(frequency_array)]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment