Skip to content
Snippets Groups Projects
Commit 06333386 authored by Cort Posnansky's avatar Cort Posnansky Committed by Divya Singh
Browse files

offline makefile templates: 

 - replace lalapps_inspinj with gstlal_lvc_rates_injections
 - offline makefile templates: rename injection files instead of using the defaults
parent 269f5210
No related branches found
No related tags found
1 merge request!612Combined online-offline ranks
Hide whitespace changes
Inline Side-by-side
gstlal-inspiral/python/workflows/templates/Makefile.offline_inspiral_filter_template
+ 19
− 18
View file @ 06333386
......@@ -153,38 +153,39 @@ inj_tisi.xml :
{% if config.injections.sets %}
{% for inj_name, params in config.injections.sets.items() %}
{{ params.file }} :
lalapps_inspinj \
{{ params.output_tag }}.xml.gz :
gstlal_lvc_rates_injections \
--gps-start-time {{ config.start + params.time.shift }} \
--gps-end-time {{ config.stop }} \
--enable-spin \
{% if 'spin_aligned' in params %}
--aligned \
{% endif %}
--i-distr uniform \
--l-distr random \
--t-distr uniform \
--dchirp-distr uniform \
--m-distr {{ params.mass_distr }} \
{% for param in ['mass1', 'mass2', 'spin1', 'spin2', 'distance'] %}
--snr-calculation INJ_PARAMS \
--mass-distribution {{ params.mass_distribution }} \
--spin-distribution ALIGNED_ALIGNED \
--max-redshift {{ params.max_redshift }} \
{% for param in ['mass1', 'mass2', 'mass', 'spin1', 'spin2', 'spin'] %}
{% if params[param] %}
{% for stat, val in params[param].items() %}
--{{ stat }}-{{ param }} {{ val }} \
{% endfor %}
{% endif %}
{% endfor %}
--f-lower {{ params.f_low }} \
--max-mtotal {{ params.max_mtotal }}\
--waveform {{ params.waveform }} \
--approximant {{ params.approximant }} \
--time-step {{ params.time.step }} \
--time-interval {{ params.time.interval }} \
--taper-injection startend \
--seed {{ params.seed }} \
--output $@
--random-seed {{ params.random_seed }} \
--h1-reference-spectrum-file {{ config.injections.h1_reference_spectrum_file }} \
--l1-reference-spectrum-file {{ config.injections.l1_reference_spectrum_file }} \
--v1-reference-spectrum-file {{ config.injections.v1_reference_spectrum_file }} \
--output-tag {{ params.output_tag }}
mv {{ params.output_tag }}-{{ config.start + params.time.shift }}-{{ config.stop }}.xml.gz {{ params.output_tag }}.xml.gz
ligolw_no_ilwdchar $@
@echo ""
{% endfor %}
{% endif %}
{% if config.injections.combine %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
gstlal_inspiral_combine_injection_sets $^ --single-output -o $(basename {{ config.injections.combined_file }})
rm injection_str.txt
......@@ -202,7 +203,7 @@ clean :
rm -rf {% for inj in config.filter.injections.values() %} {{ inj.file }}{% endfor %}
{% if config.injections.sets %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
{% endif %}
......
gstlal-inspiral/python/workflows/templates/Makefile.offline_inspiral_full_template
+ 19
− 18
View file @ 06333386
......@@ -153,38 +153,39 @@ inj_tisi.xml :
{% if config.injections.sets %}
{% for inj_name, params in config.injections.sets.items() %}
{{ params.file }} :
lalapps_inspinj \
{{ params.output_tag }}.xml.gz :
gstlal_lvc_rates_injections \
--gps-start-time {{ config.start + params.time.shift }} \
--gps-end-time {{ config.stop }} \
--enable-spin \
{% if 'spin_aligned' in params %}
--aligned \
{% endif %}
--i-distr uniform \
--l-distr random \
--t-distr uniform \
--dchirp-distr uniform \
--m-distr {{ params.mass_distr }} \
{% for param in ['mass1', 'mass2', 'spin1', 'spin2', 'distance'] %}
--snr-calculation INJ_PARAMS \
--mass-distribution {{ params.mass_distribution }} \
--spin-distribution ALIGNED_ALIGNED \
--max-redshift {{ params.max_redshift }} \
{% for param in ['mass1', 'mass2', 'mass', 'spin1', 'spin2', 'spin'] %}
{% if params[param] %}
{% for stat, val in params[param].items() %}
--{{ stat }}-{{ param }} {{ val }} \
{% endfor %}
{% endif %}
{% endfor %}
--f-lower {{ params.f_low }} \
--max-mtotal {{ params.max_mtotal }}\
--waveform {{ params.waveform }} \
--approximant {{ params.approximant }} \
--time-step {{ params.time.step }} \
--time-interval {{ params.time.interval }} \
--taper-injection startend \
--seed {{ params.seed }} \
--output $@
--random-seed {{ params.random_seed }} \
--h1-reference-spectrum-file {{ config.injections.h1_reference_spectrum_file }} \
--l1-reference-spectrum-file {{ config.injections.l1_reference_spectrum_file }} \
--v1-reference-spectrum-file {{ config.injections.v1_reference_spectrum_file }} \
--output-tag {{ params.output_tag }}
mv {{ params.output_tag }}-{{ config.start + params.time.shift }}-{{ config.stop }}.xml.gz {{ params.output_tag }}.xml.gz
ligolw_no_ilwdchar $@
@echo ""
{% endfor %}
{% endif %}
{% if config.injections.combine %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
gstlal_inspiral_combine_injection_sets $^ --single-output -o $(basename {{ config.injections.combined_file }})
rm injection_str.txt
......@@ -202,7 +203,7 @@ clean :
rm -rf {% for inj in config.filter.injections.values() %} {{ inj.file }}{% endfor %}
{% if config.injections.sets %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
{% endif %}
......
gstlal-inspiral/python/workflows/templates/Makefile.offline_inspiral_injection_template
+ 19
− 18
View file @ 06333386
......@@ -66,38 +66,39 @@ inj_tisi.xml :
{% if config.injections.sets %}
{% for inj_name, params in config.injections.sets.items() %}
{{ params.file }} :
lalapps_inspinj \
{{ params.output_tag }}.xml.gz :
gstlal_lvc_rates_injections \
--gps-start-time {{ config.start + params.time.shift }} \
--gps-end-time {{ config.stop }} \
--enable-spin \
{% if 'spin_aligned' in params %}
--aligned \
{% endif %}
--i-distr uniform \
--l-distr random \
--t-distr uniform \
--dchirp-distr uniform \
--m-distr {{ params.mass_distr }} \
{% for param in ['mass1', 'mass2', 'spin1', 'spin2', 'distance'] %}
--snr-calculation INJ_PARAMS \
--mass-distribution {{ params.mass_distribution }} \
--spin-distribution ALIGNED_ALIGNED \
--max-redshift {{ params.max_redshift }} \
{% for param in ['mass1', 'mass2', 'mass', 'spin1', 'spin2', 'spin'] %}
{% if params[param] %}
{% for stat, val in params[param].items() %}
--{{ stat }}-{{ param }} {{ val }} \
{% endfor %}
{% endif %}
{% endfor %}
--f-lower {{ params.f_low }} \
--max-mtotal {{ params.max_mtotal }}\
--waveform {{ params.waveform }} \
--approximant {{ params.approximant }} \
--time-step {{ params.time.step }} \
--time-interval {{ params.time.interval }} \
--taper-injection startend \
--seed {{ params.seed }} \
--output $@
--random-seed {{ params.random_seed }} \
--h1-reference-spectrum-file {{ config.injections.h1_reference_spectrum_file }} \
--l1-reference-spectrum-file {{ config.injections.l1_reference_spectrum_file }} \
--v1-reference-spectrum-file {{ config.injections.v1_reference_spectrum_file }} \
--output-tag {{ params.output_tag }}
mv {{ params.output_tag }}-{{ config.start + params.time.shift }}-{{ config.stop }}.xml.gz {{ params.output_tag }}.xml.gz
ligolw_no_ilwdchar $@
@echo ""
{% endfor %}
{% endif %}
{% if config.injections.combine %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
{{ config.injections.combined_file }} : {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
gstlal_inspiral_combine_injection_sets $^ --single-output -o $(basename {{ config.injections.combined_file }})
rm injection_str.txt
......@@ -115,7 +116,7 @@ clean :
rm -rf {% for inj in config.filter.injections.values() %} {{ inj.file }}{% endfor %}
{% if config.injections.sets %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.file }}{% endfor %}
rm -rf {% for inj in config.injections.sets.values() %} {{ inj.output_tag }}.xml.gz{% endfor %}
{% endif %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment