Commit b88c19ca authored by Colm Talbot's avatar Colm Talbot
Browse files

Merge branch...

Merge branch '437-allow-lal-dictionary-to-be-passed-through-to-_base_lal_cbc_fd_waveform' into 'master'

Resolve "Allow lal dictionary to be passed through to `_base_lal_cbc_fd_waveform`"

Closes #437

See merge request !752
parents 800d8653 d4cc1286
Pipeline #116908 passed with stages
in 25 minutes and 15 seconds
......@@ -301,6 +301,9 @@ def _base_lal_cbc_fd_waveform(
pn_tidal_order = waveform_kwargs['pn_tidal_order']
pn_phase_order = waveform_kwargs['pn_phase_order']
pn_amplitude_order = waveform_kwargs['pn_amplitude_order']
waveform_dictionary = waveform_kwargs.get(
'lal_waveform_dictionary', lal.CreateDict()
)
approximant = lalsim_GetApproximantFromString(waveform_approximant)
......@@ -327,7 +330,6 @@ def _base_lal_cbc_fd_waveform(
longitude_ascending_nodes = 0.0
mean_per_ano = 0.0
waveform_dictionary = lal.CreateDict()
lalsim.SimInspiralWaveformParamsInsertPNSpinOrder(
waveform_dictionary, int(pn_spin_order))
lalsim.SimInspiralWaveformParamsInsertPNTidalOrder(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment