ConfigFile.h   ConfigFile.h 
skipping to change at line 148 skipping to change at line 148
* This is used as the input structure in the config-variable reading routi nes. * This is used as the input structure in the config-variable reading routi nes.
*/ */
typedef struct tagLALParsedDataFile { typedef struct tagLALParsedDataFile {
SWIGLAL_STRUCT(LALParsedDataFile); SWIGLAL_STRUCT(LALParsedDataFile);
TokenList *lines; /**< list of pre-parsed data-file lines */ TokenList *lines; /**< list of pre-parsed data-file lines */
BOOLEAN *wasRead; /**< keep track of successfully read lines for stric tness-checking */ BOOLEAN *wasRead; /**< keep track of successfully read lines for stric tness-checking */
} LALParsedDataFile; } LALParsedDataFile;
/* Function prototypes */ /* Function prototypes */
int XLALParseDataFile (LALParsedDataFile **cfgdata, const CHAR *fname); int XLALParseDataFile (LALParsedDataFile **cfgdata, const CHAR *fname);
int XLALDestroyParsedDataFile (LALParsedDataFile **cfgdata); void XLALDestroyParsedDataFile (LALParsedDataFile *cfgdata);
int XLALConfigSectionExists(const LALParsedDataFile *, const CHAR *); int XLALConfigSectionExists(const LALParsedDataFile *, const CHAR *);
int int
XLALReadConfigBOOLVariable (BOOLEAN *varp, XLALReadConfigBOOLVariable (BOOLEAN *varp,
const LALParsedDataFile *cfgdata, const LALParsedDataFile *cfgdata,
const CHAR *secName, const CHAR *secName,
const CHAR *varName, const CHAR *varName,
BOOLEAN *wasRead); BOOLEAN *wasRead);
int int
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 LALAtomicDatatypes.h   LALAtomicDatatypes.h 
skipping to change at line 25 skipping to change at line 25
* 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
*/ */
// ---------- SEE LALDatatypes.dox for doxygen documentation ---------- // ---------- SEE LALDatatypes.dox for doxygen documentation ----------
#ifndef _LALATOMICDATATYPES_H #ifndef _LALATOMICDATATYPES_H
#define _LALATOMICDATATYPES_H #define _LALATOMICDATATYPES_H
#if defined(__cplusplus)
extern "C" {
#elif 0
} /* so that editors will match preceding brace */
#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 */
typedef unsigned char UCHAR; /**< One-byte unsigned integer, see \ref LAL Datatypes for more details */ typedef unsigned char UCHAR; /**< One-byte unsigned integer, see \ref LAL Datatypes for more details */
typedef unsigned char BOOLEAN; /**< Boolean logical type, see \ref LALDatat ypes for more details */ typedef unsigned char BOOLEAN; /**< Boolean logical type, see \ref LALDatat ypes for more details */
#include <stdint.h> #include <stdint.h>
#ifndef LAL_USE_OLD_COMPLEX_STRUCTS #ifndef LAL_USE_OLD_COMPLEX_STRUCTS
#if defined(__cplusplus) #if defined(__cplusplus)
skipping to change at line 57 skipping to change at line 63
#undef INT4 #undef INT4
#undef INT8 #undef INT8
#undef UINT2 #undef UINT2
#undef UINT4 #undef UINT4
#undef UINT8 #undef UINT8
#undef REAL4 #undef REAL4
#undef REAL8 #undef REAL8
#undef COMPLEX8 #undef COMPLEX8
#undef COMPLEX16 #undef COMPLEX16
#ifdef __cplusplus
extern "C" {
#endif
/* 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. * /
/* Macros for integer constants */ /* Macros for integer constants */
/** \def LAL_INT8_C(v) (v ## LL) /** \def LAL_INT8_C(v) (v ## LL)
skipping to change at line 93 skipping to change at line 95
* *
* This macro affixes the appropriate qualifier to form an UINT8 constant. * This macro affixes the appropriate qualifier to form an UINT8 constant.
* For example: * For example:
* \code * \code
* const UINT8 jan_1_2000_gps_nanosec = LAL_UINT8_C(63072001300000000) * const UINT8 jan_1_2000_gps_nanosec = LAL_UINT8_C(63072001300000000)
* \endcode * \endcode
*/ */
#define LAL_UINT8_C UINT64_C #define LAL_UINT8_C UINT64_C
/* Real types */ /* Real types */
typedef float REAL4; /**< Single precision real floating-point number (4 typedef float REAL4; /**< Single precision real floating-point number (4
bytes). */ bytes). */
typedef double REAL8; /**< Double precision real floating-point number (8 typedef double REAL8; /**< Double precision real floating-point number (8
bytes). */ bytes). */
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
#ifndef LAL_USE_OLD_COMPLEX_STRUCTS #ifndef LAL_USE_OLD_COMPLEX_STRUCTS
/* Complex types */ /* Complex types */
#if defined(__cplusplus) #if defined(__cplusplus)
typedef std::complex<float> COMPLEX8; typedef std::complex<float> COMPLEX8;
typedef std::complex<double> COMPLEX16; typedef std::complex<double> COMPLEX16;
#else #else
typedef float complex COMPLEX8; typedef float complex COMPLEX8; /**< Single-precision floating-point co
typedef double complex COMPLEX16; mplex number (8 bytes total) */
typedef double complex COMPLEX16; /**< Double-precision floating-point co
mplex number (16 bytes total) */
#endif #endif
/** \cond DONT_DOXYGEN */
/* Complex type constructors */ /* Complex type constructors */
#if defined(__cplusplus) #if defined(__cplusplus)
#define CX8rect( re, im) COMPLEX8( re, im ) #define CX8rect( re, im) COMPLEX8( re, im )
#define CX16rect(re, im) COMPLEX16( re, im ) #define CX16rect(re, im) COMPLEX16( re, im )
#define CX8polar( r, th) ( (r) * std::exp( CX8rect( 0, th ) ) ) #define CX8polar( r, th) ( (r) * std::exp( CX8rect( 0, th ) ) )
#define CX16polar(r, th) ( (r) * std::exp( CX16rect( 0, th ) ) ) #define CX16polar(r, th) ( (r) * std::exp( CX16rect( 0, th ) ) )
#else #else
#define CX8rect( re, im) ( (re) + _Complex_I * (im) ) #define CX8rect( re, im) ( (re) + _Complex_I * (im) ) /**< Constr
#define CX16rect(re, im) ( (re) + _Complex_I * (im) ) uct a COMPLEX8 from real and imaginary parts */
#define CX8polar( r, th) ( (r) * cexpf( CX8rect( 0, th ) ) ) #define CX16rect(re, im) ( (re) + _Complex_I * (im) ) /**< Constr
#define CX16polar(r, th) ( (r) * cexp( CX16rect( 0, th ) ) ) uct a COMPLEX16 from real and imaginary parts */
#define CX8polar( r, th) ( (r) * cexpf( CX8rect( 0, th ) ) ) /**< Constr
uct a COMPLEX8 from polar modulus and argument */
#define CX16polar(r, th) ( (r) * cexp( CX16rect( 0, th ) ) ) /**< Constr
uct a COMPLEX16 from polar modulus and argument */
#endif #endif
/* Real and imaginary part accessors */ /* Real and imaginary part accessors */
#if defined(__cplusplus) #if defined(__cplusplus)
#define CX8re( z) std::real(z) #define CX8re( z) std::real(z)
#define CX16re(z) std::real(z) #define CX16re(z) std::real(z)
#define CX8im( z) std::imag(z) #define CX8im( z) std::imag(z)
#define CX16im(z) std::imag(z) #define CX16im(z) std::imag(z)
#else #else
#define CX8re( z) crealf(z) #define CX8re( z) crealf(z) /**< Get the real part of a COMPLEX8 */
#define CX16re(z) creal( z) #define CX16re(z) creal( z) /**< Get the real part of a COMPLEX16 */
#define CX8im( z) cimagf(z) #define CX8im( z) cimagf(z) /**< Get the imaginary part of a COMPLEX8 */
#define CX16im(z) cimag( z) #define CX16im(z) cimag( z) /**< Get the imaginary part of a COMPLEX16 */
#endif #endif
/* Real and imaginary part assignment */ /* Real and imaginary part assignment */
#if !defined(__cplusplus) && defined(__GNUC__) #if !defined(__cplusplus) && defined(__GNUC__)
#define setCX8re( z, re) ( __real__(z) = (re) ) #define setCX8re( z, re) ( __real__(z) = (re) )
#define setCX16re(z, re) ( __real__(z) = (re) ) #define setCX16re(z, re) ( __real__(z) = (re) )
#define setCX8im( z, im) ( __imag__(z) = (im) ) #define setCX8im( z, im) ( __imag__(z) = (im) )
#define setCX16im(z, im) ( __imag__(z) = (im) ) #define setCX16im(z, im) ( __imag__(z) = (im) )
#else #else
#define setCX8re( z, re) ( (z) = CX8rect( re, CX8im( z) ) ) #define setCX8re( z, re) ( (z) = CX8rect( re, CX8im( z) ) ) /**< Set the
#define setCX16re(z, re) ( (z) = CX16rect( re, CX16im(z) ) ) real part of a COMPLEX8 */
#define setCX8im( z, im) ( (z) = CX8rect( CX8re( z), im ) ) #define setCX16re(z, re) ( (z) = CX16rect( re, CX16im(z) ) ) /**< Set the
#define setCX16im(z, im) ( (z) = CX16rect( CX16re(z), im ) ) real part of a COMPLEX16 */
#define setCX8im( z, im) ( (z) = CX8rect( CX8re( z), im ) ) /**< Set the
imaginary part of a COMPLEX8 */
#define setCX16im(z, im) ( (z) = CX16rect( CX16re(z), im ) ) /**< Set the
imaginary part of a COMPLEX16 */
#endif #endif
/** \endcond */
#else /* LAL_USE_OLD_COMPLEX_STRUCTS */ #else /* LAL_USE_OLD_COMPLEX_STRUCTS */
/** Single-precision floating-point complex number (8 bytes total) */ /** \cond DONT_DOXYGEN */
typedef struct /* Old LAL complex structs, being phased out ... */
tagCOMPLEX8 typedef struct tagCOMPLEX8 { REAL4 re; REAL4 im; } COMPLEX8;
{ typedef struct tagCOMPLEX16 { REAL8 re; REAL8 im; } COMPLEX16;
REAL4 re; /**< The real part. */ /** \endcond */
REAL4 im; /**< The imaginary part. */
}
COMPLEX8;
/** Double-precision floating-point complex number (16 bytes total) */
typedef struct
tagCOMPLEX16
{
REAL8 re; /**< The real part. */
REAL8 im; /**< The imaginary part. */
}
COMPLEX16;
#endif /* LAL_USE_OLD_COMPLEX_STRUCTS */ #endif /* LAL_USE_OLD_COMPLEX_STRUCTS */
/*@}*/ /*@}*/
#endif /* SWIG */ #endif /* SWIG */
#ifdef __cplusplus #if 0
{ /* so that editors will match succeeding brace */
#elif defined(__cplusplus)
} }
#endif #endif
#endif /* _LALATOMICDATATYPES_H */ #endif /* _LALATOMICDATATYPES_H */
 End of changes. 11 change blocks. 
