use gwsignal waveform generator selector

bhooshan-gadre · Jul 25, 2023 · 0e8e2a2 · 0e8e2a2
1 parent 53c9fac
commit 0e8e2a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/pycbc/waveform/waveform.py b/pycbc/waveform/waveform.py
@@ -32,7 +32,7 @@
 import lal
 import numpy
 from lalsimulation.gwsignal.core import waveform as wfm
-# from lalsimulation.gwsignal.models import gwsignal_get_waveform_generator
+from lalsimulation.gwsignal.models import gwsignal_get_waveform_generator
 
 import pycbc
 import pycbc.scheme as _scheme
@@ -226,7 +226,9 @@ def _lalsim_td_waveform(**p):
     # select or instantiate the generator
     approx = p['approximant']
     gen = _gws_waveform_generators.setdefault(approx,
-            wfm.LALCompactBinaryCoalescenceGenerator(approx))
+           gwsignal_get_waveform_generator(approx))
+    # gen = _gws_waveform_generators.setdefault(approx,
+    #         wfm.LALCompactBinaryCoalescenceGenerator(approx))
     # convert paramaters to gwsignal parameters
     p_gws = to_gwsignal_dict(p)
     hp, hc = wfm.GenerateTDWaveform(p_gws, gen)
@@ -305,7 +307,9 @@ def _lalsim_fd_waveform(**p):
     # select or instantiate the generator
     approx = p['approximant']
     gen = _gws_waveform_generators.setdefault(approx,
-            wfm.LALCompactBinaryCoalescenceGenerator(approx))
+           gwsignal_get_waveform_generator(approx))
+    # gen = _gws_waveform_generators.setdefault(approx,
+    #         wfm.LALCompactBinaryCoalescenceGenerator(approx))
     # convert paramaters to gwsignal parameters
     p_gws = to_gwsignal_dict(p)
     hp, hc = wfm.GenerateFDWaveform(p_gws, gen)

diff --git a/pycbc/waveform/waveform_modes.py b/pycbc/waveform/waveform_modes.py
@@ -39,7 +39,9 @@ def _lalsim_fd_waveform(**p):
     # select or instantiate the generator
     approx = p['approximant']
     gen = _gws_waveform_generators.setdefault(approx,
-            wfm.LALCompactBinaryCoalescenceGenerator(approx))
+           gwsignal_get_waveform_generator(approx))
+    # gen = _gws_waveform_generators.setdefault(approx,
+    #         wfm.LALCompactBinaryCoalescenceGenerator(approx))
     # convert paramaters to gwsignal parameters
     p_gws = to_gwsignal_dict(p)
     hlm = wfm.GenerateFDModes(p_gws, gen)
@@ -58,7 +60,9 @@ def _lalsim_td_waveform(**p):
     # select or instantiate the generator
     approx = p['approximant']
     gen = _gws_waveform_generators.setdefault(approx,
-            wfm.LALCompactBinaryCoalescenceGenerator(approx))
+           gwsignal_get_waveform_generator(approx))
+    # gen = _gws_waveform_generators.setdefault(approx,
+    #         wfm.LALCompactBinaryCoalescenceGenerator(approx))
     # convert paramaters to gwsignal parameters
     p_gws = to_gwsignal_dict(p)
     hlm = wfm.GenerateTDModes(p_gws, gen)