Merge branch 'master' into improve-skymap

bilby/gw/detector/networks.py

@@ -5,6 +5,7 @@ import numpy as np
 
 from bilby.core import utils
 from bilby.core.utils import logger
+from bilby.gw import utils as gwutils
 from .interferometer import Interferometer
 from .psd import PowerSpectralDensity
 from .strain_data import InterferometerStrainData
@@ -306,7 +307,7 @@ def get_event_data(
     ------
     list: A list of bilby.gw.detector.Interferometer objects
     """
-    event_time = utils.get_event_time(event)
+    event_time = gwutils.get_event_time(event)
 
     interferometers = []
 

test/gw_utils_test.py

@@ -166,7 +166,7 @@ class TestGWUtils(unittest.TestCase):
     def test_lalsim_SimInspiralChooseFDWaveform(self):
         a = gwutils.lalsim_SimInspiralChooseFDWaveform(
             35.2, 20.4, 0.1, 0.2, 0.2, 0.2, 0.2, 0.1, 1000, 2, 2.3,
-            45., 0.1, 10, 0.01, 10, 1000, 20, None, 69)
+            45., 0.1, 10, 0.01, 10, 1000, 20, None, lalsim.IMRPhenomPv2)
         self.assertEqual(len(a), 2)
         self.assertEqual(type(a[0]), lal.COMPLEX16FrequencySeries)
         self.assertEqual(type(a[1]), lal.COMPLEX16FrequencySeries)