From d35312056772df3fc4b3c87593f248dcea1cee88 Mon Sep 17 00:00:00 2001
From: Moritz <email@moritz-huebner.de>
Date: Wed, 1 May 2019 18:03:39 +1000
Subject: [PATCH] Reverted some imports
---
.../injection_examples/australian_detector.py | 4 +--
.../binary_neutron_star_example.py | 2 --
.../injection_examples/calibration_example.py | 1 -
.../change_sampled_parameters.py | 1 -
.../create_your_own_source_model.py | 2 --
...reate_your_own_time_domain_source_model.py | 3 --
.../custom_proposal_example.py | 2 --
.../injection_examples/eccentric_inspiral.py | 1 -
.../fake_sampler_example.py | 2 --
examples/injection_examples/fast_tutorial.py | 2 --
.../how_to_specify_the_prior.py | 2 +-
.../marginalized_likelihood.py | 1 -
examples/injection_examples/non_tensor.py | 2 --
examples/injection_examples/plot_skymap.py | 1 -
.../plot_time_domain_data.py | 1 -
examples/injection_examples/roq_example.py | 1 -
.../sine_gaussian_example.py | 2 --
.../standard_15d_cbc_tutorial.py | 2 --
test/detector_test.py | 32 +++++++++----------
19 files changed, 18 insertions(+), 46 deletions(-)
diff --git a/examples/injection_examples/australian_detector.py b/examples/injection_examples/australian_detector.py
index 4ad668d3a..3cd8c4aa9 100644
--- a/examples/injection_examples/australian_detector.py
+++ b/examples/injection_examples/australian_detector.py
@@ -14,8 +14,6 @@ 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
-
duration = 4.
sampling_frequency = 2048.
@@ -37,7 +35,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(
+AusIFO = bilby.gw.detector.Interferometer(
power_spectral_density=bilby.gw.detector.PowerSpectralDensity(
frequency_array=frequencies, psd_array=Aplus_psd),
name='AusIFO', length=4,
diff --git a/examples/injection_examples/binary_neutron_star_example.py b/examples/injection_examples/binary_neutron_star_example.py
index b966b5db3..81db9eda2 100644
--- a/examples/injection_examples/binary_neutron_star_example.py
+++ b/examples/injection_examples/binary_neutron_star_example.py
@@ -15,8 +15,6 @@ import numpy as np
import bilby
# Specify the output directory and the name of the simulation.
-import bilby.gw.detector
-
outdir = 'outdir'
label = 'bns_example'
bilby.core.utils.setup_logger(outdir=outdir, label=label)
diff --git a/examples/injection_examples/calibration_example.py b/examples/injection_examples/calibration_example.py
index 9bd21a281..ca5899469 100644
--- a/examples/injection_examples/calibration_example.py
+++ b/examples/injection_examples/calibration_example.py
@@ -10,7 +10,6 @@ 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
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/change_sampled_parameters.py b/examples/injection_examples/change_sampled_parameters.py
index 84ebd1cb4..9f432ef52 100644
--- a/examples/injection_examples/change_sampled_parameters.py
+++ b/examples/injection_examples/change_sampled_parameters.py
@@ -11,7 +11,6 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector
bilby.core.utils.setup_logger(log_level="info")
diff --git a/examples/injection_examples/create_your_own_source_model.py b/examples/injection_examples/create_your_own_source_model.py
index 0204cdefa..ded59e157 100644
--- a/examples/injection_examples/create_your_own_source_model.py
+++ b/examples/injection_examples/create_your_own_source_model.py
@@ -7,8 +7,6 @@ import bilby
import numpy as np
# First set up logging and some output directories and labels
-import bilby.gw.detector
-
outdir = 'outdir'
label = 'create_your_own_source_model'
sampling_frequency = 4096
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 b937c8ca8..11290fde3 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,9 +11,6 @@ import bilby
# define the time-domain model
-import bilby.gw.detector
-
-
def time_domain_damped_sinusoid(
time, amplitude, damping_time, frequency, phase, t0):
"""
diff --git a/examples/injection_examples/custom_proposal_example.py b/examples/injection_examples/custom_proposal_example.py
index cfe67e54c..8480dd361 100644
--- a/examples/injection_examples/custom_proposal_example.py
+++ b/examples/injection_examples/custom_proposal_example.py
@@ -5,8 +5,6 @@ Tutorial for running cpnest with custom jump proposals.
from __future__ import division, print_function
import numpy as np
-
-import bilby.gw.detector
import bilby.gw.sampler.proposal
from bilby.core.sampler import proposal
diff --git a/examples/injection_examples/eccentric_inspiral.py b/examples/injection_examples/eccentric_inspiral.py
index b0b80c770..8d3053f35 100644
--- a/examples/injection_examples/eccentric_inspiral.py
+++ b/examples/injection_examples/eccentric_inspiral.py
@@ -14,7 +14,6 @@ from __future__ import division
import numpy as np
import bilby
-import bilby.gw.detector
duration = 64.
sampling_frequency = 256.
diff --git a/examples/injection_examples/fake_sampler_example.py b/examples/injection_examples/fake_sampler_example.py
index 18965c85d..63c271373 100755
--- a/examples/injection_examples/fake_sampler_example.py
+++ b/examples/injection_examples/fake_sampler_example.py
@@ -9,8 +9,6 @@ import deepdish as dd
import bilby
import matplotlib.pyplot as plt
-import bilby.gw.detector
-
def make_comparison_histograms(file_full, file_roq):
# Returns a dictionary
diff --git a/examples/injection_examples/fast_tutorial.py b/examples/injection_examples/fast_tutorial.py
index 33a15f46d..6bfd0a0ed 100644
--- a/examples/injection_examples/fast_tutorial.py
+++ b/examples/injection_examples/fast_tutorial.py
@@ -14,8 +14,6 @@ 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
-
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/how_to_specify_the_prior.py b/examples/injection_examples/how_to_specify_the_prior.py
index 5a1d26f9e..68081b4d2 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
+
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/marginalized_likelihood.py b/examples/injection_examples/marginalized_likelihood.py
index c41e7a36f..c6ab3362c 100644
--- a/examples/injection_examples/marginalized_likelihood.py
+++ b/examples/injection_examples/marginalized_likelihood.py
@@ -10,7 +10,6 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/non_tensor.py b/examples/injection_examples/non_tensor.py
index 76a184159..c75fcf0db 100644
--- a/examples/injection_examples/non_tensor.py
+++ b/examples/injection_examples/non_tensor.py
@@ -10,8 +10,6 @@ from __future__ import division, print_function
import bilby
import numpy as np
-import bilby.gw.detector
-
def vector_tensor_sine_gaussian(frequency_array, hrss, Q, frequency, epsilon):
"""
diff --git a/examples/injection_examples/plot_skymap.py b/examples/injection_examples/plot_skymap.py
index 840f61164..9ebee7725 100644
--- a/examples/injection_examples/plot_skymap.py
+++ b/examples/injection_examples/plot_skymap.py
@@ -5,7 +5,6 @@ skymap
"""
from __future__ import division, print_function
import bilby
-import bilby.gw.detector
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/plot_time_domain_data.py b/examples/injection_examples/plot_time_domain_data.py
index aea74e0dc..eee3c8557 100644
--- a/examples/injection_examples/plot_time_domain_data.py
+++ b/examples/injection_examples/plot_time_domain_data.py
@@ -4,7 +4,6 @@
from __future__ import division, print_function
import numpy as np
import bilby
-import bilby.gw.detector
np.random.seed(1)
diff --git a/examples/injection_examples/roq_example.py b/examples/injection_examples/roq_example.py
index 896bcb381..6d54aaa99 100644
--- a/examples/injection_examples/roq_example.py
+++ b/examples/injection_examples/roq_example.py
@@ -13,7 +13,6 @@ from __future__ import division, print_function
import numpy as np
import bilby
-import bilby.gw.detector
outdir = 'outdir'
label = 'roq'
diff --git a/examples/injection_examples/sine_gaussian_example.py b/examples/injection_examples/sine_gaussian_example.py
index cb7052d1b..07ac1ff0b 100644
--- a/examples/injection_examples/sine_gaussian_example.py
+++ b/examples/injection_examples/sine_gaussian_example.py
@@ -9,8 +9,6 @@ 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
-
duration = 4.
sampling_frequency = 2048.
diff --git a/examples/injection_examples/standard_15d_cbc_tutorial.py b/examples/injection_examples/standard_15d_cbc_tutorial.py
index ba22360b8..822c11b10 100644
--- a/examples/injection_examples/standard_15d_cbc_tutorial.py
+++ b/examples/injection_examples/standard_15d_cbc_tutorial.py
@@ -10,8 +10,6 @@ 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
-
duration = 4.
sampling_frequency = 2048.
diff --git a/test/detector_test.py b/test/detector_test.py
index 1a3a39598..ab15548ea 100644
--- a/test/detector_test.py
+++ b/test/detector_test.py
@@ -34,7 +34,7 @@ class TestInterferometer(unittest.TestCase):
self.xarm_tilt = 0.
self.yarm_tilt = 0.
# noinspection PyTypeChecker
- self.ifo = bilby.gw.detector.interferometer.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
+ self.ifo = bilby.gw.detector.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency, length=self.length,
latitude=self.latitude, longitude=self.longitude,
@@ -360,7 +360,7 @@ class TestInterferometer(unittest.TestCase):
else:
self.ifo.to_hdf5(outdir='outdir', label='test')
filename = self.ifo._hdf5_filename_from_outdir_label(outdir='outdir', label='test')
- recovered_ifo = bilby.gw.detector.interferometer.Interferometer.from_hdf5(filename)
+ recovered_ifo = bilby.gw.detector.Interferometer.from_hdf5(filename)
self.assertEqual(self.ifo, recovered_ifo)
def test_to_and_from_hdf5_wrong_class(self):
@@ -371,7 +371,7 @@ class TestInterferometer(unittest.TestCase):
dd.io.save('./outdir/psd.h5', self.power_spectral_density)
filename = self.ifo._hdf5_filename_from_outdir_label(outdir='outdir', label='psd')
with self.assertRaises(TypeError):
- bilby.gw.detector.interferometer.Interferometer.from_hdf5(filename)
+ bilby.gw.detector.Interferometer.from_hdf5(filename)
class TestInterferometerEquals(unittest.TestCase):
@@ -396,7 +396,7 @@ class TestInterferometerEquals(unittest.TestCase):
self.frequency_array = bilby.utils.create_frequency_series(sampling_frequency=self.sampling_frequency,
duration=self.duration)
self.strain = self.frequency_array
- self.ifo_1 = bilby.gw.detector.interferometer.Interferometer(name=self.name,
+ self.ifo_1 = bilby.gw.detector.Interferometer(name=self.name,
power_spectral_density=self.power_spectral_density_1,
minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency, length=self.length,
@@ -404,7 +404,7 @@ class TestInterferometerEquals(unittest.TestCase):
elevation=self.elevation,
xarm_azimuth=self.xarm_azimuth, yarm_azimuth=self.yarm_azimuth,
xarm_tilt=self.xarm_tilt, yarm_tilt=self.yarm_tilt)
- self.ifo_2 = bilby.gw.detector.interferometer.Interferometer(name=self.name,
+ self.ifo_2 = bilby.gw.detector.Interferometer(name=self.name,
power_spectral_density=self.power_spectral_density_2,
minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency, length=self.length,
@@ -498,7 +498,7 @@ class TestInterferometerStrainData(unittest.TestCase):
def setUp(self):
self.minimum_frequency = 10
self.maximum_frequency = 20
- self.ifosd = bilby.gw.detector.strain_data.InterferometerStrainData(
+ self.ifosd = bilby.gw.detector.InterferometerStrainData(
minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency)
@@ -681,10 +681,10 @@ class TestInterferometerStrainDataEquals(unittest.TestCase):
self.frequency_array = bilby.utils.create_frequency_series(sampling_frequency=self.sampling_frequency,
duration=self.duration)
self.strain = self.frequency_array
- self.ifosd_1 = bilby.gw.detector.strain_data.InterferometerStrainData(minimum_frequency=self.minimum_frequency,
+ self.ifosd_1 = bilby.gw.detector.InterferometerStrainData(minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency,
roll_off=self.roll_off)
- self.ifosd_2 = bilby.gw.detector.strain_data.InterferometerStrainData(minimum_frequency=self.minimum_frequency,
+ self.ifosd_2 = bilby.gw.detector.InterferometerStrainData(minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency,
roll_off=self.roll_off)
self.ifosd_1.set_from_frequency_domain_strain(frequency_domain_strain=self.strain,
@@ -788,7 +788,7 @@ class TestInterferometerList(unittest.TestCase):
self.yarm_tilt1 = 0.
self.yarm_tilt2 = 0.
# noinspection PyTypeChecker
- self.ifo1 = bilby.gw.detector.interferometer.Interferometer(name=self.name1,
+ self.ifo1 = bilby.gw.detector.Interferometer(name=self.name1,
power_spectral_density=self.power_spectral_density1,
minimum_frequency=self.minimum_frequency1,
maximum_frequency=self.maximum_frequency1, length=self.length1,
@@ -796,7 +796,7 @@ class TestInterferometerList(unittest.TestCase):
elevation=self.elevation1,
xarm_azimuth=self.xarm_azimuth1, yarm_azimuth=self.yarm_azimuth1,
xarm_tilt=self.xarm_tilt1, yarm_tilt=self.yarm_tilt1)
- self.ifo2 = bilby.gw.detector.interferometer.Interferometer(name=self.name2,
+ self.ifo2 = bilby.gw.detector.Interferometer(name=self.name2,
power_spectral_density=self.power_spectral_density2,
minimum_frequency=self.minimum_frequency2,
maximum_frequency=self.maximum_frequency2, length=self.length2,
@@ -865,7 +865,7 @@ class TestInterferometerList(unittest.TestCase):
def test_init_inconsistent_duration(self):
self.frequency_arrays = np.linspace(0, 2048, 2049)
- self.ifo2 = bilby.gw.detector.interferometer.Interferometer(name=self.name2,
+ self.ifo2 = bilby.gw.detector.Interferometer(name=self.name2,
power_spectral_density=self.power_spectral_density2,
minimum_frequency=self.minimum_frequency2,
maximum_frequency=self.maximum_frequency2, length=self.length2,
@@ -880,7 +880,7 @@ class TestInterferometerList(unittest.TestCase):
def test_init_inconsistent_sampling_frequency(self):
self.frequency_arrays = np.linspace(0, 2048, 2049)
- self.ifo2 = bilby.gw.detector.interferometer.Interferometer(name=self.name2,
+ self.ifo2 = bilby.gw.detector.Interferometer(name=self.name2,
power_spectral_density=self.power_spectral_density2,
minimum_frequency=self.minimum_frequency2,
maximum_frequency=self.maximum_frequency2, length=self.length2,
@@ -898,7 +898,7 @@ class TestInterferometerList(unittest.TestCase):
with self.assertRaises(ValueError):
bilby.gw.detector.InterferometerList([self.ifo1, self.ifo2])
- @patch.object(bilby.gw.detector.interferometer.Interferometer, 'set_strain_data_from_power_spectral_density')
+ @patch.object(bilby.gw.detector.Interferometer, 'set_strain_data_from_power_spectral_density')
def test_set_strain_data_from_power_spectral_density(self, m):
self.ifo_list.set_strain_data_from_power_spectral_densities(sampling_frequency=123, duration=6.2, start_time=3)
m.assert_called_with(sampling_frequency=123, duration=6.2, start_time=3)
@@ -924,13 +924,13 @@ class TestInterferometerList(unittest.TestCase):
self.ifo_list.inject_signal(parameters=None, waveform_generator=waveform_generator)
self.assertTrue(m.called)
- @patch.object(bilby.gw.detector.interferometer.Interferometer, 'inject_signal')
+ @patch.object(bilby.gw.detector.Interferometer, 'inject_signal')
def test_inject_signal_with_inj_pol(self, m):
self.ifo_list.inject_signal(injection_polarizations=dict(plus=1))
m.assert_called_with(parameters=None, injection_polarizations=dict(plus=1))
self.assertEqual(len(self.ifo_list), m.call_count)
- @patch.object(bilby.gw.detector.interferometer.Interferometer, 'inject_signal')
+ @patch.object(bilby.gw.detector.Interferometer, 'inject_signal')
def test_inject_signal_returns_expected_polarisations(self, m):
m.return_value = dict(plus=1, cross=2)
injection_polarizations = dict(plus=1, cross=2)
@@ -938,7 +938,7 @@ class TestInterferometerList(unittest.TestCase):
self.assertDictEqual(self.ifo1.inject_signal(injection_polarizations=injection_polarizations), ifos_pol[0])
self.assertDictEqual(self.ifo2.inject_signal(injection_polarizations=injection_polarizations), ifos_pol[1])
- @patch.object(bilby.gw.detector.interferometer.Interferometer, 'save_data')
+ @patch.object(bilby.gw.detector.Interferometer, 'save_data')
def test_save_data(self, m):
self.ifo_list.save_data(outdir='test_outdir', label='test_outdir')
m.assert_called_with(outdir='test_outdir', label='test_outdir')
--
GitLab