Merge branch 'roq-fixes' into 'master'

ROQ wrap the lalsimulation calls

Closes #314

See merge request !364

bilby/gw/source.py

@@ -8,7 +8,9 @@ from .utils import (lalsim_SimInspiralTransformPrecessingNewInitialConditions,
                     lalsim_GetApproximantFromString,
                     lalsim_SimInspiralChooseFDWaveform,
                     lalsim_SimInspiralWaveformParamsInsertTidalLambda1,
-                    lalsim_SimInspiralWaveformParamsInsertTidalLambda2)
+                    lalsim_SimInspiralWaveformParamsInsertTidalLambda2,
+                    lalsim_SimIMRPhenomPCalculateModelParametersFromSourceFrame,
+                    lalsim_SimIMRPhenomPFrequencySequence)
 
 try:
     import lal
@@ -410,25 +412,25 @@ def roq(frequency_array, mass_1, mass_2, luminosity_distance, a_1, tilt_1,
         spin_2z = a_2
     else:
         iota, spin_1x, spin_1y, spin_1z, spin_2x, spin_2y, spin_2z = \
-            lalsim.SimInspiralTransformPrecessingNewInitialConditions(
+            lalsim_SimInspiralTransformPrecessingNewInitialConditions(
                 iota, phi_jl, tilt_1, tilt_2, phi_12, a_1, a_2, mass_1, mass_2,
                 reference_frequency, phase)
 
     chi_1_l, chi_2_l, chi_p, theta_jn, alpha, phase_aligned, zeta =\
-        lalsim.SimIMRPhenomPCalculateModelParametersFromSourceFrame(
+        lalsim_SimIMRPhenomPCalculateModelParametersFromSourceFrame(
             mass_1, mass_2, reference_frequency, phase, iota, spin_1x,
             spin_1y, spin_1z, spin_2x, spin_2y, spin_2z, version)
 
     waveform_polarizations = dict()
 
-    h_linear_plus, h_linear_cross = lalsim.SimIMRPhenomPFrequencySequence(
+    h_linear_plus, h_linear_cross = lalsim_SimIMRPhenomPFrequencySequence(
         frequency_nodes_linear, chi_1_l, chi_2_l, chi_p, theta_jn,
         mass_1, mass_2, luminosity_distance,
-        alpha, phase_aligned, reference_frequency, version, None)
-    h_quadratic_plus, h_quadratic_cross = lalsim.SimIMRPhenomPFrequencySequence(
+        alpha, phase_aligned, reference_frequency, version)
+    h_quadratic_plus, h_quadratic_cross = lalsim_SimIMRPhenomPFrequencySequence(
         frequency_nodes_quadratic, chi_1_l, chi_2_l, chi_p, theta_jn,
         mass_1, mass_2, luminosity_distance,
-        alpha, phase_aligned, reference_frequency, version, None)
+        alpha, phase_aligned, reference_frequency, version)
 
     waveform_polarizations['linear'] = dict(
         plus=(np.cos(2 * zeta) * h_linear_plus.data.data +

bilby/gw/utils.py

@@ -770,6 +770,33 @@ def lalsim_SimInspiralChooseFDWaveform(
         waveform_dictionary, approximant)
 
 
+def lalsim_SimIMRPhenomPCalculateModelParametersFromSourceFrame(
+        mass_1, mass_2, reference_frequency, phase, iota, spin_1x,
+        spin_1y, spin_1z, spin_2x, spin_2y, spin_2z, version):
+    [mass_1, mass_2, reference_frequency, phase, iota, spin_1x,
+     spin_1y, spin_1z, spin_2x, spin_2y, spin_2z] = convert_args_list_to_float(
+        mass_1, mass_2, reference_frequency, phase, iota, spin_1x,
+        spin_1y, spin_1z, spin_2x, spin_2y, spin_2z)
+    return lalsim.SimIMRPhenomPCalculateModelParametersFromSourceFrame(
+        mass_1, mass_2, reference_frequency, phase, iota, spin_1x,
+        spin_1y, spin_1z, spin_2x, spin_2y, spin_2z, version)
+
+
+def lalsim_SimIMRPhenomPFrequencySequence(
+        frequency_nodes, chi_1_l, chi_2_l, chi_p, theta_jn,
+        mass_1, mass_2, luminosity_distance,
+        alpha, phase_aligned, reference_frequency, version):
+    [chi_1_l, chi_2_l, chi_p, theta_jn, mass_1, mass_2, luminosity_distance,
+     alpha, phase_aligned, reference_frequency] = convert_args_list_to_float(
+        chi_1_l, chi_2_l, chi_p, theta_jn, mass_1, mass_2, luminosity_distance,
+        alpha, phase_aligned, reference_frequency)
+
+    return lalsim.SimIMRPhenomPFrequencySequence(
+        frequency_nodes, chi_1_l, chi_2_l, chi_p, theta_jn, mass_1, mass_2,
+        luminosity_distance, alpha, phase_aligned, reference_frequency, version,
+        None)
+
+
 def lalsim_SimInspiralWaveformParamsInsertTidalLambda1(
         waveform_dictionary, lambda_1):
     try: