Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
lscsoft
bilby
Commits
e7972e08
Commit
e7972e08
authored
Jul 26, 2018
by
Gregory Ashton
Browse files
Closes
#140
parent
895e6232
Pipeline
#26286
passed with stage
in 1 minute and 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tupak/gw/detector.py
View file @
e7972e08
...
...
@@ -18,12 +18,12 @@ except ImportError:
" not be able to use some of the prebuilt functions."
)
class
Interferometer
Se
t
(
list
):
class
Interferometer
Lis
t
(
list
):
""" A list of Interferometer objects """
def
__init__
(
self
,
interferometers
):
""" Instantiate a Interferometer
Se
t
""" Instantiate a Interferometer
Lis
t
The Interferometer
Se
t is a list of Interferometer objects, each
The Interferometer
Lis
t is a list of Interferometer objects, each
object has the data used in evaluating the likelihood
Parameters
...
...
@@ -178,18 +178,18 @@ class InterferometerSet(list):
return
self
[
0
].
strain_data
.
frequency_array
def
append
(
self
,
interferometer
):
if
isinstance
(
interferometer
,
Interferometer
Se
t
):
super
(
Interferometer
Se
t
,
self
).
extend
(
interferometer
)
if
isinstance
(
interferometer
,
Interferometer
Lis
t
):
super
(
Interferometer
Lis
t
,
self
).
extend
(
interferometer
)
else
:
super
(
Interferometer
Se
t
,
self
).
append
(
interferometer
)
super
(
Interferometer
Lis
t
,
self
).
append
(
interferometer
)
self
.
_check_interferometers
()
def
extend
(
self
,
interferometers
):
super
(
Interferometer
Se
t
,
self
).
extend
(
interferometers
)
super
(
Interferometer
Lis
t
,
self
).
extend
(
interferometers
)
self
.
_check_interferometers
()
def
insert
(
self
,
index
,
interferometer
):
super
(
Interferometer
Se
t
,
self
).
insert
(
index
,
interferometer
)
super
(
Interferometer
Lis
t
,
self
).
insert
(
index
,
interferometer
)
self
.
_check_interferometers
()
...
...
@@ -1437,12 +1437,12 @@ class Interferometer(object):
outdir
,
self
.
name
,
label
))
class
TriangularInterferometer
(
Interferometer
Se
t
):
class
TriangularInterferometer
(
Interferometer
Lis
t
):
def
__init__
(
self
,
name
,
power_spectral_density
,
minimum_frequency
,
maximum_frequency
,
length
,
latitude
,
longitude
,
elevation
,
xarm_azimuth
,
yarm_azimuth
,
xarm_tilt
=
0.
,
yarm_tilt
=
0.
):
Interferometer
Se
t
.
__init__
(
self
,
[])
Interferometer
Lis
t
.
__init__
(
self
,
[])
self
.
name
=
name
# for attr in ['power_spectral_density', 'minimum_frequency', 'maximum_frequency']:
if
isinstance
(
power_spectral_density
,
PowerSpectralDensity
):
...
...
@@ -1998,4 +1998,4 @@ def get_event_data(
logger
.
debug
(
"Error raised {}"
.
format
(
e
))
logger
.
warning
(
'No data found for {}.'
.
format
(
name
))
return
Interferometer
Se
t
(
interferometers
)
return
Interferometer
Lis
t
(
interferometers
)
tupak/gw/likelihood.py
View file @
e7972e08
...
...
@@ -56,7 +56,7 @@ class GravitationalWaveTransient(likelihood.Likelihood):
self
.
waveform_generator
=
waveform_generator
likelihood
.
Likelihood
.
__init__
(
self
,
waveform_generator
.
parameters
)
self
.
interferometers
=
tupak
.
gw
.
detector
.
Interferometer
Se
t
(
interferometers
)
self
.
interferometers
=
tupak
.
gw
.
detector
.
Interferometer
Lis
t
(
interferometers
)
self
.
time_marginalization
=
time_marginalization
self
.
distance_marginalization
=
distance_marginalization
self
.
phase_marginalization
=
phase_marginalization
...
...
Write
Preview
Supports
Markdown
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