From 85bac45c2297f3cf81b6a5f878211e3fbac737be Mon Sep 17 00:00:00 2001
From: Madeline Wade <madeline.wade@ligo.org>
Date: Tue, 2 Dec 2014 21:57:07 -0600
Subject: [PATCH] Changes for gstlal-calibration-0.2.0 release

---
 gstlal-calibration/bin/gstlal_compute_strain |  4 +++-
 gstlal-calibration/configure.ac              |  4 ++--
 gstlal-calibration/debian/changelog          | 10 ++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain
index 614fb8651b..7b2e8baf5c 100755
--- a/gstlal-calibration/bin/gstlal_compute_strain
+++ b/gstlal-calibration/bin/gstlal_compute_strain
@@ -242,6 +242,8 @@ if options.frame_segments_file is not None:
 	if seg is not None:
 		# clip frame segments to seek segment if it exists (not required, just saves some meory and I/O overhead)
 		frame_segments = segments.segmentlistdict((instrument, seglist & segments.segmentlist([seg])) for instrument, seglist in frame_segments.items())
+else:
+	frame_segments = None
 
 # Set up short-cut names for each of the sample rates used throughout the pipeline and establish caps
 sr = options.sample_rate
@@ -356,7 +358,7 @@ if not options.no_dq_vector:
 		odcstatevector = pipeparts.mkcapsfilter(pipeline, odcstatevector, "audio/x-raw-int, signed=false")
 
 # When reading from disk, clip the incoming data stream(s) to segment list
-if options.data_source == "frames" and options.frame_segments_file is not None and options.frame_segments is not None:
+if options.data_source == "frames" and frame_segments is not None:
 	if options.recolor:
 		rawdata = pipeparts.mkgate(pipeline, rawdata, threshold = 1, control = pipeparts.mksegmentsrc(pipeline, frame_segments[instrument]))
 	else:
diff --git a/gstlal-calibration/configure.ac b/gstlal-calibration/configure.ac
index 46ed1715ea..5cc5cc9582 100644
--- a/gstlal-calibration/configure.ac
+++ b/gstlal-calibration/configure.ac
@@ -3,8 +3,8 @@
 #
 
 
-AC_INIT([gstlal-calibration],[0.1.1],[gstlal-discuss@ligo.org],[gstlal-calibration])
-AC_COPYRIGHT([Copyright (C) 2008--2013 Kipp Cannon])
+AC_INIT([gstlal-calibration],[0.2.0],[gstlal-discuss@ligo.org],[gstlal-calibration])
+AC_COPYRIGHT([Copyright (C) 2008--2014 Kipp Cannon])
 # a file whose existance can be used to use to check that we are in the
 # top-level directory of the source tree
 AC_CONFIG_SRCDIR([gnuscripts/ltmain.sh])
diff --git a/gstlal-calibration/debian/changelog b/gstlal-calibration/debian/changelog
index 14c81a4528..47fcf4c6d8 100644
--- a/gstlal-calibration/debian/changelog
+++ b/gstlal-calibration/debian/changelog
@@ -1,9 +1,19 @@
+gstlal-calibration (0.2.0-1) unstable; urgency=low
+
+  * ER6 release
+
+ -- Madeline Wade <madeline.wade@ligo.org>  Thu, 27 Nov 2014 21:15:34 -0500
+
 gstlal-calibration (0.1.1-1) unstable; urgency=low
 
   * initial release
 
  -- Kipp Cannon <kipp.cannon@ligo.org>  Thu, 30 Jan 2014 14:02:06 -0500
 
+  * initial release
+
+ -- Kipp Cannon <kipp.cannon@ligo.org>  Thu, 30 Jan 2014 14:02:06 -0500
+
 gstlal-calibration (0.1.0-1) unstable; urgency=low
 
   * initial release
-- 
GitLab