From 46af04864e5e1b8d4a78e976f8617de4adb9538e Mon Sep 17 00:00:00 2001
From: Rachael Huxford <rachael.huxford@ligo.org>
Date: Mon, 2 Oct 2023 08:44:25 -0700
Subject: [PATCH] Move verbose calls -> options.verbose
---
gstlal-ugly/bin/gstlal_ll_inj_stream | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gstlal-ugly/bin/gstlal_ll_inj_stream b/gstlal-ugly/bin/gstlal_ll_inj_stream
index 3c146884aa..d9aea14561 100755
--- a/gstlal-ugly/bin/gstlal_ll_inj_stream
+++ b/gstlal-ugly/bin/gstlal_ll_inj_stream
@@ -194,8 +194,7 @@ for ftype in options.frame_type:
# Logging
#
-verbose = options.verbose
-log_level = logging.DEBUG if verbose else logging.INFO
+log_level = logging.DEBUG if options.verbose else logging.INFO
logging.basicConfig(level = log_level, format = "%(asctime)s | gstlal_ll_inj_stream : %(levelname)s : %(message)s")
@@ -269,7 +268,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
#
inj_src = pipeparts.mklalcachesrc(pipeline, location=f.name, cache_src_regex='HKLV')
- if verbose:
+ if options.verbose:
inj_src = pipeparts.mkprogressreport(pipeline, inj_src, '%s_inj_strain_pre_demux'%instrument)
inj_demux = pipeparts.mkframecppchanneldemux(pipeline, inj_src, do_file_checksum=False, channel_list=list(map("%s:%s".__mod__, hoft_inj_channel_dict.items())))
@@ -278,7 +277,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
inj_strain = pipeparts.mkqueue(pipeline, None, max_size_buffers=0, max_size_bytes=0, max_size_time=frame_duration * Gst.SECOND)
pipeparts.src_deferred_link(inj_demux, "%s:%s" % (instrument, hoft_inj_channel_dict[instrument]), inj_strain.get_static_pad("sink"))
inj_strain.get_static_pad("src").add_probe(Gst.PadProbeType.BUFFER, check_current_frames, now)
- if verbose:
+ if options.verbose:
inj_strain = pipeparts.mkprogressreport(pipeline, inj_strain, '%s_inj_strain_after_demux'%instrument)
@@ -288,7 +287,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
hoft_src = pipeparts.mkdevshmsrc(pipeline, shm_dirname=shared_memory_dict[instrument], wait_time=60)
hoft_src = pipeparts.mkqueue(pipeline, hoft_src, max_size_buffers=0, max_size_bytes=0, max_size_time=Gst.SECOND * frame_duration)
- if verbose:
+ if options.verbose:
hoft_src = pipeparts.mkprogressreport(pipeline, hoft_src, '%s_hoft_src'%instrument)
hoft_demux = pipeparts.mkframecppchanneldemux(pipeline, hoft_src, do_file_checksum=False, skip_bad_files=True)
@@ -299,7 +298,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
for channel_name in hoft_channel_dict[instrument]:
channel_src = pipeparts.mkqueue(pipeline, None, max_size_buffers=0, max_size_bytes=0, max_size_time=Gst.SECOND * 10)
pipeparts.src_deferred_link(hoft_demux, "%s:%s" % (instrument, channel_name), channel_src.get_static_pad("sink"))
- if verbose:
+ if options.verbose:
channel_src = pipeparts.mkprogressreport(pipeline, channel_src, "%s:%s" % (instrument, channel_name))
# Only add items to strain_dict which we want to become a new hoft + inj stream
@@ -326,7 +325,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
# add injections to hoft
inj_strain_dict[channel+'_INJ'] = pipeparts.mkadder(pipeline, [hoft_strain, this_inj_strain], sync=True, mix_mode="sum")
- if verbose:
+ if options.verbose:
inj_strain_dict[channel+'_INJ'] = pipeparts.mkprogressreport(pipeline, inj_strain_dict[channel+'_INJ'], "%s_%s_INJ_after_adder"%(instrument,channel))
# Be sure to sink the queued inj stream
this_inj_strain = pipeparts.mkfakesink(pipeline, this_inj_strain)
@@ -338,7 +337,7 @@ with tempfile.NamedTemporaryFile(mode='w',suffix='.cache') as f:
channel_dict.update(strain_dict)
channel_dict.update(inj_strain_dict)
output_stream = pipeparts.mkframecppchannelmux(pipeline, channel_src_map=channel_dict, frame_duration=1, frames_per_file=1)
- if verbose:
+ if options.verbose:
output_stream = pipeparts.mkprogressreport(pipeline, output_stream, "%s_output_after_mux"%instrument)
--
GitLab