Skip to content
Snippets Groups Projects
Commit 552d14c2 authored by Wanting Niu's avatar Wanting Niu :speech_balloon:
Browse files

separate state and dq channels between injection and non-injection

parent 84f8693d
No related branches found
No related tags found
1 merge request!632separate state and dq channels between injection and non-injection
Pipeline #678136 passed
......@@ -57,7 +57,8 @@ class Config(BaseConfig):
self.snr_optimizer.source = self.source
self.snr_optimizer.ifos = list(self.snr_optimizer.source.channel_name)
self.snr_optimizer.inj_ifos = list(self.snr_optimizer.source.inj_channel_name)
if self.snr_optimizer.source.inj_channel_name:
self.snr_optimizer.inj_ifos = list(self.snr_optimizer.source.inj_channel_name)
else:
self.snr_optimizer = False
......
......@@ -1994,8 +1994,6 @@ def optimize_snr_layer(config, dag):
# set up common options
common_opts = [
Option("psd-fft-length", config.snr_optimizer.fft_length if config.snr_optimizer.fft_length else config.psd.fft_length),
Option("state-channel-name", dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.state_channel_name)),
Option("dq-channel-name", dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.dq_channel_name)),
Option("state-vector-on-bits", dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.state_vector_on_bits)),
Option("state-vector-off-bits", dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.state_vector_off_bits)),
Option("dq-vector-on-bits", dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.dq_vector_on_bits)),
......@@ -2018,13 +2016,13 @@ def optimize_snr_layer(config, dag):
if config.snr_optimizer.source.data_source == "framexmit":
datasource_opts = [
Option("data-source", "framexmit"),
Option("framexmit-addr", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.framexmit_addr)),
Option("framexmit-addr", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.inj_framexmit_addr if input_topic == "inj_uploads" else config.snr_optimizer.source.framexmit_addr)),
Option("framexmit-iface", config.snr_optimizer.source.framexmit_iface),
]
elif config.snr_optimizer.source.data_source == "lvshm":
datasource_opts = [
Option("data-source", "lvshm"),
Option("shared-memory-partition", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.shared_memory_partition)),
Option("shared-memory-partition", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.inj_shared_memory_partition if input_topic == "inj_uploads" else config.snr_optimizer.source.shared_memory_partition)),
Option("shared-memory-block-size", config.snr_optimizer.source.shared_memory_block_size),
Option("shared-memory-assumed-duration", config.snr_optimizer.source.shared_memory_assumed_duration),
]
......@@ -2041,6 +2039,8 @@ def optimize_snr_layer(config, dag):
for jobnum in range(config.snr_optimizer.num_jobs):
arguments = datasource_opts + common_opts
arguments.extend([Option("input-topic", input_topic)])
arguments.extend([Option("state-channel-name", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.inj_state_channel_name if input_topic == "inj_uploads" else config.snr_optimizer.source.state_channel_name))])
arguments.extend([Option("dq-channel-name", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos if input_topic == "inj_uploads" else config.snr_optimizer.ifos, config.snr_optimizer.source.inj_dq_channel_name if input_topic == "inj_uploads" else config.snr_optimizer.source.dq_channel_name))])
arguments.extend([Option("job-tag", f"{format(jobnum, '04')}_inj_snropt" if input_topic == "inj_uploads" else f"{format(jobnum, '04')}_noninj_snropt")])
arguments.extend([Option("channel-name", dagutil.format_ifo_args(config.snr_optimizer.inj_ifos, config.snr_optimizer.source.inj_channel_name) if input_topic == "inj_uploads" else dagutil.format_ifo_args(config.snr_optimizer.ifos, config.snr_optimizer.source.channel_name))])
layer += Node(
......
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