From b697a2e75ad10751ae84f7cfef12b45845d5f08a Mon Sep 17 00:00:00 2001
From: Aaron Viets <aaron.viets@ligo.org>
Date: Wed, 31 Jan 2018 05:43:18 -0800
Subject: [PATCH] lal_transferfunction: fixed get_property function
---
gstlal-calibration/gst/lal/gstlal_transferfunction.c | 6 +++---
gstlal-calibration/python/calibration_parts.py | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gstlal-calibration/gst/lal/gstlal_transferfunction.c b/gstlal-calibration/gst/lal/gstlal_transferfunction.c
index 2a1c1e683d..880574a0f6 100644
--- a/gstlal-calibration/gst/lal/gstlal_transferfunction.c
+++ b/gstlal-calibration/gst/lal/gstlal_transferfunction.c
@@ -1217,7 +1217,7 @@ static void get_property(GObject *object, enum property id, GValue *value, GPara
g_value_init(&v, G_TYPE_VALUE_ARRAY);
int i;
for(i = 0; i < element->channels - 1; i++) {
- g_value_take_boxed(&v, gstlal_g_value_array_from_doubles((double *) element->transfer_functions, 2 * (element->fft_length / 2 + 1)));
+ g_value_take_boxed(&v, gstlal_g_value_array_from_doubles((double *) (element->transfer_functions + i * (element->fft_length / 2 + 1)), element->fft_length + 2));
g_value_array_append(va, &v);
}
g_value_take_boxed(value, va);
@@ -1232,7 +1232,7 @@ static void get_property(GObject *object, enum property id, GValue *value, GPara
g_value_init(&val, G_TYPE_VALUE_ARRAY);
int j;
for(j = 0; j < element->channels - 1; j++) {
- g_value_take_boxed(&val, gstlal_g_value_array_from_doubles(element->fir_filters, element->fft_length));
+ g_value_take_boxed(&val, gstlal_g_value_array_from_doubles(element->fir_filters + j * element->fft_length, element->fft_length));
g_value_array_append(val_array, &val);
}
g_value_take_boxed(value, val_array);
@@ -1387,7 +1387,7 @@ static void gstlal_transferfunction_class_init(GSTLALTransferFunctionClass *klas
"High Pass",
"The high-pass cutoff frequency (in Hz) of the FIR filters.\n\t\t\t"
"If zero, no high-pass cutoff is added.",
- 0, G_MAXINT, 9,
+ 0, G_MAXINT, 0,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT
);
properties[ARG_LOW_PASS] = g_param_spec_int(
diff --git a/gstlal-calibration/python/calibration_parts.py b/gstlal-calibration/python/calibration_parts.py
index 2d9369fe72..f670fa1050 100644
--- a/gstlal-calibration/python/calibration_parts.py
+++ b/gstlal-calibration/python/calibration_parts.py
@@ -554,8 +554,9 @@ def compute_Xi(pipeline, pcalfpcal4, darmfpcal4, fpcal4, EP11, EP12, EP13, EP14,
return Xi
-def update_filter(filter_maker, arg, filter_taker, maker_prop_name, taker_prop_name, which_filter):
- filter_taker.set_property(taker_prop_name, filter_maker.get_property(maker_prop_name)[which_filter][::-1])
+def update_filter(filter_maker, arg, filter_taker, maker_prop_name, taker_prop_name, filter_number):
+ firfilter = filter_maker.get_property(maker_prop_name)[filter_number][::-1]
+ filter_taker.set_property(taker_prop_name, firfilter)
def clean_data(pipeline, srcs, fft_length, fft_overlap, num_ffts, update_samples):
--
GitLab