Don't necessarily overwrite luminosity distance if redshift is supplied

For cosmology studies, it is conceivable that a user will generate their own precomputed dL -> z mapping and save both of these values in the injection parameters, along with source-frame masses. Currently, in this case the conversion function will ignore the dL supplied by the user and overwrite it such that it uses the Planck15 dL given the supplied redshift.

This fix works under the assumption that if the user has supplied both z and dL, they have confirmed that they are related by the intended cosmology a priori.

bilby/gw/conversion.py

@@ -192,14 +192,14 @@ def convert_to_lal_binary_black_hole_parameters(parameters):
 
     converted_parameters = parameters.copy()
     original_keys = list(converted_parameters.keys())
-
-    if 'redshift' in converted_parameters.keys():
-        converted_parameters['luminosity_distance'] = \
-            redshift_to_luminosity_distance(parameters['redshift'])
-    elif 'comoving_distance' in converted_parameters.keys():
-        converted_parameters['luminosity_distance'] = \
-            comoving_distance_to_luminosity_distance(
-                parameters['comoving_distance'])
+    if 'luminosity_distance' not in original_keys:
+        if 'redshift' in converted_parameters.keys():
+            converted_parameters['luminosity_distance'] = \
+                redshift_to_luminosity_distance(parameters['redshift'])
+        elif 'comoving_distance' in converted_parameters.keys():
+            converted_parameters['luminosity_distance'] = \
+                comoving_distance_to_luminosity_distance(
+                    parameters['comoving_distance'])
 
     for key in original_keys:
         if key[-7:] == '_source':