LALConfig.h   LALConfig.h 
/* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * / /* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * /
/* only include this file if LAL's config.h has not been included */ /* only include this file if LAL's config.h has not been included */
#ifndef CONFIG_H__LAL #ifndef CONFIG_H__LAL
#ifndef _LALCONFIG_H #ifndef _LALCONFIG_H
#define _LALCONFIG_H #define _LALCONFIG_H
/* LAL Version */ /* LAL Version */
#define LAL_VERSION "6.9.0" #define LAL_VERSION "6.9.1"
/* LAL Version Major Number */ /* LAL Version Major Number */
#define LAL_VERSION_MAJOR 6 #define LAL_VERSION_MAJOR 6
/* LAL Version Minor Number */ /* LAL Version Minor Number */
#define LAL_VERSION_MINOR 9 #define LAL_VERSION_MINOR 9
/* LAL Version Micro Number */ /* LAL Version Micro Number */
#define LAL_VERSION_MICRO 0 #define LAL_VERSION_MICRO 1
/* LAL Version Devel Number */ /* LAL Version Devel Number */
#define LAL_VERSION_DEVEL 0 #define LAL_VERSION_DEVEL 0
/* LAL Configure Arguments */ /* LAL Configure Arguments */
#define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/ut/testing/l al/6.9.0' '--exec-prefix=/home/ut/testing/lal/6.9.0' '--sysconfdir=/home/ut /testing/lal/6.9.0' '--datadir=/home/ut/testing/lal/6.9.0/share' 'CFLAGS=-w -fpermissive' 'CXXFLAGS=-w -fpermissive'" #define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/ut/testing/l al/6.9.1' '--exec-prefix=/home/ut/testing/lal/6.9.1' '--sysconfdir=/home/ut /testing/lal/6.9.1' '--datadir=/home/ut/testing/lal/6.9.1/share' 'CFLAGS=-w -fpermissive' 'CXXFLAGS=-w -fpermissive'"
/* LAL Configure Date */ /* LAL Configure Date */
#define LAL_CONFIGURE_DATE "2012-12-12T02:29:44+0400" #define LAL_CONFIGURE_DATE "2013-01-15T02:31:49+0400"
/* Suppress debugging code */ /* Suppress debugging code */
/* #undef LAL_NDEBUG */ /* #undef LAL_NDEBUG */
/* Use functions rather than macros */ /* Use functions rather than macros */
/* #undef NOLALMACROS */ /* #undef NOLALMACROS */
/* Use pthread mutex lock for threadsafety */ /* Use pthread mutex lock for threadsafety */
/* #undef LAL_PTHREAD_LOCK */ /* #undef LAL_PTHREAD_LOCK */
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 LALVCSInfo.h   LALVCSInfo.h 
skipping to change at line 33 skipping to change at line 33
#define _LALVCSINFO_H #define _LALVCSINFO_H
#include <lal/LALLibVCSInfo.h> #include <lal/LALLibVCSInfo.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* vcs information defines */ /* vcs information defines */
#define LAL_NAME "LAL" #define LAL_NAME "LAL"
#define LAL_VCS_ID "6373bfb922f5e31768c47af4cb901b7d745f7957" #define LAL_VCS_ID "629da81d648f25098e4f7ab9d681c0aab833c2e5"
#define LAL_VCS_DATE "2012-12-10 22:25:21 +0000" #define LAL_VCS_DATE "2013-01-11 22:45:11 +0000"
#define LAL_VCS_BRANCH "None" #define LAL_VCS_BRANCH "None"
#define LAL_VCS_TAG "lal-v6.9.0" #define LAL_VCS_TAG "lal-v6.9.1"
#define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>" #define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>"
#define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>" #define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>"
#define LAL_VCS_STATUS "CLEAN: All modifications committed" #define LAL_VCS_STATUS "CLEAN: All modifications committed"
/* vcs information defines - identable*/ /* vcs information defines - identable*/
#define LAL_VCS_IDENT_ID "$" "LALId: 6373bfb922f5e31768c47af4cb901b7d745f79 #define LAL_VCS_IDENT_ID "$" "LALId: 629da81d648f25098e4f7ab9d681c0aab833c2
57 " "$" e5 " "$"
#define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-12-10 22:25:21 +0000 " "$" #define LAL_VCS_IDENT_DATE "$" "LALDate: 2013-01-11 22:45:11 +0000 " "$"
#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" #define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$"
#define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.9.0 " "$" #define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.9.1 " "$"
#define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$" #define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$"
#define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$" #define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$"
#define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$" #define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$"
/* header vcs information structure */ /* header vcs information structure */
static const struct tagLALVCSInfo lalHeaderVCSInfo = { \ static const struct tagLALVCSInfo lalHeaderVCSInfo = { \
LAL_NAME, \ LAL_NAME, \
LAL_VERSION, \ LAL_VERSION, \
LAL_VCS_ID, \ LAL_VCS_ID, \
LAL_VCS_DATE, \ LAL_VCS_DATE, \
 End of changes. 4 change blocks. 
7 lines changed or deleted 7 lines changed or added


 TriggerInterpolation.h   TriggerInterpolation.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Copyright (C) 2012 Leo Singer * Copyright (C) 2012 Leo Singer
*/ */
#include <complex.h> #include <complex.h>
#include <lal/LALAtomicDatatypes.h>
#ifndef _TRIGGERINTERPOLATION_H #ifndef _TRIGGERINTERPOLATION_H
#define _TRIGGERINTERPOLATION_H #define _TRIGGERINTERPOLATION_H
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 57 skipping to change at line 58
* The '5' is the interpolation window. In this example, the interpolation will * The '5' is the interpolation window. In this example, the interpolation will
* take into account a given sample, the 5 samples before, and the 5 sample s * take into account a given sample, the 5 samples before, and the 5 sample s
* after, for a total of 11 samples. * after, for a total of 11 samples.
* *
* To apply the interpolant to a time series, call * To apply the interpolant to a time series, call
* \c XLALApplyLanczosTriggerInterpolant. It is requried that |y[0]| >= |y[ i]| * \c XLALApplyLanczosTriggerInterpolant. It is requried that |y[0]| >= |y[ i]|
* for all i from -\c window to +\c window. Suppose that you have a complex * for all i from -\c window to +\c window. Suppose that you have a complex
* array \c y: * array \c y:
* *
* \code{.c} * \code{.c}
* double complex y[] = {...}; * COMPLEX16 y[] = {...};
* \endcode * \endcode
* *
* and suppose that the maximum of |y[i]| occurs at i = 8. * and suppose that the maximum of |y[i]| occurs at i = 8.
* To interpolate the time and complex value at which the maximum occurs, d o * To interpolate the time and complex value at which the maximum occurs, d o
* the following: * the following:
* *
* \code{.c} * \code{.c}
* double tmax; * double tmax;
* double complex ymax; * COMPLEX16 ymax;
* int result = XLALApplyLanczosTriggerInterpolant(interp, &tmax, &ymax, &y[8]); * int result = XLALApplyLanczosTriggerInterpolant(interp, &tmax, &ymax, &y[8]);
* \endcode * \endcode
* *
* Upon success, the return value of \c XLALApplyLanczosTriggerInterpolant is * Upon success, the return value of \c XLALApplyLanczosTriggerInterpolant is
* zero, the interpolated index of the maximum sample is 8 + \c *tmax, and the * zero, the interpolated index of the maximum sample is 8 + \c *tmax, and the
* interpolated value is in \c ymax. Upon failure, the return value is nonz ero * interpolated value is in \c ymax. Upon failure, the return value is nonz ero
* and neither \c *tmax nor \c *ymax are modified. * and neither \c *tmax nor \c *ymax are modified.
* *
* When you are done, release all of the workspace resources associated wit h * When you are done, release all of the workspace resources associated wit h
* the interpolant with: * the interpolant with:
skipping to change at line 136 skipping to change at line 137
* \c y. There should exist \c window samples before and \c window samples * \c y. There should exist \c window samples before and \c window samples
* after this pointer. * after this pointer.
* *
* On success, set \c *tmax to the interpolated time, \c *ymax to the * On success, set \c *tmax to the interpolated time, \c *ymax to the
* complex interpolated signal, and return 0. On failure, return a non-zero GSL * complex interpolated signal, and return 0. On failure, return a non-zero GSL
* error code. * error code.
*/ */
int XLALApplyCubicSplineTriggerInterpolant( int XLALApplyCubicSplineTriggerInterpolant(
CubicSplineTriggerInterpolant *interp, CubicSplineTriggerInterpolant *interp,
double *tmax, double *tmax,
double complex *ymax, COMPLEX16 *ymax,
const double complex *y); const COMPLEX16 *y);
/* \} */ /* \} */
/** /**
* Lanczos interpolation * Lanczos interpolation
* *
* Convolve the data with a Lanczos reconstruction kernel and find the maxi mum * Convolve the data with a Lanczos reconstruction kernel and find the maxi mum
* of the absolute value using a one-dimensional numerical method. * of the absolute value using a one-dimensional numerical method.
* *
* \addtogroup LanczosTriggerInterpolant * \addtogroup LanczosTriggerInterpolant
skipping to change at line 183 skipping to change at line 184
* \c y. There should exist \c window samples before and \c window samples * \c y. There should exist \c window samples before and \c window samples
* after this pointer. * after this pointer.
* *
* On success, set \c *tmax to the interpolated time, \c *ymax to the * On success, set \c *tmax to the interpolated time, \c *ymax to the
* complex interpolated signal, and return 0. On failure, return a non-zero GSL * complex interpolated signal, and return 0. On failure, return a non-zero GSL
* error code. * error code.
*/ */
int XLALApplyLanczosTriggerInterpolant( int XLALApplyLanczosTriggerInterpolant(
LanczosTriggerInterpolant *interp, LanczosTriggerInterpolant *interp,
double *tmax, double *tmax,
double complex *ymax, COMPLEX16 *ymax,
const double complex *y); const COMPLEX16 *y);
/* \} */ /* \} */
/** /**
* Nearest-neighbor interpolation * Nearest-neighbor interpolation
* *
* Perform trivial, nearest-neighbor interpolation. * Perform trivial, nearest-neighbor interpolation.
* Always sets <tt>*tmax = 0, *ymax = data[0]</tt>. * Always sets <tt>*tmax = 0, *ymax = data[0]</tt>.
* *
* \warning It is an error to request a nearest-neighbor workspace with a w indow * \warning It is an error to request a nearest-neighbor workspace with a w indow
skipping to change at line 236 skipping to change at line 237
* \c y. There should exist \c window samples before and \c window samples * \c y. There should exist \c window samples before and \c window samples
* after this pointer. * after this pointer.
* *
* On success, set \c *tmax to the interpolated time, \c *ymax to the * On success, set \c *tmax to the interpolated time, \c *ymax to the
* complex interpolated signal, and return 0. On failure, return a non-zero GSL * complex interpolated signal, and return 0. On failure, return a non-zero GSL
* error code. * error code.
*/ */
int XLALApplyNearestNeighborTriggerInterpolant( int XLALApplyNearestNeighborTriggerInterpolant(
NearestNeighborTriggerInterpolant *interp, NearestNeighborTriggerInterpolant *interp,
double *tmax, double *tmax,
double complex *ymax, COMPLEX16 *ymax,
const double complex *y); const COMPLEX16 *y);
/* \} */ /* \} */
/** /**
* Quadratic fit * Quadratic fit
* *
* Fit a quadratic function to the absolute value of the data. Report the s ample * Fit a quadratic function to the absolute value of the data. Report the s ample
* index of the vertex if the vertex is a maximum. Note that this is not * index of the vertex if the vertex is a maximum. Note that this is not
* actually an interpolant because it is not guaranteed to agree with the i nput * actually an interpolant because it is not guaranteed to agree with the i nput
* data points, and that it always sets *ymax = data[0]. * data points, and that it always sets *ymax = data[0].
skipping to change at line 285 skipping to change at line 286
* \c y. There should exist \c window samples before and \c window samples * \c y. There should exist \c window samples before and \c window samples
* after this pointer. * after this pointer.
* *
* On success, set \c *tmax to the interpolated time, \c *ymax to the * On success, set \c *tmax to the interpolated time, \c *ymax to the
* complex interpolated signal, and return 0. On failure, return a non-zero GSL * complex interpolated signal, and return 0. On failure, return a non-zero GSL
* error code. * error code.
*/ */
int XLALApplyQuadraticFitTriggerInterpolant( int XLALApplyQuadraticFitTriggerInterpolant(
QuadraticFitTriggerInterpolant *interp, QuadraticFitTriggerInterpolant *interp,
double *tmax, double *tmax,
double complex *ymax, COMPLEX16 *ymax,
const double complex *y); const COMPLEX16 *y);
/* \} */ /* \} */
/* \} */ /* \} */
#if 0 #if 0
{ /* so that editors will match succeeding brace */ { /* so that editors will match succeeding brace */
#elif defined(__cplusplus) #elif defined(__cplusplus)
} /* extern "C" */ } /* extern "C" */
#endif #endif
 End of changes. 7 change blocks. 
10 lines changed or deleted 11 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/