ComplexFFT.h   ComplexFFT.h 
skipping to change at line 85 skipping to change at line 85
#define COMPLEXFFTH_MSGESIGN "Unknown sign of transform in plan" #define COMPLEXFFTH_MSGESIGN "Unknown sign of transform in plan"
/** \endcond */ /** \endcond */
/** Plan to perform FFT of COMPLEX8 data */ /** Plan to perform FFT of COMPLEX8 data */
typedef struct tagCOMPLEX8FFTPlan COMPLEX8FFTPlan; typedef struct tagCOMPLEX8FFTPlan COMPLEX8FFTPlan;
/** Plan to perform FFT of COMPLEX16 data */ /** Plan to perform FFT of COMPLEX16 data */
typedef struct tagCOMPLEX16FFTPlan COMPLEX16FFTPlan; typedef struct tagCOMPLEX16FFTPlan COMPLEX16FFTPlan;
#define tagComplexFFTPlan tagCOMPLEX8FFTPlan #define tagComplexFFTPlan tagCOMPLEX8FFTPlan
#define ComplexFFTPlan COMPLEX8FFTPlan #define ComplexFFTPlan COMPLEX8FFTPlan
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(VIEWIN_STRUCTS(COMPLEX8Vector, output));
SWIGLAL(VIEWIN_STRUCTS(COMPLEX16Vector, output));
#endif /* SWIG */
/* /*
* *
* XLAL COMPLEX8 functions * XLAL COMPLEX8 functions
* *
*/ */
/** /**
* Returns a new COMPLEX8FFTPlan * Returns a new COMPLEX8FFTPlan
* A COMPLEX8FFTPlan is required to perform a FFT that involves complex dat a. * A COMPLEX8FFTPlan is required to perform a FFT that involves complex dat a.
* A different plan is required for each size of the complex data vectors * A different plan is required for each size of the complex data vectors
skipping to change at line 218 skipping to change at line 223
* @par Errors: * @par Errors:
* The \c XLALCOMPLEX8VectorFFT() function shall fail if: * The \c XLALCOMPLEX8VectorFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the input and output data * - [\c XLAL_EINVAL] A argument is invalid or the input and output data
* vectors are the same. * vectors are the same.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALCOMPLEX8VectorFFT( COMPLEX8Vector * _LAL_RESTRICT_ output, const CO int XLALCOMPLEX8VectorFFT( COMPLEX8Vector * _LAL_RESTRICT_ output, const CO
MPLEX8Vector * _LAL_RESTRICT_ input, MPLEX8Vector * _LAL_RESTRICT_ input, const COMPLEX8FFTPlan *plan );
const COMPLEX8FFTPlan *plan );
/* /*
* *
* XLAL COMPLEX16 functions * XLAL COMPLEX16 functions
* *
*/ */
/** /**
* Returns a new COMPLEX16FFTPlan * Returns a new COMPLEX16FFTPlan
* *
skipping to change at line 355 skipping to change at line 359
* @par Errors: * @par Errors:
* The \c XLALCOMPLEX16VectorFFT() function shall fail if: * The \c XLALCOMPLEX16VectorFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the input and output data * - [\c XLAL_EINVAL] A argument is invalid or the input and output data
* vectors are the same. * vectors are the same.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALCOMPLEX16VectorFFT( COMPLEX16Vector * _LAL_RESTRICT_ output, const int XLALCOMPLEX16VectorFFT( COMPLEX16Vector * _LAL_RESTRICT_ output, const
COMPLEX16Vector * _LAL_RESTRICT_ input, COMPLEX16Vector * _LAL_RESTRICT_ input, const COMPLEX16FFTPlan *plan );
const COMPLEX16FFTPlan *plan );
/* /*
* *
* LAL COMPLEX8 functions * LAL COMPLEX8 functions
* *
*/ */
/** /**
* \b DEPRECATED * \b DEPRECATED
* @deprecated Use XLALCreateForwardCOMPLEX8FFTPlan() instead. * @deprecated Use XLALCreateForwardCOMPLEX8FFTPlan() instead.
 End of changes. 3 change blocks. 
6 lines changed or deleted 9 lines changed or added


 ConfigFile.h   ConfigFile.h 
skipping to change at line 194 skipping to change at line 194
BOOLEAN *wasRead); BOOLEAN *wasRead);
int int
XLALReadConfigVariable (void *varp, XLALReadConfigVariable (void *varp,
const LALParsedDataFile *cfgdata, const LALParsedDataFile *cfgdata,
const LALConfigVar *param, const LALConfigVar *param,
BOOLEAN *wasRead); BOOLEAN *wasRead);
int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict); int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict);
int XLALParseStringValueToINT8 ( INT8 *valINT8, const char *valString );
int XLALParseStringValueToINT4 ( INT4 *valINT4, const char *valString );
int XLALParseStringValueToREAL8 ( REAL8 *valREAL8, const char *valString );
int XLALParseStringValueToREAL4 ( REAL4 *valREAL4, const char *valString );
int XLALParseStringValueToBOOLEAN ( BOOLEAN *valBOOLEAN, const char *valStr
ing );
/* ========== DEPRECATED LAL INTERFACE FUNCTIONS, which have been replaced by XLAL functions, /* ========== DEPRECATED LAL INTERFACE FUNCTIONS, which have been replaced by XLAL functions,
* These functions are just wrappers around the XLAL functions * These functions are just wrappers around the XLAL functions
*/ */
/** \name Error codes */ /** \name Error codes */
/*@{*/ /*@{*/
#define CONFIGFILEH_ENULL 1 /**< Arguments contained an unexpected null pointer. */ #define CONFIGFILEH_ENULL 1 /**< Arguments contained an unexpected null pointer. */
#define CONFIGFILEH_EFILE 2 /**< File error. */ #define CONFIGFILEH_EFILE 2 /**< File error. */
#define CONFIGFILEH_EVAR 3 /**< Config variable not fo und. */ #define CONFIGFILEH_EVAR 3 /**< Config variable not fo und. */
#define CONFIGFILEH_EFMT 4 /**< Config variable not re adable using given format-string. */ #define CONFIGFILEH_EFMT 4 /**< Config variable not re adable using given format-string. */
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 Date.h   Date.h 
skipping to change at line 97 skipping to change at line 97
#define XLAL_EPOCH_GPS_JD 2444244.5 /**< Julian Day of the GPS epoch (1980 JAN 6 0h UTC) */ #define XLAL_EPOCH_GPS_JD 2444244.5 /**< Julian Day of the GPS epoch (1980 JAN 6 0h UTC) */
#define XLAL_EPOCH_GPS_TAI_UTC 19 /**< Leap seconds (TAI-UTC) on the GPS epoch (1980 JAN 6 0h UTC) */ #define XLAL_EPOCH_GPS_TAI_UTC 19 /**< Leap seconds (TAI-UTC) on the GPS epoch (1980 JAN 6 0h UTC) */
#define XLAL_MJD_REF 2400000.5 /**< Reference Julian Day f or Mean Julian Day. */ #define XLAL_MJD_REF 2400000.5 /**< Reference Julian Day f or Mean Julian Day. */
#define XLAL_MODIFIED_JULIEN_DAY(utc) (XLALJulianDay(utc)-XLAL_MJD_REF) /** < Modified Julian Day for specified civil time structure. */ #define XLAL_MODIFIED_JULIEN_DAY(utc) (XLALJulianDay(utc)-XLAL_MJD_REF) /** < Modified Julian Day for specified civil time structure. */
/** /**
* This structure stores pointers to a ::LALDetector and a * This structure stores pointers to a ::LALDetector and a
* ::LIGOTimeGPS. Its sole purpose is to aggregate these * ::LIGOTimeGPS. Its sole purpose is to aggregate these
* structures for passing to functions. * structures for passing to functions.
*/ */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagLALPlaceAndGPS, p_detector));
#endif /* SWIG */
typedef struct typedef struct
tagLALPlaceAndGPS tagLALPlaceAndGPS
{ {
const LALDetector *p_detector; /**< pointer to a detector */ const LALDetector *p_detector; /**< pointer to a detector */
LIGOTimeGPS *p_gps; /**< Pointer to a GPS time structure */ LIGOTimeGPS *p_gps; /**< Pointer to a GPS time structure */
} }
LALPlaceAndGPS; LALPlaceAndGPS;
/*@}*/ /*@}*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 DetResponse.h   DetResponse.h 
skipping to change at line 121 skipping to change at line 121
} }
LALSource; LALSource;
/** /**
* This structure aggregates a pointer to a \c LALDetector and a * This structure aggregates a pointer to a \c LALDetector and a
* \c LALSource. Its sole function is to allow the user to pass * \c LALSource. Its sole function is to allow the user to pass
* detector and source parameters to the functions * detector and source parameters to the functions
* LALComputeDetAMResponse() and * LALComputeDetAMResponse() and
* LALComputeDetAMResponseSeries(). * LALComputeDetAMResponseSeries().
*/ */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagLALDetAndSource, pDetector));
#endif /* SWIG */
typedef struct typedef struct
tagLALDetAndSource tagLALDetAndSource
{ {
const LALDetector *pDetector;/**< Pointer to ::LALDetector object contai ning information about the detector */ const LALDetector *pDetector;/**< Pointer to ::LALDetector object contai ning information about the detector */
LALSource *pSource; /**< Pointer to ::LALSource object containin g information about the source */ LALSource *pSource; /**< Pointer to ::LALSource object containin g information about the source */
} }
LALDetAndSource; LALDetAndSource;
/** /**
* This structure encapsulates the detector AM (beam pattern) coefficients for * This structure encapsulates the detector AM (beam pattern) coefficients for
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 EllipsoidOverlapTools.h   EllipsoidOverlapTools.h 
skipping to change at line 54 skipping to change at line 54
#include <gsl/gsl_min.h> #include <gsl/gsl_min.h>
#include <gsl/gsl_vector.h> #include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h> #include <gsl/gsl_matrix.h>
#include <gsl/gsl_blas.h> #include <gsl/gsl_blas.h>
#include <gsl/gsl_linalg.h> #include <gsl/gsl_linalg.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagfContactWorkSpace, invQ1, invQ2));
#endif /* SWIG */
typedef struct tagfContactWorkSpace typedef struct tagfContactWorkSpace
{ {
/* Dimension of the matrices & vectors */ /* Dimension of the matrices & vectors */
UINT4 n; UINT4 n;
/* Vector r_AB = r_B - r_A and */ /* Vector r_AB = r_B - r_A and */
/* shape matrices for ellipsoid centered */ /* shape matrices for ellipsoid centered */
/* at points A and B */ /* at points A and B */
gsl_vector *r_AB; gsl_vector *r_AB;
const gsl_matrix *invQ1, *invQ2; const gsl_matrix *invQ1, *invQ2;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 FileIO.h   FileIO.h 
skipping to change at line 80 skipping to change at line 80
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
int XLALFileVPrintf( LALFILE *file, const char *fmt, va_list ap ); int XLALFileVPrintf( LALFILE *file, const char *fmt, va_list ap );
#endif /* SWIG */ #endif /* SWIG */
int XLALFilePrintf( LALFILE *file, const char *fmt, ... ); int XLALFilePrintf( LALFILE *file, const char *fmt, ... );
int XLALFileFlush( LALFILE *file ); int XLALFileFlush( LALFILE *file );
int XLALFileSeek( LALFILE *file, long offset, int whence ); int XLALFileSeek( LALFILE *file, long offset, int whence );
long XLALFileTell( LALFILE *file ); long XLALFileTell( LALFILE *file );
void XLALFileRewind( LALFILE *file ); void XLALFileRewind( LALFILE *file );
int XLALFileEOF( LALFILE *file ); int XLALFileEOF( LALFILE *file );
int XLALFileIsRegularAndGetSize ( const char *path, size_t *fileLen );
int XLALFileIsRegular ( const char *path );
size_t XLALFileSize ( const char *path );
char *XLALFileResolvePathLong ( const char *fname, const char *fallbackdir
);
char *XLALFileResolvePath( const char *fname );
char *XLALFileLoad ( const char *path );
int XLALGzipTextFile( const char *path ); int XLALGzipTextFile( const char *path );
int XLALGunzipTextFile( const char *filename ); int XLALGunzipTextFile( const char *filename );
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _FILEIO_H */ #endif /* _FILEIO_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 LALAdaptiveRungeKutta4.h   LALAdaptiveRungeKutta4.h 
skipping to change at line 102 skipping to change at line 102
); );
int XLALAdaptiveRungeKutta4Hermite( ark4GSLIntegrator *integrator, int XLALAdaptiveRungeKutta4Hermite( ark4GSLIntegrator *integrator,
void *params, void *params,
REAL8 *yinit, REAL8 *yinit,
REAL8 tinit, REAL8 tinit,
REAL8 tend_in, REAL8 tend_in,
REAL8 deltat, REAL8 deltat,
REAL8Array **yout REAL8Array **yout
); );
/**
* Fourth-order Runge-Kutta ODE integrator using Runge-Kutta-Fehlberg (RKF4
5)
* steps with adaptive step size control. Intended for use in Fourier doma
in
* waveform generation routines based on SpinTaylorTN models.
*
* The method is described in
*
* Abramowitz & Stegun, Handbook of Mathematical Functions, Tenth Printing,
* National Bureau of Standards, Washington, DC, 1972
* (available online at http://people.math.sfu.ca/~cbm/aands/ )
*
* This method is equivalent to XLALAdaptiveRungeKutta4 and
* XLALAdaptiveRungeKutta4Hermite, but does not includes any interpolation.
*
* Memory is allocated in steps of LAL_MAX_RK4_STEPS.
*/
int XLALAdaptiveRungeKutta4IrregularIntervals( ark4GSLIntegrator *integrato
r, /**< struct holding dydt, stopping test, stepper, etc. */
void *params, /**
< params struct used to compute dydt and stopping test */
REAL8 *yinit, /**
< pass in initial values of all variables - overwritten to final values */
REAL8 tinit, /**
< integration start time */
REAL8 tend_in, /**
< maximum integration time */
REAL8Array **yout /**
< array holding the unevenly sampled output */
);
/*@}*/ /*@}*/
#if 0 #if 0
{ /* so that editors will match succeeding brace */ { /* so that editors will match succeeding brace */
#elif defined(__cplusplus) #elif defined(__cplusplus)
} }
#endif #endif
#endif /* _LALADAPTIVERUNGEKUTTA4_H */ #endif /* _LALADAPTIVERUNGEKUTTA4_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 32 lines changed or added


 LALAtomicDatatypes.h   LALAtomicDatatypes.h 
