maximum_frequency_of_generated_waveform set to zero for TaylorF2 case

Codes/set_injection_parameters.py

@@ -115,19 +115,23 @@ def ini_file_to_dict(file_path='../examples/GW170817.ini'):
     R_isco = 6.      # Orbital separation at ISCO, in geometric units. 6M for PN ISCO; 2.8M for EOB
     m1_min = 1
     m2_min = 1
-    # approximant = 'TaylorF2'
+    approximant = 'TaylorF2'
     # approximant = 'SpinTaylorF2'
     # approximant = 'IMRPhenomD'
     # approximant = 'IMRPhenomPv2'
-    approximant = 'IMRPhenomPv2_ROQ'
+    # approximant = 'IMRPhenomPv2_ROQ'
     # approximant = 'IMRPhenomPv2_NRTidal'
-    f_ISCO = Compute_fISCO(R_isco, m1, m2)
-    f_ISCO_run = Compute_fISCO(R_isco, m1_min, m2_min)
+    # f_ISCO = Compute_fISCO(R_isco, m1, m2)
+    # f_ISCO_run = Compute_fISCO(R_isco, m1_min, m2_min)
+    f_ISCO = Compute_LAL_fISCO(m1 * LAL_MSUN_SI, m2 * LAL_MSUN_SI)
+    f_ISCO_run = Compute_LAL_fISCO(m1_min * LAL_MSUN_SI, m2_min * LAL_MSUN_SI)
     if approximant == 'TaylorF2':
         f_high = f_ISCO
         f_high_run = f_ISCO_run
-        # maximum_frequency = min(4096 * 4, f_high_run)
-        maximum_frequency = 0
+        maximum_frequency_injected_waveform = 0
+        # maximum_frequency_of_analysis = min(4096 * 4, f_high_run)
+        maximum_frequency_of_analysis = f_high_run
+        maximum_frequency_of_generated_waveform = 0
         sampling_frequency = 2 * f_high_run
         duration = tc_3p5PN + 2
         reference_frequency = 0
@@ -149,6 +153,7 @@ def ini_file_to_dict(file_path='../examples/GW170817.ini'):
         # maximum_frequency_injected_waveform = rescaled_params['fhigh']
         maximum_frequency_injected_waveform = min(2048, rescaled_params['fhigh'])
         maximum_frequency_of_analysis = min(2048, rescaled_params['fhigh'])
+        maximum_frequency_of_generated_waveform = None
         # maximum_frequency_of_analysis = rescaled_params['fhigh']
         sampling_frequency = 2 * max(2048, rescaled_params['fhigh'])
         duration = rescaled_params['seglen']
@@ -180,6 +185,7 @@ def ini_file_to_dict(file_path='../examples/GW170817.ini'):
         maximum_frequency_of_analysis = min(2048, f_high_run)
         # maximum_frequency_of_analysis = min(4 * 4096, f_high_run)
         maximum_frequency_injected_waveform = maximum_frequency_of_analysis
+        maximum_frequency_of_generated_waveform = None
         sampling_frequency = 2 * maximum_frequency_of_analysis
         duration = 64
         reference_frequency = 20
@@ -194,7 +200,7 @@ def ini_file_to_dict(file_path='../examples/GW170817.ini'):
         minimum_frequency = minimum_frequency,
         maximum_frequency_injected_waveform = maximum_frequency_injected_waveform,
         maximum_frequency_of_analysis = maximum_frequency_of_analysis,
-        maximum_frequency_of_generated_waveform = None,
+        maximum_frequency_of_generated_waveform = maximum_frequency_of_generated_waveform,
         sampling_frequency = sampling_frequency,
         duration = duration,
         tc_3p5PN = tc_3p5PN,

Library/bilby_waveform.py

@@ -14,8 +14,7 @@ def get_source_frame_polarizations(parameters, minimum_frequency, interferometer
     # breakpoint()
     # Fixed arguments passed into the source model. The analysis starts at 40 Hz.
     if 'meta' in parameters.keys():
-        waveform_arguments = dict(waveform_approximant=parameters['meta']['approximant'], reference_frequency=parameters['meta']['reference_frequency'], minimum_frequency=minimum_frequency, maximum_frequency=0)
-        # waveform_arguments = dict(waveform_approximant=parameters['meta']['approximant'], reference_frequency=parameters['meta']['reference_frequency'], minimum_frequency=minimum_frequency, maximum_frequency=parameters['meta']['maximum_frequency_of_generated_waveform'])
+        waveform_arguments = dict(waveform_approximant=parameters['meta']['approximant'], reference_frequency=parameters['meta']['reference_frequency'], minimum_frequency=minimum_frequency, maximum_frequency=parameters['meta']['maximum_frequency_of_generated_waveform'])
     else:
         waveform_arguments = dict(waveform_approximant=conf.approximant, reference_frequency=conf.reference_frequency, minimum_frequency=conf.minimum_frequency, maximum_frequency=conf.maximum_frequency_of_analysis)