Merge branch 'lal-wf-dict' into 'master'

Allow any lal dictionary option and add numerical_relativity_file

See merge request !896

bilby/gw/source.py

@@ -343,6 +343,15 @@ def _base_lal_cbc_fd_waveform(
     lalsim_SimInspiralWaveformParamsInsertTidalLambda2(
         waveform_dictionary, lambda_2)
 
+    for key, value in waveform_kwargs.items():
+        func = getattr(lalsim, "SimInspiralWaveformParamsInsert" + key, None)
+        if func is not None:
+            func(waveform_dictionary, value)
+
+    if waveform_kwargs.get('numerical_relativity_file', None) is not None:
+        lalsim.SimInspiralWaveformParamsInsertNumRelData(
+            waveform_dictionary, waveform_kwargs['numerical_relativity_file'])
+
     if ('mode_array' in waveform_kwargs) and waveform_kwargs['mode_array'] is not None:
         mode_array = waveform_kwargs['mode_array']
         mode_array_lal = lalsim.SimInspiralCreateModeArray()

test/gw/source_test.py

@@ -79,6 +79,19 @@ class TestLalBBH(unittest.TestCase):
     #         bilby.gw.source.lal_binary_black_hole(
     #             self.frequency_array, **self.parameters), dict)
 
+    def test_lal_bbh_xpprecession_version(self):
+        self.parameters.update(self.waveform_kwargs)
+        self.parameters["waveform_approximant"] = "IMRPhenomXP"
+
+        # Test that we can modify the XP precession version
+        out_v223 = bilby.gw.source.lal_binary_black_hole(
+            self.frequency_array, PhenomXPrecVersion=223, **self.parameters
+        )
+        out_v102 = bilby.gw.source.lal_binary_black_hole(
+            self.frequency_array, PhenomXPrecVersion=102, **self.parameters
+        )
+        self.assertFalse(np.all(out_v223["plus"] == out_v102["plus"]))
+
 
 class TestLalBNS(unittest.TestCase):
     def setUp(self):