skipping to change at line 27 skipping to change at line 27
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
/* ---------- SEE LALDatatypes.dox for doxygen documentation ---------- */ /* ---------- SEE LALDatatypes.dox for doxygen documentation ---------- */
#ifndef _LALATOMICDATATYPES_H #ifndef _LALATOMICDATATYPES_H
#define _LALATOMICDATATYPES_H #define _LALATOMICDATATYPES_H
#include <stdint.h> #include <stdint.h>
#include <lal/LALConfig.h> #include <lal/LALConfig.h>
#include <lal/LALStddef.h>
/* macros for certain keywords */
#if __STDC_VERSION__ >= 199901L
# define _LAL_RESTRICT_ restrict
# define _LAL_INLINE_ inline
#elif defined __GNUC__
# define _LAL_RESTRICT_ __restrict__
# define _LAL_INLINE_ __inline__
#else
# define _LAL_RESTRICT_
# define _LAL_INLINE_
#endif
#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
/** \addtogroup LALDatatypes */ /*@{*/ /** \addtogroup LALDatatypes */ /*@{*/
typedef char CHAR; /**< One-byte signed integer, see \ref LALDa tatypes for more details */ typedef char CHAR; /**< One-byte signed integer, see \ref LALDa tatypes for more details */
skipping to change at line 74 skipping to change at line 63
#undef COMPLEX16 #undef COMPLEX16
/* Integer types */ /* Integer types */
typedef int16_t INT2; /**< Two-byte signed integer */ typedef int16_t INT2; /**< Two-byte signed integer */
typedef int32_t INT4; /**< Four-byte signed integer. */ typedef int32_t INT4; /**< Four-byte signed integer. */
typedef int64_t INT8; /**< Eight-byte signed integer; on some plat forms this is equivalent to <tt>long int</tt> instead. */ typedef int64_t INT8; /**< Eight-byte signed integer; on some plat forms this is equivalent to <tt>long int</tt> instead. */
typedef uint16_t UINT2; /**< Two-byte unsigned integer. */ typedef uint16_t UINT2; /**< Two-byte unsigned integer. */
typedef uint32_t UINT4; /**< Four-byte unsigned integer. */ typedef uint32_t UINT4; /**< Four-byte unsigned integer. */
typedef uint64_t UINT8; /**< Eight-byte unsigned integer; on some platforms this is equivalent to <tt>unsigned long int</tt> instead. * / typedef uint64_t UINT8; /**< Eight-byte unsigned integer; on some platforms this is equivalent to <tt>unsigned long int</tt> instead. * /
/** MACRO to initialize arbitrary variable 'x' to zero */
#define XLAL_INIT_MEM(x) memset(&(x), 0, sizeof((x)))
/** C99 MACRO to declare and zero-initialize a variable, use as "type XLAL_
INIT_DECL(var);" */
#define XLAL_INIT_DECL(var) var; XLAL_INIT_MEM(var)
/* Macros for integer constants */ /* Macros for integer constants */
/** /**
* \def LAL_INT8_C(v) (v ## LL) * \def LAL_INT8_C(v) (v ## LL)
* \brief Macro for use in defining \a v as an INT8 constant. * \brief Macro for use in defining \a v as an INT8 constant.
* *
* This macro affixes the appropriate qualifier to form an INT8 constant. * This macro affixes the appropriate qualifier to form an INT8 constant.
* For example: * For example:
* \code * \code
* const INT8 jan_1_2000_gps_nanosec = LAL_INT8_C(63072001300000000) * const INT8 jan_1_2000_gps_nanosec = LAL_INT8_C(63072001300000000)
* \endcode * \endcode
 End of changes. 2 change blocks. 
12 lines changed or deleted 7 lines changed or added


 LALConfig.h   LALConfig.h 
/* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * / /* lib/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 LAL_VERSION #ifndef LAL_VERSION
/* LAL Version */ /* LAL Version */
#define LAL_VERSION "6.12.0" #define LAL_VERSION "6.13.0"
/* 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 12 #define LAL_VERSION_MINOR 13
/* LAL Version Micro Number */ /* LAL Version Micro Number */
#define LAL_VERSION_MICRO 0 #define LAL_VERSION_MICRO 0
/* LAL Version Devel Number */ /* LAL Version Devel Number */
#define LAL_VERSION_DEVEL 0 #define LAL_VERSION_DEVEL 0
/* LAL Configure Arguments */
#define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/ut/testing/l
al/6.12.0' '--exec-prefix=/home/ut/testing/lal/6.12.0' '--sysconfdir=/home/
ut/testing/lal/6.12.0' '--datadir=/home/ut/testing/lal/6.12.0/share' 'CFLAG
S=-w -fpermissive' 'CXXFLAGS=-w -fpermissive'"
/* LAL Configure Date */
#define LAL_CONFIGURE_DATE "2014-01-10T03:03:47+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 */
/* Define if using fftw3 library */ /* Define if using fftw3 library */
#define LAL_FFTW3_ENABLED 1 #define LAL_FFTW3_ENABLED 1
/* Define if using fftw3 aligned memory optimizations */
/* #undef LAL_FFTW3_MEMALIGN_ENABLED */
/* Define if using boinc library */ /* Define if using boinc library */
/* #undef LAL_BOINC_ENABLED */ /* #undef LAL_BOINC_ENABLED */
/* Define if using CUDA library */ /* Define if using CUDA library */
/* #undef LAL_CUDA_ENABLED */ /* #undef LAL_CUDA_ENABLED */
/* Define if using qthread library */ /* Define if using qthread library */
/* #undef LAL_QTHREAD */ /* #undef LAL_QTHREAD */
#endif /* LAL_VERSION */ #endif /* LAL_VERSION */
 End of changes. 5 change blocks. 
12 lines changed or deleted 6 lines changed or added


 LALConstants.h   LALConstants.h 
skipping to change at line 62 skipping to change at line 62
#define LAL_REAL4_MAX 3.40282347e+38 /**< Largest REAL4 */ #define LAL_REAL4_MAX 3.40282347e+38 /**< Largest REAL4 */
#define LAL_REAL4_MIN 1.17549435e-38 /**< Smallest nonzero REAL4 */ #define LAL_REAL4_MIN 1.17549435e-38 /**< Smallest nonzero REAL4 */
#define LAL_REAL4_EPS 1.19209290e-07 /**< 0.5^(LAL_REAL4_MANT-1), ie the di fference between 1 and the next resolveable REAL4 */ #define LAL_REAL4_EPS 1.19209290e-07 /**< 0.5^(LAL_REAL4_MANT-1), ie the di fference between 1 and the next resolveable REAL4 */
#define LAL_REAL8_MANT 53 /**< Bits of precision in the mantissa of a REAL8 */ #define LAL_REAL8_MANT 53 /**< Bits of precision in the mantissa of a REAL8 */
#define LAL_REAL8_MAX 1.7976931348623157e+308 /**< Largest REAL8 */ #define LAL_REAL8_MAX 1.7976931348623157e+308 /**< Largest REAL8 */
#define LAL_REAL8_MIN 2.2250738585072014e-308 /**< Smallest nonzero REAL8 * / #define LAL_REAL8_MIN 2.2250738585072014e-308 /**< Smallest nonzero REAL8 * /
#define LAL_REAL8_EPS 2.2204460492503131e-16 /**< 0.5^(LAL_REAL8_MANT-1), ie the difference between 1 and the next resolveable REAL8 */ #define LAL_REAL8_EPS 2.2204460492503131e-16 /**< 0.5^(LAL_REAL8_MANT-1), ie the difference between 1 and the next resolveable REAL8 */
/*@}*/ /*@}*/
/** /**
* \name Integer constants
* Extremal integer values, all expressed as unsigned long long.
*/
/*@{*/
#define LAL_UINT8_MAX LAL_UINT8_C(18446744073709551615)
#define LAL_UINT4_MAX LAL_UINT8_C(4294967295)
#define LAL_UINT2_MAX LAL_UINT8_C(65535)
#define LAL_INT8_MAX LAL_UINT8_C(9223372036854775807)
#define LAL_INT4_MAX LAL_UINT8_C(2147483647)
#define LAL_INT2_MAX LAL_UINT8_C(32767)
/*@}*/
/**
* \name Mathematical constants * \name Mathematical constants
* The following are fundamental mathematical constants. They are mostly * The following are fundamental mathematical constants. They are mostly
* taken from the GNU C <tt>math.h</tt> header (with the exception of * taken from the GNU C <tt>math.h</tt> header (with the exception of
* <tt>LAL_TWOPI</tt>, which was computed using Maple). All numbers are * <tt>LAL_TWOPI</tt>, which was computed using Maple). All numbers are
* dimensionless. The value of exp(gamma) is taken from * dimensionless. The value of exp(gamma) is taken from
* http://www.research.att.com/~njas/sequences/A073004 * http://www.research.att.com/~njas/sequences/A073004
*/ */
/*@{*/ /*@{*/
#define LAL_E 2.7182818284590452353602874713526625 /**< e */ #define LAL_E 2.7182818284590452353602874713526625 /**< e */
#define LAL_LOG2E 1.4426950408889634073599246810018922 /**< log_2 e */ #define LAL_LOG2E 1.4426950408889634073599246810018922 /**< log_2 e */
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 LALDatatypes.h   LALDatatypes.h 
skipping to change at line 453 skipping to change at line 453
typedef struct tagCOMPLEX16ArraySequence { typedef struct tagCOMPLEX16ArraySequence {
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 arrayDim; /**< The number of data \a N in each array element (this is not the number \a m of indices). */ UINT4 arrayDim; /**< The number of data \a N in each array element (this is not the number \a m of indices). */
UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing the array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing the array dimensions */
COMPLEX16 *data; /**< Pointer to the data array. */ COMPLEX16 *data; /**< Pointer to the data array. */
} COMPLEX16ArraySequence; } COMPLEX16ArraySequence;
/* ---------- Structured datatypes ---------- */ /* ---------- Structured datatypes ---------- */
/** Epoch relative to GPS epoch, see \ref ss_LIGOTimeGPS for more details * / /** Epoch relative to GPS epoch, see \ref ss_LIGOTimeGPS for more details * /
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagLIGOTimeGPS, gpsSeconds, gpsNanoSeconds));
#endif /* SWIG */
typedef struct tagLIGOTimeGPS { typedef struct tagLIGOTimeGPS {
INT4 gpsSeconds; /**< Seconds since 0h UTC 6 Jan 1980. */ INT4 gpsSeconds; /**< Seconds since 0h UTC 6 Jan 1980. */
INT4 gpsNanoSeconds; /**< Residual nanoseconds. */ INT4 gpsNanoSeconds; /**< Residual nanoseconds. */
} LIGOTimeGPS; } LIGOTimeGPS;
/** Zero-initializer for LIGOTimeGPS structs */ /** Zero-initializer for LIGOTimeGPS structs */
#define LIGOTIMEGPSZERO { 0, 0 } #define LIGOTIMEGPSZERO { 0, 0 }
#ifdef SWIG /* SWIG interface directives */
/* *INDENT-OFF* */
%include <lal/lalswig_ligotimegps.i>
/* *INDENT-ON* */
#endif /* SWIG */
/** /**
* Indices of arrays corresponding to particular units. * Indices of arrays corresponding to particular units.
* The ::LALUnit structure has arrays giving the numerators * The ::LALUnit structure has arrays giving the numerators
* and denominators-minus-one of the powers of various units. * and denominators-minus-one of the powers of various units.
* These are the indices for the particular units. * These are the indices for the particular units.
*/ */
enum { enum {
LALUnitIndexMeter, /**< The meter index. */ LALUnitIndexMeter, /**< The meter index. */
LALUnitIndexKiloGram, /**< The kilogram index. */ LALUnitIndexKiloGram, /**< The kilogram index. */
LALUnitIndexSecond, /**< The second index. */ LALUnitIndexSecond, /**< The second index. */
skipping to change at line 496 skipping to change at line 493
* and ADC Count). It also stores an overall power-of-ten scaling factor. * and ADC Count). It also stores an overall power-of-ten scaling factor.
* Thus, the units are given by * Thus, the units are given by
* \f{equation}{ * \f{equation}{
* 10^p\times\textrm{m}^{N_0/(1+D_0)}\times\textrm{kg}^{N_1/(1+D_1)} * 10^p\times\textrm{m}^{N_0/(1+D_0)}\times\textrm{kg}^{N_1/(1+D_1)}
* \times\textrm{s}^{N_2/(1+D_2)}\times\textrm{A}^{N_3/(1+D_3)} * \times\textrm{s}^{N_2/(1+D_2)}\times\textrm{A}^{N_3/(1+D_3)}
* \times\textrm{K}^{N_4/(1+D_4)}\times\textrm{strain}^{N_5/(1+D_5)} * \times\textrm{K}^{N_4/(1+D_4)}\times\textrm{strain}^{N_5/(1+D_5)}
* \times\textrm{count}^{N_6/(1+D_6)} * \times\textrm{count}^{N_6/(1+D_6)}
* \f} * \f}
* *
*/ */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagLALUnit, powerOfTen, unitNumerator, unitDenomi
natorMinusOne));
#endif /* SWIG */
typedef struct tagLALUnit { typedef struct tagLALUnit {
INT2 powerOfTen; /**< Overall power-of-ten scaling is 10^\c powerOfTen. */ INT2 powerOfTen; /**< Overall power-of-ten scaling is 10^\c powerOfTen. */
INT2 unitNumerator[LALNumUnits]; /**< Array of unit power numerators. * / INT2 unitNumerator[LALNumUnits]; /**< Array of unit power numerators. * /
UINT2 unitDenominatorMinusOne[LALNumUnits]; /**< Array of unit power de nominators-minus-one. */ UINT2 unitDenominatorMinusOne[LALNumUnits]; /**< Array of unit power de nominators-minus-one. */
} LALUnit; } LALUnit;
/* ---------- TimeSeries types ---------- */ /* ---------- TimeSeries types ---------- */
/** Length of name fields of LAL structured data types. */ /** Length of name fields of LAL structured data types. */
enum enumLALNameLength { LALNameLength = 64 }; enum enumLALNameLength { LALNameLength = 64 };
 End of changes. 3 change blocks. 
