Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
lscsoft
bilby
Commits
d74b901a
Commit
d74b901a
authored
Jun 17, 2019
by
Moritz Huebner
Committed by
Colm Talbot
Jun 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made default parameter conversion a static method rather than a lamda expression
parent
3c896cda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
bilby/gw/waveform_generator.py
bilby/gw/waveform_generator.py
+6
-2
No files found.
bilby/gw/waveform_generator.py
View file @
d74b901a
...
...
@@ -57,7 +57,7 @@ class WaveformGenerator(object):
self
.
time_domain_source_model
=
time_domain_source_model
self
.
source_parameter_keys
=
self
.
__parameters_from_source_model
()
if
parameter_conversion
is
None
:
self
.
parameter_conversion
=
lambda
params
:
(
params
,
[])
self
.
parameter_conversion
=
self
.
_default_parameter_conversion
else
:
self
.
parameter_conversion
=
parameter_conversion
if
waveform_arguments
is
not
None
:
...
...
@@ -77,7 +77,7 @@ class WaveformGenerator(object):
tdsm_name
=
self
.
time_domain_source_model
.
__name__
else
:
tdsm_name
=
None
if
self
.
parameter_conversion
.
__name__
==
'
<lambda>
'
:
if
self
.
parameter_conversion
.
__name__
==
'
_default_parameter_conversion
'
:
param_conv_name
=
None
else
:
param_conv_name
=
self
.
parameter_conversion
.
__name__
...
...
@@ -235,3 +235,7 @@ class WaveformGenerator(object):
raise
AttributeError
(
'Either time or frequency domain source '
'model must be provided.'
)
return
set
(
utils
.
infer_parameters_from_function
(
model
))
@
staticmethod
def
_default_parameter_conversion
(
params
):
return
params
,
[]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment