gstlal-calibration: New element lal_adaptivefirfilt that allows constrution...

gstlal-calibration:  New element lal_adaptivefirfilt that allows constrution of a time-dependent FIR filter with zeros, poles, gain, and a time advance/delay. For details, type gst-inspect-1.0 lal_adaptivefirfilt.

gstlal-calibration/gst/lal/Makefile.am

@@ -16,7 +16,7 @@ lib@GSTPLUGINPREFIX@gstlalcalibration_la_SOURCES = \
 	gstlal_fccupdate.c gstlal_fccupdate.h \
 	gstlal_transferfunction.c gstlal_transferfunction.h \
 	gstlal_trackfrequency.c gstlal_trackfrequency.h \
-	gstlal_lpfilter.c gstlal_lpfilter.h
+	gstlal_adaptivefirfilt.c gstlal_adaptivefirfilt.h
 lib@GSTPLUGINPREFIX@gstlalcalibration_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS)
 lib@GSTPLUGINPREFIX@gstlalcalibration_la_CFLAGS = $(AM_CFLAGS) $(LAL_CFLAGS) $(GSTLAL_CFLAGS) $(gstreamer_CFLAGS) $(gstreamer_audio_CFLAGS)
 lib@GSTPLUGINPREFIX@gstlalcalibration_la_LDFLAGS = $(AM_LDFLAGS) $(LAL_LIBS) $(GSTLAL_LIBS) $(PYTHON_LIBS) $(gstreamer_LIBS) $(gstreamer_audio_LIBS) $(GSTLAL_PLUGIN_LDFLAGS)

gstlal-calibration/gst/lal/gstlal_lpfilter.h → gstlal-calibration/gst/lal/gstlal_adaptivefirfilt.h

@@ -17,8 +17,8 @@
  */
 
 
-#ifndef __GSTLAL_LPFILTER_H__
-#define __GSTLAL_LPFILTER_H__
+#ifndef __GSTLAL_ADAPTIVEFIRFILT_H__
+#define __GSTLAL_ADAPTIVEFIRFILT_H__
 
 
 #include <complex.h>
@@ -33,36 +33,37 @@
 G_BEGIN_DECLS
 
 
-#define GSTLAL_LPFILTER_TYPE \
-	(gstlal_lpfilter_get_type())
-#define GSTLAL_LPFILTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), GSTLAL_LPFILTER_TYPE, GSTLALLPFilter))
-#define GSTLAL_LPFILTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), GSTLAL_LPFILTER_TYPE, GSTLALLPFilterClass))
-#define GST_IS_GSTLAL_LPFILTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), GSTLAL_LPFILTER_TYPE))
-#define GST_IS_GSTLAL_LPFILTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE((klass), GSTLAL_LPFILTER_TYPE))
+#define GSTLAL_ADAPTIVEFIRFILT_TYPE \
+	(gstlal_adaptivefirfilt_get_type())
+#define GSTLAL_ADAPTIVEFIRFILT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), GSTLAL_ADAPTIVEFIRFILT_TYPE, GSTLALAdaptiveFIRFilt))
+#define GSTLAL_ADAPTIVEFIRFILT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), GSTLAL_ADAPTIVEFIRFILT_TYPE, GSTLALAdaptiveFIRFiltClass))
+#define GST_IS_GSTLAL_ADAPTIVEFIRFILT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), GSTLAL_ADAPTIVEFIRFILT_TYPE))
+#define GST_IS_GSTLAL_ADAPTIVEFIRFILT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE((klass), GSTLAL_ADAPTIVEFIRFILT_TYPE))
 
 
-typedef struct _GSTLALLPFilter GSTLALLPFilter;
-typedef struct _GSTLALLPFilterClass GSTLALLPFilterClass;
+typedef struct _GSTLALAdaptiveFIRFilt GSTLALAdaptiveFIRFilt;
+typedef struct _GSTLALAdaptiveFIRFiltClass GSTLALAdaptiveFIRFiltClass;
 
 
 /**
- * GSTLALLPFilter:
+ * GSTLALAdaptiveFIRFilt:
  */
 
 
-struct _GSTLALLPFilter {
+struct _GSTLALAdaptiveFIRFilt {
 	GstBaseSink basesink;
 
 	/* stream info */
 	gint rate;
 	gint unit_size;
-	enum gstlal_lpfilter_data_type {
-		GSTLAL_LPFILTER_Z64 = 0,
-		GSTLAL_LPFILTER_Z128,
+	gint channels;
+	enum gstlal_adaptivefirfilt_data_type {
+		GSTLAL_ADAPTIVEFIRFILT_Z64 = 0,
+		GSTLAL_ADAPTIVEFIRFILT_Z128,
 	} data_type;
 
 	/* timestamp bookkeeping */
@@ -71,37 +72,47 @@ struct _GSTLALLPFilter {
 	guint64 next_in_offset;
 
 	/* FIR filter parameters */
-	complex double input_average;
+	complex double *input_average;
 	gint64 num_in_avg;
+	gboolean filter_has_gain;
+	double complex *variable_filter;
+	fftw_plan variable_filter_plan;
 
 	/* properties */
-	double measurement_frequency;
 	gint64 update_samples;
 	gint64 average_samples;
+	int num_zeros;
+	int num_poles;
+	complex double *static_zeros;
+	int num_static_zeros;
+	complex double *static_poles;
+	int num_static_poles;
+	double phase_measurement_frequency;
+	double *static_filter;
+	gint64 static_filter_length;
+	gint64 variable_filter_length;
+	double *adaptive_filter;
+	gint filter_sample_rate;
 	gboolean write_to_screen;
 	char *filename;
-	gint64 fir_length;
-	gint fir_sample_rate;
-	complex double *fir_filter;
-	fftw_plan fir_plan;
 };
 
 
 /**
- * GSTLALLPFilterClass:
+ * GSTLALAdaptiveFIRFiltClass:
  * @parent_class:  the parent class
  */
 
 
-struct _GSTLALLPFilterClass {
+struct _GSTLALAdaptiveFIRFiltClass {
 	GstBaseSinkClass parent_class;
 };
 
 
-GType gstlal_lpfilter_get_type(void);
+GType gstlal_adaptivefirfilt_get_type(void);
 
 
 G_END_DECLS
 
 
-#endif	/* __GSTLAL_LPFILTER_H__ */
+#endif	/* __GSTLAL_ADAPTIVEFIRFILT_H__ */

gstlal-calibration/gst/lal/gstlalcalibration.c

@@ -64,7 +64,7 @@
 #include <gstlal_fccupdate.h>
 #include <gstlal_transferfunction.h>
 #include <gstlal_trackfrequency.h>
-#include <gstlal_lpfilter.h>
+#include <gstlal_adaptivefirfilt.h>
 
 
 /*
@@ -96,7 +96,7 @@ static gboolean plugin_init(GstPlugin *plugin)
 		{"lal_fcc_update", GSTLAL_FCC_UPDATE_TYPE},
 		{"lal_transferfunction", GSTLAL_TRANSFERFUNCTION_TYPE},
 		{"lal_trackfrequency", GSTLAL_TRACKFREQUENCY_TYPE},
-		{"lal_lpfilter", GSTLAL_LPFILTER_TYPE},
+		{"lal_adaptivefirfilt", GSTLAL_ADAPTIVEFIRFILT_TYPE},
 		{NULL, 0},
 	};