6 lines changed or deleted 7 lines changed or added


 LALDebugLevel.h   LALDebugLevel.h 
skipping to change at line 58 skipping to change at line 58
LALMSGLVL1 = LALERRORBIT, /**< enable error messages */ LALMSGLVL1 = LALERRORBIT, /**< enable error messages */
LALMSGLVL2 = LALERRORBIT | LALWARNINGBIT, /**< enable error and warni ng messages */ LALMSGLVL2 = LALERRORBIT | LALWARNINGBIT, /**< enable error and warni ng messages */
LALMSGLVL3 = LALERRORBIT | LALWARNINGBIT | LALINFOBIT, /**< enable error, warning, and info messages */ LALMSGLVL3 = LALERRORBIT | LALWARNINGBIT | LALINFOBIT, /**< enable error, warning, and info messages */
LALMEMDBG = LALMEMDBGBIT | LALMEMPADBIT | LALMEMTRKBIT, /**< enable memory debugging tools */ LALMEMDBG = LALMEMDBGBIT | LALMEMPADBIT | LALMEMTRKBIT, /**< enable memory debugging tools */
LALMEMTRACE = LALTRACEBIT | LALMEMDBG | LALMEMINFOBIT, /**< enable memory tracing tools */ LALMEMTRACE = LALTRACEBIT | LALMEMDBG | LALMEMINFOBIT, /**< enable memory tracing tools */
LALALLDBG = ~LALNDEBUG /**< enable all debugging */ LALALLDBG = ~LALNDEBUG /**< enable all debugging */
}; };
#define lalDebugLevel (XLALGetDebugLevel()) #define lalDebugLevel (XLALGetDebugLevel())
int XLALGetDebugLevel(void); int XLALGetDebugLevel(void);
void XLALClobberDebugLevel(int level);
#if 0 #if 0
{ /* so that editors will match succeeding brace */ { /* so that editors will match succeeding brace */
#elif defined(__cplusplus) #elif defined(__cplusplus)
} }
#endif #endif
#endif /* _LALDEBUGLEVEL_H */ #endif /* _LALDEBUGLEVEL_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 LALDetectors.h   LALDetectors.h 
skipping to change at line 180 skipping to change at line 180
LAL_GEO_600_DETECTOR = 2, LAL_GEO_600_DETECTOR = 2,
LAL_LHO_2K_DETECTOR = 3, LAL_LHO_2K_DETECTOR = 3,
LAL_LHO_4K_DETECTOR = 4, LAL_LHO_4K_DETECTOR = 4,
LAL_LLO_4K_DETECTOR = 5, LAL_LLO_4K_DETECTOR = 5,
LAL_CIT_40_DETECTOR = 6, LAL_CIT_40_DETECTOR = 6,
LAL_ALLEGRO_DETECTOR = 7, LAL_ALLEGRO_DETECTOR = 7,
LAL_AURIGA_DETECTOR = 8, LAL_AURIGA_DETECTOR = 8,
LAL_EXPLORER_DETECTOR = 9, LAL_EXPLORER_DETECTOR = 9,
LAL_NIOBE_DETECTOR = 10, LAL_NIOBE_DETECTOR = 10,
LAL_NAUTILUS_DETECTOR = 11, LAL_NAUTILUS_DETECTOR = 11,
LAL_NUM_DETECTORS = 12 LAL_ET1_DETECTOR = 12,
LAL_ET2_DETECTOR = 13,
LAL_ET3_DETECTOR = 14,
LAL_ET0_DETECTOR = 15,
LAL_NUM_DETECTORS = 16
}; };
/** Detector DQ bit assignments (2 bits per detector) */ /** Detector DQ bit assignments (2 bits per detector) */
enum { enum {
LAL_TAMA_300_DETECTOR_BIT = 1 << 2 * LAL_TAMA_300_DETECT OR, LAL_TAMA_300_DETECTOR_BIT = 1 << 2 * LAL_TAMA_300_DETECT OR,
LAL_VIRGO_DETECTOR_BIT = 1 << 2 * LAL_VIRGO_DETECTOR, LAL_VIRGO_DETECTOR_BIT = 1 << 2 * LAL_VIRGO_DETECTOR,
LAL_GEO_600_DETECTOR_BIT = 1 << 2 * LAL_GEO_600_DETECTO R, LAL_GEO_600_DETECTOR_BIT = 1 << 2 * LAL_GEO_600_DETECTO R,
LAL_LHO_2K_DETECTOR_BIT = 1 << 2 * LAL_LHO_2K_DETECTOR , LAL_LHO_2K_DETECTOR_BIT = 1 << 2 * LAL_LHO_2K_DETECTOR ,
LAL_LHO_4K_DETECTOR_BIT = 1 << 2 * LAL_LHO_4K_DETECTOR , LAL_LHO_4K_DETECTOR_BIT = 1 << 2 * LAL_LHO_4K_DETECTOR ,
LAL_LLO_4K_DETECTOR_BIT = 1 << 2 * LAL_LLO_4K_DETECTOR , LAL_LLO_4K_DETECTOR_BIT = 1 << 2 * LAL_LLO_4K_DETECTOR ,
LAL_CIT_40_DETECTOR_BIT = 1 << 2 * LAL_CIT_40_DETECTOR , LAL_CIT_40_DETECTOR_BIT = 1 << 2 * LAL_CIT_40_DETECTOR ,
LAL_ALLEGRO_DETECTOR_BIT = 1 << 2 * LAL_ALLEGRO_DETECTO R, LAL_ALLEGRO_DETECTOR_BIT = 1 << 2 * LAL_ALLEGRO_DETECTO R,
LAL_AURIGA_DETECTOR_BIT = 1 << 2 * LAL_AURIGA_DETECTOR , LAL_AURIGA_DETECTOR_BIT = 1 << 2 * LAL_AURIGA_DETECTOR ,
LAL_NIOBE_DETECTOR_BIT = 1 << 2 * LAL_NIOBE_DETECTOR, LAL_NIOBE_DETECTOR_BIT = 1 << 2 * LAL_NIOBE_DETECTOR,
LAL_NAUTILUS_DETECTOR_BIT = 1 << 2 * LAL_NAUTILUS_DETECT LAL_NAUTILUS_DETECTOR_BIT = 1 << 2 * LAL_NAUTILUS_DETECT
OR OR,
LAL_ET1_DETECTOR_BIT = 1 << 2 * LAL_ET1_DETECTOR,
LAL_ET2_DETECTOR_BIT = 1 << 2 * LAL_ET2_DETECTOR,
LAL_ET3_DETECTOR_BIT = 1 << 2 * LAL_ET3_DETECTOR,
LAL_ET0_DETECTOR_BIT = 1 << 2 * LAL_ET0_DETECTOR
}; };
/** /**
* Detector type, which determines how the detector response is determined. * Detector type, which determines how the detector response is determined.
* Since data from bars as well as interferometers can be written to * Since data from bars as well as interferometers can be written to
* frames, we need an additional piece of information to interpret the * frames, we need an additional piece of information to interpret the
* site geometry data specified in the \c LALFrDetector * site geometry data specified in the \c LALFrDetector
* structure; for instance, is the x arm really the x arm or is it the * structure; for instance, is the x arm really the x arm or is it the
* long axis of a bar? The \c LALDetectorType enumeration * long axis of a bar? The \c LALDetectorType enumeration
* provides a way to keep track of that. * provides a way to keep track of that.
skipping to change at line 496 skipping to change at line 504
#define LAL_CIT_40_VERTEX_LOCATION_Y_SI -4.65869968211e+06 /**< CIT_40 y-component of vertex location in Earth-centered frame (m) */ #define LAL_CIT_40_VERTEX_LOCATION_Y_SI -4.65869968211e+06 /**< CIT_40 y-component of vertex location in Earth-centered frame (m) */
#define LAL_CIT_40_VERTEX_LOCATION_Z_SI 3.56206411403e+06 /**< CIT_40 z-component of vertex location in Earth-centered frame (m) */ #define LAL_CIT_40_VERTEX_LOCATION_Z_SI 3.56206411403e+06 /**< CIT_40 z-component of vertex location in Earth-centered frame (m) */
#define LAL_CIT_40_ARM_X_DIRECTION_X -0.26480331633 /**< CIT_40 x-component of unit vector pointing along x arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_X_DIRECTION_X -0.26480331633 /**< CIT_40 x-component of unit vector pointing along x arm in Earth-centered f rame */
#define LAL_CIT_40_ARM_X_DIRECTION_Y -0.49530818538 /**< CIT_40 y-component of unit vector pointing along x arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_X_DIRECTION_Y -0.49530818538 /**< CIT_40 y-component of unit vector pointing along x arm in Earth-centered f rame */
#define LAL_CIT_40_ARM_X_DIRECTION_Z -0.82737476706 /**< CIT_40 z-component of unit vector pointing along x arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_X_DIRECTION_Z -0.82737476706 /**< CIT_40 z-component of unit vector pointing along x arm in Earth-centered f rame */
#define LAL_CIT_40_ARM_Y_DIRECTION_X 0.88188012386 /**< CIT_40 x-component of unit vector pointing along y arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_Y_DIRECTION_X 0.88188012386 /**< CIT_40 x-component of unit vector pointing along y arm in Earth-centered f rame */
#define LAL_CIT_40_ARM_Y_DIRECTION_Y -0.47147369718 /**< CIT_40 y-component of unit vector pointing along y arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_Y_DIRECTION_Y -0.47147369718 /**< CIT_40 y-component of unit vector pointing along y arm in Earth-centered f rame */
#define LAL_CIT_40_ARM_Y_DIRECTION_Z 0.00000000000 /**< CIT_40 z-component of unit vector pointing along y arm in Earth-centered f rame */ #define LAL_CIT_40_ARM_Y_DIRECTION_Z 0.00000000000 /**< CIT_40 z-component of unit vector pointing along y arm in Earth-centered f rame */
/*@}*/ /*@}*/
/**
* \name Einstein Telescop 10km Interferometric Detector constants
* The following constants describe the locations and geometrys of the
* three 10km Interferometric Detectors for the planned third generation
* Einstein Telescop detector as well as the theoretical null stream.
* See T1400308
*/
/*@}*/
#define LAL_ET1_DETECTOR_NAME "ET1_T1400308" /**<
ET1 detector name string */
#define LAL_ET1_DETECTOR_PREFIX "E1" /**< ET1 det
ector prefix string */
#define LAL_ET1_DETECTOR_LONGITUDE_RAD 0.18333805213 /**<
ET1 vertex longitude (rad) */
#define LAL_ET1_DETECTOR_LATITUDE_RAD 0.76151183984 /**<
ET1 vertex latitude (rad) */
#define LAL_ET1_DETECTOR_ELEVATION_SI 51.884 /**< ET1 ver
tex elevation (m) */
#define LAL_ET1_DETECTOR_ARM_X_AZIMUTH_RAD 0.33916285222 /**<
ET1 x arm azimuth (rad) */
#define LAL_ET1_DETECTOR_ARM_Y_AZIMUTH_RAD 5.05155183261 /**<
ET1 y arm azimuth (rad) */
#define LAL_ET1_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**<
ET1 x arm altitude (rad) */
#define LAL_ET1_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**<
ET1 y arm altitude (rad) */
#define LAL_ET1_DETECTOR_ARM_X_MIDPOINT_SI 5000.00000000000
/**< ET1 x arm midpoint (m) */
#define LAL_ET1_DETECTOR_ARM_Y_MIDPOINT_SI 5000.00000000000
/**< ET1 y arm midpoint (m) */
#define LAL_ET1_VERTEX_LOCATION_X_SI 4.54637409900e+06
/**< ET1 x-component of vertex location in Earth-centered frame (m) */
#define LAL_ET1_VERTEX_LOCATION_Y_SI 8.42989697626e+05
/**< ET1 y-component of vertex location in Earth-centered frame (m) */
#define LAL_ET1_VERTEX_LOCATION_Z_SI 4.37857696241e+06
/**< ET1 z-component of vertex location in Earth-centered frame (m) */
#define LAL_ET1_ARM_X_DIRECTION_X -0.70045821479 /**<
ET1 x-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET1_ARM_X_DIRECTION_Y 0.20848948619 /**<
ET1 y-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET1_ARM_X_DIRECTION_Z 0.68256166277 /**<
ET1 z-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET1_ARM_Y_DIRECTION_X -0.39681482542 /**<
ET1 x-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET1_ARM_Y_DIRECTION_Y -0.73500471881 /**<
ET1 y-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET1_ARM_Y_DIRECTION_Z 0.54982366052 /**<
ET1 z-component of unit vector pointing along y arm in Earth-centered fram
e */
/*@}*/
/*@}*/
#define LAL_ET2_DETECTOR_NAME "ET2_T1400308" /**<
ET2 detector name string */
#define LAL_ET2_DETECTOR_PREFIX "E2" /**< ET2 det
ector prefix string */
#define LAL_ET2_DETECTOR_LONGITUDE_RAD 0.18405858870 /**<
ET2 vertex longitude (rad) */
#define LAL_ET2_DETECTOR_LATITUDE_RAD 0.76299307990 /**<
ET2 vertex latitude (rad) */
#define LAL_ET2_DETECTOR_ELEVATION_SI 59.735 /**< ET2 ver
tex elevation (m) */
#define LAL_ET2_DETECTOR_ARM_X_AZIMUTH_RAD 4.52795305701 /**<
ET2 x arm azimuth (rad) */
#define LAL_ET2_DETECTOR_ARM_Y_AZIMUTH_RAD 3.48075550581 /**<
ET2 y arm azimuth (rad) */
#define LAL_ET2_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**<
ET2 x arm altitude (rad) */
#define LAL_ET2_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**<
ET2 y arm altitude (rad) */
#define LAL_ET2_DETECTOR_ARM_X_MIDPOINT_SI 5000.00000000000
/**< ET2 x arm midpoint (m) */
#define LAL_ET2_DETECTOR_ARM_Y_MIDPOINT_SI 5000.00000000000
/**< ET2 y arm midpoint (m) */
#define LAL_ET2_VERTEX_LOCATION_X_SI 4.53936951685e+06
/**< ET2 x-component of vertex location in Earth-centered frame (m) */
#define LAL_ET2_VERTEX_LOCATION_Y_SI 8.45074592488e+05
/**< ET2 y-component of vertex location in Earth-centered frame (m) */
#define LAL_ET2_VERTEX_LOCATION_Z_SI 4.38540257904e+06
/**< ET2 z-component of vertex location in Earth-centered frame (m) */
#define LAL_ET2_ARM_X_DIRECTION_X 0.30364338937 /**<
ET2 x-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET2_ARM_X_DIRECTION_Y -0.94349420500 /**<
ET2 y-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET2_ARM_X_DIRECTION_Z -0.13273800225 /**<
ET2 z-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET2_ARM_Y_DIRECTION_X 0.70045821479 /**<
ET2 x-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET2_ARM_Y_DIRECTION_Y -0.20848948619 /**<
ET2 y-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET2_ARM_Y_DIRECTION_Z -0.68256166277 /**<
ET2 z-component of unit vector pointing along y arm in Earth-centered fram
e */
/*@}*/
/*@}*/
#define LAL_ET3_DETECTOR_NAME "ET3_T1400308" /**<
ET3 detector name string */
#define LAL_ET3_DETECTOR_PREFIX "E3" /**< ET3 det
ector prefix string */
#define LAL_ET3_DETECTOR_LONGITUDE_RAD 0.18192996730 /**<
ET3 vertex longitude (rad) */
#define LAL_ET3_DETECTOR_LATITUDE_RAD 0.76270463257 /**<
ET3 vertex latitude (rad) */
#define LAL_ET3_DETECTOR_ELEVATION_SI 59.727 /**< ET3 ver
tex elevation (m) */
#define LAL_ET3_DETECTOR_ARM_X_AZIMUTH_RAD 2.43355795462 /**<
ET3 x arm azimuth (rad) */
#define LAL_ET3_DETECTOR_ARM_Y_AZIMUTH_RAD 1.38636040342 /**<
ET3 y arm azimuth (rad) */
#define LAL_ET3_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**<
ET3 x arm altitude (rad) */
#define LAL_ET3_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**<
ET3 y arm altitude (rad) */
#define LAL_ET3_DETECTOR_ARM_X_MIDPOINT_SI 5000.00000000000
/**< ET3 x arm midpoint (m) */
#define LAL_ET3_DETECTOR_ARM_Y_MIDPOINT_SI 5000.00000000000
/**< ET3 y arm midpoint (m) */
#define LAL_ET3_VERTEX_LOCATION_X_SI 4.54240595075e+06
/**< ET3 x-component of vertex location in Earth-centered frame (m) */
#define LAL_ET3_VERTEX_LOCATION_Y_SI 8.35639650438e+05
/**< ET3 y-component of vertex location in Earth-centered frame (m) */
#define LAL_ET3_VERTEX_LOCATION_Z_SI 4.38407519902e+06
/**< ET3 z-component of vertex location in Earth-centered frame (m) */
#define LAL_ET3_ARM_X_DIRECTION_X 0.39681482542 /**<
ET3 x-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET3_ARM_X_DIRECTION_Y 0.73500471881 /**<
ET3 y-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET3_ARM_X_DIRECTION_Z -0.54982366052 /**<
ET3 z-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET3_ARM_Y_DIRECTION_X -0.30364338937 /**<
ET3 x-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET3_ARM_Y_DIRECTION_Y 0.94349420500 /**<
ET3 y-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET3_ARM_Y_DIRECTION_Z 0.13273800225 /**<
ET3 z-component of unit vector pointing along y arm in Earth-centered fram
e */
/*@}*/
/*@}*/
#define LAL_ET0_DETECTOR_NAME "ET0_T1400308" /**<
ET0 detector name string */
#define LAL_ET0_DETECTOR_PREFIX "E0" /**< ET0 det
ector prefix string */
#define LAL_ET0_DETECTOR_LONGITUDE_RAD 0.18192996730 /**<
ET0 vertex longitude (rad) */
#define LAL_ET0_DETECTOR_LATITUDE_RAD 0.76270463257 /**<
ET0 vertex latitude (rad) */
#define LAL_ET0_DETECTOR_ELEVATION_SI 59.727 /**< ET0 ver
tex elevation (m) */
#define LAL_ET0_DETECTOR_ARM_X_AZIMUTH_RAD 0.00000000000 /**<
ET0 x arm azimuth (rad) */
#define LAL_ET0_DETECTOR_ARM_Y_AZIMUTH_RAD 0.00000000000 /**<
ET0 y arm azimuth (rad) */
#define LAL_ET0_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**<
ET0 x arm altitude (rad) */
#define LAL_ET0_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**<
ET0 y arm altitude (rad) */
#define LAL_ET0_DETECTOR_ARM_X_MIDPOINT_SI 0.00000000000 /**<
ET0 x arm midpoint (m) */
#define LAL_ET0_DETECTOR_ARM_Y_MIDPOINT_SI 0.00000000000 /**<
ET0 y arm midpoint (m) */
#define LAL_ET0_VERTEX_LOCATION_X_SI 4.54240595075e+06
/**< ET0 x-component of vertex location in Earth-centered frame (m) */
#define LAL_ET0_VERTEX_LOCATION_Y_SI 8.35639650438e+05
/**< ET0 y-component of vertex location in Earth-centered frame (m) */
#define LAL_ET0_VERTEX_LOCATION_Z_SI 4.38407519902e+06
/**< ET0 z-component of vertex location in Earth-centered frame (m) */
#define LAL_ET0_ARM_X_DIRECTION_X 0.00000000000 /**<
ET0 x-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET0_ARM_X_DIRECTION_Y 0.00000000000 /**<
ET0 y-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET0_ARM_X_DIRECTION_Z 0.00000000000 /**<
ET0 z-component of unit vector pointing along x arm in Earth-centered fram
e */
#define LAL_ET0_ARM_Y_DIRECTION_X 0.00000000000 /**<
ET0 x-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET0_ARM_Y_DIRECTION_Y 0.00000000000 /**<
ET0 y-component of unit vector pointing along y arm in Earth-centered fram
e */
#define LAL_ET0_ARM_Y_DIRECTION_Z 0.00000000000 /**<
ET0 z-component of unit vector pointing along y arm in Earth-centered fram
e */
/*@}*/
/* Resonant Mass (Bar) Detectors */ /* Resonant Mass (Bar) Detectors */
/** /**
* \name ALLEGRO Resonant Mass Detector with 320 degree azimuth "IGEC axis" constants * \name ALLEGRO Resonant Mass Detector with 320 degree azimuth "IGEC axis" constants
* The following constants describe the location and geometry of the * The following constants describe the location and geometry of the
* ALLEGRO Resonant Mass Detector with 320 degree azimuth "IGEC axis". * ALLEGRO Resonant Mass Detector with 320 degree azimuth "IGEC axis".
*/ */
/*@{*/ /*@{*/
#define LAL_ALLEGRO_320_DETECTOR_NAME "ALLEGRO_320" /**< ALLEGRO_320 detector name string */ #define LAL_ALLEGRO_320_DETECTOR_NAME "ALLEGRO_320" /**< ALLEGRO_320 detector name string */
#define LAL_ALLEGRO_320_DETECTOR_PREFIX "A1" /**< ALLEGRO _320 detector prefix string */ #define LAL_ALLEGRO_320_DETECTOR_PREFIX "A1" /**< ALLEGRO _320 detector prefix string */
skipping to change at line 555 skipping to change at line 662
#define LAL_AURIGA_AXIS_DIRECTION_Z 0.50550364038 /**< AURIGA z-component of unit vector pointing along axis in Earth-centered fr ame */ #define LAL_AURIGA_AXIS_DIRECTION_Z 0.50550364038 /**< AURIGA z-component of unit vector pointing along axis in Earth-centered fr ame */
/*@}*/ /*@}*/
/** /**
* \name EXPLORER Resonant Mass Detector constants * \name EXPLORER Resonant Mass Detector constants
* The following constants describe the location and geometry of the * The following constants describe the location and geometry of the
* EXPLORER Resonant Mass Detector. * EXPLORER Resonant Mass Detector.
*/ */
/*@{*/ /*@{*/
#define LAL_EXPLORER_DETECTOR_NAME "EXPLORER" /**< EXPLORER detector name string */ #define LAL_EXPLORER_DETECTOR_NAME "EXPLORER" /**< EXPLORER detector name string */
#define LAL_EXPLORER_DETECTOR_PREFIX "E1" /**< EXPLORE R detector prefix string */ #define LAL_EXPLORER_DETECTOR_PREFIX "X1" /**< EXPLORE R detector prefix string */
#define LAL_EXPLORER_DETECTOR_LONGITUDE_RAD 0.10821041362 /**< EXPLORER vertex longitude (rad) */ #define LAL_EXPLORER_DETECTOR_LONGITUDE_RAD 0.10821041362 /**< EXPLORER vertex longitude (rad) */
#define LAL_EXPLORER_DETECTOR_LATITUDE_RAD 0.81070543755 /**< EXPLORER vertex latitude (rad) */ #define LAL_EXPLORER_DETECTOR_LATITUDE_RAD 0.81070543755 /**< EXPLORER vertex latitude (rad) */
#define LAL_EXPLORER_DETECTOR_ELEVATION_SI 0 /**< EXPLORE R vertex elevation (m) */ #define LAL_EXPLORER_DETECTOR_ELEVATION_SI 0 /**< EXPLORE R vertex elevation (m) */
#define LAL_EXPLORER_DETECTOR_ARM_X_AZIMUTH_RAD 0.68067840828 /**< EXPLORER x arm azimuth (rad) */ #define LAL_EXPLORER_DETECTOR_ARM_X_AZIMUTH_RAD 0.68067840828 /**< EXPLORER x arm azimuth (rad) */
#define LAL_EXPLORER_DETECTOR_ARM_Y_AZIMUTH_RAD 0.00000000000 /**< EXPLORER y arm azimuth (rad) UNUSED FOR BARS */ #define LAL_EXPLORER_DETECTOR_ARM_Y_AZIMUTH_RAD 0.00000000000 /**< EXPLORER y arm azimuth (rad) UNUSED FOR BARS */
#define LAL_EXPLORER_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**< EXPLORER x arm altitude (rad) */ #define LAL_EXPLORER_DETECTOR_ARM_X_ALTITUDE_RAD 0.00000000000 /**< EXPLORER x arm altitude (rad) */
#define LAL_EXPLORER_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**< EXPLORER y arm altitude (rad) UNUSED FOR BARS */ #define LAL_EXPLORER_DETECTOR_ARM_Y_ALTITUDE_RAD 0.00000000000 /**< EXPLORER y arm altitude (rad) UNUSED FOR BARS */
#define LAL_EXPLORER_DETECTOR_ARM_X_MIDPOINT_SI 0.00000000000 /**< EXPLORER x arm midpoint (m) UNUSED FOR BARS */ #define LAL_EXPLORER_DETECTOR_ARM_X_MIDPOINT_SI 0.00000000000 /**< EXPLORER x arm midpoint (m) UNUSED FOR BARS */
#define LAL_EXPLORER_DETECTOR_ARM_Y_MIDPOINT_SI 0.00000000000 /**< EXPLORER y arm midpoint (m) UNUSED FOR BARS */ #define LAL_EXPLORER_DETECTOR_ARM_Y_MIDPOINT_SI 0.00000000000 /**< EXPLORER y arm midpoint (m) UNUSED FOR BARS */
#define LAL_EXPLORER_VERTEX_LOCATION_X_SI 4.37645395452e+06 /**< EXPLORER x-component of vertex location in Earth-centered frame (m ) */ #define LAL_EXPLORER_VERTEX_LOCATION_X_SI 4.37645395452e+06 /**< EXPLORER x-component of vertex location in Earth-centered frame (m ) */
 End of changes. 4 change blocks. 
4 lines changed or deleted 215 lines changed or added


 LALMalloc.h   LALMalloc.h 
/* /*
* Copyright (C) 2007 Jolien Creighton, Kipp Cannon * Copyright (C) 2007 Jolien Creighton, Kipp Cannon, Josh Willis
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
skipping to change at line 33 skipping to change at line 33
#include <stddef.h> #include <stddef.h>
#include <lal/LALConfig.h> #include <lal/LALConfig.h>
#ifdef __cplusplus #ifdef __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
/** \addtogroup LALMalloc_h */ /*@{ */ /** \addtogroup LALMalloc_h */ /*@{ */
extern size_t lalMallocTotal;
extern size_t lalMallocTotalPeak;
void *XLALMalloc(size_t n); void *XLALMalloc(size_t n);
void *XLALMallocLong(size_t n, const char *file, int line); void *XLALMallocLong(size_t n, const char *file, int line);
void *XLALCalloc(size_t m, size_t n); void *XLALCalloc(size_t m, size_t n);
void *XLALCallocLong(size_t m, size_t n, const char *file, int line); void *XLALCallocLong(size_t m, size_t n, const char *file, int line);
void *XLALRealloc(void *p, size_t n); void *XLALRealloc(void *p, size_t n);
void *XLALReallocLong(void *p, size_t n, const char *file, int line); void *XLALReallocLong(void *p, size_t n, const char *file, int line);
void XLALFree(void *p); void XLALFree(void *p);
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
#define XLALMalloc( n ) XLALMallocLong( n, __FILE__, __LINE__ ) #define XLALMalloc( n ) XLALMallocLong( n, __FILE__, __LINE__ )
#define XLALCalloc( m, n ) XLALCallocLong( m, n, __FILE__, __LINE__ ) #define XLALCalloc( m, n ) XLALCallocLong( m, n, __FILE__, __LINE__ )
#define XLALRealloc( p, n ) XLALReallocLong( p, n, __FILE__, __LINE__ ) #define XLALRealloc( p, n ) XLALReallocLong( p, n, __FILE__, __LINE__ )
#endif /* SWIG */ #endif /* SWIG */
/*@}*/ /*@}*/
/** \addtogroup LALMalloc_h */ /*@{ */
/* presently these are only here if needed */
#ifdef LAL_FFTW3_MEMALIGN_ENABLED
#define LAL_MEM_ALIGNMENT 0x40
int XLALIsMemoryAligned(void *ptr);
void *XLALMallocAlignedLong(size_t size, const char *file, int line);
void *XLALMallocAligned(size_t size);
void *XLALCallocAlignedLong(size_t nelem, size_t elsize, const char *file,
int line);
void *XLALCallocAligned(size_t nelem, size_t elsize);
void *XLALReallocAlignedLong(void *ptr, size_t size, const char *file, int
line);
void *XLALReallocAligned(void *ptr, size_t size);
void XLALFreeAligned(void *ptr);
#ifndef SWIG /* exclude from SWIG interface */
#define LAL_IS_MEMORY_ALIGNED(ptr) (((size_t)(ptr) % LAL_MEM_ALIGNMENT) ==
0)
#define XLALMallocAligned(size) XLALMallocAlignedLong(size, __FILE__, __LIN
E__)
#define XLALCallocAligned(nelem, elsize) XLALCallocAlignedLong(nelem, elsiz
e, __FILE__, __LINE__)
#define XLALReallocAligned(ptr, size) XLALReallocAlignedLong(ptr, size, __F
ILE__, __LINE__)
#endif /* SWIG */
#endif /* LAL_FFTW3_MEMALIGN_ENABLED */
/*@}*/
#if defined NDEBUG || defined LAL_NDEBUG #if defined NDEBUG || defined LAL_NDEBUG
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
#define LALMalloc malloc #define LALMalloc malloc
#define LALMallocShort malloc #define LALMallocShort malloc
#define LALMallocLong( n, file, line ) malloc( n ) #define LALMallocLong( n, file, line ) malloc( n )
#define LALCalloc calloc #define LALCalloc calloc
#define LALCallocShort calloc #define LALCallocShort calloc
#define LALCallocLong( m, n, file, line ) calloc( m, n ) #define LALCallocLong( m, n, file, line ) calloc( m, n )
#define LALRealloc realloc #define LALRealloc realloc
 End of changes. 3 change blocks. 
