Update defaults for internal ESIGMA parameters

pycbc/waveform/waveform.py

@@ -589,39 +589,47 @@ def get_td_waveform(template=None, **kwargs):
     if "ESIGMA" in input_params["approximant"]:
         from gwnr.waveform import esigma_utils
 
-        hp, hc = None, None
-
         os.environ["RadiationPNOrder"] = "8"
         os.environ["ModePNOrder"] = "8"
         os.environ["InspiralEndRadius"] = "4.0"
 
         esigma_params = dict(
             mass1=float(input_params["mass1"]),
             mass2=float(input_params["mass2"]),
-            spin1z=float(input_params["spin1z"]),
-            spin2z=float(input_params["spin2z"]),
-            eccentricity=float(input_params["eccentricity"]),
-            mean_anomaly=float(input_params["mean_per_ano"]),
-            coa_phase=float(input_params["coa_phase"]),
-            distance=float(input_params["distance"]),
-            inclination=float(input_params["inclination"]),
             f_lower=float(input_params["f_lower"]),
             delta_t=float(input_params["delta_t"]),
+            spin1z=float(input_params.get("spin1z", 0)),
+            spin2z=float(input_params.get("spin2z", 0)),
+            eccentricity=float(input_params.get("eccentricity", 0)),
+            mean_anomaly=float(input_params.get("mean_per_ano", 0)),
+            coa_phase=float(input_params.get("coa_phase", 0)),
+            distance=float(input_params.get("distance", 1.0)),
+            inclination=float(input_params.get("inclination", 0)),
             # even thought we specify them, the inspiral ESIGMA methods
             # will ignore the following arguments
-            mode_to_align_by=(2, 2),
-            include_conjugate_modes=True,
-            f_mr_transition=None,
-            f_window_mr_transition=None,
-            num_hyb_orbits=0.25,
-            hybridize_using_avg_orbital_frequency=False,
-            hybridize_aligning_merger_to_inspiral=False,
-            keep_f_mr_transition_at_center=False,
-            merger_ringdown_approximant="NRSur7dq4",
-            return_hybridization_info=False,
-            return_orbital_params=False,
-            failsafe=True,
-            verbose=False,
+            mode_to_align_by=input_params.get("mode_to_align_by", (2, 2)),
+            include_conjugate_modes=input_params.get("include_conjugate_modes", True),
+            f_mr_transition=input_params.get("f_mr_transition", None),
+            f_window_mr_transition=input_params.get("f_window_mr_transition", None),
+            num_hyb_orbits=input_params.get("num_hyb_orbits", 0.25),
+            hybridize_using_avg_orbital_frequency=input_params.get(
+                "hybridize_using_avg_orbital_frequency", True
+            ),
+            hybridize_aligning_merger_to_inspiral=input_params.get(
+                "hybridize_aligning_merger_to_inspiral", True
+            ),
+            keep_f_mr_transition_at_center=input_params.get(
+                "keep_f_mr_transition_at_center", False
+            ),
+            merger_ringdown_approximant=input_params.get(
+                "merger_ringdown_approximant", "NRSur7dq4"
+            ),
+            return_hybridization_info=input_params.get(
+                "return_hybridization_info", False
+            ),
+            return_orbital_params=input_params.get("return_orbital_params", False),
+            failsafe=input_params.get("failsafe", True),
+            verbose=input_params.get("verbose", False),
         )
 
         try: