From 57b8a5d71e810305b9b4ecd6a59a525a9fb27ed1 Mon Sep 17 00:00:00 2001 From: Madeline Wade <wademc@ldas-pcdev4.ligo.caltech.edu> Date: Tue, 21 Jul 2015 07:45:25 -0700 Subject: [PATCH] Final fix to --wings option for gstlal-calibration-0.3.3 release --- gstlal-calibration/bin/gstlal_compute_strain | 4 ++-- gstlal-calibration/configure.ac | 2 +- gstlal-calibration/debian/changelog | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain index 28a6f8d0cd..dd4d302e11 100755 --- a/gstlal-calibration/bin/gstlal_compute_strain +++ b/gstlal-calibration/bin/gstlal_compute_strain @@ -756,9 +756,9 @@ if options.wings is not None: def clip_wings(pad, obj, (wings, start, end)): if isinstance(obj, gst.Buffer): startts = lal.LIGOTimeGPS(0, obj.timestamp) - if startts >= (start + wings) and startts <= (end - wings): + if startts >= (start + wings) and startts < (end - wings): return True - elif startts < (start + wings) or startts > (end - wings): + elif startts < (start + wings) or startts >= (end - wings): return False elif isinstance(obj, gst.Event): return True diff --git a/gstlal-calibration/configure.ac b/gstlal-calibration/configure.ac index 4437ad9f5a..fc60984279 100644 --- a/gstlal-calibration/configure.ac +++ b/gstlal-calibration/configure.ac @@ -3,7 +3,7 @@ # -AC_INIT([gstlal-calibration],[0.3.2],[gstlal-discuss@ligo.org],[gstlal-calibration]) +AC_INIT([gstlal-calibration],[0.3.3],[gstlal-discuss@ligo.org],[gstlal-calibration]) AC_COPYRIGHT([Copyright (C) 2008--2015 Madeline Wade]) # a file whose existance can be used to use to check that we are in the # top-level directory of the source tree diff --git a/gstlal-calibration/debian/changelog b/gstlal-calibration/debian/changelog index 77493bb7cb..7b63706b4b 100644 --- a/gstlal-calibration/debian/changelog +++ b/gstlal-calibration/debian/changelog @@ -1,3 +1,9 @@ +gstlal-calibration (0.3.3-1) unstable; urgency=low + + * Another bug fix release for the --wings option (again) + + -- Madeline Wade <madeline.wade@ligo.org> Mon, 20 July 2015 16:03:00 -0500 + gstlal-calibration (0.3.2-1) unstable; urgency=low * Another bug fix release for the --wings option -- GitLab