Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Fix passing mode_array in injection-waveform-arguments #820

Merged
merged 9 commits into from
Jan 27, 2025
Merged

[BUG] Fix passing mode_array in injection-waveform-arguments #820

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c550ae8
Fix passing mode_array in injection-waveform-arguments
lorenzo-pompili Oct 6, 2024
4d85792
Add name to authors.md
lorenzo-pompili Oct 6, 2024
f3652b6
Put conversion inside if statement
lorenzo-pompili Oct 7, 2024
d0ced8d
Add try/except
lorenzo-pompili Oct 7, 2024
ba16abe
Typo
lorenzo-pompili Oct 7, 2024
29c325c
Merge branch 'main' into fix_injection_mode_array
ColmTalbot Nov 14, 2024
8d93f18
Add more informative error message
lorenzo-pompili Jan 16, 2025
97f82cc
Add safe_cast_mode_to_int
lorenzo-pompili Jan 24, 2025
b3c76d8
Merge branch 'main' into fix_injection_mode_array
lorenzopompili00 Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,5 @@ Martin White
Peter Tsun-Ho Pang
Alexandre Sebastien Goettel
Ann-Kristin Malz
Lorenzo Pompili
Sean Hibbitt
9 changes: 8 additions & 1 deletion bilby/gw/source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ def gwsignal_binary_black_hole(frequency_array, mass_1, mass_2, luminosity_dista
}

if mode_array is not None:
try:
mode_array = [tuple(map(int, mode)) for mode in mode_array]
except (ValueError, TypeError) as e:
raise ValueError(
f"Unable to convert mode_array elements to tuples of ints. "
f"mode_array: {mode_array}, Error: {e}"
) from e
gwsignal_dict.update(ModeArray=mode_array)

# Pass extra waveform arguments to gwsignal
Expand Down Expand Up @@ -528,7 +535,7 @@ def set_waveform_dictionary(waveform_kwargs, lambda_1=0, lambda_2=0):
if mode_array is not None:
mode_array_lal = lalsim.SimInspiralCreateModeArray()
for mode in mode_array:
lalsim.SimInspiralModeArrayActivateMode(mode_array_lal, mode[0], mode[1])
lalsim.SimInspiralModeArrayActivateMode(mode_array_lal, int(mode[0]), int(mode[1]))
adivijaykumar marked this conversation as resolved.
Show resolved Hide resolved
lalsim.SimInspiralWaveformParamsInsertModeArray(waveform_dictionary, mode_array_lal)
return waveform_dictionary

Expand Down
Loading