From 066a1e5ca06ceceecfaf0c2b043213d908f69c1a Mon Sep 17 00:00:00 2001
From: Madeline Wade <wademc@ldas-pcdev1.ligo-wa.caltech.edu>
Date: Fri, 16 Oct 2015 11:04:04 -0700
Subject: [PATCH] Bug fix for lock ups caused by averaging \kappas when not
locked
---
gstlal-calibration/bin/gstlal_compute_strain | 6 +++---
gstlal-calibration/python/calibration_parts.py | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain
index 2931c47420..8bebad1d34 100644
--- a/gstlal-calibration/bin/gstlal_compute_strain
+++ b/gstlal-calibration/bin/gstlal_compute_strain
@@ -184,9 +184,9 @@ parser.add_option("--factors-integration-time", metavar = "sec", type = float, d
parser.add_option("--expected-kappaa-real", metavar = "float", type = float, default = 1.0, help = "Expected value for the real part of \kappa_a. (Default = 1.0)")
parser.add_option("--expected-kappapu-real", metavar = "float", type = float, default = 1.0, help = "Expected value for the real part of \kappa_pu. (Default = 1.0)")
parser.add_option("--expected-kappatst-real", metavar = "float", type = float, default = 1.0, help = "Expected value for the real part of \kappa_tst. (Default = 1.0)")
-parser.add_option("--expected-kappaa-imag", metavar = "float", type = float, default = 0.0, help = "Expected value for the imaginary part of \kappa_a. (Default = 0.0)")
-parser.add_option("--expected-kappapu-imag", metavar = "float", type = float, default = 0.0, help = "Expected value for the imaginary part of \kappa_pu. (Default = 0.0)")
-parser.add_option("--expected-kappatst-imag", metavar = "float", type = float, default = 0.0, help = "Expected value for the imaginary part of \kappa_tst. (Default = 0.0)")
+parser.add_option("--expected-kappaa-imag", metavar = "float", type = float, default = 1e-9, help = "Expected value for the imaginary part of \kappa_a. (Default = 0.0)")
+parser.add_option("--expected-kappapu-imag", metavar = "float", type = float, default = 1e-9, help = "Expected value for the imaginary part of \kappa_pu. (Default = 0.0)")
+parser.add_option("--expected-kappatst-imag", metavar = "float", type = float, default = 1e-9, help = "Expected value for the imaginary part of \kappa_tst. (Default = 0.0)")
parser.add_option("--expected-kappac", metavar = "float", type = float, default = 1.0, help = "Expected value for \kappa_c. (Default = 1.0)")
parser.add_option("--expected-fcc", metavar = "Hz", type = float, default = 330.0, help = "Expected value for the coupled cavity pole. (Default = 330.0 Hz)")
parser.add_option("--kappaa-real-ok-var", metavar = "float", type = float, default = 0.5, help = "Values of the real part of \kappa_a +/- this number will be considered OK. (Default = 0.5)")
diff --git a/gstlal-calibration/python/calibration_parts.py b/gstlal-calibration/python/calibration_parts.py
index 4f04685939..16e4aa24c4 100644
--- a/gstlal-calibration/python/calibration_parts.py
+++ b/gstlal-calibration/python/calibration_parts.py
@@ -116,7 +116,6 @@ def average_calib_factors(pipeline, head, var, expected, averaging_time, caps, d
N = averaging_time * averaging_rate
head = pipeparts.mkaudioconvert(pipeline, head)
head = pipeparts.mkcapsfilter(pipeline, head, caps)
- head = pipeparts.mkgate(pipeline, mkqueue(pipeline, head), control = mkqueue(pipeline, statevector), threshold = 1)
head = pipeparts.mkgeneric(pipeline, head, "lal_check_calib_factors", min = expected - var, max = expected + var, default = expected)
head = resample(pipeline, head, "audio/x-raw-float, rate=%d" % averaging_rate)
head = pipeparts.mkfirbank(pipeline, head, fir_matrix = [numpy.ones(N)/N], time_domain = td)
--
GitLab