diff --git a/gstlal-calibration/bin/gstlal_compute_strain b/gstlal-calibration/bin/gstlal_compute_strain index 614fb8651b0397350f5b2d07857bc582d281ef9f..7b2e8baf5c088c9c7ae657f523d30b1199886bc2 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 46ed1715ea3085be1b612b443efd66ddfb21dd1d..5cc5cc9582f83d792211d390ea215b7ffc8e4886 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 14c81a4528f8d2b701c0a83bdf4bded719be7877..47fcf4c6d867bc9b6c9bdac55f768c528eb78494 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