Moved calibration.py into the detector package

bilby/gw/__init__.py

-from . import (calibration, conversion, cosmology, detector, likelihood, prior,
+from . import (conversion, cosmology, detector, likelihood, prior,
                result, source, utils, waveform_generator)
 
 from .waveform_generator import WaveformGenerator

bilby/gw/detector/__init__.py

@@ -3,6 +3,7 @@ from .interferometer import *
 from .networks import *
 from .psd import *
 from .strain_data import *
+from .calibration import *
 
 try:
     import lal

bilby/gw/detector/interferometer.py

@@ -7,7 +7,7 @@ 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.calibration import Recalibrate
+from bilby.gw.detector.calibration import Recalibrate
 from bilby.gw.detector.geometry import InterferometerGeometry
 from bilby.gw.utils import PropertyAccessor
 from .strain_data import InterferometerStrainData

examples/injection_examples/calibration_example.py

@@ -50,7 +50,7 @@ for ifo in ifos:
         'recalib_{}_amplitude_{}'.format(ifo.name, ii): 0.1 for ii in range(5)})
     injection_parameters.update({
         'recalib_{}_phase_{}'.format(ifo.name, ii): 0.01 for ii in range(5)})
-    ifo.calibration_model = bilby.gw.calibration.CubicSpline(
+    ifo.calibration_model = bilby.gw.detector.calibration.CubicSpline(
         prefix='recalib_{}_'.format(ifo.name),
         minimum_frequency=ifo.minimum_frequency,
         maximum_frequency=ifo.maximum_frequency, n_points=5)

test/calibration_test.py

-from bilby.gw import calibration
+from bilby.gw.detector import calibration
 import unittest
 import numpy as np
 

test/example_test.py

@@ -43,8 +43,8 @@ class Test(unittest.TestCase):
 
     def test_examples(self):
         """ Loop over examples to check they run """
-        examples = ['examples/other_examples/linear_regression.py',
-                    'examples/other_examples/linear_regression_unknown_noise.py',
+        examples = ['../examples/other_examples/linear_regression.py',
+                    '../examples/other_examples/linear_regression_unknown_noise.py',
                     ]
         for filename in examples:
             print("Testing {}".format(filename))

test/gw_example_test.py

@@ -43,9 +43,9 @@ class Test(unittest.TestCase):
 
     def test_examples(self):
         """ Loop over examples to check they run """
-        examples = ['examples/injection_examples/fast_tutorial.py',
-                    'examples/injection_examples/marginalized_likelihood.py',
-                    'examples/open_data_examples/GW150914.py'
+        examples = ['../examples/injection_examples/fast_tutorial.py',
+                    '../examples/injection_examples/marginalized_likelihood.py',
+                    '../examples/open_data_examples/GW150914.py'
                     ]
         for filename in examples:
             print("Testing {}".format(filename))