From b74f30fd1b31705db4440b884c759164b18069f1 Mon Sep 17 00:00:00 2001
From: Moritz <email@moritz-huebner.de>
Date: Wed, 1 May 2019 18:10:28 +1000
Subject: [PATCH] Fixed some PEP8 and import issues
---
bilby/gw/detector/__init__.py | 5 ++---
bilby/gw/detector/interferometer.py | 2 +-
bilby/gw/detector/networks.py | 2 +-
bilby/gw/detector/psd.py | 2 +-
bilby/gw/detector/strain_data.py | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/bilby/gw/detector/__init__.py b/bilby/gw/detector/__init__.py
index c68d79011..0cb914470 100644
--- a/bilby/gw/detector/__init__.py
+++ b/bilby/gw/detector/__init__.py
@@ -1,6 +1,5 @@
from bilby.core.utils import logger
-from ...gw import conversion
-from .detector import *
+from .. import conversion
from .interferometer import *
from .networks import *
from .psd import *
@@ -479,4 +478,4 @@ def inject_signal_into_gwpy_timeseries(
for key in parameters:
logger.info(' {} = {}'.format(key, parameters[key]))
- return signal_and_data, meta_data
\ No newline at end of file
+ return signal_and_data, meta_data
diff --git a/bilby/gw/detector/interferometer.py b/bilby/gw/detector/interferometer.py
index 1be30abb2..c11e04c7b 100644
--- a/bilby/gw/detector/interferometer.py
+++ b/bilby/gw/detector/interferometer.py
@@ -930,4 +930,4 @@ class Interferometer(object):
res = deepdish.io.load(filename)
if res.__class__ != cls:
raise TypeError('The loaded object is not an Interferometer')
- return res
\ No newline at end of file
+ return res
diff --git a/bilby/gw/detector/networks.py b/bilby/gw/detector/networks.py
index 5622e04c4..7058f492e 100644
--- a/bilby/gw/detector/networks.py
+++ b/bilby/gw/detector/networks.py
@@ -260,4 +260,4 @@ class TriangularInterferometer(InterferometerList):
yarm_azimuth += 240
latitude += np.arctan(length * np.sin(xarm_azimuth * np.pi / 180) * 1e3 / utils.radius_of_earth)
- longitude += np.arctan(length * np.cos(xarm_azimuth * np.pi / 180) * 1e3 / utils.radius_of_earth)
\ No newline at end of file
+ longitude += np.arctan(length * np.cos(xarm_azimuth * np.pi / 180) * 1e3 / utils.radius_of_earth)
diff --git a/bilby/gw/detector/psd.py b/bilby/gw/detector/psd.py
index 858f0f8ca..808e2a8ce 100644
--- a/bilby/gw/detector/psd.py
+++ b/bilby/gw/detector/psd.py
@@ -264,4 +264,4 @@ class PowerSpectralDensity(object):
frequency_domain_strain = self.__power_spectral_density_interpolated(frequencies) ** 0.5 * white_noise
out_of_bounds = (frequencies < min(self.frequency_array)) | (frequencies > max(self.frequency_array))
frequency_domain_strain[out_of_bounds] = 0 * (1 + 1j)
- return frequency_domain_strain, frequencies
\ No newline at end of file
+ return frequency_domain_strain, frequencies
diff --git a/bilby/gw/detector/strain_data.py b/bilby/gw/detector/strain_data.py
index a9aa57653..ba5bc1ae1 100644
--- a/bilby/gw/detector/strain_data.py
+++ b/bilby/gw/detector/strain_data.py
@@ -686,4 +686,4 @@ class InterferometerStrainData(object):
@time_array.setter
def time_array(self, time_array):
- self._times_and_frequencies.time_array = time_array
\ No newline at end of file
+ self._times_and_frequencies.time_array = time_array
--
GitLab