diff --git a/gstlal-ugly/bin/gstlal_lvc_rates_injection_dag b/gstlal-ugly/bin/gstlal_lvc_rates_injection_dag index 6b9b57a274ad96399f31d3b30d1489cdb6980f91..4d862e1fe583384e813ddf853b9940d2e3906387 100755 --- a/gstlal-ugly/bin/gstlal_lvc_rates_injection_dag +++ b/gstlal-ugly/bin/gstlal_lvc_rates_injection_dag @@ -18,7 +18,7 @@ # MA 02111-1307 USA # -## @file lvc_rates_injection_dag +## @file gstlal_lvc_rates_injection_dag # The rates injection dag generator. # # ### Usage examples @@ -77,7 +77,7 @@ analysis_parser.read(options.analysis_ini) if options.bns_params_ini is not None: bnsinjparser = ConfigParser() bnsinjparser.read(options.bns_params_ini) - bnsInjJob = injection_generation_dag.InjectionJob("lvc_rates_injections", tag_base = "bns_rates_injections", condor_commands = ccommands) + bnsInjJob = injection_generation_dag.InjectionJob("gstlal_lvc_rates_injections", tag_base = "bns_rates_injections", condor_commands = ccommands) for analysis_section in analysis_parser.sections(): for inj_section in bnsinjparser.sections(): @@ -98,7 +98,7 @@ if options.bns_params_ini is not None: if options.bns_gaussian_params_ini is not None: bnsgaussianinjparser = ConfigParser() bnsgaussianinjparser.read(options.bns_gaussian_params_ini) - bnsGaussianInjJob = injection_generation_dag.InjectionJob("lvc_rates_injections", tag_base = "bns_gaussian_rates_injections", condor_commands = ccommands) + bnsGaussianInjJob = injection_generation_dag.InjectionJob("gstlal_lvc_rates_injections", tag_base = "bns_gaussian_rates_injections", condor_commands = ccommands) for analysis_section in analysis_parser.sections(): for inj_section in bnsgaussianinjparser.sections(): @@ -120,7 +120,7 @@ if options.bns_gaussian_params_ini is not None: if options.nsbh_params_ini is not None: nsbhinjparser = ConfigParser() nsbhinjparser.read(options.nsbh_params_ini) - nsbhInjJob = injection_generation_dag.InjectionJob("lvc_rates_injections", tag_base = "nsbh_rates_injections", condor_commands = ccommands) + nsbhInjJob = injection_generation_dag.InjectionJob("gstlal_lvc_rates_injections", tag_base = "nsbh_rates_injections", condor_commands = ccommands) for analysis_section in analysis_parser.sections(): for inj_section in nsbhinjparser.sections(): @@ -142,7 +142,7 @@ if options.nsbh_params_ini is not None: if options.bbh_params_ini is not None: bbhinjparser = ConfigParser() bbhinjparser.read(options.bbh_params_ini) - bbhInjJob = injection_generation_dag.InjectionJob("lvc_rates_injections", tag_base = "bbh_rates_injections", condor_commands = ccommands) + bbhInjJob = injection_generation_dag.InjectionJob("gstlal_lvc_rates_injections", tag_base = "bbh_rates_injections", condor_commands = ccommands) for analysis_section in analysis_parser.sections(): for inj_section in bbhinjparser.sections(): @@ -163,7 +163,7 @@ if options.bbh_params_ini is not None: if options.nosplit_params_ini is not None: nosplitinjparser = ConfigParser() nosplitinjparser.read(options.nosplit_params_ini) - nosplitInjJob = injection_generation_dag.InjectionJob("lvc_rates_injections", tag_base = "nosplit_rates_injections", condor_commands = ccommands) + nosplitInjJob = injection_generation_dag.InjectionJob("gstlal_lvc_rates_injections", tag_base = "nosplit_rates_injections", condor_commands = ccommands) for analysis_section in analysis_parser.sections(): for inj_section in nosplitinjparser.sections(): diff --git a/gstlal-ugly/bin/gstlal_lvc_rates_injections b/gstlal-ugly/bin/gstlal_lvc_rates_injections index 11fe4ad257d12d42b5e54f3ee64d819204632a1b..790939d03959d4f96dd71fce37faedbab7f68579 100755 --- a/gstlal-ugly/bin/gstlal_lvc_rates_injections +++ b/gstlal-ugly/bin/gstlal_lvc_rates_injections @@ -18,7 +18,7 @@ # MA 02111-1307 USA # -## @file lvc_rates_injections +## @file gstlal_lvc_rates_injections # The rates injection generator. # # ### Usage examples @@ -105,8 +105,8 @@ def parse_command_line(): "1. OPTIMALLY_ORIENTED_1MPC - Assumes inclination = 0, distance = 1Mpc. Computes only hp." + "2. INJ_PARAMS - Computes hp and hc using injections' parameters." + "3. GENERIC - Computes hp and hc using injections' parameters and can take FD and TD waveforms.") - parser.add_option("--snr-threshold", default = 5.0, type = "float", help = "Set the network detector snr threshold to determine " + - "whether an injection is expected to be found or not, default = 5.0") + parser.add_option("--snr-threshold", default = 3.0, type = "float", help = "Set the single detector snr threshold to determine " + + "whether an injection is expected to be found or not, default = 3.0") parser.add_option("--min-frequency", default = 15.0, type = "float", help = "Lower frequency cutoff for SNR calculation, default = 15 Hz.") parser.add_option("--max-frequency", default = 1500.0, type = "float", help = "Upper frequency cutoff for SNR calculation, default = 1500 Hz.") parser.add_option("--delta-frequency", default = 1.0, type = "float", help = "Step in frequency for SNR calculation, default = 1 Hz.") @@ -197,7 +197,7 @@ sim_inspiral_table = lsctables.New(lsctables.SimInspiralTable) process = ligolw_process.register_to_xmldoc( xmldoc, - program="lvc_rates_injections", + program="gstlal_lvc_rates_injections", paramdict=process_params, comment="Injection parameter generator for rates calculations") @@ -231,7 +231,7 @@ VT_params = { ligolw_process.register_to_xmldoc( xmldoc, - program="lvc_rates_injections_vtparams", + program="gslal_lvc_rates_injections_vtparams", paramdict=VT_params, comment="Acceptance and rejection related statistics for VT calculations.") diff --git a/gstlal-ugly/python/injection_utils.py b/gstlal-ugly/python/injection_utils.py index a0480ef5ef92093e601ccb4cfb48d4d373e06089..df202a6a1c33ac6cbb7a4049838efdf19856f90e 100644 --- a/gstlal-ugly/python/injection_utils.py +++ b/gstlal-ugly/python/injection_utils.py @@ -642,7 +642,7 @@ def is_hopeless_hp_hc(row, paramdict, h1_psd, l1_psd, v1_psd, fph, fch, fpl, fcl rho_h = lalsimulation.MeasureSNRFD(hptilde, h1_psd, row.f_lower, -1.0) rho_l = lalsimulation.MeasureSNRFD(hctilde, l1_psd, row.f_lower, -1.0) rho_v = lalsimulation.MeasureSNRFD(hvtilde, v1_psd, row.f_lower, -1.0) - #rho_k = lalsimulation.MeasureSNRFD(hktilde, k1_psd, row.f_lower, -1.0) + #rho_k = lalsimulation.MeasureSNRFD(hktilde, k1_psd, row.f_lower, -1.) if rho_h**2. + rho_l**2. + rho_v**2. < paramdict['snr_threshold']**2.: return True, rho_h, rho_l, rho_v