1 lines changed or deleted 30 lines changed or added


 LALVCSInfo.h   LALVCSInfo.h 
/* /*
* LALVCSInfo.h - LAL VCS Information Header * LALVCSInfo.h - LAL VCS Information
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version. * your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* 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) 2009-2013 Adam Mercer * Copyright (C) 2009-2013 Adam Mercer
* Copyright (C) 2014 Karl Wette
*/ */
#ifndef _LALVCSINFO_H #ifndef _LALVCSINFO_H
#define _LALVCSINFO_H #define _LALVCSINFO_H
#include <lal/LALLibVCSInfo.h> #include <lal/LALVCSInfoType.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* vcs information defines */ /* global variables for vcs information */
#define LAL_NAME "LAL" extern const char *const lalVCSVersion;
#define LAL_VCS_ID "8140347ea6fa4167d17e64e1fe0c0d3d151cf229" extern const char *const lalVCSId;
#define LAL_VCS_DATE "2014-01-07 21:41:44 +0000" extern const char *const lalVCSDate;
#define LAL_VCS_BRANCH "None" extern const char *const lalVCSBranch;
#define LAL_VCS_TAG "lal-v6.12.0" extern const char *const lalVCSTag;
#define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>" extern const char *const lalVCSAuthor;
#define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>" extern const char *const lalVCSCommitter;
#define LAL_VCS_STATUS "CLEAN: All modifications committed" extern const char *const lalVCSStatus;
/* vcs information defines - identable*/ /* global variables for vcs information - identable */
#define LAL_VCS_IDENT_ID "$" "LALId: 8140347ea6fa4167d17e64e1fe0c0d3d151cf2 extern const char *const lalVCSIdentId;
29 " "$" extern const char *const lalVCSIdentDate;
#define LAL_VCS_IDENT_DATE "$" "LALDate: 2014-01-07 21:41:44 +0000 " "$" extern const char *const lalVCSIdentBranch;
#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" extern const char *const lalVCSIdentTag;
#define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.12.0 " "$" extern const char *const lalVCSIdentAuthor;
#define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. extern const char *const lalVCSIdentCommitter;
org> " "$" extern const char *const lalVCSIdentStatus;
#define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer
@ligo.org> " "$" /* library vcs information structure */
#define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi extern const struct tagLALVCSInfo lalVCSInfo;
tted " "$"
/* header vcs information structure */
static const struct tagLALVCSInfo lalHeaderVCSInfo = { \
LAL_NAME, \
LAL_VERSION, \
LAL_VCS_ID, \
LAL_VCS_DATE, \
LAL_VCS_BRANCH, \
LAL_VCS_TAG, \
LAL_VCS_AUTHOR, \
LAL_VCS_COMMITTER, \
LAL_VCS_STATUS \
};
/* /* configure arguments */
* function prototypes extern const char *const lalConfigureArgs;
*/
/* configure date */
extern const char *const lalConfigureDate;
/* function to compare two LALVCSInfo structures */ /* build date */
int XLALVCSInfoCompare(const LALVCSInfo *header, const LALVCSInfo *library) extern const char *const lalBuildDate;
;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _LALVCSINFO_H */ #endif /* _LALVCSINFO_H */
/* /*
* vim: tw=0 ts=2 et * vim: tw=0 ts=2 et
*/ */
 End of changes. 6 change blocks. 
43 lines changed or deleted 31 lines changed or added


 LALVersion.h   LALVersion.h 
skipping to change at line 76 skipping to change at line 76
#define LALVERSIONH_MSGENULL "Null string pointer." #define LALVERSIONH_MSGENULL "Null string pointer."
#define LALVERSIONH_MSGESIZE "Zero string size." #define LALVERSIONH_MSGESIZE "Zero string size."
#define LALVERSIONH_MSGESPRN "Error in snprintf." #define LALVERSIONH_MSGESPRN "Error in snprintf."
#define LALVERSIONH_MSGESHRT "String too short." #define LALVERSIONH_MSGESHRT "String too short."
extern const char *const lalVersion; extern const char *const lalVersion;
extern const int lalVersionMajor; extern const int lalVersionMajor;
extern const int lalVersionMinor; extern const int lalVersionMinor;
extern const int lalVersionMicro; extern const int lalVersionMicro;
extern const int lalVersionDevel; extern const int lalVersionDevel;
extern const char *const lalBuildDate;
extern const char *const lalConfigureArgs;
extern const char *const lalConfigureDate;
void LALVersion(LALStatus * status, CHAR * message, UINT4 size, void LALVersion(LALStatus * status, CHAR * message, UINT4 size,
INT4 verbose); INT4 verbose);
/*@}*/ /*@}*/
#if 0 #if 0
{ /* so that editors will match succeeding brace */ { /* so that editors will match succeeding brace */
#elif defined(__cplusplus) #elif defined(__cplusplus)
} }
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 lines changed or added


 LogPrintf.h   LogPrintf.h 
skipping to change at line 36 skipping to change at line 36
/* C++ protection. */ /* C++ protection. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
/*---------- INCLUDES ----------*/ /*---------- INCLUDES ----------*/
#include <stdarg.h> #include <stdarg.h>
#include <gsl/gsl_matrix.h> #include <gsl/gsl_matrix.h>
/** /**
* \addtogroup LogPrintf_h * \addtogroup LogPrintf_h
* \author Reinhard Prix * \author Reinhard Prix
* \date 2005 * \date 2005
* \brief General-purpose log-message handling, controlled by lalDebugLevel independent of lalDebugLevel, * \brief General-purpose log-message handling, controlled by lalDebugLevel independent of lalDebugLevel,
* mostly modelled after the MSG_LOG class in BOINC. * mostly modelled after the MSG_LOG class in BOINC.
* *
*/ */
skipping to change at line 76 skipping to change at line 75
void LogSetLevel(LogLevel_t level); void LogSetLevel(LogLevel_t level);
void LogPrintf (LogLevel_t, const char* format, ...); void LogPrintf (LogLevel_t, const char* format, ...);
void LogPrintfVerbatim (LogLevel_t, const char* format, ...); void LogPrintfVerbatim (LogLevel_t, const char* format, ...);
int XLALfprintfGSLmatrix ( FILE *fp, const char *fmt, const gsl_matrix *gij ); int XLALfprintfGSLmatrix ( FILE *fp, const char *fmt, const gsl_matrix *gij );
int XLALfprintfGSLvector ( FILE *fp, const char *fmt, const gsl_vector *vec t ); int XLALfprintfGSLvector ( FILE *fp, const char *fmt, const gsl_vector *vec t );
int XLALfprintfGSLvector_int ( FILE *fp, const char *fmt, const gsl_vector_ int *vect ); int XLALfprintfGSLvector_int ( FILE *fp, const char *fmt, const gsl_vector_ int *vect );
REAL8 XLALGetTimeOfDay(void); REAL8 XLALGetTimeOfDay(void);
REAL8 XLALGetPeakHeapUsageMB ( void );
char * XLALClearLinebreaks ( const char *str ); char * XLALClearLinebreaks ( const char *str );
int XLALdumpREAL4TimeSeries (const char *fname, const REAL4TimeSeries *seri
es);
int XLALdumpREAL8TimeSeries (const char *fname, const REAL8TimeSeries *seri
es);
int XLALdumpCOMPLEX8TimeSeries (const char *fname, const COMPLEX8TimeSeries
*series );
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
/* C++ protection. */ /* C++ protection. */
#endif /* Double-include protection. */ #endif /* Double-include protection. */
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added


 RealFFT.h   RealFFT.h 
