Skip to content
Snippets Groups Projects
Commit 31f7da27 authored by Kipp Cannon's avatar Kipp Cannon
Browse files

gstlal, gstlal-ugly, gstlal-inspiral: remove lal_nofakedisconts

- from after every audioresample element
parent 93a6d834
No related branches found
No related tags found
No related merge requests found
......@@ -598,7 +598,6 @@ class Handler(simplehandler.Handler):
# lal_checktimestamps4 [URL="\ref pipeparts.mkchecktimestamps()"];
# lal_checktimestamps5 [URL="\ref pipeparts.mkchecktimestamps()"];
# capsfilter [URL="\ref pipeparts.mkcapsfilter()"];
# lal_nofakedisconts [URL="\ref pipeparts.mknofakedisconts()"];
# gate [URL="\ref pipeparts.mkgate()"];
# "mkcontrolsnksrc()" [URL="\ref mkcontrolsnksrc()"];
# lal_sumsquares [URL="\ref pipeparts.mksumsquares()"];
......@@ -610,8 +609,7 @@ class Handler(simplehandler.Handler):
# queue2 -> lal_checktimestamps3;
# lal_checktimestamps3 -> audioresample;
# audioresample -> capsfilter;
# capsfilter -> lal_nofakedisconts;
# lal_nofakedisconts -> lal_checktimestamps4;
# capsfilter -> lal_checktimestamps4;
# lal_checktimestamps4 -> "mkcontrolsnksrc()"
# "mkcontrolsnksrc()" -> queue3;
# queue3 -> gate;
......@@ -684,7 +682,6 @@ def mkLLOIDbranch(pipeline, src, bank, bank_fragment, (control_snk, control_src)
# should intersect it's downstream peer's format with the
# sink format
elem = pipeparts.mkcapsfilter(pipeline, pipeparts.mkresample(pipeline, elem, quality = 9), "audio/x-raw, rate=%d" % max(bank.get_rates()))
elem = pipeparts.mknofakedisconts(pipeline, elem) # FIXME: remove when resampler is patched
elem = pipeparts.mkchecktimestamps(pipeline, elem, "timestamps_%s_after_sumsquare_resampler" % logname)
elem.link(control_snk)
......@@ -881,7 +878,6 @@ def mkLLOIDhoftToSnrSlices(pipeline, hoftdict, bank, control_snksrc, block_durat
# are padded such that the Nyquist frequency is 1.5
# times the highest frequency of the time slice
branch_heads[rate] = pipeparts.mkcapsfilter(pipeline, pipeparts.mkresample(pipeline, branch_heads[rate], quality = 1), "audio/x-raw, rate=%d" % next_rate[rate])
branch_heads[rate] = pipeparts.mknofakedisconts(pipeline, branch_heads[rate]) # FIXME: remove when resampler is patched
branch_heads[rate] = pipeparts.mkchecktimestamps(pipeline, branch_heads[rate], "timestamps_%s_after_%d_to_%d_snr_resampler" % (logname, rate, next_rate[rate]))
#
......
......@@ -75,14 +75,11 @@ for bank_fragment in bank.bank_fragments:
"queue", {"max-size-bytes": 0, "max-size-buffers": 0, "max-size-time": 4 * int(math.ceil(bank.filter_length)) * gst.SECOND},
"audioamplify", {"clipping-method": 3, "amplification": 1/math.sqrt(pipeparts.audioresample_variance_gain(downsample_quality, source_rate, bank_fragment.rate))},
"audioresample", {"quality": downsample_quality},
"lal_nofakedisconts", {"silent": True},
"capsfilter", {"caps": gst.Caps("audio/x-raw-float,rate=%d" % bank_fragment.rate)},
"lal_firbank", {"latency": -int(round(bank_fragment.start * bank_fragment.rate)) - 1, "fir-matrix": bank_fragment.orthogonal_template_bank},
"lal_nofakedisconts", {"silent": True},
"lal_reblock",
"lal_matrixmixer", {"matrix": bank_fragment.mix_matrix},
"audioresample", {"quality": upsample_quality},
"lal_nofakedisconts", {"silent": True},
snr_elems[0],
)
......
......@@ -275,7 +275,6 @@ main (int argc, char *argv[])
"! audioconvert " /* convert to floating point */
"! audiochebband lower-frequency=40 upper-frequency=1000 " /* band-pass filter */
"! audioresample " /* downsample (or upsample) */
"! lal_nofakedisconts " /* fix fake discontinuity flags (it's a long story) */
"! audioconvert " /* convert back to integer */
"! rtpL16pay name=pay0 pt=97 )" /* payload raw audio */
);
......
......@@ -70,7 +70,6 @@ for ifo in ('H1', 'L1'):
"quality": 9,
"gap-aware": True,
},
"lal_nofakedisconts",
"capsfilter",
{
"caps": gst.Caps("audio/x-raw-float,rate=4096"),
......@@ -89,7 +88,6 @@ for ifo in ('H1', 'L1'):
"average-samples": 64,
"mean-psd": psd.data,
},
"lal_nofakedisconts",
"audiochebband",
{
"lower-frequency": 45,
......
......@@ -80,7 +80,6 @@ from gstlal import datasource
# capsfilter1 [URL="\ref pipeparts.mkcapsfilter()"];
# audioresample [URL="\ref pipeparts.mkresample()"];
# capsfilter2 [URL="\ref pipeparts.mkcapsfilter()"];
# nofakedisconts [URL="\ref pipeparts.mknofakedisconts()"];
# reblock [URL="\ref pipeparts.mkreblock()"];
# whiten [URL="\ref pipeparts.mkwhiten()"];
# audioconvert [URL="\ref pipeparts.mkaudioconvert()"];
......@@ -89,17 +88,14 @@ from gstlal import datasource
# tee [URL="\ref pipeparts.mktee()"];
# audioamplifyr1 [URL="\ref pipeparts.mkaudioamplify()"];
# capsfilterr1 [URL="\ref pipeparts.mkcapsfilter()"];
# nofakediscontsr1 [URL="\ref pipeparts.mknofakedisconts()"];
# htgater1 [URL="\ref datasource.mkhtgate()", label="htgate() \n [iff ht gate specified]", style=filled, color=lightgrey];
# tee1 [URL="\ref pipeparts.mktee()"];
# audioamplifyr2 [URL="\ref pipeparts.mkaudioamplify()"];
# capsfilterr2 [URL="\ref pipeparts.mkcapsfilter()"];
# nofakediscontsr2 [URL="\ref pipeparts.mknofakedisconts()"];
# htgater2 [URL="\ref datasource.mkhtgate()", label="htgate() \n [iff ht gate specified]", style=filled, color=lightgrey];
# tee2 [URL="\ref pipeparts.mktee()"];
# audioamplify_rn [URL="\ref pipeparts.mkaudioamplify()"];
# capsfilter_rn [URL="\ref pipeparts.mkcapsfilter()"];
# nofakedisconts_rn [URL="\ref pipeparts.mknofakedisconts()"];
# htgate_rn [URL="\ref datasource.mkhtgate()", style=filled, color=lightgrey, label="htgate() \n [iff ht gate specified]"];
# tee [URL="\ref pipeparts.mktee()"];
#
......@@ -107,8 +103,7 @@ from gstlal import datasource
#
# "?" -> capsfilter1 -> audioresample;
# audioresample -> capsfilter2;
# capsfilter2 -> nofakedisconts;
# nofakedisconts -> reblock;
# capsfilter2 -> reblock;
# reblock -> whiten;
# whiten -> audioconvert;
# audioconvert -> capsfilter3;
......@@ -117,20 +112,17 @@ from gstlal import datasource
#
# tee -> audioamplifyr1 [label="Rate 1"];
# audioamplifyr1 -> capsfilterr1;
# capsfilterr1 -> nofakediscontsr1;
# nofakediscontsr1 -> htgater1;
# capsfilterr1 -> htgater1;
# htgater1 -> tee1 -> "? 1";
#
# tee -> audioamplifyr2 [label="Rate 2"];
# audioamplifyr2 -> capsfilterr2;
# capsfilterr2 -> nofakediscontsr2;
# nofakediscontsr2 -> htgater2;
# capsfilterr2 -> htgater2;
# htgater2 -> tee2 -> "? 2";
#
# tee -> audioamplify_rn [label="Rate N"];
# audioamplify_rn -> capsfilter_rn;
# capsfilter_rn -> nofakedisconts_rn;
# nofakedisconts_rn -> htgate_rn;
# capsfilter_rn -> htgate_rn;
# htgate_rn -> tee_n -> "? 3";
#
# }
......@@ -168,7 +160,6 @@ def mkwhitened_multirate_src(pipeline, src, rates, instrument, psd = None, psd_f
quality = 9
head = pipeparts.mkcapsfilter(pipeline, src, "audio/x-raw, rate=[%d,MAX]" % max(rates))
head = pipeparts.mkresample(pipeline, head, quality = quality)
head = pipeparts.mknofakedisconts(pipeline, head) # FIXME: remove when resampler is patched
head = pipeparts.mkchecktimestamps(pipeline, head, "%s_timestamps_%d_hoft" % (instrument, max(rates)))
#
......@@ -288,7 +279,6 @@ def mkwhitened_multirate_src(pipeline, src, rates, instrument, psd = None, psd_f
else:
head[rate] = head[max(rates)]
head[rate] = pipeparts.mkcapsfilter(pipeline, pipeparts.mkresample(pipeline, head[rate], quality = quality), caps = "audio/x-raw, rate=%d" % rate)
head[rate] = pipeparts.mknofakedisconts(pipeline, head[rate]) # FIXME: remove when resampler is patched
head[rate] = pipeparts.mkchecktimestamps(pipeline, head[rate], "%s_timestamps_%d_whitehoft" % (instrument, rate))
head[rate] = pipeparts.mktee(pipeline, head[rate])
......
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