diff --git a/bilby/core/sampler/proposal.py b/bilby/core/sampler/proposal.py index 496869274e482efc7fae1b4fd5449d9d65c163e4..f889f94530881b13bafe0d311ccefa21797bc9f7 100644 --- a/bilby/core/sampler/proposal.py +++ b/bilby/core/sampler/proposal.py @@ -4,7 +4,7 @@ from inspect import isclass import numpy as np import random -from bilby.core.prior import Uniform +from ..prior import Uniform class Sample(OrderedDict): diff --git a/bilby/gw/detector/__init__.py b/bilby/gw/detector/__init__.py index 6b5b2449f5c8591b6fcae035e5a8fb6320284875..50b9f7a349873ba608880afdeb3f6c97345d4f21 100644 --- a/bilby/gw/detector/__init__.py +++ b/bilby/gw/detector/__init__.py @@ -1,4 +1,4 @@ -from bilby.gw import conversion +from ..conversion import convert_to_lal_binary_black_hole_parameters from .calibration import * from .interferometer import * from .networks import * @@ -64,7 +64,7 @@ def inject_signal_into_gwpy_timeseries( ifo = get_empty_interferometer(det) ifo.strain_data.set_from_gwpy_timeseries(data) - parameters_check, _ = conversion.convert_to_lal_binary_black_hole_parameters(parameters) + parameters_check, _ = convert_to_lal_binary_black_hole_parameters(parameters) safe_time = get_safe_signal_duration(**parameters_check) if data.duration.value < safe_time: ValueError( diff --git a/bilby/gw/detector/geometry.py b/bilby/gw/detector/geometry.py index 0bd29e3321288f8e85559198f8016a0ea58183fa..319645187435d9ebae71653a84bc3c84a73276d2 100644 --- a/bilby/gw/detector/geometry.py +++ b/bilby/gw/detector/geometry.py @@ -1,6 +1,6 @@ import numpy as np -from bilby.gw import utils as gwutils +from .. import utils as gwutils class InterferometerGeometry(object): diff --git a/bilby/gw/detector/interferometer.py b/bilby/gw/detector/interferometer.py index c7b44a3164c115153fafabfc88e85a95dc11da82..d059d4df5dea622befd7c7f4422c0292736ae6e3 100644 --- a/bilby/gw/detector/interferometer.py +++ b/bilby/gw/detector/interferometer.py @@ -4,12 +4,12 @@ import sys import numpy as np from matplotlib import pyplot as plt -from bilby.core import utils -from bilby.core.utils import logger -from bilby.gw import utils as gwutils -from bilby.gw.detector.calibration import Recalibrate -from bilby.gw.detector.geometry import InterferometerGeometry -from bilby.gw.utils import PropertyAccessor +from ...core import utils +from ...core.utils import logger +from .. import utils as gwutils +from ..utils import PropertyAccessor +from .calibration import Recalibrate +from .geometry import InterferometerGeometry from .strain_data import InterferometerStrainData try: diff --git a/bilby/gw/detector/networks.py b/bilby/gw/detector/networks.py index 9a0cc7025b24a2eb2728c56063243ef91f62331d..53883cc9cb30b9f113e66ae87daf6368e012ef4a 100644 --- a/bilby/gw/detector/networks.py +++ b/bilby/gw/detector/networks.py @@ -3,9 +3,9 @@ import sys import numpy as np -from bilby.core import utils -from bilby.core.utils import logger -from bilby.gw import utils as gwutils +from ...core import utils +from ...core.utils import logger +from .. import utils as gwutils from .interferometer import Interferometer from .psd import PowerSpectralDensity from .strain_data import InterferometerStrainData diff --git a/bilby/gw/detector/psd.py b/bilby/gw/detector/psd.py index a0d30d6a49e5d1b587f35514bdad3e3d7eb74991..0267dce30885d57860357d3f4c3abfefd4cb83a7 100644 --- a/bilby/gw/detector/psd.py +++ b/bilby/gw/detector/psd.py @@ -3,8 +3,8 @@ import os import numpy as np from scipy.interpolate import interp1d -from bilby.core import utils -from bilby.core.utils import logger +from ...core import utils +from ...core.utils import logger from .strain_data import InterferometerStrainData diff --git a/bilby/gw/detector/strain_data.py b/bilby/gw/detector/strain_data.py index 83f063ce777c4502fb66c9c1c064077d1827a52d..84f763337c4beb7c56175b38487fe9b132d91878 100644 --- a/bilby/gw/detector/strain_data.py +++ b/bilby/gw/detector/strain_data.py @@ -1,11 +1,11 @@ import numpy as np from scipy.signal.windows import tukey -from bilby.core import utils -from bilby.core.series import CoupledTimeAndFrequencySeries -from bilby.core.utils import logger -from bilby.gw import utils as gwutils -from bilby.gw.utils import PropertyAccessor +from ...core import utils +from ...core.series import CoupledTimeAndFrequencySeries +from ...core.utils import logger +from .. import utils as gwutils +from ..utils import PropertyAccessor try: import gwpy diff --git a/bilby/gw/sampler/proposal.py b/bilby/gw/sampler/proposal.py index 328fd98a89f051b634f99602a5cfba50b7a68dc6..79e1ec92ce6b3ed21c9f9ae0c9317a1473cd72b4 100644 --- a/bilby/gw/sampler/proposal.py +++ b/bilby/gw/sampler/proposal.py @@ -2,7 +2,7 @@ import random import numpy as np -from bilby.core.sampler.proposal import JumpProposal +from ...core.sampler.proposal import JumpProposal class SkyLocationWanderJump(JumpProposal): diff --git a/bilby/hyper/model.py b/bilby/hyper/model.py index a5d2c669971de4cb567bf9715019dc3fdfdfc1b7..82b0d8fa508617073e70dbe37a1abc91d369eaa4 100644 --- a/bilby/hyper/model.py +++ b/bilby/hyper/model.py @@ -1,4 +1,4 @@ -from bilby.core.utils import infer_parameters_from_function +from ..core.utils import infer_parameters_from_function class Model(object):