skipping to change at line 159 skipping to change at line 159
* incompatible lengths, * incompatible lengths,
* #XLAL_ENOMEM if a memory allocation of temporary internal memory * #XLAL_ENOMEM if a memory allocation of temporary internal memory
* fails. * fails.
* *
* As before, the \c REAL8 versions of these routines behave the * As before, the \c REAL8 versions of these routines behave the
* same way but for double-precision transforms. * same way but for double-precision transforms.
* *
*/ */
/*@{*/ /*@{*/
/** Plan to perform FFT of REAL4 data */
typedef struct tagREAL4FFTPlan REAL4FFTPlan;
/** Plan to perform FFT of REAL8 data */
typedef struct tagREAL8FFTPlan REAL8FFTPlan;
#define tagRealFFTPlan tagREAL4FFTPlan
#define RealFFTPlan REAL4FFTPlan
/** \name Error Codes */ /** \name Error Codes */
/*@{*/ /*@{*/
#define REALFFTH_ENULL 1 /**< Null pointer */ #define REALFFTH_ENULL 1 /**< Null pointer */
#define REALFFTH_ENNUL 2 /**< Non-null pointer */ #define REALFFTH_ENNUL 2 /**< Non-null pointer */
#define REALFFTH_ESIZE 4 /**< Invalid input size */ #define REALFFTH_ESIZE 4 /**< Invalid input size */
#define REALFFTH_ESZMM 8 /**< Size mismatch */ #define REALFFTH_ESZMM 8 /**< Size mismatch */
#define REALFFTH_ESLEN 16 /**< Invalid/mismatched sequence lengths */ #define REALFFTH_ESLEN 16 /**< Invalid/mismatched sequence lengths */
#define REALFFTH_ESAME 32 /**< Input/Output data vectors are the same */ #define REALFFTH_ESAME 32 /**< Input/Output data vectors are the same */
#define REALFFTH_ESIGN 64 /**< Incorrect plan sign */ #define REALFFTH_ESIGN 64 /**< Incorrect plan sign */
#define REALFFTH_EDATA 128 /**< Bad input data: DC/Nyquist should be re al */ #define REALFFTH_EDATA 128 /**< Bad input data: DC/Nyquist should be re al */
skipping to change at line 197 skipping to change at line 190
#define REALFFTH_MSGESLEN "Invalid/mismatched sequence lengths" #define REALFFTH_MSGESLEN "Invalid/mismatched sequence lengths"
#define REALFFTH_MSGESAME "Input/Output data vectors are the same" #define REALFFTH_MSGESAME "Input/Output data vectors are the same"
#define REALFFTH_MSGESIGN "Incorrect plan sign" #define REALFFTH_MSGESIGN "Incorrect plan sign"
#define REALFFTH_MSGEDATA "Bad input data: DC/Nyquist should be real" #define REALFFTH_MSGEDATA "Bad input data: DC/Nyquist should be real"
#define REALFFTH_MSGEALOC "Memory allocation failed" #define REALFFTH_MSGEALOC "Memory allocation failed"
#define REALFFTH_MSGEFFTW "Error in FFTW" #define REALFFTH_MSGEFFTW "Error in FFTW"
#define REALFFTH_MSGESNGL "FFTW library is not single-precision" #define REALFFTH_MSGESNGL "FFTW library is not single-precision"
#define REALFFTH_MSGEINTL "Error in Intel FFT library" #define REALFFTH_MSGEINTL "Error in Intel FFT library"
/** \endcond */ /** \endcond */
/** Plan to perform FFT of REAL4 data */
typedef struct tagREAL4FFTPlan REAL4FFTPlan;
/** Plan to perform FFT of REAL8 data */
typedef struct tagREAL8FFTPlan REAL8FFTPlan;
#define tagRealFFTPlan tagREAL4FFTPlan
#define RealFFTPlan REAL4FFTPlan
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(VIEWIN_STRUCTS(REAL4Vector, output, spec));
SWIGLAL(VIEWIN_STRUCTS(REAL8Vector, output, spec));
SWIGLAL(VIEWIN_STRUCTS(COMPLEX8Vector, output));
SWIGLAL(VIEWIN_STRUCTS(COMPLEX16Vector, output));
#endif /* SWIG */
/* /*
* *
* XLAL REAL4 functions * XLAL REAL4 functions
* *
*/ */
/** /**
* Returns a new REAL4FFTPlan * Returns a new REAL4FFTPlan
* A REAL4FFTPlan is required to perform a FFT that involves real data. * A REAL4FFTPlan is required to perform a FFT that involves real data.
* A different plan is required for each size of the real data vector * A different plan is required for each size of the real data vector
skipping to change at line 334 skipping to change at line 341
* @par Errors: * @par Errors:
* The \c XLALREAL4ForwardFFT() function shall fail if: * The \c XLALREAL4ForwardFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the plan is for a * - [\c XLAL_EINVAL] A argument is invalid or the plan is for a
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL4ForwardFFT( COMPLEX8Vector *output, const REAL4Vector *input, int XLALREAL4ForwardFFT( COMPLEX8Vector *output, const REAL4Vector *input,
const REAL4FFTPlan *plan ); const REAL4FFTPlan *plan );
/** /**
* Performs a reverse FFT of REAL4 data * Performs a reverse FFT of REAL4 data
* *
* This routine performs the transformation: * This routine performs the transformation:
* \f[y[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,z[k]\f] * \f[y[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,z[k]\f]
* where N, the size of the transform, is the length of the vector y. * where N, the size of the transform, is the length of the vector y.
* *
* @note * @note
* Due to the reality of the output data y, the following identity * Due to the reality of the output data y, the following identity
skipping to change at line 371 skipping to change at line 377
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* - [\c XLAL_EDOM] Domain error if the DC component of the input data, z[0 ], * - [\c XLAL_EDOM] Domain error if the DC component of the input data, z[0 ],
* is not purely real * is not purely real
* or if the length of the output vector N is even and the Nyquist * or if the length of the output vector N is even and the Nyquist
* component of the input data, z[N/2], is not purely real. * component of the input data, z[N/2], is not purely real.
* . * .
*/ */
int XLALREAL4ReverseFFT( REAL4Vector *output, const COMPLEX8Vector *input, int XLALREAL4ReverseFFT( REAL4Vector *output, const COMPLEX8Vector *input,
const REAL4FFTPlan *plan ); const REAL4FFTPlan *plan );
/** /**
* Perform a REAL4Vector to REAL4Vector FFT * Perform a REAL4Vector to REAL4Vector FFT
* *
* This routine computes * This routine computes
* \f[y[k]=\left\{\begin{array}{ll}\Re z[k]&0\le k\le\lfloor N/2\rfloor\\\I m z[N-k]&\lfloor N/2\rfloor<k<N\end{array}\right.\f] * \f[y[k]=\left\{\begin{array}{ll}\Re z[k]&0\le k\le\lfloor N/2\rfloor\\\I m z[N-k]&\lfloor N/2\rfloor<k<N\end{array}\right.\f]
* where \f[z[k] = \sum_{j=0}^{N-1} e^{\mp2\pi ijk/N}\,x[j],\f] * where \f[z[k] = \sum_{j=0}^{N-1} e^{\mp2\pi ijk/N}\,x[j],\f]
* and where the minus sign is used if a forward plan is provided as the ar gument * and where the minus sign is used if a forward plan is provided as the ar gument
* and the plus sign is used if a reverse plan is provided as the argument; * and the plus sign is used if a reverse plan is provided as the argument;
* here N is the length of the input vector x. * here N is the length of the input vector x.
skipping to change at line 400 skipping to change at line 405
* @par Errors: * @par Errors:
* The \c XLALREAL4VectorFFT() function shall fail if: * The \c XLALREAL4VectorFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the plan is for a * - [\c XLAL_EINVAL] A argument is invalid or the plan is for a
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL4VectorFFT( REAL4Vector * _LAL_RESTRICT_ output, const REAL4Vec int XLALREAL4VectorFFT( REAL4Vector * _LAL_RESTRICT_ output, const REAL4Vec
tor * _LAL_RESTRICT_ input, tor * _LAL_RESTRICT_ input, const REAL4FFTPlan *plan );
const REAL4FFTPlan *plan );
/** /**
* Computes the power spectrum of REAL4 data * Computes the power spectrum of REAL4 data
* *
* This routine computes * This routine computes
* \f[P[k]=\left\{\begin{array}{ll}|z[0]|^2&k=0\\2|z[k]|^2&1\leq \lfloor (N +1)/2\rfloor\\|z[N/2]|^2&k=N/2,\;\mbox{$N$ even}\end{array}\right.\f] * \f[P[k]=\left\{\begin{array}{ll}|z[0]|^2&k=0\\2|z[k]|^2&1\leq \lfloor (N +1)/2\rfloor\\|z[N/2]|^2&k=N/2,\;\mbox{$N$ even}\end{array}\right.\f]
* where \f[z[k] = \sum_{j=0}^{N-1} e^{-2\pi ijk/N}\,x[j],\f] * where \f[z[k] = \sum_{j=0}^{N-1} e^{-2\pi ijk/N}\,x[j],\f]
* and N is the length of the input vector x. * and N is the length of the input vector x.
* *
* @param[out] spec The real power spectrum P of length [N/2] + 1 of the da ta x * @param[out] spec The real power spectrum P of length [N/2] + 1 of the da ta x
skipping to change at line 425 skipping to change at line 429
* @par Errors: * @par Errors:
* The \c XLALREAL4PowerSpectrum() function shall fail if: * The \c XLALREAL4PowerSpectrum() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the input and output * - [\c XLAL_EINVAL] A argument is invalid or the input and output
* data vectors are the same. * data vectors are the same.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL4PowerSpectrum( REAL4Vector *spec, const REAL4Vector *data, int XLALREAL4PowerSpectrum( REAL4Vector * _LAL_RESTRICT_ spec, const REAL4V
const REAL4FFTPlan *plan ); ector * _LAL_RESTRICT_ data, const REAL4FFTPlan *plan );
/* /*
* *
* XLAL REAL8 functions * XLAL REAL8 functions
* *
*/ */
/** /**
* Returns a new REAL8FFTPlan * Returns a new REAL8FFTPlan
* *
skipping to change at line 566 skipping to change at line 569
* @par Errors: * @par Errors:
* The \c XLALREAL8ForwardFFT() function shall fail if: * The \c XLALREAL8ForwardFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the plan is for a * - [\c XLAL_EINVAL] A argument is invalid or the plan is for a
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL8ForwardFFT( COMPLEX16Vector *output, REAL8Vector *input, int XLALREAL8ForwardFFT( COMPLEX16Vector *output, const REAL8Vector *input,
const REAL8FFTPlan *plan ); const REAL8FFTPlan *plan );
/** /**
* Performs a reverse FFT of REAL8 data * Performs a reverse FFT of REAL8 data
* *
* This routine performs the transformation: * This routine performs the transformation:
* \f[y[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,z[k]\f] * \f[y[j] = \sum_{k=0}^{N-1} e^{+2\pi ijk/N}\,z[k]\f]
* where N, the size of the transform, is the length of the vector y. * where N, the size of the transform, is the length of the vector y.
* *
* @note * @note
skipping to change at line 603 skipping to change at line 606
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* - [\c XLAL_EDOM] Domain error if the DC component of the input data, z[0 ], * - [\c XLAL_EDOM] Domain error if the DC component of the input data, z[0 ],
* is not purely real * is not purely real
* or if the length of the output vector N is even and the Nyquist * or if the length of the output vector N is even and the Nyquist
* component of the input data, z[N/2], is not purely real. * component of the input data, z[N/2], is not purely real.
* . * .
*/ */
int XLALREAL8ReverseFFT( REAL8Vector *output, COMPLEX16Vector *input, int XLALREAL8ReverseFFT( REAL8Vector *output, const COMPLEX16Vector *input,
const REAL8FFTPlan *plan ); const REAL8FFTPlan *plan );
/** /**
* Perform a REAL8Vector to REAL8Vector FFT * Perform a REAL8Vector to REAL8Vector FFT
* *
* This routine computes * This routine computes
* \f[y[k]=\left\{\begin{array}{ll}\Re z[k]&0\le k\le\lfloor N/2\rfloor\\\I m z[N-k]&\lfloor N/2\rfloor<k<N\end{array}\right.\f] * \f[y[k]=\left\{\begin{array}{ll}\Re z[k]&0\le k\le\lfloor N/2\rfloor\\\I m z[N-k]&\lfloor N/2\rfloor<k<N\end{array}\right.\f]
* where \f[z[k] = \sum_{j=0}^{N-1} e^{\mp2\pi ijk/N}\,x[j],\f] * where \f[z[k] = \sum_{j=0}^{N-1} e^{\mp2\pi ijk/N}\,x[j],\f]
* and where the minus sign is used if a forward plan is provided as the ar gument * and where the minus sign is used if a forward plan is provided as the ar gument
* and the plus sign is used if a reverse plan is provided as the argument; * and the plus sign is used if a reverse plan is provided as the argument;
skipping to change at line 632 skipping to change at line 635
* @par Errors: * @par Errors:
* The \c XLALREAL8VectorFFT() function shall fail if: * The \c XLALREAL8VectorFFT() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the input and output data * - [\c XLAL_EINVAL] A argument is invalid or the input and output data
* vectors are the same. * vectors are the same.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL8VectorFFT( REAL8Vector *output, REAL8Vector *input, int XLALREAL8VectorFFT( REAL8Vector *output, const REAL8Vector *input,
const REAL8FFTPlan *plan ); const REAL8FFTPlan *plan );
/** /**
* Computes the power spectrum of REAL8 data * Computes the power spectrum of REAL8 data
* *
* This routine computes * This routine computes
* \f[P[k]=\left\{\begin{array}{ll}|z[0]|^2 & k=0\\2|z[k]|^2 & 1\leq \lfloo r (N+1)/2\rfloor\\ |z[N/2]|^2 & k=N/2,\;\mbox{$N$ even}\end{array}\right.\f ] * \f[P[k]=\left\{\begin{array}{ll}|z[0]|^2 & k=0\\2|z[k]|^2 & 1\leq \lfloo r (N+1)/2\rfloor\\ |z[N/2]|^2 & k=N/2,\;\mbox{$N$ even}\end{array}\right.\f ]
* where \f[z[k] = \sum_{j=0}^{N-1} e^{-2\pi ijk/N}\,x[j],\f] * where \f[z[k] = \sum_{j=0}^{N-1} e^{-2\pi ijk/N}\,x[j],\f]
* and N is the length of the input vector x. * and N is the length of the input vector x.
* *
skipping to change at line 657 skipping to change at line 660
* @par Errors: * @par Errors:
* The \c XLALREAL8PowerSpectrum() function shall fail if: * The \c XLALREAL8PowerSpectrum() function shall fail if:
* - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments . * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the arguments .
* - [\c XLAL_EINVAL] A argument is invalid or the plan is for a * - [\c XLAL_EINVAL] A argument is invalid or the plan is for a
* reverse transform. * reverse transform.
* - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are * - [\c XLAL_EBADLEN] The input vector, output vector, and plan size are
* incompatible. * incompatible.
* - [\c XLAL_ENOMEM] Insufficient storage space is available. * - [\c XLAL_ENOMEM] Insufficient storage space is available.
* . * .
*/ */
int XLALREAL8PowerSpectrum( REAL8Vector *spec, REAL8Vector *data, int XLALREAL8PowerSpectrum( REAL8Vector *spec, const REAL8Vector *data,
const REAL8FFTPlan *plan ); const REAL8FFTPlan *plan );
/* /*
* *
* LAL REAL4 functions * LAL REAL4 functions
* *
*/ */
/** /**
* \b DEPRECATED * \b DEPRECATED
 End of changes. 10 change blocks. 
20 lines changed or deleted 26 lines changed or added


 Segments.h   Segments.h 
skipping to change at line 137 skipping to change at line 137
* that a segment list could in principle be disjoint but not sorted, but t hat * that a segment list could in principle be disjoint but not sorted, but t hat
* case is not of interest for the code; the \c disjoint field in the * case is not of interest for the code; the \c disjoint field in the
* structure specifically means that the list is sorted \e and disjoint. * structure specifically means that the list is sorted \e and disjoint.
* *
* Also all segments in a segment list can be time-shifted using \c XLALSeg ListShift(). * Also all segments in a segment list can be time-shifted using \c XLALSeg ListShift().
* *
*/ */
/*@{*/ /*@{*/
/*------------------- Compile-time parameters -------------------*/ /*------------------- Compile-time parameters -------------------*/
#ifndef SWIG /* exclude from SWIG interface */
#define SEGMENTSH_ALLOCBLOCK 64 /**< Initial number of LALSeg spaces to #define SEGMENTSH_ALLOCBLOCK 64 /**< Initial number of LALSeg spaces to
* allocate in memory at one time; this is * allocate in memory at one time; this is
* intended to reduce the number of memory * intended to reduce the number of memory
* reallocation calls needing to be made to * reallocation calls needing to be made t
* build up a segment list. For a large o
* segment list, the reallocation size * build up a segment list. For a large
* switches over to a multiplicative factor * segment list, the reallocation size
. * switches over to a multiplicative facto
*/ r.
*/
#define SEGMENTSH_INITMAGICVAL 729415386 /**< Distinctive value set in the #define SEGMENTSH_INITMAGICVAL 729415386 /**< Distinctive value set in the
* 'initMagic' field to provide a * 'initMagic' field to provide a
* check that the structure was * check that the structure was
* properly initialized. */ * properly initialized. */
#endif /* SWIG */
/*------------------- Data structure definitions -------------------*/ /*------------------- Data structure definitions -------------------*/
/** Struct holding a single segment */ /** Struct holding a single segment */
typedef struct typedef struct
tagLALSeg tagLALSeg
{ {
LIGOTimeGPS start; /**< Beginning time of the segment */ LIGOTimeGPS start; /**< Beginning time of the segment */
LIGOTimeGPS end; /**< Ending time of the segment */ LIGOTimeGPS end; /**< Ending time of the segment */
INT4 id; /**< Identifier (segment ID, array index, etc.) for us er */ INT4 id; /**< Identifier (segment ID, array index, etc.) for us er */
} }
LALSeg; LALSeg;
/** Struct holding a segment list */ /** Struct holding a segment list */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IGNORE_MEMBERS(tagLALSegList, initMagic, lastFound));
#endif // SWIG
typedef struct typedef struct
tagLALSegList tagLALSegList
{ {
LALSeg *segs; /**< Pointer to array of segments (LALSeg structures) */ LALSeg *segs; /**< Pointer to array of segments (LALSeg structures) */
size_t arraySize; /**< Size of array for which memory is allocated */ size_t arraySize; /**< Size of array for which memory is allocated */
UINT4 length; /**< Number of segments in this segment list */ UINT4 length; /**< Number of segments in this segment list */
UINT4 dplaces; /**< Decimal places (0,3,6,9) to format GPS times */ UINT4 dplaces; /**< Decimal places (0,3,6,9) to format GPS times */
UINT4 sorted; /**< Flag to indicate whether segment list is sorted * / UINT4 sorted; /**< Flag to indicate whether segment list is sorted * /
UINT4 disjoint; /**< Flag to indicate whether segment list is disjoint */ UINT4 disjoint; /**< Flag to indicate whether segment list is disjoint */
UINT4 initMagic; /**< Internal value to help ensure list was initialize d */ UINT4 initMagic; /**< Internal value to help ensure list was initialize d */
LALSeg *lastFound; /**< Internal record of last segment found by a search */ LALSeg *lastFound; /**< Internal record of last segment found by a search */
} }
LALSegList; LALSegList;
/*----------------------- Function prototypes ----------------------*/ /*----------------------- Function prototypes ----------------------*/
INT4 int
XLALSegSet( LALSeg *seg, const LIGOTimeGPS *start, const LIGOTimeGPS *end, XLALSegSet( LALSeg *seg, const LIGOTimeGPS *start, const LIGOTimeGPS *end,
const INT4 id ); const INT4 id );
LALSeg * LALSeg *
XLALSegCreate( const LIGOTimeGPS *start, const LIGOTimeGPS *end, XLALSegCreate( const LIGOTimeGPS *start, const LIGOTimeGPS *end,
const INT4 id ); const INT4 id );
int int
XLALGPSInSeg( const void *gps, const void *seg ); XLALGPSInSeg( const void *gps, const void *seg );
int int
XLALSegCmp( const void *seg0, const void *seg1 ); XLALSegCmp( const void *seg0, const void *seg1 );
INT4 LALSegList *
XLALSegListCreate( void );
int
XLALSegListInit( LALSegList *seglist ); XLALSegListInit( LALSegList *seglist );
INT4 int
XLALSegListClear( LALSegList *seglist ); XLALSegListClear( LALSegList *seglist );
INT4 int
XLALSegListFree( LALSegList *seglist );
int
XLALSegListAppend( LALSegList *seglist, const LALSeg *seg ); XLALSegListAppend( LALSegList *seglist, const LALSeg *seg );
INT4 int
XLALSegListSort( LALSegList *seglist ); XLALSegListSort( LALSegList *seglist );
INT4 int
XLALSegListCoalesce( LALSegList *seglist ); XLALSegListCoalesce( LALSegList *seglist );
LALSeg * LALSeg *
XLALSegListSearch( LALSegList *seglist, const LIGOTimeGPS *gps ); XLALSegListSearch( LALSegList *seglist, const LIGOTimeGPS *gps );
INT4 int
XLALSegListShift( LALSegList *seglist, const LIGOTimeGPS *shift ); XLALSegListShift( LALSegList *seglist, const LIGOTimeGPS *shift );
INT4 int
XLALSegListKeep( LALSegList *seglist, const LIGOTimeGPS *start, const LIGO TimeGPS *end ); XLALSegListKeep( LALSegList *seglist, const LIGOTimeGPS *start, const LIGO TimeGPS *end );
LALSeg * LALSeg *
XLALSegListGet( LALSegList *seglist, UINT4 indx ); XLALSegListGet( LALSegList *seglist, UINT4 indx );
int XLALSegListIsInitialized ( const LALSegList *seglist ); int XLALSegListIsInitialized ( const LALSegList *seglist );
int XLALSegListInitSimpleSegments ( LALSegList *seglist, LIGOTimeGPS startT ime, UINT4 Nseg, REAL8 Tseg ); int XLALSegListInitSimpleSegments ( LALSegList *seglist, LIGOTimeGPS startT ime, UINT4 Nseg, REAL8 Tseg );
char *XLALSegList2String ( const LALSegList *seglist ); char *XLALSegList2String ( const LALSegList *seglist );
/*@}*/ /*@}*/
 End of changes. 14 change blocks. 
21 lines changed or deleted 36 lines changed or added


 TimeFreqFFT.h   TimeFreqFFT.h 
skipping to change at line 49 skipping to change at line 49
* ### Synopsis ### * ### Synopsis ###
* *
* \code * \code
* #include <lal/TimeFreqFFT.h> * #include <lal/TimeFreqFFT.h>
* \endcode * \endcode
* *
* Perform time-to-frequency and frequency-to-time fast Fourier * Perform time-to-frequency and frequency-to-time fast Fourier
* transforms. Also provides a function to compute mean and median power * transforms. Also provides a function to compute mean and median power
* spectra with user specified windowning. * spectra with user specified windowning.
* *
* The definition of the Fourier transform is \f$ e^{2 \pi i f t} \f$
* and the inline equation version of that is
* \f[
* \tilde{h}_k = \sum
* \f]
*
* ### Description ### * ### Description ###
* *
* The routines LALTimeFreqRealFFT() and LALTimeFreqComplexFFT() * The routines LALTimeFreqRealFFT() and LALTimeFreqComplexFFT()
* transform time series \f$h_j\f$, \f$0\le j<n\f$, into a frequency series * transform time series \f$h_j\f$, \f$0\le j<n\f$, into a frequency series
* \f$\tilde{h}_k\f$. For LALTimeFreqRealFFT(), * \f$\tilde{h}_k\f$. For LALTimeFreqRealFFT(),
* \f[ * \f[
* \tilde{h}_k = \Delta t \times H_k \; * \tilde{h}_k = \Delta t \times H_k \;
* \mbox{for } 0\le k\le\lfloor n/2\rfloor * \mbox{for } 0\le k\le\lfloor n/2\rfloor
* \f] * \f]
* The packing covers the range from dc (inclusive) to Nyquist (inclusive i f * The packing covers the range from dc (inclusive) to Nyquist (inclusive i f
 End of changes. 1 change blocks. 
6 lines changed or deleted 0 lines changed or added


 TimeSeries.h   TimeSeries.h 
skipping to change at line 115 skipping to change at line 115
void XLALDestroyREAL8TimeSeries ( REAL8TimeSeries *series ); void XLALDestroyREAL8TimeSeries ( REAL8TimeSeries *series );
void XLALDestroyINT2TimeSeries ( INT2TimeSeries *series ); void XLALDestroyINT2TimeSeries ( INT2TimeSeries *series );
void XLALDestroyINT4TimeSeries ( INT4TimeSeries *series ); void XLALDestroyINT4TimeSeries ( INT4TimeSeries *series );
void XLALDestroyINT8TimeSeries ( INT8TimeSeries *series ); void XLALDestroyINT8TimeSeries ( INT8TimeSeries *series );
void XLALDestroyUINT2TimeSeries ( UINT2TimeSeries *series ); void XLALDestroyUINT2TimeSeries ( UINT2TimeSeries *series );
void XLALDestroyUINT4TimeSeries ( UINT4TimeSeries *series ); void XLALDestroyUINT4TimeSeries ( UINT4TimeSeries *series );
void XLALDestroyUINT8TimeSeries ( UINT8TimeSeries *series ); void XLALDestroyUINT8TimeSeries ( UINT8TimeSeries *series );
/*@}*/ /*@}*/
/** /**
* \name Conversion Functions
*
* ### Synopsis ###
*
* \code
* #include <lal/TimeSeries.h>
*
* XLALConvertREAL8TimeSeriesToREAL4()
* XLALConvertREAL4TimeSeriesToREAL8()
* \endcode
*
* ### Description ###
*
* These functions create a new REAL8 or REAL4 time series, initialized
* from a REAL4 or REAL8 time series, respectively. The source time series
* is not deallocated.
*/
/*@{*/
REAL4TimeSeries *XLALConvertREAL8TimeSeriesToREAL4 ( const REAL8TimeSeries
*series );
REAL8TimeSeries *XLALConvertREAL4TimeSeriesToREAL8 ( const REAL4TimeSeries
*series );
/*@}*/
/**
* \name Cutting Functions * \name Cutting Functions
* *
* ### Synopsis ### * ### Synopsis ###
* *
* \code * \code
* #include <lal/TimeSeries.h> * #include <lal/TimeSeries.h>
* *
* XLALCut<timeseriestype>() * XLALCut<timeseriestype>()
* LALCut<timeseriestype>() * LALCut<timeseriestype>()
* \endcode * \endcode
 End of changes. 1 change blocks. 
0 lines changed or deleted 25 lines changed or added


 Units.h   Units.h 
skipping to change at line 167 skipping to change at line 167
tagRAT4 tagRAT4
{ {
INT2 numerator; /**< The numerator */ INT2 numerator; /**< The numerator */
UINT2 denominatorMinusOne; /**< One less than the denominator */ UINT2 denominatorMinusOne; /**< One less than the denominator */
} RAT4; } RAT4;
/** /**
* Consists of a pair of unit structures; used as an input structure for * Consists of a pair of unit structures; used as an input structure for
* the LALUnitCompare() and LALUnitMultiply() functions. * the LALUnitCompare() and LALUnitMultiply() functions.
*/ */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(IMMUTABLE_MEMBERS(tagLALUnitPair, unitOne, unitTwo));
#endif /* SWIG */
typedef struct typedef struct
tagLALUnitPair tagLALUnitPair
{ {
const LALUnit *unitOne; /**< The first unit */ const LALUnit *unitOne; /**< The first unit */
const LALUnit *unitTwo; /**< The second unit */ const LALUnit *unitTwo; /**< The second unit */
} }
LALUnitPair; LALUnitPair;
/*@}*/ /*@}*/
/* end: Units_h */ /* end: Units_h */
/********************************************************* /*********************************************************
* * * *
* Functions to manipulate unit structures * * Functions to manipulate unit structures *
* * * *
*********************************************************/ *********************************************************/
#ifndef SWIG /* exclude from SWIG interface */
/* XLAL routines */ /* XLAL routines */
char * XLALUnitAsString( char *string, UINT4 length, const LALUnit *input ) ; char * XLALUnitAsString( char *string, UINT4 length, const LALUnit *input ) ;
char * XLALUnitToString( const LALUnit *input ); char * XLALUnitToString( const LALUnit *input );
LALUnit * XLALParseUnitString( LALUnit *output, const char *string ); LALUnit * XLALParseUnitString( LALUnit *output, const char *string );
int XLALUnitNormalize( LALUnit *unit ); int XLALUnitNormalize( LALUnit *unit );
int XLALUnitCompare( const LALUnit *unit1, const LALUnit *unit2 ); int XLALUnitCompare( const LALUnit *unit1, const LALUnit *unit2 );
LALUnit * XLALUnitMultiply( LALUnit *output, const LALUnit *unit1, LALUnit * XLALUnitMultiply( LALUnit *output, const LALUnit *unit1,
const LALUnit *unit2 ); const LALUnit *unit2 );
LALUnit * XLALUnitDivide( LALUnit *output, const LALUnit *unit1, LALUnit * XLALUnitDivide( LALUnit *output, const LALUnit *unit1,
const LALUnit *unit2 ); const LALUnit *unit2 );
skipping to change at line 213 skipping to change at line 218
REAL8 XLALUnitRatio(const LALUnit *unit1, const LALUnit *unit2); REAL8 XLALUnitRatio(const LALUnit *unit1, const LALUnit *unit2);
/* Obsolete LAL-interface functions */ /* Obsolete LAL-interface functions */
void LALUnitNormalize (LALStatus *status, LALUnit *output, const LALUnit *i nput); void LALUnitNormalize (LALStatus *status, LALUnit *output, const LALUnit *i nput);
void LALUnitMultiply (LALStatus *status, LALUnit *output, const LALUnitPair *input); void LALUnitMultiply (LALStatus *status, LALUnit *output, const LALUnitPair *input);
void LALUnitCompare (LALStatus *status, BOOLEAN *output, const LALUnitPair *input); void LALUnitCompare (LALStatus *status, BOOLEAN *output, const LALUnitPair *input);
void LALUnitRaise (LALStatus *status, LALUnit *output, const LALUnit *input , const RAT4 *power); void LALUnitRaise (LALStatus *status, LALUnit *output, const LALUnit *input , const RAT4 *power);
void LALUnitAsString (LALStatus *status, CHARVector *output, const LALUnit *input); void LALUnitAsString (LALStatus *status, CHARVector *output, const LALUnit *input);
void LALParseUnitString ( LALStatus *status, LALUnit *output, const CHARVec tor *input ); void LALParseUnitString ( LALStatus *status, LALUnit *output, const CHARVec tor *input );
#ifndef SWIG /* exclude from SWIG interface */
enum enumLALUnitNameSize { enum enumLALUnitNameSize {
LALUnitNameSize = sizeof("strain") LALUnitNameSize = sizeof("strain")
}; };
enum enumLALUnitTextSize { enum enumLALUnitTextSize {
LALUnitTextSize = sizeof("10^-32768 m^-32768/32767 kg^-32768/32767 " LALUnitTextSize = sizeof("10^-32768 m^-32768/32767 kg^-32768/32767 "
"s^-32768/32767 A^-32768/32767 " "s^-32768/32767 A^-32768/32767 "
"K^-32768/32767 strain^-32768/32767 " "K^-32768/32767 strain^-32768/32767 "
"count^-32768/32767") "count^-32768/32767")
}; };
extern const CHAR lalUnitName[LALNumUnits][LALUnitNameSize]; extern const CHAR lalUnitName[LALNumUnits][LALUnitNameSize];
#endif /* SWIG */ #endif /* SWIG */
/********************************************************* /*********************************************************
* * * *
* Predefined units * * Predefined units *
* * * *
*********************************************************/ *********************************************************/
/* Predefined constant units make it easier for programmers to specify /* Predefined constant units make it easier for programmers to specify
* and compare (using LALUnitCompare) units more easily. Those given * and compare (using LALUnitCompare) units more easily. Those given
 End of changes. 4 change blocks. 
1 lines changed or deleted 6 lines changed or added


 UserInput.h   UserInput.h 
skipping to change at line 75 skipping to change at line 75
* *
* // these are the C-variables we want to read in from user-input * // these are the C-variables we want to read in from user-input
* typedef struct { * typedef struct {
* BOOLEAN help; // did user request help-output? * BOOLEAN help; // did user request help-output?
* INT4 anInteger; * INT4 anInteger;
* REAL8 aDoubleVar; * REAL8 aDoubleVar;
* CHAR *andAString; * CHAR *andAString;
* REAL8 specialGeekSwitch; * REAL8 specialGeekSwitch;
* } UserInput_t; * } UserInput_t;
* *
* UserInput_t empty_UserInput; // this is zero-intialized!
* *
* int main(int argc,char *argv[]) * int main(int argc,char *argv[])
* { * {
* UserInput_t UserVariables = empty_UserInput; // initializes this struc t to {0} * UserInput_t XLAL_INIT_DECL(UserVariables); // initializes this struct to {0}
* UserInput_t *uvar = &UserVariables; // struct-pointer allows us to use the XLALreg<TYPE>UserStruct() macros... * UserInput_t *uvar = &UserVariables; // struct-pointer allows us to use the XLALreg<TYPE>UserStruct() macros...
* *
* // 1. step: set default-values for optional user-input variables * // 1. step: set default-values for optional user-input variables
* uvar->anInteger = 0; * uvar->anInteger = 0;
* uvar->andAString = NULL; // Note: need to assign allocated strings here as default!! * uvar->andAString = NULL; // Note: need to assign allocated strings here as default!!
* *
* // 2. step: Register all user-variables using the shortcut macros: * // 2. step: Register all user-variables using the shortcut macros:
* XLALregBOOLUserStruct ( help, 'h', UVAR_HELP, "Out put this help-message"); * XLALregBOOLUserStruct ( help, 'h', UVAR_HELP, "Out put this help-message");
* XLALregINTUserStruct ( anInteger, 'i', UVAR_OPTIONAL, "An example user-variable of an optional integer"); * XLALregINTUserStruct ( anInteger, 'i', UVAR_OPTIONAL, "An example user-variable of an optional integer");
* XLALregREALUserStruct ( aDoubleVar, 'r', UVAR_REQUIRED, "Thi s REAL8 user-variable is required"); * XLALregREALUserStruct ( aDoubleVar, 'r', UVAR_REQUIRED, "Thi s REAL8 user-variable is required");
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 Window.h   Window.h 
skipping to change at line 162 skipping to change at line 162
* ### Gauss ### * ### Gauss ###
* *
* \f{equation}{ * \f{equation}{
* w(y) * w(y)
* = \exp \left( -\frac{1}{2} \beta^{2} y^{2} \right). * = \exp \left( -\frac{1}{2} \beta^{2} y^{2} \right).
* \f} * \f}
* The shape parameter \f$\beta \in [0, \infty]\f$ sets the sharpness of th e * The shape parameter \f$\beta \in [0, \infty]\f$ sets the sharpness of th e
* central peak. \f$\beta = 0\f$ yields the rectangle window, \f$\beta \ri ghtarrow \infty\f$ yields a \f$\delta\f$ function with a single non-zero sa mple in the * central peak. \f$\beta = 0\f$ yields the rectangle window, \f$\beta \ri ghtarrow \infty\f$ yields a \f$\delta\f$ function with a single non-zero sa mple in the
* middle. * middle.
* *
* ### Lanczos ###
*
* \f{equation}{
* w(y)
* = \frac{\sin \pi y}{\pi y}.
* \f}
* The Lanczos window is the central lobe of the sinc function. This is
* used, for example, in finite impulse response resampling to modulate a
* truncated sinc interpolating kernel.
*
* These window functions are shown in \figref{window_t}, showing various w indows as functions of the normalized * These window functions are shown in \figref{window_t}, showing various w indows as functions of the normalized
* independend variable \f$y\f$, choosing \f$\beta = 6\f$ for the Kaiser wi ndow, \f$\beta = 2\f$ for the Creighton window, * independend variable \f$y\f$, choosing \f$\beta = 6\f$ for the Kaiser wi ndow, \f$\beta = 2\f$ for the Creighton window,
* \f$\beta = 0.5\f$ for the Tukey window, and \f$\beta = 3\f$ for the Gaus s window. * \f$\beta = 0.5\f$ for the Tukey window, and \f$\beta = 3\f$ for the Gaus s window.
* *
* \figure{window_t,pdf,0.6,Various windows as functions of the normalized independend variable y} * \figure{window_t,pdf,0.6,Various windows as functions of the normalized independend variable y}
* *
* For a vector of length \f$L\f$ (an integer), the mapping from integer ar ray * For a vector of length \f$L\f$ (an integer), the mapping from integer ar ray
* index \f$i\f$ to normalized co-ordinate \f$y\f$ is * index \f$i\f$ to normalized co-ordinate \f$y\f$ is
* \f{equation}{ * \f{equation}{
* y(i) * y(i)
skipping to change at line 251 skipping to change at line 261
REAL4Window *XLALCreateHannREAL4Window(UINT4 length); REAL4Window *XLALCreateHannREAL4Window(UINT4 length);
REAL4Window *XLALCreateWelchREAL4Window(UINT4 length); REAL4Window *XLALCreateWelchREAL4Window(UINT4 length);
REAL4Window *XLALCreateBartlettREAL4Window(UINT4 length); REAL4Window *XLALCreateBartlettREAL4Window(UINT4 length);
REAL4Window *XLALCreateParzenREAL4Window(UINT4 length); REAL4Window *XLALCreateParzenREAL4Window(UINT4 length);
REAL4Window *XLALCreatePapoulisREAL4Window(UINT4 length); REAL4Window *XLALCreatePapoulisREAL4Window(UINT4 length);
REAL4Window *XLALCreateHammingREAL4Window(UINT4 length); REAL4Window *XLALCreateHammingREAL4Window(UINT4 length);
REAL4Window *XLALCreateKaiserREAL4Window(UINT4 length, REAL4 beta); REAL4Window *XLALCreateKaiserREAL4Window(UINT4 length, REAL4 beta);
REAL4Window *XLALCreateCreightonREAL4Window(UINT4 length, REAL4 beta); REAL4Window *XLALCreateCreightonREAL4Window(UINT4 length, REAL4 beta);
REAL4Window *XLALCreateTukeyREAL4Window(UINT4 length, REAL4 beta); REAL4Window *XLALCreateTukeyREAL4Window(UINT4 length, REAL4 beta);
REAL4Window *XLALCreateGaussREAL4Window(UINT4 length, REAL4 beta); REAL4Window *XLALCreateGaussREAL4Window(UINT4 length, REAL4 beta);
REAL4Window *XLALCreateLanczosREAL4Window(UINT4 length);
REAL8Window *XLALCreateRectangularREAL8Window(UINT4 length); REAL8Window *XLALCreateRectangularREAL8Window(UINT4 length);
REAL8Window *XLALCreateHannREAL8Window(UINT4 length); REAL8Window *XLALCreateHannREAL8Window(UINT4 length);
REAL8Window *XLALCreateWelchREAL8Window(UINT4 length); REAL8Window *XLALCreateWelchREAL8Window(UINT4 length);
REAL8Window *XLALCreateBartlettREAL8Window(UINT4 length); REAL8Window *XLALCreateBartlettREAL8Window(UINT4 length);
REAL8Window *XLALCreateParzenREAL8Window(UINT4 length); REAL8Window *XLALCreateParzenREAL8Window(UINT4 length);
REAL8Window *XLALCreatePapoulisREAL8Window(UINT4 length); REAL8Window *XLALCreatePapoulisREAL8Window(UINT4 length);
REAL8Window *XLALCreateHammingREAL8Window(UINT4 length); REAL8Window *XLALCreateHammingREAL8Window(UINT4 length);
REAL8Window *XLALCreateKaiserREAL8Window(UINT4 length, REAL8 beta); REAL8Window *XLALCreateKaiserREAL8Window(UINT4 length, REAL8 beta);
REAL8Window *XLALCreateCreightonREAL8Window(UINT4 length, REAL8 beta); REAL8Window *XLALCreateCreightonREAL8Window(UINT4 length, REAL8 beta);
REAL8Window *XLALCreateTukeyREAL8Window(UINT4 length, REAL8 beta); REAL8Window *XLALCreateTukeyREAL8Window(UINT4 length, REAL8 beta);
REAL8Window *XLALCreateGaussREAL8Window(UINT4 length, REAL8 beta); REAL8Window *XLALCreateGaussREAL8Window(UINT4 length, REAL8 beta);
REAL8Window *XLALCreateLanczosREAL8Window(UINT4 length);
void XLALDestroyREAL4Window(REAL4Window *window); void XLALDestroyREAL4Window(REAL4Window *window);
void XLALDestroyREAL8Window(REAL8Window *window); void XLALDestroyREAL8Window(REAL8Window *window);
REAL4Sequence *XLALUnitaryWindowREAL4Sequence(REAL4Sequence *sequence, cons t REAL4Window *window); REAL4Sequence *XLALUnitaryWindowREAL4Sequence(REAL4Sequence *sequence, cons t REAL4Window *window);
COMPLEX8Sequence *XLALUnitaryWindowCOMPLEX8Sequence(COMPLEX8Sequence *seque nce, const REAL4Window *window); COMPLEX8Sequence *XLALUnitaryWindowCOMPLEX8Sequence(COMPLEX8Sequence *seque nce, const REAL4Window *window);
REAL8Sequence *XLALUnitaryWindowREAL8Sequence(REAL8Sequence *sequence, cons t REAL8Window *window); REAL8Sequence *XLALUnitaryWindowREAL8Sequence(REAL8Sequence *sequence, cons t REAL8Window *window);
COMPLEX16Sequence *XLALUnitaryWindowCOMPLEX16Sequence(COMPLEX16Sequence *se quence, const REAL8Window *window); COMPLEX16Sequence *XLALUnitaryWindowCOMPLEX16Sequence(COMPLEX16Sequence *se quence, const REAL8Window *window);
REAL8Window *XLALCreateNamedREAL8Window ( const char *windowName, REAL8 bet a, UINT4 length ); REAL8Window *XLALCreateNamedREAL8Window ( const char *windowName, REAL8 bet a, UINT4 length );
 End of changes. 3 change blocks. 
0 lines changed or deleted 12 lines changed or added


 XLALError.h   XLALError.h 
skipping to change at line 627 skipping to change at line 627
* <li> \b errnum The XLAL error number to set. * <li> \b errnum The XLAL error number to set.
* <li> \b fmt (Optional) Format string for additional error information. * <li> \b fmt (Optional) Format string for additional error information.
* <li> \b ... (Optional) Additional arguments for printf-like format. * <li> \b ... (Optional) Additional arguments for printf-like format.
* </ul> * </ul>
*/ */
#define XLAL_ERROR_VAL(val, ...) XLAL_ERROR_VAL_(val, __VA_ARGS__, NULL, NU LL) #define XLAL_ERROR_VAL(val, ...) XLAL_ERROR_VAL_(val, __VA_ARGS__, NULL, NU LL)
/* Helper macro for internal use only */ /* Helper macro for internal use only */
#define XLAL_ERROR_VAL_(val, errnum, fmt, ...) \ #define XLAL_ERROR_VAL_(val, errnum, fmt, ...) \
do { \ do { \
if (fmt) { \ if (fmt != NULL) { \
XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \ XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \
} \ } \
XLALError(__func__, __FILE__, __LINE__, errnum); \ XLALError(__func__, __FILE__, __LINE__, errnum); \
return val; \ return val; \
} while (0) } while (0)
/** /**
* Macro to invoke a failure from a XLAL routine returning an integer. * Macro to invoke a failure from a XLAL routine returning an integer.
* *
* Prototype: <b>XLAL_ERROR(errnum [, fmt [, ...]])</b> * Prototype: <b>XLAL_ERROR(errnum [, fmt [, ...]])</b>
skipping to change at line 720 skipping to change at line 720
* <li> \b fmt (Optional) Format string for additional error information. * <li> \b fmt (Optional) Format string for additional error information.
* <li> \b ... (Optional) Additional arguments for printf-like format. * <li> \b ... (Optional) Additional arguments for printf-like format.
* </ul> * </ul>
*/ */
#define XLAL_CHECK_VAL(val, assertion, ...) XLAL_CHECK_VAL_(val, assertion, __VA_ARGS__, NULL, NULL) #define XLAL_CHECK_VAL(val, assertion, ...) XLAL_CHECK_VAL_(val, assertion, __VA_ARGS__, NULL, NULL)
/* Helper macro for internal use only */ /* Helper macro for internal use only */
#define XLAL_CHECK_VAL_(val, assertion, errnum, fmt, ...) \ #define XLAL_CHECK_VAL_(val, assertion, errnum, fmt, ...) \
do { \ do { \
if (!(assertion)) { \ if (!(assertion)) { \
if (fmt) { \ if (fmt != NULL) { \
XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \ XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \
} else { \ } else { \
XLAL_PRINT_ERROR("Check failed: " #assertion ); \ XLAL_PRINT_ERROR("Check failed: " #assertion ); \
} \ } \
XLALError(__func__, __FILE__, __LINE__, errnum); \ XLALError(__func__, __FILE__, __LINE__, errnum); \
return val; \ return val; \
} \ } \
} while (0) } while (0)
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/