43 lines changed or deleted 42 lines changed or added


 LALConfig.h   LALConfig.h 
/* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * / /* include/lal/LALConfig.h. Generated from LALConfig.h.in by configure. * /
/* only include this file if LAL's config.h has not been included */ /* only include this file if LAL's config.h has not been included */
#ifndef CONFIG_H__LAL #ifndef CONFIG_H__LAL
#ifndef _LALCONFIG_H #ifndef _LALCONFIG_H
#define _LALCONFIG_H #define _LALCONFIG_H
/* LAL Version */ /* LAL Version */
#define LAL_VERSION "6.7.1" #define LAL_VERSION "6.7.2"
/* 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 7 #define LAL_VERSION_MINOR 7
/* LAL Version Micro Number */ /* LAL Version Micro Number */
#define LAL_VERSION_MICRO 1 #define LAL_VERSION_MICRO 2
/* LAL Version Devel Number */ /* LAL Version Devel Number */
#define LAL_VERSION_DEVEL 0 #define LAL_VERSION_DEVEL 0
/* LAL Configure Arguments */ /* LAL Configure Arguments */
#define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/andrey/upstr eam-tracker/testing/lal/6.7.1' '--exec-prefix=/home/andrey/upstream-tracker /testing/lal/6.7.1' '--sysconfdir=/home/andrey/upstream-tracker/testing/lal /6.7.1' '--datadir=/home/andrey/upstream-tracker/testing/lal/6.7.1' 'CFLAGS =-w -fpermissive' 'CXXFLAGS=-w -fpermissive'" #define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/andrey/upstr eam-tracker/testing/lal/6.7.2' '--exec-prefix=/home/andrey/upstream-tracker /testing/lal/6.7.2' '--sysconfdir=/home/andrey/upstream-tracker/testing/lal /6.7.2' '--datadir=/home/andrey/upstream-tracker/testing/lal/6.7.2' 'CFLAGS =-w -fpermissive' 'CXXFLAGS=-w -fpermissive'"
/* LAL Configure Date */ /* LAL Configure Date */
#define LAL_CONFIGURE_DATE "2012-05-12T11:44:34+0400" #define LAL_CONFIGURE_DATE "2012-06-14T02:21:53+0400"
/* LAL Install Prefix */ /* LAL Install Prefix */
#define LAL_PREFIX "/usr/local" #define LAL_PREFIX "/usr/local"
/* 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 */
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 LALVCSInfo.h   LALVCSInfo.h 
skipping to change at line 38 skipping to change at line 38
#endif #endif
#include <lal/LALConfig.h> #include <lal/LALConfig.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* vcs information defines */ /* vcs information defines */
#define LAL_NAME "LAL" #define LAL_NAME "LAL"
#define LAL_VCS_ID "5de7951cb4c0d9ab4c6a9c4b8f36e16d2cc2b4ed" #define LAL_VCS_ID "cba4e9f38c56cba4d07a365bfc7a20fa6a7607e3"
#define LAL_VCS_DATE "2012-05-11 16:55:41 +0000" #define LAL_VCS_DATE "2012-06-13 16:02:19 +0000"
#define LAL_VCS_BRANCH "None" #define LAL_VCS_BRANCH "None"
#define LAL_VCS_TAG "lal-v6.7.1" #define LAL_VCS_TAG "lal-v6.7.2"
#define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>" #define LAL_VCS_AUTHOR "Adam Mercer <adam.mercer@ligo.org>"
#define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>" #define LAL_VCS_COMMITTER "Adam Mercer <adam.mercer@ligo.org>"
#define LAL_VCS_STATUS "CLEAN: All modifications committed" #define LAL_VCS_STATUS "CLEAN: All modifications committed"
/* vcs information defines - identable*/ /* vcs information defines - identable*/
#define LAL_VCS_IDENT_ID "$" "LALId: 5de7951cb4c0d9ab4c6a9c4b8f36e16d2cc2b4 #define LAL_VCS_IDENT_ID "$" "LALId: cba4e9f38c56cba4d07a365bfc7a20fa6a7607
ed " "$" e3 " "$"
#define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-05-11 16:55:41 +0000 " "$" #define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-06-13 16:02:19 +0000 " "$"
#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" #define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$"
#define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.7.1 " "$" #define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.7.2 " "$"
#define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$" #define LAL_VCS_IDENT_AUTHOR "$" "LALAuthor: Adam Mercer <adam.mercer@ligo. org> " "$"
#define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$" #define LAL_VCS_IDENT_COMMITTER "$" "LALCommitter: Adam Mercer <adam.mercer @ligo.org> " "$"
#define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$" #define LAL_VCS_IDENT_STATUS "$" "LALStatus: CLEAN: All modifications commi tted " "$"
/* global variables for vcs information, defined in LALVCSInfo.c */ /* global variables for vcs information, defined in LALVCSInfo.c */
extern const char *const lalVCSVersion; extern const char *const lalVCSVersion;
extern const char *const lalVCSId; extern const char *const lalVCSId;
extern const char *const lalVCSDate; extern const char *const lalVCSDate;
extern const char *const lalVCSBranch; extern const char *const lalVCSBranch;
extern const char *const lalVCSTag; extern const char *const lalVCSTag;
 End of changes. 4 change blocks. 
7 lines changed or deleted 7 lines changed or added


 ReadFiltersFile.h   ReadFiltersFile.h 
skipping to change at line 36 skipping to change at line 36
#include <lal/Calibration.h> #include <lal/Calibration.h>
/* C++ protection. */ /* C++ protection. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
int XLALReadFiltersFile(const char *filterfile, StrainIn *InputData); int XLALReadFiltersFile(const char *filterfile, StrainIn *InputData);
int XLALDestroyFiltersFile(StrainIn *InputData); void XLALDestroyFiltersFile(StrainIn *InputData);
/* C++ protection. */ /* C++ protection. */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* LALREADFILTERSFILE_H */ #endif /* LALREADFILTERSFILE_H */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/