final plots added

scripts/check_unfinished_jobs.py

@@ -5,13 +5,13 @@ runtag_template = 'y_%.3f_q_%.1e_Ml_%.1f_zl_%.1f_dect_%s_fhi_%.1f_zs_%.1f_m1_%.1
 
 
 # Values for fixed parameters (adjust as necessary)
 # Values for fixed parameters (adjust as necessary)
 kwargs = {
 kwargs = {
-    "zl":0.5, "dect":"Aplus",
+    "zl":0.5, "dect":"ET",
     "f_hi":1024.0, "zs":2.0, "m1":20.0, "m2":20.0,
     "f_hi":1024.0, "zs":2.0, "m1":20.0, "m2":20.0,
     "approx":"IMRPhenomXP", "delta_f":1./32, "t_max":200., "dt_fac":7.5
     "approx":"IMRPhenomXP", "delta_f":1./32, "t_max":200., "dt_fac":7.5
 }
 }
 
 
 # File containing all the parameter combinations
 # File containing all the parameter combinations
-param_file = "params_pos.txt"
+param_file = "params.txt"
 
 
 # Directory where the jobs are stored
 # Directory where the jobs are stored
 job_directory = "/home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/results"
 job_directory = "/home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/results"

scripts/gen_params.py

@@ -14,12 +14,17 @@ import numpy as np
 # Ml_values = [50, 100, 250, 500, 1000]
 # Ml_values = [50, 100, 250, 500, 1000]
 
 
 ## The following parameters are used for positive q values
 ## The following parameters are used for positive q values
-y_values = [0.1, 0.5, 1.0, 2.0, 3.0]
-q_values = np.linspace(0, 0.35, 36)
-Ml_values = [50, 100, 250, 500, 1000]
+# y_values = [0.1, 0.5, 1.0, 2.0, 3.0]
+# q_values = np.linspace(0, 0.35, 36)
+# Ml_values = [50, 100, 250, 500, 1000]
+
+## The following parameters are used for making plots in paper
+y_values = [0.5, 1.0, 2.0]
+q_values = [-0.5, 0.1, 0.5]
+Ml_values = [100, 500]
 
 
 # Write to a parameter file
 # Write to a parameter file
-with open('params_pos.txt', 'w') as f:
+with open('params.txt', 'w') as f:
     for Ml in Ml_values:
     for Ml in Ml_values:
         for y in y_values:
         for y in y_values:
             for qeff in q_values:
             for qeff in q_values:

scripts/submit_lensed_waveform_charged_lens.sub

 Universe         = vanilla
 Universe         = vanilla
 Executable       = /home1/uddeepta.deka/lensing/charged_lens_updated/scripts/lensed_waveform_exec.py
 Executable       = /home1/uddeepta.deka/lensing/charged_lens_updated/scripts/lensed_waveform_exec.py
-Arguments        = y $(y_value) q $(q_value) t_max 200
+Arguments        = Ml $(Ml_value) y $(y_value) q $(q_value) t_max 200
 Getenv   = True
 Getenv   = True
-Output   = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/outfiles/output_$(y_value)_$(q_value).out
-Error    = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/errors/error_$(y_value)_$(q_value).err
-Log      = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/logs/log_$(y_value)_$(q_value).log
+Output   = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/outfiles/output_Ml$(Ml_value)_y$(y_value)_q$(q_value).out
+Error    = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/errors/error_Ml$(Ml_value)_y$(y_value)_q$(q_value).err
+Log      = /home1/uddeepta.deka/lensing/charged_lens_updated/data/lensed_waveform_data/logs/log_Ml$(Ml_value)_y$(y_value)_q$(q_value).log
 notify_user      = uddeepta.deka@icts.res.in
 notify_user      = uddeepta.deka@icts.res.in
 Notification     = Never
 Notification     = Never
-requirements = (Machine != "node72.alice.icts.res.in")
+requirements = (Machine != "node42.alice.icts.res.in") && (Machine != "node51.alice.icts.res.in") && (Machine != "node76.alice.icts.res.in")
 request_cpus     = 4
 request_cpus     = 4
 request_memory   = 1024
 request_memory   = 1024
 
 
-queue y_value q_value from params.txt
+queue Ml_value y_value q_value from params.txt
\ No newline at end of file