Skip to content
Snippets Groups Projects
Commit 3a70444b authored by Rebecca Ewing's avatar Rebecca Ewing
Browse files

allow to use different channels for injection jobs

parent af99eb42
No related branches found
No related tags found
1 merge request!209O4 Online
......@@ -1674,11 +1674,13 @@ def filter_injections_online_layer(config, dag, svd_bank_cache, dist_stat_cache,
else:
raise ValueError(f"data source = {config.source.data_source} not valid for online jobs")
channels = dagutil.format_ifo_args(config.ifos, config.source.inj_channel_name) if config.source.inj_channel_name else dagutil.format_ifo_args(config.ifos, config.source.channel_name)
common_opts = [
Option("track-psd"),
Option("control-peak-time", 0),
Option("psd-fft-length", config.psd.fft_length),
Option("channel-name", dagutil.format_ifo_args(config.ifos, config.source.channel_name)),
Option("channel-name", channels),
Option("state-channel-name", dagutil.format_ifo_args(config.ifos, config.source.state_channel_name)),
Option("dq-channel-name", dagutil.format_ifo_args(config.ifos, config.source.dq_channel_name)),
Option("state-vector-on-bits", dagutil.format_ifo_args(config.ifos, config.source.state_vector_on_bits)),
......@@ -1734,13 +1736,26 @@ def filter_injections_online_layer(config, dag, svd_bank_cache, dist_stat_cache,
filter_opts.extend(datasource_opts)
for inj_idx, inj_name in enumerate(config.filter.injections.keys(), start=1):
injection_file = config.filter.injections[inj_name.lower()]["file"]
if config.filter.injections[inj_name].file:
injection_file = config.filter.injections[inj_name].file
else:
injection_file = None
inj_job_tag = f"{int(svd_bin):04d}_inj_{inj_name}"
injection_opts = [
Option("job-tag", inj_job_tag),
*filter_opts,
]
injection_inputs = [
Option("svd-bank", svd_banks.files),
Option("reference-psd", config.data.reference_psd),
Option("time-slide-file", config.filter.time_slide_file),
Option("ranking-stat-input", dist_stats[svd_bin].files),
Option("ranking-stat-pdf", marg_pdf_cache.files),
]
if injection_file: injection_inputs.extend([Option("injections", injection_file)])
layer += Node(
arguments = injection_opts,
inputs = [
......@@ -1753,6 +1768,7 @@ def filter_injections_online_layer(config, dag, svd_bank_cache, dist_stat_cache,
],
outputs = Option("output", "/dev/null"),
)
dag.attach(layer)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment