diff --git a/bilby/gw/detector/detector.py b/bilby/gw/detector/detector.py
deleted file mode 100644
index aded27a15695a6b72e8c4b7b35ca7a036eba8ba4..0000000000000000000000000000000000000000
--- a/bilby/gw/detector/detector.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from __future__ import division, print_function, absolute_import
-
-from bilby.core.utils import logger
-
diff --git a/bilby/gw/detector/interferometer.py b/bilby/gw/detector/interferometer.py
index b87b2994a0954c631968e13da282bc18c76cf14c..1be30abb2387558e524ed9e0733466091c2bcee8 100644
--- a/bilby/gw/detector/interferometer.py
+++ b/bilby/gw/detector/interferometer.py
@@ -31,7 +31,7 @@ class Interferometer(object):
----------
name: str
Interferometer name, e.g., H1.
- power_spectral_density: bilby.gw.detector.psd.PowerSpectralDensity
+ power_spectral_density: bilby.gw.detector.PowerSpectralDensity
Power spectral density determining the sensitivity of the detector.
minimum_frequency: float
Minimum frequency to analyse for detector.
diff --git a/examples/injection_examples/australian_detector.py b/examples/injection_examples/australian_detector.py
index 124fa17b81e5f55324c424395f98e082a52e8012..4ad668d3a1f926d349788725e52111a4eb8f2f57 100644
--- a/examples/injection_examples/australian_detector.py
+++ b/examples/injection_examples/australian_detector.py
@@ -14,8 +14,7 @@ import gwinc
# Set the duration and sampling frequency of the data segment that we're going
# to inject the signal into
-import bilby.gw.detector.interferometer
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -39,7 +38,7 @@ Aplus_psd = gwinc_noises['Total']
# Set up the detector as a four-kilometer detector in Gingin
# The location of this detector is not defined in Bilby, so we need to add it
AusIFO = bilby.gw.detector.interferometer.Interferometer(
- power_spectral_density=bilby.gw.detector.detector.PowerSpectralDensity(
+ power_spectral_density=bilby.gw.detector.PowerSpectralDensity(
frequency_array=frequencies, psd_array=Aplus_psd),
name='AusIFO', length=4,
minimum_frequency=min(frequencies), maximum_frequency=max(frequencies),
@@ -47,10 +46,10 @@ AusIFO = bilby.gw.detector.interferometer.Interferometer(
elevation=0., xarm_azimuth=2., yarm_azimuth=125.)
# Set up two other detectors at Hanford and Livingston
-interferometers = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+interferometers = bilby.gw.detector.InterferometerList(['H1', 'L1'])
for interferometer in interferometers:
interferometer.power_spectral_density =\
- bilby.gw.detector.detector.PowerSpectralDensity(
+ bilby.gw.detector.PowerSpectralDensity(
frequency_array=frequencies, psd_array=Aplus_psd)
# append the Australian detector to the list of other detectors
diff --git a/examples/injection_examples/binary_neutron_star_example.py b/examples/injection_examples/binary_neutron_star_example.py
index 8e339924f21083842c0d1f2da4e2f48e553d8098..b966b5db3efb699b363c4d0a9f681f181eaf8c85 100644
--- a/examples/injection_examples/binary_neutron_star_example.py
+++ b/examples/injection_examples/binary_neutron_star_example.py
@@ -15,7 +15,7 @@ import numpy as np
import bilby
# Specify the output directory and the name of the simulation.
-import bilby.gw.detector.networks
+import bilby.gw.detector
outdir = 'outdir'
label = 'bns_example'
@@ -54,7 +54,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
# Set up interferometers. In this case we'll use three interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1), and Virgo (V1)).
# These default to their design sensitivity and start at 40 Hz.
-interferometers = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+interferometers = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
for interferometer in interferometers:
interferometer.minimum_frequency = 40
interferometers.set_strain_data_from_power_spectral_densities(
diff --git a/examples/injection_examples/calibration_example.py b/examples/injection_examples/calibration_example.py
index d10e6bdce499697fe947cec6ad1541cd9a39545b..9bd21a281c15d060359d4677ee3d4cbb87e07dd6 100644
--- a/examples/injection_examples/calibration_example.py
+++ b/examples/injection_examples/calibration_example.py
@@ -10,7 +10,7 @@ import bilby
# Set the duration and sampling frequency of the data segment
# that we're going to create and inject the signal into.
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -45,7 +45,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
# Set up interferometers. In this case we'll use three interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1), and Virgo (V1)).
# These default to their design sensitivity
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
for ifo in ifos:
injection_parameters.update({
'recalib_{}_amplitude_{}'.format(ifo.name, ii): 0.1 for ii in range(5)})
diff --git a/examples/injection_examples/change_sampled_parameters.py b/examples/injection_examples/change_sampled_parameters.py
index ad327c51fcfd2fa821425f225c4244c9beb48976..84ebd1cb483faa27f2c23e1a93fe727c5cb1c6b1 100644
--- a/examples/injection_examples/change_sampled_parameters.py
+++ b/examples/injection_examples/change_sampled_parameters.py
@@ -11,7 +11,7 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector.networks
+import bilby.gw.detector
bilby.core.utils.setup_logger(log_level="info")
@@ -39,7 +39,7 @@ waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
waveform_arguments=waveform_arguments)
# Set up interferometers.
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1', 'K1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1', 'K1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/create_your_own_source_model.py b/examples/injection_examples/create_your_own_source_model.py
index 3969bd275e683659fcd7972202c79f917a33d91b..0204cdefa578cbb9e4ebf1dce74d5940c4b8b926 100644
--- a/examples/injection_examples/create_your_own_source_model.py
+++ b/examples/injection_examples/create_your_own_source_model.py
@@ -7,7 +7,7 @@ import bilby
import numpy as np
# First set up logging and some output directories and labels
-import bilby.gw.detector.networks
+import bilby.gw.detector
outdir = 'outdir'
label = 'create_your_own_source_model'
@@ -34,7 +34,7 @@ waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
frequency_domain_source_model=sine_gaussian)
# Set up interferometers.
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/create_your_own_time_domain_source_model.py b/examples/injection_examples/create_your_own_time_domain_source_model.py
index f0d662a183202a77c712635de41659ebd05e4c7b..b937c8ca88fde13e080504ea32cbcfda04aef4c6 100644
--- a/examples/injection_examples/create_your_own_time_domain_source_model.py
+++ b/examples/injection_examples/create_your_own_time_domain_source_model.py
@@ -11,7 +11,7 @@ import bilby
# define the time-domain model
-import bilby.gw.detector.networks
+import bilby.gw.detector
def time_domain_damped_sinusoid(
@@ -44,7 +44,7 @@ waveform = bilby.gw.waveform_generator.WaveformGenerator(
start_time=injection_parameters['geocent_time'] - 0.5)
# inject the signal into three interferometers
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 0.5)
diff --git a/examples/injection_examples/custom_proposal_example.py b/examples/injection_examples/custom_proposal_example.py
index b52174ba11cf0d395894876462fdedac27bd6672..cfe67e54ca9f72983351a881a7be94ac1a38d99b 100644
--- a/examples/injection_examples/custom_proposal_example.py
+++ b/examples/injection_examples/custom_proposal_example.py
@@ -6,7 +6,7 @@ from __future__ import division, print_function
import numpy as np
-import bilby.gw.detector.networks
+import bilby.gw.detector
import bilby.gw.sampler.proposal
from bilby.core.sampler import proposal
@@ -32,7 +32,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
duration=duration, sampling_frequency=sampling_frequency,
frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole,
waveform_arguments=waveform_arguments)
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/eccentric_inspiral.py b/examples/injection_examples/eccentric_inspiral.py
index bae82bf1f50e5efb9fea0a6063af834f1e27c49f..b0b80c770a976a1da1f0fb85e198e1527ce4ca40 100644
--- a/examples/injection_examples/eccentric_inspiral.py
+++ b/examples/injection_examples/eccentric_inspiral.py
@@ -14,7 +14,7 @@ from __future__ import division
import numpy as np
import bilby
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 64.
sampling_frequency = 256.
@@ -48,7 +48,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
minimum_frequency = 10.
maximum_frequency = 128.
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
for ifo in ifos:
ifo.minimum_frequency = minimum_frequency
ifo.maximum_frequency = maximum_frequency
diff --git a/examples/injection_examples/fake_sampler_example.py b/examples/injection_examples/fake_sampler_example.py
index 63a4418ada9b5f07c0628a9d6564988f91aeeddd..18965c85d018492f6229e2434a9b433440cd4255 100755
--- a/examples/injection_examples/fake_sampler_example.py
+++ b/examples/injection_examples/fake_sampler_example.py
@@ -9,7 +9,7 @@ import deepdish as dd
import bilby
import matplotlib.pyplot as plt
-import bilby.gw.detector.networks
+import bilby.gw.detector
def make_comparison_histograms(file_full, file_roq):
@@ -77,7 +77,7 @@ def main():
waveform_arguments=waveform_arguments,
parameter_conversion=bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters)
- ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
if noise == 'Gaussian':
ifos.set_strain_data_from_power_spectral_densities(
diff --git a/examples/injection_examples/fast_tutorial.py b/examples/injection_examples/fast_tutorial.py
index df0e276d23d34da65b8c1cbacca616532c27dbe3..33a15f46dcb210025eb0bcd77c4434980453ca0a 100644
--- a/examples/injection_examples/fast_tutorial.py
+++ b/examples/injection_examples/fast_tutorial.py
@@ -14,7 +14,7 @@ import bilby
# Set the duration and sampling frequency of the data segment that we're
# going to inject the signal into
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -49,7 +49,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
# Set up interferometers. In this case we'll use two interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1). These default to their design
# sensitivity
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/how_to_specify_the_prior.py b/examples/injection_examples/how_to_specify_the_prior.py
index 6d8928af0f33fa4e178edc2b7c69af78f79e4712..5a1d26f9e362c2902f09e26a40f4d51b34af1cab 100644
--- a/examples/injection_examples/how_to_specify_the_prior.py
+++ b/examples/injection_examples/how_to_specify_the_prior.py
@@ -7,7 +7,7 @@ from __future__ import division, print_function
import numpy as np
import bilby
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -30,7 +30,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
waveform_arguments=waveform_arguments)
# Set up interferometers.
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/marginalized_likelihood.py b/examples/injection_examples/marginalized_likelihood.py
index 03f162b10a9b6462be80e8524c840b6a6bd73f44..c41e7a36f9062a2398bd6f302f765a52044cdca2 100644
--- a/examples/injection_examples/marginalized_likelihood.py
+++ b/examples/injection_examples/marginalized_likelihood.py
@@ -10,7 +10,7 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -34,7 +34,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
waveform_arguments=waveform_arguments)
# Set up interferometers.
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/non_tensor.py b/examples/injection_examples/non_tensor.py
index dc813163b383dcdb011f59d6a63062272fd356a1..76a18415979b49036c1d9e612a9771abee93ee87 100644
--- a/examples/injection_examples/non_tensor.py
+++ b/examples/injection_examples/non_tensor.py
@@ -10,7 +10,7 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector.networks
+import bilby.gw.detector
def vector_tensor_sine_gaussian(frequency_array, hrss, Q, frequency, epsilon):
@@ -56,7 +56,7 @@ waveform_generator =\
duration=duration, sampling_frequency=sampling_frequency,
frequency_domain_source_model=vector_tensor_sine_gaussian)
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/plot_skymap.py b/examples/injection_examples/plot_skymap.py
index ebea0f90aedb3380763dc6f5c528c9740a083965..840f61164920c3e024ff6f69a8295ba165143bcb 100644
--- a/examples/injection_examples/plot_skymap.py
+++ b/examples/injection_examples/plot_skymap.py
@@ -5,7 +5,7 @@ skymap
"""
from __future__ import division, print_function
import bilby
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -24,7 +24,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
frequency_domain_source_model=bilby.gw.source.lal_binary_black_hole,
parameters=injection_parameters, waveform_arguments=waveform_arguments)
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/roq_example.py b/examples/injection_examples/roq_example.py
index c7e45c30aea70af60931487fdcd0af16ea23835a..896bcb381a61d907c823c861b498a81f02d26c45 100644
--- a/examples/injection_examples/roq_example.py
+++ b/examples/injection_examples/roq_example.py
@@ -13,7 +13,7 @@ from __future__ import division, print_function
import numpy as np
import bilby
-import bilby.gw.detector.networks
+import bilby.gw.detector
outdir = 'outdir'
label = 'roq'
@@ -46,7 +46,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
waveform_arguments=waveform_arguments,
parameter_conversion=bilby.gw.conversion.convert_to_lal_binary_black_hole_parameters)
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/sine_gaussian_example.py b/examples/injection_examples/sine_gaussian_example.py
index 30eef114feabdc3b56a981534584c1ddfc1b1054..cb7052d1b22a6f810488a5410047bec324826185 100644
--- a/examples/injection_examples/sine_gaussian_example.py
+++ b/examples/injection_examples/sine_gaussian_example.py
@@ -9,7 +9,7 @@ import numpy as np
# Set the duration and sampling frequency of the data segment that we're going
# to inject the signal into
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -37,7 +37,7 @@ waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
# Set up interferometers. In this case we'll use three interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1), and Virgo (V1)). These default to
# their design sensitivity
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/injection_examples/standard_15d_cbc_tutorial.py b/examples/injection_examples/standard_15d_cbc_tutorial.py
index f72688c086bdbaa0faaa693354e6b6e94f59c004..ba22360b8e9204a369f4ccccf9c6d6d044f3546b 100644
--- a/examples/injection_examples/standard_15d_cbc_tutorial.py
+++ b/examples/injection_examples/standard_15d_cbc_tutorial.py
@@ -10,7 +10,7 @@ import bilby
# Set the duration and sampling frequency of the data segment that we're
# going to inject the signal into
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
@@ -47,7 +47,7 @@ waveform_generator = bilby.gw.WaveformGenerator(
# Set up interferometers. In this case we'll use two interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1). These default to their design
# sensitivity
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/examples/open_data_examples/read_gracedb_data.py b/examples/open_data_examples/read_gracedb_data.py
index 44d16f6b064fbccad8e8c639c780c4b446273e88..4e59874a231ba0f5a7556ff11c973013badd736c 100644
--- a/examples/open_data_examples/read_gracedb_data.py
+++ b/examples/open_data_examples/read_gracedb_data.py
@@ -8,7 +8,7 @@ This tutorial must be run on a LIGO cluster.
import bilby
import bilby.gw.detector
-import bilby.gw.detector.networks
+import bilby.gw.detector
label = 'GW170608'
outdir = label + '_out'
@@ -38,7 +38,7 @@ candidate, frame_caches = bilby.gw.utils.get_gracedb(
gracedb, outdir, duration, calibration, detectors, query_types)
# Set up interferometer objects from the cache files
-interferometers = bilby.gw.detector.networks.InterferometerList([])
+interferometers = bilby.gw.detector.InterferometerList([])
for cache_file, channel_name in zip(frame_caches, channel_names):
interferometer = bilby.gw.detector.load_data_from_cache_file(
diff --git a/examples/supernova_example/supernova_example.py b/examples/supernova_example/supernova_example.py
index 6dd170a35ab5dd64a934aff5b7f1b9db6e0e2c5d..d0cca28b058e13a62a2c4d705943e440cf45a73b 100644
--- a/examples/supernova_example/supernova_example.py
+++ b/examples/supernova_example/supernova_example.py
@@ -13,7 +13,7 @@ import bilby
# Set the duration and sampling frequency of the data segment that we're going
# to inject the signal into
-import bilby.gw.detector.networks
+import bilby.gw.detector
duration = 3.
sampling_frequency = 4096.
@@ -44,7 +44,7 @@ waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
# Set up interferometers. In this case we'll use three interferometers
# (LIGO-Hanford (H1), LIGO-Livingston (L1), and Virgo (V1)). These default to
# their design sensitivity
-ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=sampling_frequency, duration=duration,
start_time=injection_parameters['geocent_time'] - 3)
diff --git a/test/detector_test.py b/test/detector_test.py
index 9f47a0d00a3c6cf97a2db7d125f83e1ee2257d66..1a3a3959824275c5d00ad9b0854b3ef976034c23 100644
--- a/test/detector_test.py
+++ b/test/detector_test.py
@@ -13,16 +13,16 @@ from shutil import rmtree
import logging
import deepdish as dd
-import bilby.gw.detector.interferometer
-import bilby.gw.detector.networks
-import bilby.gw.detector.strain_data
+import bilby.gw.detector
+import bilby.gw.detector
+import bilby.gw.detector
class TestInterferometer(unittest.TestCase):
def setUp(self):
self.name = 'name'
- self.power_spectral_density = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ self.power_spectral_density = bilby.gw.detector.PowerSpectralDensity.from_aligo()
self.minimum_frequency = 10
self.maximum_frequency = 20
self.length = 30
@@ -378,8 +378,8 @@ class TestInterferometerEquals(unittest.TestCase):
def setUp(self):
self.name = 'name'
- self.power_spectral_density_1 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
- self.power_spectral_density_2 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ self.power_spectral_density_1 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
+ self.power_spectral_density_2 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
self.minimum_frequency = 10
self.maximum_frequency = 20
self.length = 30
@@ -765,8 +765,8 @@ class TestInterferometerList(unittest.TestCase):
self.frequency_arrays = np.linspace(0, 4096, 4097)
self.name1 = 'name1'
self.name2 = 'name2'
- self.power_spectral_density1 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
- self.power_spectral_density2 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ self.power_spectral_density1 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
+ self.power_spectral_density2 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
self.minimum_frequency1 = 10
self.minimum_frequency2 = 10
self.maximum_frequency1 = 20
@@ -808,7 +808,7 @@ class TestInterferometerList(unittest.TestCase):
self.frequency_arrays, sampling_frequency=4096, duration=2)
self.ifo2.strain_data.set_from_frequency_domain_strain(
self.frequency_arrays, sampling_frequency=4096, duration=2)
- self.ifo_list = bilby.gw.detector.networks.InterferometerList([self.ifo1, self.ifo2])
+ self.ifo_list = bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
self.outdir = 'outdir'
bilby.core.utils.check_directory_exists_and_if_not_mkdir(self.outdir)
@@ -845,21 +845,21 @@ class TestInterferometerList(unittest.TestCase):
def test_init_with_string(self):
with self.assertRaises(TypeError):
- bilby.gw.detector.networks.InterferometerList("string")
+ bilby.gw.detector.InterferometerList("string")
def test_init_with_string_list(self):
""" Merely checks if this ends up in the right bracket """
with mock.patch('bilby.gw.detector.get_empty_interferometer') as m:
m.side_effect = TypeError
with self.assertRaises(TypeError):
- bilby.gw.detector.networks.InterferometerList(['string'])
+ bilby.gw.detector.InterferometerList(['string'])
def test_init_with_other_object(self):
with self.assertRaises(TypeError):
- bilby.gw.detector.networks.InterferometerList([object()])
+ bilby.gw.detector.InterferometerList([object()])
def test_init_with_actual_ifos(self):
- ifo_list = bilby.gw.detector.networks.InterferometerList([self.ifo1, self.ifo2])
+ ifo_list = bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
self.assertEqual(self.ifo1, ifo_list[0])
self.assertEqual(self.ifo2, ifo_list[1])
@@ -876,7 +876,7 @@ class TestInterferometerList(unittest.TestCase):
self.ifo2.strain_data.set_from_frequency_domain_strain(
self.frequency_arrays, sampling_frequency=4096, duration=1)
with self.assertRaises(ValueError):
- bilby.gw.detector.networks.InterferometerList([self.ifo1, self.ifo2])
+ bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
def test_init_inconsistent_sampling_frequency(self):
self.frequency_arrays = np.linspace(0, 2048, 2049)
@@ -891,12 +891,12 @@ class TestInterferometerList(unittest.TestCase):
self.ifo2.strain_data.set_from_frequency_domain_strain(
self.frequency_arrays, sampling_frequency=2048, duration=2)
with self.assertRaises(ValueError):
- bilby.gw.detector.networks.InterferometerList([self.ifo1, self.ifo2])
+ bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
def test_init_inconsistent_start_time(self):
self.ifo2.strain_data.start_time = 1
with self.assertRaises(ValueError):
- bilby.gw.detector.networks.InterferometerList([self.ifo1, self.ifo2])
+ bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
@patch.object(bilby.gw.detector.interferometer.Interferometer, 'set_strain_data_from_power_spectral_density')
def test_set_strain_data_from_power_spectral_density(self, m):
@@ -910,7 +910,7 @@ class TestInterferometerList(unittest.TestCase):
def test_meta_data(self):
ifos_list = [self.ifo1, self.ifo2]
- ifos = bilby.gw.detector.networks.InterferometerList(ifos_list)
+ ifos = bilby.gw.detector.InterferometerList(ifos_list)
self.assertTrue(isinstance(ifos.meta_data, dict))
meta_data = {ifo.name: ifo.meta_data for ifo in ifos_list}
self.assertEqual(ifos.meta_data, meta_data)
@@ -992,7 +992,7 @@ class TestInterferometerList(unittest.TestCase):
else:
self.ifo_list.to_hdf5(outdir='outdir', label='test')
filename = 'outdir/test_name1name2.h5'
- recovered_ifo = bilby.gw.detector.networks.InterferometerList.from_hdf5(filename)
+ recovered_ifo = bilby.gw.detector.InterferometerList.from_hdf5(filename)
self.assertListEqual(self.ifo_list, recovered_ifo)
def test_to_and_from_hdf5_wrong_class(self):
@@ -1003,14 +1003,14 @@ class TestInterferometerList(unittest.TestCase):
filename = self.ifo_list._hdf5_filename_from_outdir_label(
outdir='outdir', label='psd')
with self.assertRaises(TypeError):
- bilby.gw.detector.networks.InterferometerList.from_hdf5(filename)
+ bilby.gw.detector.InterferometerList.from_hdf5(filename)
def test_plot_data(self):
- ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1'])
+ ifos = bilby.gw.detector.InterferometerList(['H1', 'L1'])
ifos.set_strain_data_from_power_spectral_densities(2048, 4)
ifos.plot_data(outdir=self.outdir)
- ifos = bilby.gw.detector.networks.InterferometerList(['H1', 'L1', 'V1'])
+ ifos = bilby.gw.detector.InterferometerList(['H1', 'L1', 'V1'])
ifos.set_strain_data_from_power_spectral_densities(2048, 4)
ifos.plot_data(outdir=self.outdir)
@@ -1028,26 +1028,26 @@ class TestPowerSpectralDensityWithoutFiles(unittest.TestCase):
del self.asd_array
def test_init_with_asd_array(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_array=self.asd_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_array=self.asd_array)
self.assertTrue(np.array_equal(self.frequency_array, psd.frequency_array))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
def test_init_with_psd_array(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
self.assertTrue(np.array_equal(self.frequency_array, psd.frequency_array))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
def test_setting_asd_array_after_init(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
psd.asd_array = self.asd_array
self.assertTrue(np.array_equal(self.frequency_array, psd.frequency_array))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
def test_setting_psd_array_after_init(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
psd.psd_array = self.psd_array
self.assertTrue(np.array_equal(self.frequency_array, psd.frequency_array))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
@@ -1055,28 +1055,28 @@ class TestPowerSpectralDensityWithoutFiles(unittest.TestCase):
def test_power_spectral_density_interpolated_from_asd_array(self):
expected = np.array([25.])
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_array=self.asd_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_array=self.asd_array)
self.assertEqual(expected, psd.power_spectral_density_interpolated(2))
def test_power_spectral_density_interpolated_from_psd_array(self):
expected = np.array([25.])
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
self.assertEqual(expected, psd.power_spectral_density_interpolated(2))
def test_from_amplitude_spectral_density_array(self):
- actual = bilby.gw.detector.detector.PowerSpectralDensity.from_amplitude_spectral_density_array(
+ actual = bilby.gw.detector.PowerSpectralDensity.from_amplitude_spectral_density_array(
frequency_array=self.frequency_array, asd_array=self.asd_array)
self.assertTrue(np.array_equal(self.psd_array, actual.psd_array))
self.assertTrue(np.array_equal(self.asd_array, actual.asd_array))
def test_from_power_spectral_density_array(self):
- actual = bilby.gw.detector.detector.PowerSpectralDensity.from_power_spectral_density_array(
+ actual = bilby.gw.detector.PowerSpectralDensity.from_power_spectral_density_array(
frequency_array=self.frequency_array, psd_array=self.psd_array)
self.assertTrue(np.array_equal(self.psd_array, actual.psd_array))
self.assertTrue(np.array_equal(self.asd_array, actual.asd_array))
def test_repr(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_array=self.psd_array)
expected = 'PowerSpectralDensity(frequency_array={}, psd_array={}, asd_array={})'.format(self.frequency_array,
self.psd_array,
self.asd_array)
@@ -1109,26 +1109,26 @@ class TestPowerSpectralDensityWithFiles(unittest.TestCase):
del self.psd_file
def test_init_with_psd_file(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_file=self.psd_file)
self.assertEqual(self.psd_file, psd.psd_file)
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
self.assertTrue(np.allclose(self.asd_array, psd.asd_array, atol=1e-30))
def test_init_with_asd_file(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_file=self.asd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_file=self.asd_file)
self.assertEqual(self.asd_file, psd.asd_file)
self.assertTrue(np.allclose(self.psd_array, psd.psd_array, atol=1e-60))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
def test_setting_psd_array_after_init(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
psd.psd_file = self.psd_file
self.assertEqual(self.psd_file, psd.psd_file)
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
self.assertTrue(np.allclose(self.asd_array, psd.asd_array, atol=1e-30))
def test_init_with_asd_array_after_init(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array)
psd.asd_file = self.asd_file
self.assertEqual(self.asd_file, psd.asd_file)
self.assertTrue(np.allclose(self.psd_array, psd.psd_array, atol=1e-60))
@@ -1136,30 +1136,30 @@ class TestPowerSpectralDensityWithFiles(unittest.TestCase):
def test_power_spectral_density_interpolated_from_asd_file(self):
expected = np.array([4.0e-42])
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_file=self.asd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, asd_file=self.asd_file)
self.assertTrue(np.allclose(expected, psd.power_spectral_density_interpolated(2), atol=1e-60))
def test_power_spectral_density_interpolated_from_psd_file(self):
expected = np.array([4.0e-42])
- psd = bilby.gw.detector.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(frequency_array=self.frequency_array, psd_file=self.psd_file)
self.assertAlmostEqual(expected, psd.power_spectral_density_interpolated(2))
def test_from_amplitude_spectral_density_file(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity.from_amplitude_spectral_density_file(asd_file=self.asd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity.from_amplitude_spectral_density_file(asd_file=self.asd_file)
self.assertEqual(self.asd_file, psd.asd_file)
self.assertTrue(np.allclose(self.psd_array, psd.psd_array, atol=1e-60))
self.assertTrue(np.array_equal(self.asd_array, psd.asd_array))
def test_from_power_spectral_density_file(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity.from_power_spectral_density_file(psd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity.from_power_spectral_density_file(psd_file=self.psd_file)
self.assertEqual(self.psd_file, psd.psd_file)
self.assertTrue(np.array_equal(self.psd_array, psd.psd_array))
self.assertTrue(np.allclose(self.asd_array, psd.asd_array, atol=1e-30))
def test_from_aligo(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ psd = bilby.gw.detector.PowerSpectralDensity.from_aligo()
expected_filename = 'aLIGO_ZERO_DET_high_P_psd.txt'
- expected = bilby.gw.detector.detector.PowerSpectralDensity(psd_file=expected_filename)
+ expected = bilby.gw.detector.PowerSpectralDensity(psd_file=expected_filename)
actual_filename = psd.psd_file.split('/')[-1]
self.assertEqual(expected_filename, actual_filename)
self.assertTrue(np.allclose(expected.psd_array, psd.psd_array, atol=1e-60))
@@ -1169,28 +1169,28 @@ class TestPowerSpectralDensityWithFiles(unittest.TestCase):
logger = logging.getLogger('bilby')
m = MagicMock()
logger.warning = m
- psd = bilby.gw.detector.detector.PowerSpectralDensity(psd_file=self.asd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(psd_file=self.asd_file)
self.assertEqual(4, m.call_count)
def test_check_file_not_called_psd_file_set_to_psd_file(self):
logger = logging.getLogger('bilby')
m = MagicMock()
logger.warning = m
- psd = bilby.gw.detector.detector.PowerSpectralDensity(psd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(psd_file=self.psd_file)
self.assertEqual(0, m.call_count)
def test_check_file_asd_file_set_to_psd_file(self):
logger = logging.getLogger('bilby')
m = MagicMock()
logger.warning = m
- psd = bilby.gw.detector.detector.PowerSpectralDensity(asd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(asd_file=self.psd_file)
self.assertEqual(4, m.call_count)
def test_check_file_not_called_asd_file_set_to_asd_file(self):
logger = logging.getLogger('bilby')
m = MagicMock()
logger.warning = m
- psd = bilby.gw.detector.detector.PowerSpectralDensity(asd_file=self.asd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(asd_file=self.asd_file)
self.assertEqual(0, m.call_count)
def test_from_frame_file(self):
@@ -1199,14 +1199,14 @@ class TestPowerSpectralDensityWithFiles(unittest.TestCase):
with mock.patch('bilby.gw.detector.InterferometerStrainData.set_from_frame_file') as m:
with mock.patch('bilby.gw.detector.InterferometerStrainData.create_power_spectral_density') as n:
n.return_value = expected_frequency_array, expected_psd_array
- psd = bilby.gw.detector.detector.PowerSpectralDensity.from_frame_file(frame_file=self.asd_file,
+ psd = bilby.gw.detector.PowerSpectralDensity.from_frame_file(frame_file=self.asd_file,
psd_start_time=0,
psd_duration=4)
self.assertTrue(np.array_equal(expected_frequency_array, psd.frequency_array))
self.assertTrue(np.array_equal(expected_psd_array, psd.psd_array))
def test_repr(self):
- psd = bilby.gw.detector.detector.PowerSpectralDensity(psd_file=self.psd_file)
+ psd = bilby.gw.detector.PowerSpectralDensity(psd_file=self.psd_file)
expected = 'PowerSpectralDensity(psd_file=\'{}\', asd_file=\'{}\')'.format(self.psd_file, None)
self.assertEqual(expected, repr(psd))
@@ -1214,13 +1214,13 @@ class TestPowerSpectralDensityWithFiles(unittest.TestCase):
class TestPowerSpectralDensityEquals(unittest.TestCase):
def setUp(self):
- self.psd_from_file_1 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
- self.psd_from_file_2 = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ self.psd_from_file_1 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
+ self.psd_from_file_2 = bilby.gw.detector.PowerSpectralDensity.from_aligo()
self.frequency_array = np.linspace(1, 100)
self.psd_array = np.linspace(1, 100)
- self.psd_from_array_1 = bilby.gw.detector.detector.PowerSpectralDensity. \
+ self.psd_from_array_1 = bilby.gw.detector.PowerSpectralDensity. \
from_power_spectral_density_array(frequency_array=self.frequency_array, psd_array= self.psd_array)
- self.psd_from_array_2 = bilby.gw.detector.detector.PowerSpectralDensity. \
+ self.psd_from_array_2 = bilby.gw.detector.PowerSpectralDensity. \
from_power_spectral_density_array(frequency_array=self.frequency_array, psd_array= self.psd_array)
def tearDown(self):
diff --git a/test/gw_likelihood_test.py b/test/gw_likelihood_test.py
index 7c975fdd17b3fded38e2e4881446145b94ee290f..4ac135bf02d593cebac9a382ca1b88465c2295df 100644
--- a/test/gw_likelihood_test.py
+++ b/test/gw_likelihood_test.py
@@ -3,7 +3,7 @@ import unittest
import bilby
import numpy as np
-import bilby.gw.detector.networks
+import bilby.gw.detector
class TestBasicGWTransient(unittest.TestCase):
@@ -15,7 +15,7 @@ class TestBasicGWTransient(unittest.TestCase):
phi_12=1.7, phi_jl=0.3, luminosity_distance=4000., theta_jn=0.4,
psi=2.659, phase=1.3, geocent_time=1126259642.413, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=2048, duration=4)
self.waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
@@ -78,7 +78,7 @@ class TestGWTransient(unittest.TestCase):
phi_12=1.7, phi_jl=0.3, luminosity_distance=4000., theta_jn=0.4,
psi=2.659, phase=1.3, geocent_time=1126259642.413, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration)
self.waveform_generator = bilby.gw.waveform_generator.WaveformGenerator(
@@ -137,17 +137,17 @@ class TestGWTransient(unittest.TestCase):
self.assertEqual(expected, repr(self.likelihood))
def test_interferometers_setting_list(self):
- ifos = [bilby.gw.detector.detector.get_empty_interferometer(name=name) for name in ['H1', 'L1']]
+ ifos = [bilby.gw.detector.get_empty_interferometer(name=name) for name in ['H1', 'L1']]
self.likelihood.interferometers = ifos
- self.assertListEqual(bilby.gw.detector.networks.InterferometerList(ifos), self.likelihood.interferometers)
- self.assertTrue(type(self.likelihood.interferometers) == bilby.gw.detector.networks.InterferometerList)
+ self.assertListEqual(bilby.gw.detector.InterferometerList(ifos), self.likelihood.interferometers)
+ self.assertTrue(type(self.likelihood.interferometers) == bilby.gw.detector.InterferometerList)
def test_interferometers_setting_interferometer_list(self):
- ifos = bilby.gw.detector.networks.InterferometerList([bilby.gw.detector.detector.get_empty_interferometer(name=name)
+ ifos = bilby.gw.detector.InterferometerList([bilby.gw.detector.get_empty_interferometer(name=name)
for name in ['H1', 'L1']])
self.likelihood.interferometers = ifos
- self.assertListEqual(bilby.gw.detector.networks.InterferometerList(ifos), self.likelihood.interferometers)
- self.assertTrue(type(self.likelihood.interferometers) == bilby.gw.detector.networks.InterferometerList)
+ self.assertListEqual(bilby.gw.detector.InterferometerList(ifos), self.likelihood.interferometers)
+ self.assertTrue(type(self.likelihood.interferometers) == bilby.gw.detector.InterferometerList)
def test_meta_data(self):
expected = dict(
@@ -176,7 +176,7 @@ class TestTimeMarginalization(unittest.TestCase):
psi=2.659, phase=1.3, geocent_time=1126259640, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration,
start_time=1126259640)
@@ -275,7 +275,7 @@ class TestMarginalizedLikelihood(unittest.TestCase):
psi=2.659, phase=1.3, geocent_time=1126259642.413, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration,
start_time=self.parameters['geocent_time'] - self.duration / 2)
@@ -339,7 +339,7 @@ class TestPhaseMarginalization(unittest.TestCase):
psi=2.659, phase=1.3, geocent_time=1126259642.413, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration)
@@ -402,7 +402,7 @@ class TestTimePhaseMarginalization(unittest.TestCase):
psi=2.659, phase=1.3, geocent_time=1126259642.413, ra=1.375,
dec=-1.2108)
- self.interferometers = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.interferometers = bilby.gw.detector.InterferometerList(['H1'])
self.interferometers.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration,
start_time=1126259640)
@@ -505,7 +505,7 @@ class TestROQLikelihood(unittest.TestCase):
phi_12=1.7, phi_jl=0.3, luminosity_distance=1000., theta_jn=0.4,
psi=0.659, phase=1.3, geocent_time=1.2, ra=1.3, dec=-1.2)
- ifos = bilby.gw.detector.networks.InterferometerList(['H1'])
+ ifos = bilby.gw.detector.InterferometerList(['H1'])
ifos.set_strain_data_from_power_spectral_densities(
sampling_frequency=self.sampling_frequency, duration=self.duration)
@@ -579,7 +579,7 @@ class TestROQLikelihood(unittest.TestCase):
class TestBBHLikelihoodSetUp(unittest.TestCase):
def setUp(self):
- self.ifos = bilby.gw.detector.networks.InterferometerList(['H1'])
+ self.ifos = bilby.gw.detector.InterferometerList(['H1'])
def tearDown(self):
del self.ifos
diff --git a/test/gw_utils_test.py b/test/gw_utils_test.py
index a7f2b3155bbccd7600420924334b3ac7c5cad197..5d3ae04fa4e6fceb0d59f9b95b247c16c63260c7 100644
--- a/test/gw_utils_test.py
+++ b/test/gw_utils_test.py
@@ -64,7 +64,7 @@ class TestGWUtils(unittest.TestCase):
aa = np.array([1, 2, 3])
bb = np.array([5, 6, 7])
frequency = np.array([0.2, 0.4, 0.6])
- PSD = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ PSD = bilby.gw.detector.PowerSpectralDensity.from_aligo()
ip = gwutils.inner_product(aa, bb, frequency, PSD)
self.assertEqual(ip, 0)
@@ -72,7 +72,7 @@ class TestGWUtils(unittest.TestCase):
aa = np.array([1e-23, 2e-23, 3e-23])
bb = np.array([5e-23, 6e-23, 7e-23])
frequency = np.array([100, 101, 102])
- PSD = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ PSD = bilby.gw.detector.PowerSpectralDensity.from_aligo()
psd = PSD.power_spectral_density_interpolated(frequency)
duration = 4
nwip = gwutils.noise_weighted_inner_product(aa, bb, psd, duration)
@@ -86,7 +86,7 @@ class TestGWUtils(unittest.TestCase):
signal = np.array([1e-23, 2e-23, 3e-23])
frequency_domain_strain = np.array([5e-23, 6e-23, 7e-23])
frequency = np.array([100, 101, 102])
- PSD = bilby.gw.detector.detector.PowerSpectralDensity.from_aligo()
+ PSD = bilby.gw.detector.PowerSpectralDensity.from_aligo()
psd = PSD.power_spectral_density_interpolated(frequency)
duration = 4
diff --git a/test/noise_realisation_test.py b/test/noise_realisation_test.py
index 44c78a746689b6e3a236e40ee277c8ce6f617341..15aa404f4d00092fde0d093a3eba6260d961efeb 100644
--- a/test/noise_realisation_test.py
+++ b/test/noise_realisation_test.py
@@ -11,7 +11,7 @@ class TestNoiseRealisation(unittest.TestCase):
factor = np.sqrt(2 / time_duration)
n_avg = 1000
psd_avg = 0
- interferometer = bilby.gw.detector.detector.get_empty_interferometer('H1')
+ interferometer = bilby.gw.detector.get_empty_interferometer('H1')
for x in range(0, n_avg):
interferometer.set_strain_data_from_power_spectral_density(
sampling_frequency=sampling_frequency, duration=time_duration)
@@ -37,7 +37,7 @@ class TestNoiseRealisation(unittest.TestCase):
* np.sin(2 * np.pi * 100 * time_array))
muf, frequency_array = bilby.core.utils.nfft(mu, sampling_frequency)
for x in range(0, n_avg):
- interferometer = bilby.gw.detector.detector.get_empty_interferometer('H1')
+ interferometer = bilby.gw.detector.get_empty_interferometer('H1')
interferometer.set_strain_data_from_power_spectral_density(
sampling_frequency=sampling_frequency, duration=duration)
snr[x] = interferometer.matched_filter_snr(signal=muf)