TaylorF2 corrections

Codes/set_injection_parameters.py

@@ -140,13 +140,20 @@ def compute_extended_analysis_dict(mass_1, mass_2, geocent_time, chirp_mass, **a
     if approximant == 'TaylorF2':
         f_high = f_ISCO
         f_high_run = f_ISCO_run
-        maximum_frequency_injected_waveform = 0
-        maximum_frequency_search_waveform = 0
-        # maximum_frequency_ifo = min(4096 * 4, f_high_run)
-        maximum_frequency_ifo = f_high_run
-        sampling_frequency = 2 * f_high_run
+        # maximum_frequency_injected_waveform = 0
+        # maximum_frequency_search_waveform = 0
+        # # maximum_frequency_ifo = min(4096 * 4, f_high_run)
+        # maximum_frequency_ifo = f_high_run
+        # sampling_frequency = 2 * f_high_run
         # duration = int(tc_3p5PN) + 1 + 2
         # reference_frequency = 0
+        maximum_frequency_ifo = min(maximum_frequency, f_high_run)
+        maximum_frequency_injected_waveform = maximum_frequency_ifo
+        maximum_frequency_search_waveform = maximum_frequency_ifo
+
+        sampling_frequency = 2 * maximum_frequency_ifo
+        # duration = 64
+        duration = int(tc_3p5PN) + 1 + 2
     elif approximant == 'IMRPhenomPv2' and roq:
         # cf:
         # - https://lscsoft.docs.ligo.org/lalsuite/lalsimulation/group___l_a_l_sim_i_m_r_phenom__c.html#gad3f98acfe9527259a7f73a8ef69a2f7b

examples/config_files/config_GW170817_TaylorF2.ini

+[analysis]
+# Interferometers to run the analysis on.
+ifos = H1,L1,V1
+approximant = TaylorF2
+minimum_frequency = 30
+maximum_frequency = 2048.0
+reference_frequency = 20
+roq = False
+roq_b_matrix_directory = /Users/marcarene/roq/ROQ_data/IMRPhenomPv2/
+# 1: sets the PSDs from official GWTC-1 open PSD data; 2: computes PSDs using Welch methods from gwosc open strain data; 3: uses bilby's analytical pre-stored PSD files.
+psd = 1
+phase_marginalization = False
+
+
+[parameters]
+prior_file=../gw/prior_files/GW170817_LALInf_TaylorF2.prior
+
+[hmc]
+# Total number of trajectories of HMC
+n_traj_hmc_tot = 10
+# Number of trajectories using  numericalgradients in phase 1.
+n_traj_fit = 10
+# Number of iterations if phase1 loop to go over for this run. This permits to split phase1 into several chunks. If set to 0, then the value will be set to that of n_traj_fit
+n_traj_for_this_run = 200000
+# Number of points used to sub-select points in Ordered Look-Up Tables for local fit bimodal parameters like (cos(inc), psi, logD)
+n_fit_1 = 2000
+# Number of points sub-selected from the above n1 ones to perform a linera fit
+n_fit_2 = 200
+# Length of numerical trajectories during phase1
+length_num_traj = 200
+# Stepsize between steps of trajectories used for phase1.
+epsilon0 = 5e-3
+# Python file to configure your search parameter space
+; config_hmc_parameters_file = ../examples/config_params/config_hmc_parameters.json
+config_hmc_parameters_file = ../examples/config_params/GW170817_TaylorF2.json
+; config_hmc_parameters_file = ../examples/config_params/config_hmc_parameters_spins_P.json
+# Number of statistically independant samples desired.
+n_sis = 5000

examples/config_params/GW170817_TaylorF2.json

+{
+  "search_parameter_keys": [
+    "theta_jn",
+    "phase",
+    "psi",
+    "luminosity_distance",
+    "chirp_mass",
+    "reduced_mass",
+    "dec",
+    "ra",
+    "geocent_time"
+  ],
+  "trajectory_functions": {
+      "theta_jn": "cosine",
+      "psi": "None",
+      "luminosity_distance": "log",
+      "chirp_mass": "log",
+      "reduced_mass": "log",
+      "dec": "sine",
+      "ra": "None",
+      "geocent_time": "log"
+  },
+  "search_parameter_keys_local_fit": [
+    "theta_jn",
+    "psi",
+    "luminosity_distance"
+  ],
+  "parameters_offsets": {
+      "theta_jn": 1e-7,
+      "phase": 1e-7,
+      "psi": 1e-7,
+      "luminosity_distance": 1e-7,
+      "chirp_mass": 1e-7,
+      "reduced_mass": 1e-7,
+      "dec": 1e-7,
+      "ra": 1e-7,
+      "geocent_time": 1e-7
+  }
+}