BandPassTimeSeries.h   BandPassTimeSeries.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _BANDPASSTIMESERIES_H #ifndef _BANDPASSTIMESERIES_H
#define _BANDPASSTIMESERIES_H #define _BANDPASSTIMESERIES_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/IIRFilter.h> #include <lal/IIRFilter.h>
#include <lal/ZPGFilter.h> #include <lal/ZPGFilter.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 74 skipping to change at line 69
#define BANDPASSTIMESERIESH_MSGEBAD "Bad filter parameters" #define BANDPASSTIMESERIESH_MSGEBAD "Bad filter parameters"
/** \endcond */ /** \endcond */
/** This structure stores data used for constructing a low- or high-pass /** This structure stores data used for constructing a low- or high-pass
* filter: either the order and characteristic frequency of the filter, * filter: either the order and characteristic frequency of the filter,
* or the frequencies and desired attenuations at the ends of some * or the frequencies and desired attenuations at the ends of some
* transition band. In the latter case, a nonzero filter order parameter * transition band. In the latter case, a nonzero filter order parameter
* \c n indicates a maximum allowed order * \c n indicates a maximum allowed order
*/ */
typedef struct tagPassBandParamStruc{ typedef struct tagPassBandParamStruc{
SWIGLAL_STRUCT(PassBandParamStruc);
CHAR *name; /**< A user-assigned name */ CHAR *name; /**< A user-assigned name */
INT4 nMax; /**< The maximum desired filter order (actual order may be l ess if specified attenuations do not require a high order) */ INT4 nMax; /**< The maximum desired filter order (actual order may be l ess if specified attenuations do not require a high order) */
REAL8 f1; /**< The reference frequencies of the transition band */ REAL8 f1; /**< The reference frequencies of the transition band */
REAL8 f2; /**< The reference frequencies of the transition band */ REAL8 f2; /**< The reference frequencies of the transition band */
REAL8 a1; /**< The minimal desired attenuation factors at the referenc e frequencies */ REAL8 a1; /**< The minimal desired attenuation factors at the referenc e frequencies */
REAL8 a2; /**< The minimal desired attenuation factors at the referenc e frequencies */ REAL8 a2; /**< The minimal desired attenuation factors at the referenc e frequencies */
} PassBandParamStruc; } PassBandParamStruc;
/*@}*/ /*@}*/
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 BitField.h   BitField.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _BITFIELD_H #ifndef _BITFIELD_H
#define _BITFIELD_H #define _BITFIELD_H
#include <lal/LALAtomicDatatypes.h>
/** /**
* \addtogroup BitField_h * \addtogroup BitField_h
* \author Karl Wette * \author Karl Wette
* \brief Macros for manipulating integers as bit fields * \brief Macros for manipulating integers as bit fields
*/ */
/*@{*/ /*@{*/
/** /**
* Return a mask where the (zero-based) ith bit is set * Return a mask where the (zero-based) ith bit is set
*/ */
#define ONE_BIT(T, i) (((T)1) << (i)) #define ONE_BIT(T, i) (((T)1) << (i))
/** /**
* Return a mask where all bits from 0 to n-1 are set * Return a mask where all bits from 0 to n-1 are set
*/ */
#define ALL_BITS(T, n) ((((T)1) << (n)) - ((T)1)) #define ALL_BITS(T, n) ((((T)1) << (n)) - ((T)1))
/** /**
* Get the value of the (zero-based) ith bit of x * Get the value of the (zero-based) ith bit of x
*/ */
#define GET_BIT(T, x, i) ((x & ONE_BIT(T, i)) == ONE_BIT(T, i) ? 1 : 0) #define GET_BIT(T, x, i) (((x) & ONE_BIT(T, i)) == ONE_BIT(T, i) ? 1 : 0)
/** /**
* Sets the (zero-based) ith bit of x to the truth of v * Sets the (zero-based) ith bit of x to the truth of v
*/ */
#define SET_BIT(T, x, i, v) x = ((v) ? x | ONE_BIT(T, i) : x & ~ONE_BIT(T, i)) #define SET_BIT(T, x, i, v) ((v) ? ((x) |= ONE_BIT(T, i)) : ((x) &= ~ONE_BI T(T, i)))
/** /**
* Get if all bits from 0 to n-1 of x are set * Get if all bits from 0 to n-1 of x are set
*/ */
#define GET_ALL(T, x, n) ((x & ALL_BITS(T, n)) == ALL_BITS(T, n) ? 1 : 0) #define GET_ALL(T, x, n) (((x) & ALL_BITS(T, n)) == ALL_BITS(T, n) ? 1 : 0)
/** /**
* Sets all bits from 0 to n of x to the truth of v * Sets all bits from 0 to n of x to the truth of v
*/ */
#define SET_ALL(T, x, n, v) x = ((v) ? x | ALL_BITS(T, n) : x & ~ALL_BITS(T , n)) #define SET_ALL(T, x, n, v) ((v) ? ((x) |= ALL_BITS(T, n)) : ((x) &= ~ALL_B ITS(T, n)))
/*@}*/ /*@}*/
#endif #endif
 End of changes. 5 change blocks. 
6 lines changed or deleted 4 lines changed or added


 Calibration.h   Calibration.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _CALIBRATION_H #ifndef _CALIBRATION_H
#define _CALIBRATION_H #define _CALIBRATION_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/BandPassTimeSeries.h> #include <lal/BandPassTimeSeries.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** \addtogroup Calibration_h /** \addtogroup Calibration_h
skipping to change at line 83 skipping to change at line 78
CalibrationDelay = 004, CalibrationDelay = 004,
CalibrationTransfer = 010, CalibrationTransfer = 010,
CalibrationZPG = 020 CalibrationZPG = 020
} }
CalibrationType; CalibrationType;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagCalFactors tagCalFactors
{ {
SWIGLAL_STRUCT(CalFactors);
COMPLEX16 alpha; COMPLEX16 alpha;
COMPLEX16 alphabeta; COMPLEX16 alphabeta;
COMPLEX16 beta; COMPLEX16 beta;
COMPLEX16 exc; COMPLEX16 exc;
COMPLEX16 asq; COMPLEX16 asq;
COMPLEX16 darm; COMPLEX16 darm;
} }
CalFactors; CalFactors;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagUpdateFactorsParams tagUpdateFactorsParams
{ {
SWIGLAL_STRUCT(UpdateFactorsParams);
REAL8 lineFrequency; REAL8 lineFrequency;
COMPLEX16 openloop; COMPLEX16 openloop;
COMPLEX16 digital; COMPLEX16 digital;
COMPLEX16 whitener; COMPLEX16 whitener;
REAL4TimeSeries *darmCtrl; REAL4TimeSeries *darmCtrl;
REAL4TimeSeries *asQ; REAL4TimeSeries *asQ;
REAL4TimeSeries *exc; REAL4TimeSeries *exc;
} }
UpdateFactorsParams; UpdateFactorsParams;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagCalibrationRecord tagCalibrationRecord
{ {
SWIGLAL_STRUCT(CalibrationRecord);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 duration; REAL8 duration;
CHAR reference[LALNameLength]; CHAR reference[LALNameLength];
LALUnit units; LALUnit units;
UINT4 type; UINT4 type;
REAL8 conversion; REAL8 conversion;
REAL8 offset; REAL8 offset;
REAL8 delay; REAL8 delay;
COMPLEX8FrequencySeries *transfer; COMPLEX8FrequencySeries *transfer;
skipping to change at line 137 skipping to change at line 129
CalibrationRecord; CalibrationRecord;
/** The type CalibrationFunctions contains two calibration functions, /** The type CalibrationFunctions contains two calibration functions,
* the sensing function \f$C(f)\f$ and the response function \f$R(f)\f$. W hile the * the sensing function \f$C(f)\f$ and the response function \f$R(f)\f$. W hile the
* response function is the function that is most often wanted, the sensing * response function is the function that is most often wanted, the sensing
* function is needed in updating calibration from one epoch to another. * function is needed in updating calibration from one epoch to another.
*/ */
typedef struct typedef struct
tagCalibrationFunctions tagCalibrationFunctions
{ {
SWIGLAL_STRUCT(CalibrationFunctions);
COMPLEX8FrequencySeries *responseFunction; COMPLEX8FrequencySeries *responseFunction;
COMPLEX8FrequencySeries *sensingFunction; COMPLEX8FrequencySeries *sensingFunction;
} }
CalibrationFunctions; CalibrationFunctions;
/** The type \c CalibrationUpdateParams contains two time series /** The type \c CalibrationUpdateParams contains two time series
* representing an overall gain factor for the open-loop gain function \f$H (f)\f$ * representing an overall gain factor for the open-loop gain function \f$H (f)\f$
* and the sensing function \f$C(f)\f$. These transfer functions are known to * and the sensing function \f$C(f)\f$. These transfer functions are known to
* change (by an overall factor) with time, and these two factors can be * change (by an overall factor) with time, and these two factors can be
* tracked using the injected calibration lines. The factors are stored * tracked using the injected calibration lines. The factors are stored
skipping to change at line 159 skipping to change at line 150
* used in updating the calibration functions described previously. * used in updating the calibration functions described previously.
* (The response function can be computed from the open-loop gain and the * (The response function can be computed from the open-loop gain and the
* sensing function. It is simply \f$R(f)=[1+H(f)]/C(f)\f$.) In addition, this * sensing function. It is simply \f$R(f)=[1+H(f)]/C(f)\f$.) In addition, this
* structure contains the present epoch and the duration of the data to be * structure contains the present epoch and the duration of the data to be
* calibrated to identify the particular set of * calibrated to identify the particular set of
* factors (from those recorded in the time series) to use. * factors (from those recorded in the time series) to use.
*/ */
typedef struct typedef struct
tagCalibrationUpdateParams tagCalibrationUpdateParams
{ {
SWIGLAL_STRUCT(CalibrationUpdateParams);
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
LIGOTimeGPS duration; LIGOTimeGPS duration;
CHAR *ifo; CHAR *ifo;
COMPLEX8 alpha; COMPLEX8 alpha;
COMPLEX8 alphabeta; COMPLEX8 alphabeta;
COMPLEX8TimeSeries *openLoopFactor; COMPLEX8TimeSeries *openLoopFactor;
COMPLEX8TimeSeries *sensingFactor; COMPLEX8TimeSeries *sensingFactor;
} }
CalibrationUpdateParams; CalibrationUpdateParams;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef typedef
struct tagStrainOut { struct tagStrainOut {
SWIGLAL_STRUCT(StrainOut);
REAL8TimeSeries h; /**< timeseries containing h(t) */ REAL8TimeSeries h; /**< timeseries containing h(t) */
REAL8TimeSeries hC; /**< timeseries containing the control signa l */ REAL8TimeSeries hC; /**< timeseries containing the control signa l */
REAL8TimeSeries hR; /**< timeseries containing the residual sign al */ REAL8TimeSeries hR; /**< timeseries containing the residual sign al */
COMPLEX16TimeSeries alpha; /**< alpha time series */ COMPLEX16TimeSeries alpha; /**< alpha time series */
COMPLEX16TimeSeries beta; /**< beta time series */ COMPLEX16TimeSeries beta; /**< beta time series */
COMPLEX16TimeSeries alphabeta;/**< alpha time series */ COMPLEX16TimeSeries alphabeta;/**< alpha time series */
INT2TimeSeries science_mode; /**< flag = 1 for science mode, 0 otherwise */ INT2TimeSeries science_mode; /**< flag = 1 for science mode, 0 otherwise */
} StrainOut; } StrainOut;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef typedef
struct tagStrainIn { struct tagStrainIn {
SWIGLAL_STRUCT(StrainIn);
REAL4TimeSeries AS_Q ; /**< timeseries containing ASQ */ REAL4TimeSeries AS_Q ; /**< timeseries containing ASQ */
REAL4TimeSeries DARM_ERR;/**< timeseries containing DARM_ERR */ REAL4TimeSeries DARM_ERR;/**< timeseries containing DARM_ERR */
REAL4TimeSeries DARM ; /**< timeseries containing DARM_CTRL */ REAL4TimeSeries DARM ; /**< timeseries containing DARM_CTRL */
REAL4TimeSeries EXC ; /**< timeseries containing the excitation */ REAL4TimeSeries EXC ; /**< timeseries containing the excitation */
REAL4TimeSeries StateVector; /**< timeseries containing the State Vector (IFO-SV_STATE_VECTOR) */ REAL4TimeSeries StateVector; /**< timeseries containing the State Vector (IFO-SV_STATE_VECTOR) */
REAL4TimeSeries LAX; /**< timeseries containing the Light-in-X-arm (L SC-LA_PTRX_NORM) */ REAL4TimeSeries LAX; /**< timeseries containing the Light-in-X-arm (L SC-LA_PTRX_NORM) */
REAL4TimeSeries LAY; /**< timeseries containing the Light-in-Y-arm (L SC-LA_PTRY_NORM) */ REAL4TimeSeries LAY; /**< timeseries containing the Light-in-Y-arm (L SC-LA_PTRY_NORM) */
COMPLEX16 Do; /**< digital filter at cal line frequency */ COMPLEX16 Do; /**< digital filter at cal line frequency */
COMPLEX16 Go; /**< OLG at cal line frequency */ COMPLEX16 Go; /**< OLG at cal line frequency */
COMPLEX16 Wo; /**< Whitening filter at cal line frequency */ COMPLEX16 Wo; /**< Whitening filter at cal line frequency */
skipping to change at line 229 skipping to change at line 217
INT4 NCinv; /**< Numbers of filters of each type */ INT4 NCinv; /**< Numbers of filters of each type */
INT4 ND;/**< UNDOCUMENTED */ INT4 ND;/**< UNDOCUMENTED */
INT4 NAA;/**< UNDOCUMENTED */ INT4 NAA;/**< UNDOCUMENTED */
INT4 NAX;/**< UNDOCUMENTED */ INT4 NAX;/**< UNDOCUMENTED */
INT4 NAY;/**< UNDOCUMENTED */ INT4 NAY;/**< UNDOCUMENTED */
} StrainIn; } StrainIn;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef typedef
struct tagMyIIRFilter { struct tagMyIIRFilter {
SWIGLAL_STRUCT(MyIIRFilter);
INT4 yOrder; INT4 yOrder;
INT4 xOrder; INT4 xOrder;
REAL8 a[20]; REAL8 a[20];
REAL8 b[20]; REAL8 b[20];
REAL8 yhist[20]; REAL8 yhist[20];
REAL8 xhist[20]; REAL8 xhist[20];
} MyIIRFilter; } MyIIRFilter;
/*@}*/ /*@}*/
 End of changes. 9 change blocks. 
13 lines changed or deleted 0 lines changed or added


 CoarseGrainFrequencySeries.h   CoarseGrainFrequencySeries.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
*/ */
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#ifndef _COARSEGRAINFREQUENCYSERIES_H #ifndef _COARSEGRAINFREQUENCYSERIES_H
#define _COARSEGRAINFREQUENCYSERIES_H #define _COARSEGRAINFREQUENCYSERIES_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup CoarseGrainFrequencySeries_h \addtogroup CoarseGrainFrequencySeries_h
\author UTB Relativity Group; contact whelan@phys.utb.edu (original by S . Drasco) \author UTB Relativity Group; contact whelan@phys.utb.edu (original by S . Drasco)
\brief Provides prototype, structure and error code information for rout ines which coarse-grain a frequency series. \brief Provides prototype, structure and error code information for rout ines which coarse-grain a frequency series.
skipping to change at line 227 skipping to change at line 222
* * * *
* Structures and prototypes associated with * * Structures and prototypes associated with *
* CoarseGrainFrequencySeries.c * * CoarseGrainFrequencySeries.c *
* * * *
*************************************************************/ *************************************************************/
/** Contains the parameters needed to specify the sampling of a frequency s eries */ /** Contains the parameters needed to specify the sampling of a frequency s eries */
typedef struct typedef struct
tagFrequencySamplingParams tagFrequencySamplingParams
{ {
SWIGLAL_STRUCT(FrequencySamplingParams);
REAL8 f0; /**< The start frequency of the frequency se ries */ REAL8 f0; /**< The start frequency of the frequency se ries */
REAL8 deltaF; /**< The frequency spacing of the fr equency series */ REAL8 deltaF; /**< The frequency spacing of the fr equency series */
UINT4 length; /**< The number of points in the fre quency series */ UINT4 length; /**< The number of points in the fre quency series */
} }
FrequencySamplingParams; FrequencySamplingParams;
/** \see See \ref CoarseGrainFrequencySeries_h for documetation */ /** \see See \ref CoarseGrainFrequencySeries_h for documetation */
void void
LALSCoarseGrainFrequencySeries(LALStatus *status, LALSCoarseGrainFrequencySeries(LALStatus *status,
REAL4FrequencySeries *output, REAL4FrequencySeries *output,
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 CoherentEstimation.h   CoherentEstimation.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _COHERENTESTIMATION_H #ifndef _COHERENTESTIMATION_H
#define _COHERENTESTIMATION_H #define _COHERENTESTIMATION_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/DetectorSite.h> #include <lal/DetectorSite.h>
#include <lal/SkyCoordinates.h> #include <lal/SkyCoordinates.h>
#include <lal/IIRFilter.h> #include <lal/IIRFilter.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 56 skipping to change at line 51
#define COHERENTESTIMATIONH_MSGEMEM "Memory allocation error" #define COHERENTESTIMATIONH_MSGEMEM "Memory allocation error"
#define COHERENTESTIMATIONH_MSGENULL "NULL pointer" #define COHERENTESTIMATIONH_MSGENULL "NULL pointer"
#define COHERENTESTIMATIONH_MSGE0DEC "invalid DetectorsData structure" #define COHERENTESTIMATIONH_MSGE0DEC "invalid DetectorsData structure"
#define COHERENTESTIMATIONH_MSGEDST "input time series don't all have same start time" #define COHERENTESTIMATIONH_MSGEDST "input time series don't all have same start time"
#define COHERENTESTIMATIONH_MSGEICE "invalid CoherentEstimation structure" #define COHERENTESTIMATIONH_MSGEICE "invalid CoherentEstimation structure"
#define COHERENTESTIMATIONH_MSGENUM "Numerical erorr" #define COHERENTESTIMATIONH_MSGENUM "Numerical erorr"
#define COHERENTESTIMATIONH_MSGEUIMP "Implemented only for 3 detectors" #define COHERENTESTIMATIONH_MSGEUIMP "Implemented only for 3 detectors"
typedef struct tagDetectorsData { typedef struct tagDetectorsData {
SWIGLAL_STRUCT(DetectorsData);
UINT4 Ndetectors; /* number of detectors */ UINT4 Ndetectors; /* number of detectors */
REAL4TimeSeries *data; /* data time series from all detectors */ REAL4TimeSeries *data; /* data time series from all detectors */
} DetectorsData; } DetectorsData;
typedef struct tagCoherentEstimation { typedef struct tagCoherentEstimation {
SWIGLAL_STRUCT(CoherentEstimation);
UINT4 Ndetectors; /* number of detectors */ UINT4 Ndetectors; /* number of detectors */
LALDetector *detectors; /* vector of detectors info */ LALDetector *detectors; /* vector of detectors info */
REAL8IIRFilter **filters; /* vector of pre-processing filters */ REAL8IIRFilter **filters; /* vector of pre-processing filters */
BOOLEAN preProcessed; /* set to 0 to for pre-processing */ BOOLEAN preProcessed; /* set to 0 to for pre-processing */
UINT2 nPreProcessed; /* number of times to apply pre-proc filters */ UINT2 nPreProcessed; /* number of times to apply pre-proc filters */
SkyPosition *position; /* position of source (equatorial celestial coor dinates) */ SkyPosition *position; /* position of source (equatorial celestial coor dinates) */
REAL8 polAngle; /* polarization angle: counter-clockwise angle x -axis makes with a line per- pendicular to meridian of source in Westward d irection (i.e. North of West), in decimal radians. */ REAL8 polAngle; /* polarization angle: counter-clockwise angle x -axis makes with a line per- pendicular to meridian of source in Westward d irection (i.e. North of West), in decimal radians. */
REAL8 plus2cross; /* ratio |s+|/|sx|, non-zero */ REAL8 plus2cross; /* ratio |s+|/|sx|, non-zero */
REAL8 plusDotcross; /* s+ sx / |s+| |sx| */ REAL8 plusDotcross; /* s+ sx / |s+| |sx| */
REAL8 **CMat; /* correlation matrix */ REAL8 **CMat; /* correlation matrix */
} CoherentEstimation; } CoherentEstimation;
void void
LALCoherentEstimation ( LALDoCoherentEstimation (
LALStatus *status, LALStatus *status,
REAL4TimeSeries *output, REAL4TimeSeries *output,
CoherentEstimation *params, CoherentEstimation *params,
DetectorsData *in DetectorsData *in
); );
void void
LALClearCoherentData ( LALClearCoherentData (
LALStatus *status, LALStatus *status,
DetectorsData *dat DetectorsData *dat
 End of changes. 4 change blocks. 
8 lines changed or deleted 1 lines changed or added


 ComplexFFT.h   ComplexFFT.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _COMPLEXFFT_H #ifndef _COMPLEXFFT_H
#define _COMPLEXFFT_H #define _COMPLEXFFT_H
#include <lal/LALStdlib.h>
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
#ifdef __cplusplus
#ifdef __GNUC__
#define RESTRICT __restrict__
#else
#define RESTRICT
#endif
#else
#define RESTRICT restrict
#endif
/** /**
* \addtogroup ComplexFFT_h * \addtogroup ComplexFFT_h
* *
* \brief Performs complex-to-complex FFTs. * \brief Performs complex-to-complex FFTs.
* *
* \heading{Synopsis} * \heading{Synopsis}
* \code * \code
* #include <lal/ComplexFFT.h> * #include <lal/ComplexFFT.h>
* \endcode * \endcode
* *
skipping to change at line 222 skipping to change at line 213
* @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 argument s. * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the argument s.
* - [\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 * RESTRICT output, COMPLEX8Vector * RESTRICT input, int XLALCOMPLEX8VectorFFT( COMPLEX8Vector * restrict output, COMPLEX8Vector * 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 354 skipping to change at line 345
* @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 argument s. * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the argument s.
* - [\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 * RESTRICT output, COMPLEX16Vec tor * RESTRICT input, int XLALCOMPLEX16VectorFFT( COMPLEX16Vector * restrict output, COMPLEX16Vec tor * 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.
skipping to change at line 467 skipping to change at line 458
void void
LALCOMPLEX16VectorFFT ( LALCOMPLEX16VectorFFT (
LALStatus *status, LALStatus *status,
COMPLEX16Vector *output, COMPLEX16Vector *output,
COMPLEX16Vector *input, COMPLEX16Vector *input,
COMPLEX16FFTPlan *plan COMPLEX16FFTPlan *plan
); );
/*@}*/ /*@}*/
#undef RESTRICT
#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 /* _COMPLEXFFT_H */ #endif /* _COMPLEXFFT_H */
 End of changes. 5 change blocks. 
14 lines changed or deleted 3 lines changed or added


 ConfigFile.h   ConfigFile.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _CONFIGFILE_H /* Double-include protection. */ #ifndef _CONFIGFILE_H /* Double-include protection. */
#define _CONFIGFILE_H #define _CONFIGFILE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/StringInput.h> #include <lal/StringInput.h>
/* C++ protection. */ /* C++ protection. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \addtogroup ConfigFile_h /** \addtogroup ConfigFile_h
* \author Reinhard Prix * \author Reinhard Prix
skipping to change at line 127 skipping to change at line 122
} ConfigStrictness; } ConfigStrictness;
/** This structure defines a config-variable to be read in using the /** This structure defines a config-variable to be read in using the
* general-purpose reading function LALReadConfigVariable(). */ * general-purpose reading function LALReadConfigVariable(). */
#ifdef SWIG /* SWIG interface directives */ #ifdef SWIG /* SWIG interface directives */
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::secName; %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::secName;
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::varName; %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::varName;
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::fmt; %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALConfigVar::fmt;
#endif /* SWIG */ #endif /* SWIG */
typedef struct tagLALConfigVar { typedef struct tagLALConfigVar {
SWIGLAL_STRUCT(LALConfigVar);
const CHAR *secName; /**< Section name within which to find varN ame. May be NULL */ const CHAR *secName; /**< Section name within which to find varN ame. May be NULL */
const CHAR *varName; /**< Variable-name to be read in the config- file */ const CHAR *varName; /**< Variable-name to be read in the config- file */
const CHAR *fmt; /**< Format string for reading (<tt>sscanf() </tt>-style) */ const CHAR *fmt; /**< Format string for reading (<tt>sscanf() </tt>-style) */
ConfigStrictness strictness; /**< what to do if variable not found: ignor e, warn, error */ ConfigStrictness strictness; /**< what to do if variable not found: ignor e, warn, error */
} LALConfigVar; } LALConfigVar;
/** This structure is returned by LALParseDataFile() and holds the contents of an /** This structure is returned by LALParseDataFile() and holds the contents of an
* ASCII data-file in a pre-parsed form, namely stripped from all comments ('\#', ';'), * ASCII data-file in a pre-parsed form, namely stripped from all comments ('\#', ';'),
* spurious whitespaces, and separated into lines (taking into account line -continuation * spurious whitespaces, and separated into lines (taking into account line -continuation
* by '\\' at the end of lines). * by '\\' at the end of lines).
* 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);
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);
void XLALDestroyParsedDataFile (LALParsedDataFile *cfgdata); void XLALDestroyParsedDataFile (LALParsedDataFile *cfgdata);
int XLALConfigSectionExists(const LALParsedDataFile *, const CHAR *); int XLALConfigSectionExists(const LALParsedDataFile *, const CHAR *);
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 Date.h   Date.h 
skipping to change at line 24 skipping to change at line 24
* *
* 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
*/ */
#ifndef _DATE_H #ifndef _DATE_H
#define _DATE_H #define _DATE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
/* the following two preprocessor defines are to include the prototypes for /* the following two preprocessor defines are to include the prototypes for
* gmtime_r() and asctime_r() from /usr/include/time.h * gmtime_r() and asctime_r() from /usr/include/time.h
* HOWEVER, they do no good if -ansi is used in gcc: warnings are generated * HOWEVER, they do no good if -ansi is used in gcc: warnings are generated
* that the prototypes have not been seen */ * that the prototypes have not been seen */
/* HP-UX and Solaris */ /* HP-UX and Solaris */
#ifndef _REENTRANT #ifndef _REENTRANT
# define _REENTRANT # define _REENTRANT
#endif #endif
skipping to change at line 123 skipping to change at line 118
#define XLAL_MJD_REF 2400000.5 /**< Reference Julia n Day for Mean Julian Day. */ #define XLAL_MJD_REF 2400000.5 /**< Reference Julia n Day for 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.
*/ */
typedef struct typedef struct
tagLALPlaceAndGPS tagLALPlaceAndGPS
{ {
SWIGLAL_STRUCT(LALPlaceAndGPS);
LALDetector *p_detector; /**< pointer to a detector */ 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;
/*@}*/ /*@}*/
/* ---------- Function prototypes : see respective source.c files for doxyg en documentation ---------- */ /* ---------- Function prototypes : see respective source.c files for doxyg en documentation ---------- */
/* Converts GPS time to nano seconds stored as an INT8. */ /* Converts GPS time to nano seconds stored as an INT8. */
skipping to change at line 148 skipping to change at line 142
/* Sets GPS time given GPS integer seconds and residual nanoseconds. */ /* Sets GPS time given GPS integer seconds and residual nanoseconds. */
LIGOTimeGPS * XLALGPSSet( LIGOTimeGPS *epoch, INT4 gpssec, INT8 gpsnan ); LIGOTimeGPS * XLALGPSSet( LIGOTimeGPS *epoch, INT4 gpssec, INT8 gpsnan );
/* Sets GPS time given GPS seconds as a REAL8. */ /* Sets GPS time given GPS seconds as a REAL8. */
LIGOTimeGPS * XLALGPSSetREAL8( LIGOTimeGPS *epoch, REAL8 t ); LIGOTimeGPS * XLALGPSSetREAL8( LIGOTimeGPS *epoch, REAL8 t );
/* Returns GPS time as a REAL8. */ /* Returns GPS time as a REAL8. */
REAL8 XLALGPSGetREAL8( const LIGOTimeGPS *epoch ); REAL8 XLALGPSGetREAL8( const LIGOTimeGPS *epoch );
/** Breaks the GPS time into REAL8 integral and fractional parts,
* each of which has the same sign as the epoch. Returns the
* fractional part, and stores the integral part (as a REAL8)
* in the object pointed to by iptr. Like the standard C math
* library function modf(). */
REAL8 XLALGPSModf( REAL8 *iptr, const LIGOTimeGPS *epoch );
/* Adds dt to a GPS time. */ /* Adds dt to a GPS time. */
LIGOTimeGPS * XLALGPSAdd( LIGOTimeGPS *epoch, REAL8 dt ); LIGOTimeGPS * XLALGPSAdd( LIGOTimeGPS *epoch, REAL8 dt );
/* Adds two GPS times. */ /* Adds two GPS times. */
LIGOTimeGPS * XLALGPSAddGPS( LIGOTimeGPS *epoch, const LIGOTimeGPS *dt ); LIGOTimeGPS * XLALGPSAddGPS( LIGOTimeGPS *epoch, const LIGOTimeGPS *dt );
/* Difference between two GPS times. */ /* Difference between two GPS times. */
REAL8 XLALGPSDiff( const LIGOTimeGPS *t1, const LIGOTimeGPS *t0 ); REAL8 XLALGPSDiff( const LIGOTimeGPS *t1, const LIGOTimeGPS *t0 );
/* Compares two GPS times. */ /* Compares two GPS times. */
skipping to change at line 178 skipping to change at line 179
/* Returns the leap seconds GPS-UTC at a given GPS second. */ /* Returns the leap seconds GPS-UTC at a given GPS second. */
int XLALGPSLeapSeconds( INT4 gpssec ); int XLALGPSLeapSeconds( INT4 gpssec );
/* Returns the leap seconds TAI-UTC for a given UTC broken down time. */ /* Returns the leap seconds TAI-UTC for a given UTC broken down time. */
int XLALLeapSecondsUTC( const struct tm *utc ); int XLALLeapSecondsUTC( const struct tm *utc );
/* Returns the GPS seconds since the GPS epoch for a specified UTC time str ucture. */ /* Returns the GPS seconds since the GPS epoch for a specified UTC time str ucture. */
INT4 XLALUTCToGPS( const struct tm *utc ); INT4 XLALUTCToGPS( const struct tm *utc );
#ifdef SWIG // SWIG interface directives
SWIGLAL(EMPTY_ARGUMENT(struct tm*, utc));
SWIGLAL(RETURN_VALUE(struct tm*, XLALGPSToUTC));
#endif
/* Returns a pointer to a tm structure representing the time /* Returns a pointer to a tm structure representing the time
* specified in seconds since the GPS epoch. */ * specified in seconds since the GPS epoch. */
struct tm * XLALGPSToUTC( struct tm * XLALGPSToUTC(
struct tm *utc, struct tm *utc,
INT4 gpssec INT4 gpssec
); );
#ifdef SWIG // SWIG interface directives
SWIGLAL_CLEAR(EMPTY_ARGUMENT(struct tm*, utc));
#endif
/* Returns the Julian Day (JD) corresponding to the date given in a broken /* Returns the Julian Day (JD) corresponding to the date given in a broken
* down time structure. */ * down time structure. */
REAL8 XLALJulianDay( const struct tm *utc); REAL8 XLALJulianDay( const struct tm *utc);
/* Returns the Modified Julian Day (MJD) corresponding to the date given in a broken down time structure.*/ /* Returns the Modified Julian Day (MJD) corresponding to the date given in a broken down time structure.*/
INT4 XLALModifiedJulianDay( const struct tm *utc ); INT4 XLALModifiedJulianDay( const struct tm *utc );
/* Fill in missing fields of a C 'tm' broken-down time struct. */ /* Fill in missing fields of a C 'tm' broken-down time struct. */
int XLALFillBrokenDownTime(struct tm *tm); int XLALFillBrokenDownTime(struct tm *tm);
skipping to change at line 222 skipping to change at line 232
/* Returns the GPS time for the given Greenwich sidereal time (in radians). */ /* Returns the GPS time for the given Greenwich sidereal time (in radians). */
LIGOTimeGPS *XLALGreenwichSiderealTimeToGPS( LIGOTimeGPS *XLALGreenwichSiderealTimeToGPS(
REAL8 gmst, REAL8 gmst,
REAL8 equation_of_equinoxes, REAL8 equation_of_equinoxes,
LIGOTimeGPS *gps LIGOTimeGPS *gps
); );
int XLALStrToGPS(LIGOTimeGPS *t, const char *nptr, char **endptr); int XLALStrToGPS(LIGOTimeGPS *t, const char *nptr, char **endptr);
char *XLALGPSToStr(char *, const LIGOTimeGPS *t); char *XLALGPSToStr(char *, const LIGOTimeGPS *t);
#ifdef SWIG // SWIG interface directives
SWIGLAL(NEW_EMPTY_ARGUMENT(LIGOTimeGPS*, gpstime));
SWIGLAL(RETURN_VALUE(LIGOTimeGPS*, XLALGPSTimeNow));
#endif
/* This function returns the current GPS time according to the system clock */ /* This function returns the current GPS time according to the system clock */
LIGOTimeGPS * LIGOTimeGPS *
XLALGPSTimeNow ( XLALGPSTimeNow (
LIGOTimeGPS *gpstime LIGOTimeGPS *gpstime
); );
#ifdef SWIG // SWIG interface directives
SWIGLAL_CLEAR(NEW_EMPTY_ARGUMENT(LIGOTimeGPS*, gpstime));
#endif
int int
XLALINT8NanoSecIsPlayground ( XLALINT8NanoSecIsPlayground (
INT8 ns INT8 ns
); );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _DATE_H */ #endif /* _DATE_H */
 End of changes. 7 change blocks. 
6 lines changed or deleted 25 lines changed or added


 DetResponse.h   DetResponse.h 
/* /*
* Copyright (C) 2007 David Chin, Jolien Creighton, Kipp Cannon, Teviet Cre ighton * Copyright (C) 2007 David Chin, Jolien Creighton, Kipp Cannon, Teviet Cre ighton
* Copyright (C) 2012 Matthew Pitkin
* *
* 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.
* *
* 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
*/ */
#ifndef _DETRESPONSE_H #ifndef _DETRESPONSE_H
#define _DETRESPONSE_H #define _DETRESPONSE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALStdio.h> #include <lal/LALStdio.h>
#include <lal/LALConstants.h> #include <lal/LALConstants.h>
#include <lal/DetectorSite.h> #include <lal/DetectorSite.h>
#include <lal/SkyCoordinates.h> #include <lal/SkyCoordinates.h>
#include <lal/Date.h> #include <lal/Date.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
skipping to change at line 106 skipping to change at line 102
* source's meridian and extending westwards. For a source in the Northern * source's meridian and extending westwards. For a source in the Northern
* celestial hemisphere, and an observer in the Northern hemisphere standin g * celestial hemisphere, and an observer in the Northern hemisphere standin g
* such that they are facing South, this angle is measured counter-clockwis e * such that they are facing South, this angle is measured counter-clockwis e
* from a 3 o'clock position (pointing West) at the source. The polarizati on * from a 3 o'clock position (pointing West) at the source. The polarizati on
* convention is chosen such that if the source orientation were zero, the * convention is chosen such that if the source orientation were zero, the
* source would be a pure \f$+\f$-polarized source. * source would be a pure \f$+\f$-polarized source.
*/ */
typedef struct typedef struct
tagLALSource tagLALSource
{ {
SWIGLAL_STRUCT(LALSource);
CHAR name[LALNameLength]; /**< name of source, eg catalog number */ CHAR name[LALNameLength]; /**< name of source, eg catalog number */
SkyPosition equatorialCoords; /**< equatorial coordinates of source, in decimal RADIANS */ SkyPosition equatorialCoords; /**< equatorial coordinates of source, in decimal RADIANS */
REAL8 orientation; /**< Orientation angle (\f$\psi\f$) of source: REAL8 orientation; /**< Orientation angle (\f$\psi\f$) of source:
* counter-clockwise angle \f$x\f$-axi s makes with a line perpendicular to * counter-clockwise angle \f$x\f$-axi s makes with a line perpendicular to
* meridian of source in Westward dire ction (i.e. North of West), * meridian of source in Westward dire ction (i.e. North of West),
* in decimal radians. * in decimal radians.
*/ */
} }
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().
*/ */
typedef struct typedef struct
tagLALDetAndSource tagLALDetAndSource
{ {
SWIGLAL_STRUCT(LALDetAndSource);
LALDetector *pDetector; /**< Pointer to ::LALDetector object contain ing information about the detector */ LALDetector *pDetector; /**< Pointer to ::LALDetector object contain ing 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
* one source at one instance in time. * one source at one instance in time.
*/ */
typedef struct typedef struct
tagLALDetAMResponse tagLALDetAMResponse
{ {
SWIGLAL_STRUCT(LALDetAMResponse);
REAL4 plus; /**< Detector response to \f$+\f$-polarized gravitational ra diation */ REAL4 plus; /**< Detector response to \f$+\f$-polarized gravitational ra diation */
REAL4 cross; /**< Detector response to \f$\times\f$-polarized gravitation al radiation */ REAL4 cross; /**< Detector response to \f$\times\f$-polarized gravitation al radiation */
REAL4 scalar; /**< Detector response to scalar gravitational radia tion (NB: ignored at present -- scalar response computation not yet impleme nted) */ REAL4 scalar; /**< Detector response to scalar gravitational radia tion (NB: ignored at present -- scalar response computation not yet impleme nted) */
} }
LALDetAMResponse; LALDetAMResponse;
/** This structure aggregates together three ::REAL4TimeSeries objects cont aining /** This structure aggregates together three ::REAL4TimeSeries objects cont aining
* time series of detector AM response. * time series of detector AM response.
*/ */
typedef struct typedef struct
tagLALDetAMResponseSeries tagLALDetAMResponseSeries
{ {
SWIGLAL_STRUCT(LALDetAMResponseSeries);
REAL4TimeSeries *pPlus; /**< timeseries of detector response to \f$+ \f$-polarized gravitational radiation */ REAL4TimeSeries *pPlus; /**< timeseries of detector response to \f$+ \f$-polarized gravitational radiation */
REAL4TimeSeries *pCross; /**< timeseries of detector response to \f$\ times\f$-polarized gravitational radiation */ REAL4TimeSeries *pCross; /**< timeseries of detector response to \f$\ times\f$-polarized gravitational radiation */
REAL4TimeSeries *pScalar; /**< timeseries of detector response to scal ar gravitational radiation (NB: not yet implemented.) */ REAL4TimeSeries *pScalar; /**< timeseries of detector response to scal ar gravitational radiation (NB: not yet implemented.) */
} }
LALDetAMResponseSeries; LALDetAMResponseSeries;
/** This structure encapsulates time and sampling information for computing a /** This structure encapsulates time and sampling information for computing a
* ::LALDetAMResponseSeries. Its fields correspond to some fields of the * ::LALDetAMResponseSeries. Its fields correspond to some fields of the
* TimeSeries structures for easy conversion. * TimeSeries structures for easy conversion.
*/ */
typedef struct typedef struct
tagLALTimeIntervalAndNSample tagLALTimeIntervalAndNSample
{ {
SWIGLAL_STRUCT(LALTimeIntervalAndNSample);
LIGOTimeGPS epoch; /**< The start time \f$t_0\f$ of the time se ries */ LIGOTimeGPS epoch; /**< The start time \f$t_0\f$ of the time se ries */
REAL8 deltaT; /**< The sampling interval \f$\Delta t\f$, i n seconds */ REAL8 deltaT; /**< The sampling interval \f$\Delta t\f$, i n seconds */
UINT4 nSample; /**< The total number of samples to be compu ted */ UINT4 nSample; /**< The total number of samples to be compu ted */
} }
LALTimeIntervalAndNSample; LALTimeIntervalAndNSample;
/* /*
* Function prototypes * Function prototypes
*/ */
skipping to change at line 192 skipping to change at line 183
void XLALComputeDetAMResponse( void XLALComputeDetAMResponse(
double *fplus, double *fplus,
double *fcross, double *fcross,
REAL4 D[3][3], REAL4 D[3][3],
const double ra, const double ra,
const double dec, const double dec,
const double psi, const double psi,
const double gmst const double gmst
); );
void XLALComputeDetAMResponseExtraModes(
double *fplus,
double *fcross,
double *fb,
double *fl,
double *fx,
double *fy,
REAL4 D[3][3],
const double ra,
const double dec,
const double psi,
const double gmst
);
/* /*
* Gives a time series of the detector's response to plus and cross * Gives a time series of the detector's response to plus and cross
* polarization * polarization
*/ */
void void
LALComputeDetAMResponseSeries( LALStatus *status, LALComputeDetAMResponseSeries( LALStatus *status,
LALDetAMResponseSeries *pResponseSer ies, LALDetAMResponseSeries *pResponseSer ies,
const LALDetAndSource *pDetAndSourc e, const LALDetAndSource *pDetAndSourc e,
const LALTimeIntervalAndNSample *pTimeInfo); const LALTimeIntervalAndNSample *pTimeInfo);
skipping to change at line 214 skipping to change at line 219
REAL4TimeSeries **fcross, REAL4TimeSeries **fcross,
REAL4 D[3][3], REAL4 D[3][3],
const double ra, const double ra,
const double dec, const double dec,
const double psi, const double psi,
const LIGOTimeGPS *start, const LIGOTimeGPS *start,
const double deltaT, const double deltaT,
const int n const int n
); );
int XLALComputeDetAMResponseExtraModesSeries(
REAL4TimeSeries **fplus,
REAL4TimeSeries **fcross,
REAL4TimeSeries **fb,
REAL4TimeSeries **fl,
REAL4TimeSeries **fx,
REAL4TimeSeries **fy,
REAL4 D[3][3],
const double ra,
const double dec,
const double psi,
const LIGOTimeGPS *start,
const double deltaT,
const int n
);
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* !defined _DETRESPONSE_H */ #endif /* !defined _DETRESPONSE_H */
 End of changes. 9 change blocks. 
10 lines changed or deleted 31 lines changed or added


 Dirichlet.h   Dirichlet.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _DIRICHLET_H #ifndef _DIRICHLET_H
#define _DIRICHLET_H #define _DIRICHLET_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup Dirichlet_h \addtogroup Dirichlet_h
\author UTB Relativity Group; contact whelan@phys.utb.edu \author UTB Relativity Group; contact whelan@phys.utb.edu
skipping to change at line 73 skipping to change at line 68
#define DIRICHLETH_MSGENVALUE "Dirichlet parameter N less than or equal to zero" #define DIRICHLETH_MSGENVALUE "Dirichlet parameter N less than or equal to zero"
#define DIRICHLETH_MSGESIZE "Length parameter less than or equal to ze ro" #define DIRICHLETH_MSGESIZE "Length parameter less than or equal to ze ro"
#define DIRICHLETH_MSGEDELTAX "Spacing of x values less than or equal to zero" #define DIRICHLETH_MSGEDELTAX "Spacing of x values less than or equal to zero"
#define DIRICHLETH_MSGENULLPOUT "Null pointer to ouput vector" #define DIRICHLETH_MSGENULLPOUT "Null pointer to ouput vector"
#define DIRICHLETH_MSGESIZEMM "Length of data member of output vector do es not equal length specified in input parameters" #define DIRICHLETH_MSGESIZEMM "Length of data member of output vector do es not equal length specified in input parameters"
#define DIRICHLETH_MSGENULLPDOUT "Null pointer to data member of output vec tor" #define DIRICHLETH_MSGENULLPDOUT "Null pointer to data member of output vec tor"
/** \endcond */ /** \endcond */
/** Contains parameters that specify the Dirichlet kernel \f$\mathcal{D}_N( x)\f$ */ /** Contains parameters that specify the Dirichlet kernel \f$\mathcal{D}_N( x)\f$ */
typedef struct tagDirichletParameters{ typedef struct tagDirichletParameters{
SWIGLAL_STRUCT(DirichletParameters);
UINT4 n; /**< Dirichlet parameter \f$N\f$ */ UINT4 n; /**< Dirichlet parameter \f$N\f$ */
UINT4 length; /**< Specified length of output vector */ UINT4 length; /**< Specified length of output vector */
REAL8 deltaX; /**< Spacing of \f$x\f$ values */ REAL8 deltaX; /**< Spacing of \f$x\f$ values */
} DirichletParameters; } DirichletParameters;
void void
LALDirichlet(LALStatus*, LALDirichlet(LALStatus*,
REAL4Vector*, REAL4Vector*,
const DirichletParameters*); const DirichletParameters*);
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 EllipsoidOverlapTools.h   EllipsoidOverlapTools.h 
skipping to change at line 37 skipping to change at line 37
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
#if 0 #if 0
Author: Robinson, C. A. and Sengupta, A. S. Author: Robinson, C. A. and Sengupta, A. S.
#endif #endif
#ifndef _ELLIPSOIDOVERLAPTOOLS_H #ifndef _ELLIPSOIDOVERLAPTOOLS_H
#define _ELLIPSOIDOVERLAPTOOLS_H #define _ELLIPSOIDOVERLAPTOOLS_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <math.h> #include <math.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALGSL.h> #include <lal/LALGSL.h>
#include <lal/LALError.h> #include <lal/LALError.h>
#include <gsl/gsl_errno.h> #include <gsl/gsl_errno.h>
#include <gsl/gsl_math.h> #include <gsl/gsl_math.h>
#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
typedef struct tagfContactWorkSpace typedef struct tagfContactWorkSpace
{ {
SWIGLAL_STRUCT(fContactWorkSpace);
/* 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;
/* Parameters for minimizing the contact function */ /* Parameters for minimizing the contact function */
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 FileIO.h   FileIO.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _FILEIO_H #ifndef _FILEIO_H
#define _FILEIO_H #define _FILEIO_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <lal/LALStdio.h> #include <lal/LALStdio.h>
/* maximum string size to print with LAL Printf routines */ /* maximum string size to print with LAL Printf routines */
#define LAL_PRINTF_BUFSIZE 4096 #define LAL_PRINTF_BUFSIZE 4096
skipping to change at line 58 skipping to change at line 53
\endcode \endcode
Only use \ref FileIO.h in test code that links to the \c lalsupport libr ary. Only use \ref FileIO.h in test code that links to the \c lalsupport libr ary.
*/ */
/*@{*/ /*@{*/
FILE * FILE *
LALOpenDataFile( const char * ); LALOpenDataFile( const char * );
typedef struct tagLALFILE { typedef struct tagLALFILE {
SWIGLAL_STRUCT(LALFILE);
int compression; int compression;
void *fp; void *fp;
} LALFILE; } LALFILE;
LALFILE *lalstdin(void); LALFILE *lalstdin(void);
LALFILE *lalstdout(void); LALFILE *lalstdout(void);
LALFILE *lalstderr(void); LALFILE *lalstderr(void);
#define LALSTDIN (lalstdin()) #define LALSTDIN (lalstdin())
#define LALSTDOUT (lalstdout()) #define LALSTDOUT (lalstdout())
#define LALSTDERR (lalstderr()) #define LALSTDERR (lalstderr())
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 FindRoot.h   FindRoot.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _FINDROOT_H #ifndef _FINDROOT_H
#define _FINDROOT_H #define _FINDROOT_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup FindRoot_h \addtogroup FindRoot_h
\brief Root finding routines. \brief Root finding routines.
skipping to change at line 119 skipping to change at line 114
#define FINDROOTH_MSGEIDOM "Invalid initial domain" #define FINDROOTH_MSGEIDOM "Invalid initial domain"
#define FINDROOTH_MSGEMXIT "Maximum iterations exceeded" #define FINDROOTH_MSGEMXIT "Maximum iterations exceeded"
#define FINDROOTH_MSGEBRKT "Root not bracketed" #define FINDROOTH_MSGEBRKT "Root not bracketed"
/** \endcond */ /** \endcond */
/** These are function pointers to functions that map REAL4 numbers to REAL 4 numbers. /** These are function pointers to functions that map REAL4 numbers to REAL 4 numbers.
*/ */
typedef struct typedef struct
tagSFindRootIn tagSFindRootIn
{ {
SWIGLAL_STRUCT(SFindRootIn);
void (*function)(LALStatus *s, REAL4 *y, REAL4 x, void *p); /**< The fun ction to find the root of */ void (*function)(LALStatus *s, REAL4 *y, REAL4 x, void *p); /**< The fun ction to find the root of */
REAL4 xmax; /**< The maximum value of the domain interval to look for th e root */ REAL4 xmax; /**< The maximum value of the domain interval to look for th e root */
REAL4 xmin; /**< The minimum value of the domain interval to look for th e root */ REAL4 xmin; /**< The minimum value of the domain interval to look for th e root */
REAL4 xacc; /**< The accuracy desired for the root */ REAL4 xacc; /**< The accuracy desired for the root */
} }
SFindRootIn; SFindRootIn;
/** These are function pointers to functions that map REAL8 numbers to REAL 8 numbers. /** These are function pointers to functions that map REAL8 numbers to REAL 8 numbers.
*/ */
typedef struct typedef struct
tagDFindRootIn tagDFindRootIn
{ {
SWIGLAL_STRUCT(DFindRootIn);
void (*function)(LALStatus *s, REAL8 *y, REAL8 x, void *p); /**< The fun ction to find the root of */ void (*function)(LALStatus *s, REAL8 *y, REAL8 x, void *p); /**< The fun ction to find the root of */
REAL8 xmax; /**< The maximum value of the domain interval to look for th e root */ REAL8 xmax; /**< The maximum value of the domain interval to look for th e root */
REAL8 xmin; /**< The minimum value of the domain interval to look for th e root */ REAL8 xmin; /**< The minimum value of the domain interval to look for th e root */
REAL8 xacc; /**< The accuracy desired for the root */ REAL8 xacc; /**< The accuracy desired for the root */
} }
DFindRootIn; DFindRootIn;
/* ----- FindRoot.c ----- */ /* ----- FindRoot.c ----- */
void void
LALSBracketRoot ( LALSBracketRoot (
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 FlatLatticeTiling.h   FlatLatticeTiling.h 
/* //
* Copyright (C) 2007, 2008 Karl Wette // Copyright (C) 2007, 2008, 2012 Karl Wette
* //
* 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.
* //
* 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
*/ //
/** ///
* \author Karl Wette /// \addtogroup FlatLatticeTiling_h
* \ingroup pulsarTODO /// \author Karl Wette
* \brief Lattice-based template generation for flat metric parameter space /// \brief Lattice-based template generation for flat metric parameter spac
s es
*/ ///
/// @{
#ifndef _FLATLATTICETILING_H #ifndef _FLATLATTICETILING_H
#define _FLATLATTICETILING_H #define _FLATLATTICETILING_H
/* remove SWIG interface directives */ #include <stdbool.h>
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <gsl/gsl_vector.h> #include <gsl/gsl_vector.h>
#include <gsl/gsl_matrix.h> #include <gsl/gsl_matrix.h>
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/Random.h> #include <lal/Random.h>
#include <lal/GSLSupport.h> #include <lal/GSLSupport.h>
#if defined(__cplusplus) #ifdef __cplusplus
extern "C" { extern "C" {
#elif 0
} /* so that editors will match preceding brace */
#endif #endif
/** ///
* Flat lattice tiling bound /// Flat lattice tiling bound function
*/ ///
typedef BOOLEAN (*FlatLatticeTilingBoundFunc)( typedef void (*FlatLatticeBound)(
void *data, /**< Arbit const size_t dimension, ///< [in] Dimension on which bound applies
rary data describing parameter space */ const gsl_vector_uint* bound, ///< [in] Indices of current bounds
INT4 dimension, /**< Dimen const gsl_vector* point, ///< [in] Point on which to find bounds
sion on which bound applies */ const void* data, ///< [in] Arbitrary data describing paramete
gsl_vector *point, /**< Point r space
on which to find bounds */ gsl_vector* lower, ///< [out] Lower bounds on point in dimensio
REAL8 *lower, /**< Lower n
bound on point in dimension */ gsl_vector* upper ///< [out] Upper bounds on point in dimensio
REAL8 *upper /**< Upper n
bound on point in dimension */ );
);
typedef void (*FlatLatticeTilingBoundFree)( ///
void *data /**< Arbitrary data d /// Flat tiling lattice generator function
escribing parameter space */ ///
); typedef int (*FlatLatticeGenerator)(
typedef struct tagFlatLatticeTilingBound FlatLatticeTilingBound; const size_t dimensions, ///< [in] Number of dimensions
gsl_matrix** generator, ///< [out] Generator matrix
/** double* norm_thickness ///< [out] Normalised thickness
* Flat lattice tiling subspace );
*/
typedef struct tagFlatLatticeTilingSubspace FlatLatticeTilingSubspace; ///
/// Flat lattice tiling state structure
/** ///
* Flat tiling lattice generator typedef struct tagFlatLatticeTiling FlatLatticeTiling;
*/
typedef int (*FlatTilingLatticeGenerator)( ///
INT4 dimensions, /**< Numb /// Create a new flat lattice tiling state structure
er of dimensions */ ///
gsl_matrix** generator, /**< Gene FlatLatticeTiling* XLALCreateFlatLatticeTiling(
rator matrix */ const size_t dimensions ///< [in] Number of parameter space dimensio
REAL8* norm_thickness /**< Norm ns
alised thickness */ );
);
///
/** /// Destroy a flat lattice tiling state structure
* Flat lattice tiling state/input structure ///
*/ void XLALDestroyFlatLatticeTiling(
typedef struct tagFlatLatticeTiling { FlatLatticeTiling* tiling ///< [in] Tiling state
SWIGLAL_STRUCT(FlatLatticeTiling); );
/* Dimension of the parameter space */ ///
INT4 dimensions; /// Return the number of dimensions being tiled
///
/* Parameter space bounds */ size_t XLALGetFlatLatticeDimensions(
INT4 num_bounds; FlatLatticeTiling* tiling ///< [in] Tiling state
FlatLatticeTilingBound **bounds; );
gsl_vector_int *bound_map;
gsl_vector *bound_point; ///
/// Return the current number of flat lattice tiling parameter space points
/* Metric of the parameter space in normalised coordinates */ ///
gsl_matrix *metric; unsigned long XLALGetFlatLatticePointCount(
FlatLatticeTiling* tiling ///< [in] Tiling state
/* Normalised to real parameter coordinates scaling and offset */ );
gsl_vector *real_scale;
gsl_vector *real_offset; ///
/// Add a parameter space bound to the flat lattice tiling
/* Maximum metric mismatch between the templates */ ///
REAL8 max_mismatch; int XLALSetFlatLatticeBound(
FlatLatticeTiling* tiling, ///< [in] Tiling state
/* Flat tiling lattice generator */ const size_t dimension, ///< [in] Dimension on which bound a
FlatTilingLatticeGenerator generator; pplies
const bool singular, ///< [in] Is bound composed of singl
/* Cache of generated tiling subspaces */ e points?
INT4 num_subspaces; const FlatLatticeBound func, ///< [in] Parameter space bound func
FlatLatticeTilingSubspace **subspaces; tion
void* data ///< [in] Arbitrary data describing
/* Scaling of the padding of bounds (for testing) */ parameter space
REAL8 scale_padding; );
/* Current dimensions which are tiled (non-flat) */ ///
UINT8 curr_is_tiled; /// Set the flat tiling lattice generator
///
/* Current tiling subspace */ int XLALSetFlatLatticeGenerator(
FlatLatticeTilingSubspace *curr_subspace; FlatLatticeTiling* tiling, ///< [in] Tiling state
const FlatLatticeGenerator generator ///< [in] Lattice generator function
/* Current lattice point */ );
gsl_vector *curr_point;
///
/* Bounds on current point */ /// Set the flat lattice tiling metric and maximum mismatch
gsl_vector *curr_lower; ///
gsl_vector *curr_upper; int XLALSetFlatLatticeMetric(
FlatLatticeTiling* tiling, ///< [in] Tiling state
/* Current template */ const gsl_matrix* metric, ///< [in] Parameter space metric
gsl_vector *current; const double max_mismatch ///< [in] Maximum prescribed mismatc
h
/* Total number of points generated so far */ );
UINT4 count;
#ifdef SWIG // SWIG interface directives
/* State of the tiling */ SWIGLAL(NO_NEW_OBJECT(XLALNextFlatLatticePoint));
int state; #endif
///
} FlatLatticeTiling; /// Return the next point in the flat lattice tiling parameter space
///
/** gsl_vector* XLALNextFlatLatticePoint(
* Core functions FlatLatticeTiling* tiling ///< [in] Tiling state
*/ );
FlatLatticeTiling* XLALCreateFlatLatticeTiling(INT4);
void XLALFreeFlatLatticeTiling(FlatLatticeTiling*); ///
int XLALAddFlatLatticeTilingBound(FlatLatticeTiling*, UINT8, FlatLatticeTil /// Return to the beginning of a flat lattice tiling
ingBoundFunc, void*, FlatLatticeTilingBoundFree); ///
int XLALSetFlatLatticeTilingMetric(FlatLatticeTiling*, gsl_matrix*, REAL8, int XLALRestartFlatLatticeTiling(
gsl_vector*); FlatLatticeTiling* tiling ///< [in] Tiling state
int XLALSetFlatTilingLattice(FlatLatticeTiling*, FlatTilingLatticeGenerator );
);
int XLALNextFlatLatticePoint(FlatLatticeTiling*); ///
UINT4 XLALTotalFlatLatticePointCount(FlatLatticeTiling*); /// Calculate the total number of flat lattice tiling parameter space point
int XLALRandomPointInFlatLatticeParamSpace(FlatLatticeTiling*, RandomParams s
*, gsl_vector*, gsl_vector*, REAL8*); ///
unsigned long XLALCountTotalFlatLatticePoints(
/** FlatLatticeTiling* tiling ///< [in] Tiling state
* Support functions );
*/
gsl_matrix* XLALMetricEllipsePrincipalAxes(gsl_matrix*, REAL8); #ifdef SWIG // SWIG interface directives
gsl_vector* XLALMetricEllipseBoundingBox(gsl_matrix*, REAL8); SWIGLAL(FUNCTION_POINTER(XLALCubicLatticeGenerator));
int XLALOrthonormaliseWRTMetric(gsl_matrix*, gsl_matrix*); #endif
gsl_matrix* XLALSquareLowerTriangularLatticeGenerator(gsl_matrix*); ///
int XLALNormaliseLatticeGenerator(gsl_matrix*, REAL8, REAL8); /// Calculate the generator matrix for a cubic (\f$Z_n\f$) lattice
///
/** int XLALCubicLatticeGenerator(
* Specific lattices and parameter spaces const size_t dimensions, ///< [in] Number of dimensions
*/ gsl_matrix** generator, ///< [out] Generator matrix
int XLALSetFlatTilingCubicLattice(FlatLatticeTiling*); double* norm_thickness ///< [out] Normalised thickness
int XLALSetFlatTilingAnstarLattice(FlatLatticeTiling*); );
int XLALAddFlatLatticeTilingConstantBound(FlatLatticeTiling*, INT4, REAL8,
REAL8); #ifdef SWIG // SWIG interface directives
SWIGLAL(FUNCTION_POINTER(XLALAnstarLatticeGenerator));
#if 0 #endif
{ /* so that editors will match succeeding brace */ ///
#elif defined(__cplusplus) /// Calculate the generator matrix for a \f$A_n^*\f$ lattice
///
int XLALAnstarLatticeGenerator(
const size_t dimensions, ///< [in] Number of dimensions
gsl_matrix** generator, ///< [out] Generator matrix
double* norm_thickness ///< [out] Normalised thickness
);
///
/// Add a constant parameter space bound, given by the minimum and
/// maximum of the two supplied bounds, to the flat lattice tiling
///
int XLALSetFlatLatticeConstantBound(
FlatLatticeTiling* tiling, ///< [in] Tiling state
const size_t dimension, ///< [in] Dimension on which bound applies
const double bound1, ///< [in] First bound on dimension
const double bound2 ///< [in] Second bound on dimension
);
///
/// Find the bounding box of the mismatch ellipses of a metric
///
gsl_vector* XLALMetricEllipseBoundingBox(
gsl_matrix* metric, ///< [in] Metric to bound
const double max_mismatch ///< [in] Maximum mismatch with respect to m
etric
);
///
/// Orthonormalise the columns of a matrix with respect to a metric (matrix
is lower triangular)
///
int XLALOrthonormaliseWRTMetric(
gsl_matrix* matrix, ///< [in] Matrix of columns to orthonormalis
e
const gsl_matrix* metric ///< [in] Metric to orthonormalise with resp
ect to
);
///
/// Transform a lattice generator to a square lower triangular form
///
gsl_matrix* XLALSquareLowerTriangularLatticeGenerator(
gsl_matrix* generator ///< [in] Generator matrix of lattic
e
);
///
/// Normalise a lattice generator matrix to have a specified covering radiu
s
///
int XLALNormaliseLatticeGenerator(
gsl_matrix* generator, ///< [in] Generator matrix of lattice
const double norm_thickness, ///< [in] Normalised thickness of lattice
const double covering_radius ///< [in] Desired covering radius
);
#ifdef SWIG // SWIG interface directives
SWIGLAL(INOUT_STRUCTS(gsl_matrix**, random_points, nearest_points, workspac
e));
SWIGLAL(INOUT_STRUCTS(gsl_vector**, nearest_distances));
SWIGLAL(INOUT_STRUCTS(gsl_vector_ulong**, nearest_indices));
#endif
///
/// Generate random points within the flat lattice tiling parameter space,
/// then calculate the nearest flat lattice point to each random point
///
int XLALNearestFlatLatticePointToRandomPoints(
FlatLatticeTiling* tiling, ///< [in] Tiling state
RandomParams* rng, ///< [in] Random number generator
const size_t num_random_points, ///< [in] Number of random points to
generate
gsl_matrix** random_points, ///< [in/out] Pointer to matrix of r
andom points
gsl_matrix** nearest_points, ///< [in/out] Pointer to matrix of n
earest lattice points to each random point
gsl_vector_ulong** nearest_indices, ///< [in/out] Pointer to vector of i
ndices of nearest lattice point
gsl_vector** nearest_distances, ///< [in/out] Pointer to vector of d
istances to nearest lattice point
gsl_matrix** workspace ///< [in/out] Pointer to workspace m
atrix for computing distances
);
#ifdef __cplusplus
} }
#endif #endif
#endif #endif
/// @}
 End of changes. 6 change blocks. 
165 lines changed or deleted 246 lines changed or added


 Grid.h   Grid.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _GRID_H #ifndef _GRID_H
#define _GRID_H #define _GRID_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup Grid_h \addtogroup Grid_h
\author Creighton, T. D. \author Creighton, T. D.
skipping to change at line 159 skipping to change at line 154
/*@}*/ /*@}*/
/*@}*/ /*@}*/
/** \cond DONT_DOXYGEN */ /** \cond DONT_DOXYGEN */
#define GRIDH_MSGENUL "Unexpected null pointer in arguments" #define GRIDH_MSGENUL "Unexpected null pointer in arguments"
#define GRIDH_MSGEOUT "Output handle points to a non-null pointer" #define GRIDH_MSGEOUT "Output handle points to a non-null pointer"
#define GRIDH_MSGEMEM "Memory allocation error" #define GRIDH_MSGEMEM "Memory allocation error"
/** \endcond */ /** \endcond */
typedef struct tagINT2Grid { typedef struct tagINT2Grid {
SWIGLAL_STRUCT(INT2Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
INT2Array *data; INT2Array *data;
} INT2Grid; } INT2Grid;
typedef struct tagINT4Grid { typedef struct tagINT4Grid {
SWIGLAL_STRUCT(INT4Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
INT4Array *data; INT4Array *data;
} INT4Grid; } INT4Grid;
typedef struct tagINT8Grid { typedef struct tagINT8Grid {
SWIGLAL_STRUCT(INT8Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
INT8Array *data; INT8Array *data;
} INT8Grid; } INT8Grid;
typedef struct tagUINT2Grid { typedef struct tagUINT2Grid {
SWIGLAL_STRUCT(UINT2Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
UINT2Array *data; UINT2Array *data;
} UINT2Grid; } UINT2Grid;
typedef struct tagUINT4Grid { typedef struct tagUINT4Grid {
SWIGLAL_STRUCT(UINT4Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
UINT4Array *data; UINT4Array *data;
} UINT4Grid; } UINT4Grid;
typedef struct tagUINT8Grid { typedef struct tagUINT8Grid {
SWIGLAL_STRUCT(UINT8Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
UINT8Array *data; UINT8Array *data;
} UINT8Grid; } UINT8Grid;
typedef struct tagREAL4Grid { typedef struct tagREAL4Grid {
SWIGLAL_STRUCT(REAL4Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
REAL4Array *data; REAL4Array *data;
} REAL4Grid; } REAL4Grid;
typedef struct tagREAL8Grid { typedef struct tagREAL8Grid {
SWIGLAL_STRUCT(REAL8Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
REAL8Array *data; REAL8Array *data;
} REAL8Grid; } REAL8Grid;
typedef struct tagCOMPLEX8Grid { typedef struct tagCOMPLEX8Grid {
SWIGLAL_STRUCT(COMPLEX8Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
COMPLEX8Array *data; COMPLEX8Array *data;
} COMPLEX8Grid; } COMPLEX8Grid;
typedef struct tagCOMPLEX16Grid { typedef struct tagCOMPLEX16Grid {
SWIGLAL_STRUCT(COMPLEX16Grid);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LALUnit sampleUnits; LALUnit sampleUnits;
LALUnit *dimUnits; LALUnit *dimUnits;
REAL8Vector *offset; REAL8Vector *offset;
REAL8Vector *interval; REAL8Vector *interval;
COMPLEX16Array *data; COMPLEX16Array *data;
} COMPLEX16Grid; } COMPLEX16Grid;
/* Function prototypes. */ /* Function prototypes. */
 End of changes. 11 change blocks. 
15 lines changed or deleted 0 lines changed or added


 IIRFilter.h   IIRFilter.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _IIRFILTER_H #ifndef _IIRFILTER_H
#define _IIRFILTER_H #define _IIRFILTER_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/ZPGFilter.h> #include <lal/ZPGFilter.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** /**
skipping to change at line 151 skipping to change at line 146
/** \endcond */ /** \endcond */
/** This structure stores the direct and recursive REAL4 filter coefficient s, as /** This structure stores the direct and recursive REAL4 filter coefficient s, as
* well as the history of the auxiliary sequence \f$w\f$. * well as the history of the auxiliary sequence \f$w\f$.
* The length of the history vector gives the order of the filter * The length of the history vector gives the order of the filter
*/ */
#ifdef SWIG /* SWIG interface directives */ #ifdef SWIG /* SWIG interface directives */
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagREAL4IIRFilter::name; %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagREAL4IIRFilter::name;
#endif /* SWIG */ #endif /* SWIG */
typedef struct tagREAL4IIRFilter{ typedef struct tagREAL4IIRFilter{
SWIGLAL_STRUCT(REAL4IIRFilter);
const CHAR *name; /**< User assigned name. */ const CHAR *name; /**< User assigned name. */
REAL8 deltaT; /**< Sampling time interval of the filter; If \f $\leq0\f$, it will be ignored (ie it will be taken from the data stream) */ REAL8 deltaT; /**< Sampling time interval of the filter; If \f $\leq0\f$, it will be ignored (ie it will be taken from the data stream) */
REAL4Vector *directCoef; /**< The direct filter coefficients. */ REAL4Vector *directCoef; /**< The direct filter coefficients. */
REAL4Vector *recursCoef; /**< The recursive filter coefficients. */ REAL4Vector *recursCoef; /**< The recursive filter coefficients. */
REAL4Vector *history; /**< The previous values of w. */ REAL4Vector *history; /**< The previous values of w. */
} REAL4IIRFilter; } REAL4IIRFilter;
/** This structure stores the direct and recursive REAL8 filter coefficient s, as /** This structure stores the direct and recursive REAL8 filter coefficient s, as
* well as the history of the auxiliary sequence \f$w\f$. * well as the history of the auxiliary sequence \f$w\f$.
* The length of the history vector gives the order of the filter * The length of the history vector gives the order of the filter
*/ */
#ifdef SWIG /* SWIG interface directives */ #ifdef SWIG /* SWIG interface directives */
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagREAL8IIRFilter::name; %warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagREAL8IIRFilter::name;
#endif /* SWIG */ #endif /* SWIG */
typedef struct tagREAL8IIRFilter{ typedef struct tagREAL8IIRFilter{
SWIGLAL_STRUCT(REAL8IIRFilter);
const CHAR *name; /**< User assigned name. */ const CHAR *name; /**< User assigned name. */
REAL8 deltaT; /**< Sampling time interval of the filter; If \f $\leq0\f$, it will be ignored (ie it will be taken from the data stream). * / REAL8 deltaT; /**< Sampling time interval of the filter; If \f $\leq0\f$, it will be ignored (ie it will be taken from the data stream). * /
REAL8Vector *directCoef; /**< The direct filter coefficients. */ REAL8Vector *directCoef; /**< The direct filter coefficients. */
REAL8Vector *recursCoef; /**< The recursive filter coefficients. */ REAL8Vector *recursCoef; /**< The recursive filter coefficients. */
REAL8Vector *history; /**< The previous values of w. */ REAL8Vector *history; /**< The previous values of w. */
} REAL8IIRFilter; } REAL8IIRFilter;
/*@}*/ /*@}*/
/* Function prototypes. */ /* Function prototypes. */
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 Integrate.h   Integrate.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _INTEGRATE_H #ifndef _INTEGRATE_H
#define _INTEGRATE_H #define _INTEGRATE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup Integrate_h \addtogroup Integrate_h
\brief Integrates a function. \brief Integrates a function.
skipping to change at line 165 skipping to change at line 160
SingularUpperLimit, /**< integrate an inv sqrt singularity at upper limit */ SingularUpperLimit, /**< integrate an inv sqrt singularity at upper limit */
InfiniteDomainPow, /**< integrate infinite domain with power-law falloff */ InfiniteDomainPow, /**< integrate infinite domain with power-law falloff */
InfiniteDomainExp /**< integrate infinite domain with exponential fallo ff */ InfiniteDomainExp /**< integrate infinite domain with exponential fallo ff */
} }
IntegralType; IntegralType;
/** These are input structures to the integration routines. */ /** These are input structures to the integration routines. */
typedef struct typedef struct
tagSIntegrateIn tagSIntegrateIn
{ {
SWIGLAL_STRUCT(SIntegrateIn);
void (*function)(LALStatus *s, REAL4 *y, REAL4 x, void *p); /**< The fu nction to integrate */ void (*function)(LALStatus *s, REAL4 *y, REAL4 x, void *p); /**< The fu nction to integrate */
REAL4 xmax; /**< The maximum value of the domain of integration */ REAL4 xmax; /**< The maximum value of the domain of integration */
REAL4 xmin; /**< The minimum value of the domain of integration */ REAL4 xmin; /**< The minimum value of the domain of integration */
IntegralType type; /**< The type of integration */ IntegralType type; /**< The type of integration */
} }
SIntegrateIn; SIntegrateIn;
/** These are input structures to the integration routines. */ /** These are input structures to the integration routines. */
typedef struct typedef struct
tagDIntegrateIn tagDIntegrateIn
{ {
SWIGLAL_STRUCT(DIntegrateIn);
void (*function)(LALStatus *s, REAL8 *y, REAL8 x, void *p); /**< The fu nction to integrate */ void (*function)(LALStatus *s, REAL8 *y, REAL8 x, void *p); /**< The fu nction to integrate */
REAL8 xmax; /**< The maximum value of the domain of integration */ REAL8 xmax; /**< The maximum value of the domain of integration */
REAL8 xmin; /**< The minimum value of the domain of integration */ REAL8 xmin; /**< The minimum value of the domain of integration */
IntegralType type; /**< The type of integration */ IntegralType type; /**< The type of integration */
} }
DIntegrateIn; DIntegrateIn;
/* ----- Integrate.c ----- */ /* ----- Integrate.c ----- */
/** \see See \ref Integrate_h for documentation */ /** \see See \ref Integrate_h for documentation */
void void
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 Interpolate.h   Interpolate.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _INTERPOLATE_H #ifndef _INTERPOLATE_H
#define _INTERPOLATE_H #define _INTERPOLATE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup Interpolate_h \addtogroup Interpolate_h
\brief This header covers the routines for interpolation. \brief This header covers the routines for interpolation.
skipping to change at line 103 skipping to change at line 98
/** \cond DONT_DOXYGEN */ /** \cond DONT_DOXYGEN */
#define INTERPOLATEH_MSGENULL "Null pointer" #define INTERPOLATEH_MSGENULL "Null pointer"
#define INTERPOLATEH_MSGESIZE "Invalid size" #define INTERPOLATEH_MSGESIZE "Invalid size"
#define INTERPOLATEH_MSGEZERO "Zero divide" #define INTERPOLATEH_MSGEZERO "Zero divide"
/** \endcond */ /** \endcond */
/** These structures contain the output of the interpolation */ /** These structures contain the output of the interpolation */
typedef struct typedef struct
tagSInterpolateOut tagSInterpolateOut
{ {
SWIGLAL_STRUCT(SInterpolateOut);
REAL4 y; /**< The interpolated value */ REAL4 y; /**< The interpolated value */
REAL4 dy; /**< The estimated error in the interpolated value */ REAL4 dy; /**< The estimated error in the interpolated value */
} }
SInterpolateOut; SInterpolateOut;
/** These structures contain the output of the interpolation */ /** These structures contain the output of the interpolation */
typedef struct typedef struct
tagDInterpolateOut tagDInterpolateOut
{ {
SWIGLAL_STRUCT(DInterpolateOut);
REAL8 y; /**< The interpolated value */ REAL8 y; /**< The interpolated value */
REAL8 dy; /**< The estimated error in the interpolated value */ REAL8 dy; /**< The estimated error in the interpolated value */
} }
DInterpolateOut; DInterpolateOut;
/** These structures contain the interpolation parameters; These are the ar rays /** These structures contain the interpolation parameters; These are the ar rays
* of \c n domain values \f$x[0] \ldots x[n-1]\f$ and their * of \c n domain values \f$x[0] \ldots x[n-1]\f$ and their
* corresponding values \f$y[0] \ldots y[n-1]\f$ * corresponding values \f$y[0] \ldots y[n-1]\f$
*/ */
typedef struct typedef struct
tagSInterpolatePar tagSInterpolatePar
{ {
SWIGLAL_STRUCT(SInterpolatePar);
UINT4 n; /**< The number of points in the arrays to use in the interp olation */ UINT4 n; /**< The number of points in the arrays to use in the interp olation */
REAL4 *x; /**< The array of domain values */ REAL4 *x; /**< The array of domain values */
REAL4 *y; /**< The array of values to interpolate */ REAL4 *y; /**< The array of values to interpolate */
} }
SInterpolatePar; SInterpolatePar;
/** These structures contain the interpolation parameters; These are the ar rays /** These structures contain the interpolation parameters; These are the ar rays
* of \c n domain values \f$x[0]\ldots x[n-1]\f$ and their * of \c n domain values \f$x[0]\ldots x[n-1]\f$ and their
* corresponding values \f$y[0]\ldots y[n-1]\f$ * corresponding values \f$y[0]\ldots y[n-1]\f$
*/ */
typedef struct typedef struct
tagDInterpolatePar tagDInterpolatePar
{ {
SWIGLAL_STRUCT(DInterpolatePar);
UINT4 n; /**< The number of points in the arrays to use in the interp olation */ UINT4 n; /**< The number of points in the arrays to use in the interp olation */
REAL8 *x; /**< The array of domain values */ REAL8 *x; /**< The array of domain values */
REAL8 *y; /**< The array of values to interpolate */ REAL8 *y; /**< The array of values to interpolate */
} }
DInterpolatePar; DInterpolatePar;
/* ----- Interpolate.c ----- */ /* ----- Interpolate.c ----- */
/** \see See \ref Interpolate_h for documentation */ /** \see See \ref Interpolate_h for documentation */
void void
LALSPolynomialInterpolation ( LALSPolynomialInterpolation (
 End of changes. 5 change blocks. 
9 lines changed or deleted 0 lines changed or added


 LALAdaptiveRungeKutta4.h   LALAdaptiveRungeKutta4.h 
skipping to change at line 16 skipping to change at line 16
#include <lal/LALGSL.h> #include <lal/LALGSL.h>
#include <lal/SeqFactories.h> #include <lal/SeqFactories.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
/** /**
\addtogroup LALAdaptiveRungeKutta4_h \addtogroup LALAdaptiveRungeKutta4_h
\author Vallisneri, M. \author Vallisneri, M.
\brief Adaptive Runge-Kutta4 \brief Adaptive Runge-Kutta4
<ul> <ul>
<li> \c integrator Integration structure (quasi-class). Created using <tt>X LALAdaptiveRungeKutta4Init()</tt>. <li> \c integrator Integration structure (quasi-class). Created using <tt>X LALAdaptiveRungeKutta4Init()</tt>.
...</li> ...</li>
</ul> </ul>
skipping to change at line 64 skipping to change at line 59
saveGSLErrorHandler_ = gsl_set_error_handler_off(); saveGSLErrorHandler_ = gsl_set_error_handler_off();
#define XLAL_ENDGSL \ #define XLAL_ENDGSL \
gsl_set_error_handler( saveGSLErrorHandler_ ); \ gsl_set_error_handler( saveGSLErrorHandler_ ); \
XLALGSL_PTHREAD_MUTEX_UNLOCK; \ XLALGSL_PTHREAD_MUTEX_UNLOCK; \
} }
typedef struct typedef struct
tagark4GSLIntegrator tagark4GSLIntegrator
{ {
SWIGLAL_STRUCT(ark4GSLIntegrator);
gsl_odeiv_step *step; gsl_odeiv_step *step;
gsl_odeiv_control *control; gsl_odeiv_control *control;
gsl_odeiv_evolve *evolve; gsl_odeiv_evolve *evolve;
gsl_odeiv_system *sys; gsl_odeiv_system *sys;
int (* dydt) (double t, const double y[], double dydt[], void * params); int (* dydt) (double t, const double y[], double dydt[], void * params);
int (* stop) (double t, const double y[], double dydt[], void * params); int (* stop) (double t, const double y[], double dydt[], void * params);
int retries; /* retries with smaller step when derivatives encoun ter singularity */ int retries; /* retries with smaller step when derivatives encoun ter singularity */
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 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 */ /*@{*/
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 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)
#include <complex> #include <complex>
#else #else
#include <complex.h> #include <complex.h>
#endif #endif
#endif /* LAL_USE_OLD_COMPLEX_STRUCTS */ #endif /* LAL_USE_OLD_COMPLEX_STRUCTS */
#include <lal/LALConfig.h> #include <lal/LALConfig.h>
#if defined(__cplusplus)
extern "C" {
#elif 0
} /* so that editors will match preceding brace */
#endif
/** \addtogroup LALDatatypes */ /*@{*/
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 BOOLEAN; /**< Boolean logical type, see \ref LALDatat
ypes for more details */
/* If INT8 etc. are already defined, undefine them */ /* If INT8 etc. are already defined, undefine them */
#undef CHAR #undef CHAR
#undef UCHAR #undef UCHAR
#undef INT2 #undef INT2
#undef INT4 #undef INT4
#undef INT8 #undef INT8
#undef UINT2 #undef UINT2
#undef UINT4 #undef UINT4
#undef UINT8 #undef UINT8
#undef REAL4 #undef REAL4
 End of changes. 2 change blocks. 
15 lines changed or deleted 15 lines changed or added


 LALBarycenter.h   LALBarycenter.h 
/* /*
* Copyright (C) 2012 Miroslav Shaltev, R Prix
* Copyright (C) 2007 Curt Cutler, Jolien Creighton, Reinhard Prix, Teviet Creighton * Copyright (C) 2007 Curt Cutler, Jolien Creighton, Reinhard Prix, Teviet Creighton
* *
* 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
skipping to change at line 23 skipping to change at line 24
* *
* 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
*/ */
#ifndef _LALBARYCENTER_H /* Protect against double-inclusion */ #ifndef _LALBARYCENTER_H /* Protect against double-inclusion */
#define _LALBARYCENTER_H #define _LALBARYCENTER_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <lal/LALStdio.h> #include <lal/LALStdio.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALConstants.h> #include <lal/LALConstants.h>
#include <lal/DetectorSite.h> #include <lal/DetectorSite.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 93 skipping to change at line 89
* what is in it. Subsequent lines give the time (GPS) and the * what is in it. Subsequent lines give the time (GPS) and the
* Earth's position \f$(x,y,z)\f$, * Earth's position \f$(x,y,z)\f$,
* velocity \f$(v_x, v_y, v_z)\f$, and acceleration \f$(a_x, a_y, a_z)\f$ * velocity \f$(v_x, v_y, v_z)\f$, and acceleration \f$(a_x, a_y, a_z)\f$
* at that instant. All in units of seconds; e.g. positions have * at that instant. All in units of seconds; e.g. positions have
* units of seconds, and accelerations have units 1/sec. * units of seconds, and accelerations have units 1/sec.
* *
* \deprecated Use XLALInitBarycenter() instead. * \deprecated Use XLALInitBarycenter() instead.
*/ */
typedef struct tagEphemerisFilenames typedef struct tagEphemerisFilenames
{ {
SWIGLAL_STRUCT(EphemerisFilenames);
CHAR *earthEphemeris; /**< File containing Earth's position. */ CHAR *earthEphemeris; /**< File containing Earth's position. */
CHAR *sunEphemeris; /**< File containing Sun's position. */ CHAR *sunEphemeris; /**< File containing Sun's position. */
} }
EphemerisFilenames; EphemerisFilenames;
/** Structure holding a REAL8 time, and a position, velocity and /** Structure holding a REAL8 time, and a position, velocity and
* acceleration vector. */ * acceleration vector. */
typedef struct tagPosVelAcc typedef struct tagPosVelAcc
{ {
SWIGLAL_STRUCT(PosVelAcc);
REAL8 gps; /**< REAL8 timestamp */ REAL8 gps; /**< REAL8 timestamp */
REAL8 pos[3]; /**< position-vector */ REAL8 pos[3]; /**< position-vector */
REAL8 vel[3]; /**< velocity-vector */ REAL8 vel[3]; /**< velocity-vector */
REAL8 acc[3]; /**< acceleration-vector */ REAL8 acc[3]; /**< acceleration-vector */
} }
PosVelAcc; PosVelAcc;
/** This structure contains all information about the /** This structure contains all information about the
* center-of-mass positions of the Earth and Sun, listed at regular * center-of-mass positions of the Earth and Sun, listed at regular
* time intervals. * time intervals.
*/ */
typedef struct tagEphemerisData typedef struct tagEphemerisData
{ {
SWIGLAL_STRUCT(EphemerisData);
EphemerisFilenames ephiles; /**< Names of the two files containing positi ons of EphemerisFilenames ephiles; /**< Names of the two files containing positi ons of
* Earth and Sun, respectively at evenly spac ed times. */ * Earth and Sun, respectively at evenly spac ed times. */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(1D_ARRAY(PosVelAcc, ephemE, INT4, nentriesE));
SWIGLAL(1D_ARRAY(PosVelAcc, ephemS, INT4, nentriesS));
#endif /* SWIG */
INT4 nentriesE; /**< The number of entries in Earth ephemeris table . */ INT4 nentriesE; /**< The number of entries in Earth ephemeris table . */
INT4 nentriesS; /**< The number of entries in Sun ephemeris table. */ INT4 nentriesS; /**< The number of entries in Sun ephemeris table. */
REAL8 dtEtable; /**< The spacing in sec between consecutive intants in Earth ephemeris table.*/ REAL8 dtEtable; /**< The spacing in sec between consecutive intants in Earth ephemeris table.*/
REAL8 dtStable; /**< The spacing in sec between consecutive intants in Sun ephemeris table.*/ REAL8 dtStable; /**< The spacing in sec between consecutive intants in Sun ephemeris table.*/
PosVelAcc *ephemE; /**< Array containing pos,vel,acc of earth, as extr acted from earth PosVelAcc *ephemE; /**< Array containing pos,vel,acc of earth, as extr acted from earth
* ephem file. Units are sec, 1, 1/sec respectively */ * ephem file. Units are sec, 1, 1/sec respectively */
PosVelAcc *ephemS; /**< Array with pos, vel and acc for the sun (see e phemE) */ PosVelAcc *ephemS; /**< Array with pos, vel and acc for the sun (see e phemE) */
} }
EphemerisData; EphemerisData;
/** Basic output structure of LALBarycenterEarth.c. /** Basic output structure of LALBarycenterEarth.c.
*/ */
typedef struct tagEarthState typedef struct tagEarthState
{ {
SWIGLAL_STRUCT(EarthState);
REAL8 einstein; /**< the einstein delay equiv TDB - TDT */ REAL8 einstein; /**< the einstein delay equiv TDB - TDT */
REAL8 deinstein; /**< d(einstein)/d(tgps) */ REAL8 deinstein; /**< d(einstein)/d(tgps) */
REAL8 posNow[3]; /**< Cartesian coords of Earth's center at tgps, REAL8 posNow[3]; /**< Cartesian coords of Earth's center at tgps,
* extrapolated from JPL DE405 ephemeris; units= se c */ * extrapolated from JPL DE405 ephemeris; units= se c */
REAL8 velNow[3]; /**< dimensionless velocity of Earth's center at tg ps, REAL8 velNow[3]; /**< dimensionless velocity of Earth's center at tg ps,
* extrapolated from JPL DE405 ephemeris */ * extrapolated from JPL DE405 ephemeris */
REAL8 gmstRad; /**< Greenwich Mean Sidereal Time (GMST) in radians , at tgps */ REAL8 gmstRad; /**< Greenwich Mean Sidereal Time (GMST) in radians , at tgps */
REAL8 gastRad; /**< Greenwich Apparent Sidereal Time, in radians, at tgps; REAL8 gastRad; /**< Greenwich Apparent Sidereal Time, in radians, at tgps;
skipping to change at line 167 skipping to change at line 163
REAL8 dse[3]; /**< d(se[3])/d(tgps); Dimensionless */ REAL8 dse[3]; /**< d(se[3])/d(tgps); Dimensionless */
REAL8 rse; /**< length of vector se[3]; units = sec */ REAL8 rse; /**< length of vector se[3]; units = sec */
REAL8 drse; /**< d(rse)/d(tgps); dimensionless */ REAL8 drse; /**< d(rse)/d(tgps); dimensionless */
} }
EarthState; EarthState;
/** Basic input structure to LALBarycenter.c. /** Basic input structure to LALBarycenter.c.
*/ */
typedef struct tagBarycenterInput typedef struct tagBarycenterInput
{ {
SWIGLAL_STRUCT(BarycenterInput);
LIGOTimeGPS tgps; /**< input GPS arrival time. I use tgps (lower case ) LIGOTimeGPS tgps; /**< input GPS arrival time. I use tgps (lower case )
* to remind that here the LAL structure is a * to remind that here the LAL structure is a
* field in the larger structure BarycenterInput. * field in the larger structure BarycenterInput.
* I use tGPS as an input structure (by itself) to * I use tGPS as an input structure (by itself) to
* LALBarycenterEarth */ * LALBarycenterEarth */
LALDetector site; /**< detector site info. <b>NOTE:</b> LALDetector site; /**< detector site info. <b>NOTE:</b>
* the <tt>site.location</tt> field must be modifie d * the <tt>site.location</tt> field must be modifie d
* to give the detector location in units of * to give the detector location in units of
* <em>seconds</em> (i.e. divide the values normall y * <em>seconds</em> (i.e. divide the values normall y
skipping to change at line 189 skipping to change at line 184
REAL8 alpha; /**< Source right ascension in ICRS J2000 coords ( radians). */ REAL8 alpha; /**< Source right ascension in ICRS J2000 coords ( radians). */
REAL8 delta; /**< Source declination in ICRS J2000 coords (radia ns) */ REAL8 delta; /**< Source declination in ICRS J2000 coords (radia ns) */
REAL8 dInv; /**< 1/(distance to source), in 1/sec. REAL8 dInv; /**< 1/(distance to source), in 1/sec.
* This is needed to correct Roemer delay for very * This is needed to correct Roemer delay for very
* nearby sources; correction is about 10 microsec for * nearby sources; correction is about 10 microsec for
* source at 100 pc */ * source at 100 pc */
} }
BarycenterInput; BarycenterInput;
/*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1.
But most users would immediately add back the one anyway.
*/
/*Curt: rem te is ``time pulse would arrive at a GPS clock
way out in empty space, if you renormalized and zero-ed the latter
to give, on average, the same arrival time as the GPS clock on Earth'' */
/// ---------- internal buffer type for optimized Barycentering function --
--------
typedef struct tagfixed_sky
{
REAL8 sinAlpha; /// sin(alpha)
REAL8 cosAlpha; /// cos(alpha)
REAL8 sinDelta; /// sin(delta)
REAL8 cosDelta; /// cos(delta)
REAL8 n[3]; /// unit vector pointing from SSB to the source, in
J2000 Cartesian coords, 0=x,1=y,2=z
} fixed_sky_t;
typedef struct tagfixed_site
{
REAL8 rd; /// distance 'rd' from center of Earth, in light sec
onds
REAL8 longitude; /// geocentric (not geodetic!!) longitude of detecto
r vertex
REAL8 latitude; /// geocentric latitude of detector vertex
REAL8 sinLat; /// sin(latitude)
REAL8 cosLat; /// cos(latitude);
REAL8 rd_sinLat; /// rd * sin(latitude)
REAL8 rd_cosLat; /// rd * cos(latitude)
} fixed_site_t;
/// internal buffer type for optimized Barycentering function
typedef struct tagBarycenterBuffer
{
REAL8 alpha; /// buffered sky-location: right-ascension i
n rad
REAL8 delta; /// buffered sky-location: declination in ra
d
fixed_sky_t fixed_sky; /// fixed-sky buffered quantities
LALDetector site; /// buffered detector site
fixed_site_t fixed_site; /// fixed-site buffered quantities
} BarycenterBuffer;
/** Basic output structure produced by LALBarycenter.c. /** Basic output structure produced by LALBarycenter.c.
*/ */
typedef struct tagEmissionTime typedef struct tagEmissionTime
{ {
SWIGLAL_STRUCT(EmissionTime);
REAL8 deltaT; /**< \f$t_e\f$(TDB) - \f$t_a\f$(GPS) REAL8 deltaT; /**< \f$t_e\f$(TDB) - \f$t_a\f$(GPS)
* + (light-travel-time from source to SSB) */ * + (light-travel-time from source to SSB) */
LIGOTimeGPS te; /**< pulse emission time (TDB); also sometimes call ed LIGOTimeGPS te; /**< pulse emission time (TDB); also sometimes call ed
* ``arrival time (TDB) of same wavefront at SSB'' */ * ``arrival time (TDB) of same wavefront at SSB'' */
REAL8 tDot; /**< d(emission time in TDB)/d(arrival time in GPS) */ REAL8 tDot; /**< d(emission time in TDB)/d(arrival time in GPS) */
REAL8 rDetector[3]; /**< Cartesian coords (0=x,1=y,2=z) of detector pos ition REAL8 rDetector[3]; /**< Cartesian coords (0=x,1=y,2=z) of detector pos ition
* at $t_a$ (GPS), in ICRS J2000 coords. Units = se c. */ * at $t_a$ (GPS), in ICRS J2000 coords. Units = se c. */
REAL8 vDetector[3]; /* Cartesian coords (0=x,1=y,2=z) of detector veloc ity REAL8 vDetector[3]; /* Cartesian coords (0=x,1=y,2=z) of detector veloc ity
* at \f$t_a\f$ (GPS), in ICRS J2000 coords. Dimens ionless. */ * at \f$t_a\f$ (GPS), in ICRS J2000 coords. Dimens ionless. */
} }
EmissionTime; EmissionTime;
/*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1.
But most users would immediately add back the one anyway.
*/
/*Curt: rem te is ``time pulse would arrive at a GPS clock
way out in empty space, if you renormalized and zero-ed the latter
to give, on average, the same arrival time as the GPS clock on Earth'' */
/* Function prototypes. */ /* Function prototypes. */
int XLALBarycenterEarth ( EarthState *earth, const LIGOTimeGPS *tGPS, const EphemerisData *edat); int XLALBarycenterEarth ( EarthState *earth, const LIGOTimeGPS *tGPS, const EphemerisData *edat);
int XLALBarycenter ( EmissionTime *emit, const BarycenterInput *baryinput, const EarthState *earth); int XLALBarycenter ( EmissionTime *emit, const BarycenterInput *baryinput, const EarthState *earth);
int XLALBarycenterOpt ( EmissionTime *emit, const BarycenterInput *baryinpu t, const EarthState *earth, BarycenterBuffer *buffer);
// deprecated LAL interface
void LALBarycenterEarth ( LALStatus *status, EarthState *earth, const LIGOT imeGPS *tGPS, const EphemerisData *edat); void LALBarycenterEarth ( LALStatus *status, EarthState *earth, const LIGOT imeGPS *tGPS, const EphemerisData *edat);
void LALBarycenter ( LALStatus *status, EmissionTime *emit, const Barycente rInput *baryinput, const EarthState *earth); void LALBarycenter ( LALStatus *status, EmissionTime *emit, const Barycente rInput *baryinput, const EarthState *earth);
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* Close C++ protection */ #endif /* Close C++ protection */
#endif /* Close double-include protection */ #endif /* Close double-include protection */
 End of changes. 14 change blocks. 
20 lines changed or deleted 53 lines changed or added


 LALCache.h   LALCache.h 
skipping to change at line 31 skipping to change at line 31
* \ingroup support * \ingroup support
* \author Creighton, J. D. E. * \author Creighton, J. D. E.
* \date 2007 * \date 2007
* \brief This header covers routines to create and manipulate LALCache * \brief This header covers routines to create and manipulate LALCache
* structures and to read LAL cache files. * structures and to read LAL cache files.
* *
*/ */
#ifndef _LALCACHE_H_ #ifndef _LALCACHE_H_
#define _LALCACHE_H_ #define _LALCACHE_H_
/* remove SWIG interface directives */ #include <stdio.h>
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT) #include <lal/LALDatatypes.h>
#define SWIGLAL_STRUCT(...) #include <lal/FileIO.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if 0
} /* to match preceeding brace */
#endif
struct tagLALCacheEntry;
struct tagLALCache;
#include <stdio.h> /** An entry in a LAL cache. */
#include <lal/LALDatatypes.h>
#include <lal/FileIO.h>
/** An entry in a LAL cache */
typedef struct tagLALCacheEntry { typedef struct tagLALCacheEntry {
SWIGLAL_STRUCT(LALCacheEntry); CHAR *src; /**< File source field */
CHAR *src; /**< File source field */ CHAR *dsc; /**< File description field */
CHAR *dsc; /**< File description field */ INT4 t0; /**< GPS time (seconds) of beginning of data in fil
INT4 t0; /**< GPS time (seconds) of beginning of data in file */ e */
INT4 dt; /**< Duration (seconds) of data in file */ INT4 dt; /**< Duration (seconds) of data in file */
CHAR *url; /**< URL of file */ CHAR *url; /**< URL of file */
} LALCacheEntry; } LALCacheEntry;
/** The LALCache structure is an array of entries */ /** The LALCache structure is an array of entries. */
typedef struct tagLALCache { typedef struct tagLALCache {
SWIGLAL_STRUCT(LALCache); UINT4 length;
UINT4 length; LALCacheEntry *list;
LALCacheEntry *list;
} LALCache; } LALCache;
/** Creates a LALCache structure */ /** Creates a LALCache structure. */
LALCache * XLALCreateCache( UINT4 length ); LALCache *XLALCreateCache(UINT4 length);
/** Destroys a LALCache structure. */
void XLALDestroyCache(LALCache * cache);
/** Destroys a LALCache structure */ /** Duplicates a LALCache structure. */
void XLALDestroyCache( LALCache *cache ); LALCache *XLALCacheDuplicate(const LALCache * cache);
/** Duplicates a LALCache structure */ /** Returns a new LALCache structure that is the merge of two. */
LALCache * XLALCacheDuplicate( LALCache *cache ); LALCache *XLALCacheMerge(const LALCache * cache1, const LALCache * cache2);
/** Returns a new LALCache structure that is the merge of two */ /** Reads a LAL cache file and produces a LALCache structure. */
LALCache * XLALCacheMerge( LALCache *cache1, LALCache *cache2 ); LALCache *XLALCacheFileRead(LALFILE * fp);
/** Reads a LAL cache file and produces a LALCache structure */ /** Reads a LAL cache file and produces a LALCache structure. */
LALCache * XLALCacheFileRead( LALFILE *fp ); LALCache *XLALCacheImport(const char *fname);
/** Globs a directory and construct LALCache from matching entries */ /** Globs a directory and construct LALCache from matching entries.
LALCache * XLALCacheGlob( * \params [in] dirstr Colon-delimited list of directories.
const char *dirstr, /**< colon-delimited list of directorie * \params [in] fnptrn Glob pattern for matching files.
s */ * \returns LALCache structure.
const char *fnptrn /**< glob pattern for matching files */ */
); LALCache *XLALCacheGlob(const char *dirstr, const char *fnptrn);
/** Writes a LALCache structure to an output LAL cache file */ /** Writes a LALCache structure to an output LAL cache file. */
int XLALCacheFileWrite( LALFILE *fp, LALCache *cache ); int XLALCacheFileWrite(LALFILE * fp, const LALCache * cache);
/** Sorts entries in a LALCache structure */ /** Sorts entries in a LALCache structure. */
int XLALCacheSort( LALCache *cache ); int XLALCacheSort(LALCache * cache);
/** Prunes duplicate entries keeping the second one; cache is reduced in /** Prunes duplicate entries keeping the second one; cache is reduced in
* length if there are. Entries are duplicates if their metadata are * length if there are. Entries are duplicates if their metadata are
* the same (even if the urls are different */ * the same (even if the urls are different */
int XLALCacheUniq( LALCache *cache ); int XLALCacheUniq(LALCache * cache);
/** Selects only matching entries in a LALCache structure -- other entries /** Selects only matching entries in a LALCache structure -- other entries
* are deleted from the LALCache structure */ * are deleted from the LALCache structure.
int XLALCacheSieve( * \params t0 Remove entries ending before t0 (0 to disable).
LALCache *cache, /**< The LALCache structure - modified */ * \params t1 Remove entries ending after t1 (0 to disable).
INT4 t0, /**< Remove entries ending before t0 (0 to disable * \params srcregex Regular expression to match src field (NULL to disable)
) */ .
INT4 t1, /**< Remove entries ending after t1 (0 to disable) * \params dscregex Regular expression to match dsc field (NULL to disable)
*/ .
const char *srcregex, /**< Regular expression to match src * \params urlregex Regular expression to match url field (NULL to disable)
field (NULL to disable) */ .
const char *dscregex, /**< Regular expression to match dsc */
field (NULL to disable) */ int XLALCacheSieve(LALCache * cache, INT4 t0, INT4 t1,
const char *urlregex /**< Regular expression to match url f const char *srcregex, const char *dscregex,
ield (NULL to disable) */ const char *urlregex);
);
/** Finds the first entry that contains the requested time, or the first en
try
* after the time if the time is in a gap or before the first entry. Retur
ns
* NULL if the time is after the last entry.
*/
LALCacheEntry *XLALCacheEntrySeek(const LALCache * cache, double t);
/** Open a file identified by an entry in a LALCache structure */ /** Open a file identified by an entry in a LALCache structure. */
LALFILE * XLALCacheEntryOpen( LALCacheEntry *entry ); LALFILE *XLALCacheEntryOpen(const LALCacheEntry * entry);
#ifdef __cplusplus #if 0
{ /* to match succeding brace */
#endif
#if defined(__cplusplus)
} }
#endif #endif
#endif /* _LALCACHE_H_ */ #endif /* _LALCACHE_H_ */
 End of changes. 19 change blocks. 
58 lines changed or deleted 69 lines changed or added


 LALCalibration.h   LALCalibration.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALCALIBRATION_H #ifndef _LALCALIBRATION_H
#define _LALCALIBRATION_H #define _LALCALIBRATION_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \addtogroup Calibration_h */ /** \addtogroup Calibration_h */
/*@{*/ /*@{*/
/** Structure containing calibration information (reference spectra and /** Structure containing calibration information (reference spectra and
* factors for updating calibraiton to a particular time). */ * factors for updating calibraiton to a particular time). */
typedef struct tagLALCalData typedef struct tagLALCalData
{ {
SWIGLAL_STRUCT(LALCalData);
REAL4TimeSeries *cavityFactors; REAL4TimeSeries *cavityFactors;
REAL4TimeSeries *openLoopFactors; REAL4TimeSeries *openLoopFactors;
COMPLEX8FrequencySeries *responseReference; COMPLEX8FrequencySeries *responseReference;
COMPLEX8FrequencySeries *cavityGainReference; COMPLEX8FrequencySeries *cavityGainReference;
COMPLEX8FrequencySeries *openLoopGainReference; COMPLEX8FrequencySeries *openLoopGainReference;
COMPLEX8FrequencySeries *actuationReference; COMPLEX8FrequencySeries *actuationReference;
COMPLEX8FrequencySeries *digitalFilterReference; COMPLEX8FrequencySeries *digitalFilterReference;
} }
LALCalData; LALCalData;
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 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.2" #define LAL_VERSION "6.8.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 7 #define LAL_VERSION_MINOR 8
/* LAL Version Micro Number */ /* LAL Version Micro Number */
#define LAL_VERSION_MICRO 2 #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 */ /* LAL Configure Arguments */
#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'" #define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/ut/testing/l al/6.8.0' '--exec-prefix=/home/ut/testing/lal/6.8.0' '--sysconfdir=/home/ut /testing/lal/6.8.0' '--datadir=/home/ut/testing/lal/6.8.0' 'CFLAGS=-w -fper missive' 'CXXFLAGS=-w -fpermissive'"
/* LAL Configure Date */ /* LAL Configure Date */
#define LAL_CONFIGURE_DATE "2012-06-14T02:21:53+0400" #define LAL_CONFIGURE_DATE "2012-11-07T03:01:58+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. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 LALConstants.h   LALConstants.h 
skipping to change at line 111 skipping to change at line 111
#define LAL_LYR_SI 9.4607304725808e15 /**< (Julian) Lightyear, m */ #define LAL_LYR_SI 9.4607304725808e15 /**< (Julian) Lightyear, m */
/*@}*/ /*@}*/
/** \name Physical constants /** \name Physical constants
* The following are measured fundamental physical constants, with values * The following are measured fundamental physical constants, with values
* given in \ref Barnet_1996. When not dimensionless, they are given * given in \ref Barnet_1996. When not dimensionless, they are given
* in the SI units shown. */ * in the SI units shown. */
/*@{*/ /*@{*/
#define LAL_G_SI 6.67259e-11 /**< Gravitational constant, N m^2 kg^ -2 */ #define LAL_G_SI 6.67259e-11 /**< Gravitational constant, N m^2 kg^ -2 */
#define LAL_H_SI 6.6260755e-34 /**< Planck constant, J s */ #define LAL_H_SI 6.6260755e-34 /**< Planck constant, J s */
#define LAL_HBAR_SI 1.05457266e-34 /**< Reduced Planck constant, J s */ #define LAL_HBAR_SI 1.0545726691251019773669079307477023e-34 /**< Reduced
#define LAL_MPL_SI 2.17671e-8 /**< Planck mass, kg */ Planck constant, J s. = LAL_H_SI / LAL_TWOPI */
#define LAL_LPL_SI 1.61605e-35 /**< Planck length, m */ #define LAL_MPL_SI 2.1767140835297016797409334934257335e-8 /**< Planck
#define LAL_TPL_SI 5.39056e-44 /**< Planck time, s */ mass, kg. = \sqrt{LAL_HBAR_SI * LAL_C_SI / LAL_G_SI} */
#define LAL_LPL_SI 1.6160486159348859434398861412879278e-35 /**< Planck
length, m. = \sqrt{LAL_HBAR_SI * LAL_G_SI / LAL_C_SI^3} */
#define LAL_TPL_SI 5.3905579437054615411301846068720240e-44 /**< Planck
time, s. = \sqrt{LAL_HBAR_SI * LAL_G_SI / LAL_C_SI^5} */
#define LAL_K_SI 1.380658e-23 /**< Boltzmann constant, J K^-1 */ #define LAL_K_SI 1.380658e-23 /**< Boltzmann constant, J K^-1 */
#define LAL_R_SI 8.314511 /**< Ideal gas constant, J K^-1 */ #define LAL_R_SI 8.314511 /**< Ideal gas constant, J K^-1 */
#define LAL_MOL 6.0221367e23 /**< Avogadro constant, dimensionless */ #define LAL_MOL 6.0221367e23 /**< Avogadro constant, dimensionless */
#define LAL_BWIEN_SI 2.897756e-3 /**< Wien displacement law constant, m K */ #define LAL_BWIEN_SI 2.897756e-3 /**< Wien displacement law constant, m K */
#define LAL_SIGMA_SI 5.67051e-8 /**< Stefan-Boltzmann constant, W m^-2 K^ -4 */ #define LAL_SIGMA_SI 5.67051e-8 /**< Stefan-Boltzmann constant, W m^-2 K^ -4 */
#define LAL_AMU_SI 1.6605402e-27 /**< Atomic mass unit, kg */ #define LAL_AMU_SI 1.6605402e-27 /**< Atomic mass unit, kg */
#define LAL_MP_SI 1.6726231e-27 /**< Proton mass, kg */ #define LAL_MP_SI 1.6726231e-27 /**< Proton mass, kg */
#define LAL_ME_SI 9.1093897e-31 /**< Electron mass, kg */ #define LAL_ME_SI 9.1093897e-31 /**< Electron mass, kg */
#define LAL_QE_SI 1.60217733e-19 /**< Electron charge, C */ #define LAL_QE_SI 1.60217733e-19 /**< Electron charge, C */
#define LAL_ALPHA 7.297354677e-3 /**< Fine structure constant, dimensionle ss */ #define LAL_ALPHA 7.297354677e-3 /**< Fine structure constant, dimensionle ss */
skipping to change at line 147 skipping to change at line 147
* given in the SI units shown. Note that the ``year'' and * given in the SI units shown. Note that the ``year'' and
* ``light-year'' have exactly defined values, and appear under * ``light-year'' have exactly defined values, and appear under
* ``Exact physical constants''. * ``Exact physical constants''.
*/ */
/*@{*/ /*@{*/
#define LAL_REARTH_SI 6.378140e6 /**< Earth equatorial radius, m */ #define LAL_REARTH_SI 6.378140e6 /**< Earth equatorial radius, m */
#define LAL_AWGS84_SI 6.378137e6 /**< Semimajor axis of WGS-84 Referen ce Ellipsoid, m */ #define LAL_AWGS84_SI 6.378137e6 /**< Semimajor axis of WGS-84 Referen ce Ellipsoid, m */
#define LAL_BWGS84_SI 6.356752314e6 /**< Semiminor axis of WGS-84 Referen ce Ellipsoid, m */ #define LAL_BWGS84_SI 6.356752314e6 /**< Semiminor axis of WGS-84 Referen ce Ellipsoid, m */
#define LAL_MEARTH_SI 5.97370e24 /**< Earth mass, kg */ #define LAL_MEARTH_SI 5.97370e24 /**< Earth mass, kg */
#define LAL_IEARTH 0.409092804 /**< Earth inclination (2000), radian s */ #define LAL_IEARTH 0.409092804 /**< Earth inclination (2000), radian s */
#define LAL_COSIEARTH 0.91748206215761919815 /**< Cosine of Earth inclina
tion (2000) */
#define LAL_SINIEARTH 0.39777715572793088957 /**< Sine of Earth inclinati
on (2000) */
#define LAL_EEARTH 0.0167 /**< Earth orbital eccentricity */ #define LAL_EEARTH 0.0167 /**< Earth orbital eccentricity */
#define LAL_RSUN_SI 6.960e8 /**< Solar equatorial radius, m */ #define LAL_RSUN_SI 6.960e8 /**< Solar equatorial radius, m */
#define LAL_MSUN_SI 1.98892e30 /**< Solar mass, kg */ #define LAL_MSUN_SI 1.98892e30 /**< Solar mass, kg */
#define LAL_MRSUN_SI 1.47662504e3 /**< Geometrized solar mass, m */ #define LAL_MRSUN_SI 1.4766254500421874513093320107664308e3 /**< Geometri
#define LAL_MTSUN_SI 4.92549095e-6 /**< Geometrized solar mass, s */ zed solar mass, m. = LAL_MSUN_SI / LAL_MPL_SI * LAL_LPL_SI */
#define LAL_MTSUN_SI 4.9254923218988636432342917247829673e-6 /**< Geometri
zed solar mass, s. = LAL_MSUN_SI / LAL_MPL_SI * LAL_TPL_SI */
#define LAL_LSUN_SI 3.846e26 /**< Solar luminosity, W */ #define LAL_LSUN_SI 3.846e26 /**< Solar luminosity, W */
#define LAL_AU_SI 1.4959787066e11 /**< Astronomical unit, m */ #define LAL_AU_SI 1.4959787066e11 /**< Astronomical unit, m */
#define LAL_PC_SI 3.0856775807e16 /**< Parsec, m */ #define LAL_PC_SI 3.0856775807e16 /**< Parsec, m */
#define LAL_YRTROP_SI 31556925.2 /**< Tropical year (1994), s */ #define LAL_YRTROP_SI 31556925.2 /**< Tropical year (1994), s */
#define LAL_YRSID_SI 31558149.8 /**< Sidereal year (1994), s */ #define LAL_YRSID_SI 31558149.8 /**< Sidereal year (1994), s */
#define LAL_DAYSID_SI 86164.09053 /**< Mean sidereal day, s */ #define LAL_DAYSID_SI 86164.09053 /**< Mean sidereal day, s */
/*@}*/ /*@}*/
/** \name Cosmological parameters /** \name Cosmological parameters
* The following cosmological parameters are derived from measurements of * The following cosmological parameters are derived from measurements of
 End of changes. 3 change blocks. 
6 lines changed or deleted 16 lines changed or added


 LALCorrelation.h   LALCorrelation.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALCORRELATION_H #ifndef _LALCORRELATION_H
#define _LALCORRELATION_H #define _LALCORRELATION_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
/* ****** INCLUDE ANY OTHER LAL HEADERS needed for header (NOT module) **** / /* ****** INCLUDE ANY OTHER LAL HEADERS needed for header (NOT module) **** /
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup LALCorrelation_h \addtogroup LALCorrelation_h
\author Yakushin, Igor \author Yakushin, Igor
skipping to change at line 73 skipping to change at line 68
/** \endcond */ /** \endcond */
/* ***** DEFINE OTHER GLOBAL CONSTANTS OR MACROS ************/ /* ***** DEFINE OTHER GLOBAL CONSTANTS OR MACROS ************/
/* ***** DEFINE NEW STRUCTURES AND TYPES ************/ /* ***** DEFINE NEW STRUCTURES AND TYPES ************/
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagCorrelationParams tagCorrelationParams
{ {
SWIGLAL_STRUCT(CorrelationParams);
REAL4 maxTimeShiftNan; REAL4 maxTimeShiftNan;
} }
CorrelationParams; CorrelationParams;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagInputCorrelation tagInputCorrelation
{ {
SWIGLAL_STRUCT(InputCorrelation);
REAL4TimeSeries *one; REAL4TimeSeries *one;
REAL4TimeSeries *two; REAL4TimeSeries *two;
} }
InputCorrelation; InputCorrelation;
/** OutputCorrelation structure */ /** OutputCorrelation structure */
typedef struct typedef struct
tagOutputCorrelation tagOutputCorrelation
{ {
SWIGLAL_STRUCT(OutputCorrelation);
REAL4 *timeShiftedCorrelation; /**< cor(x(t-T),y(t)) or cor(x(t),y(t-T)) as a function of T*/ REAL4 *timeShiftedCorrelation; /**< cor(x(t-T),y(t)) or cor(x(t),y(t-T)) as a function of T*/
INT4 maxCorrelationTimeShift; /**< time step (from shift=0) at which cor relation is maximum */ INT4 maxCorrelationTimeShift; /**< time step (from shift=0) at which cor relation is maximum */
REAL4 maxCorrelationValue; /**< maximum value of the correlation for the range of shifts */ REAL4 maxCorrelationValue; /**< maximum value of the correlation for the range of shifts */
INT4 minCorrelationTimeShift; /**< UNDOCUMENTED */ INT4 minCorrelationTimeShift; /**< UNDOCUMENTED */
REAL4 minCorrelationValue; /**< UNDOCUMENTED */ REAL4 minCorrelationValue; /**< UNDOCUMENTED */
LIGOTimeGPS start; /**< start time for the time series under co nsideration */ LIGOTimeGPS start; /**< start time for the time series under co nsideration */
INT4 length; /**< number of time steps in the tim e series */ INT4 length; /**< number of time steps in the tim e series */
 End of changes. 4 change blocks. 
8 lines changed or deleted 0 lines changed or added


 LALDatatypes.h   LALDatatypes.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 _LALDATATYPES_H #ifndef _LALDATATYPES_H
#define _LALDATATYPES_H #define _LALDATATYPES_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#if !defined(SWIG) && !defined(SWIGLAL_DYNAMIC_1DARRAY)
#define SWIGLAL_DYNAMIC_1DARRAY(...)
#endif
#if !defined(SWIG) && !defined(SWIGLAL_DYNAMIC_2DARRAY)
#define SWIGLAL_DYNAMIC_2DARRAY(...)
#endif
#include <lal/LALAtomicDatatypes.h> #include <lal/LALAtomicDatatypes.h>
/** \addtogroup LALDatatypes */ /*@{*/ /** \addtogroup LALDatatypes */ /*@{*/
/* ---------- constants ---------- */ /* ---------- constants ---------- */
/** Type size constants, see \ref LALDatatypes for more details. */ /** Type size constants, see \ref LALDatatypes for more details. */
enum enum
{ {
LAL_1_BYTE_TYPE_SIZE = 000, /**< One byte size 00 = 0 */ LAL_1_BYTE_TYPE_SIZE = 000, /**< One byte size 00 = 0 */
skipping to change at line 89 skipping to change at line 78
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* ---------- Vector types ---------- */ /* ---------- Vector types ---------- */
/** Vector of type CHAR, see \ref ss_Vector for more details. */ /** Vector of type CHAR, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagCHARVector tagCHARVector
{ {
SWIGLAL_STRUCT(CHARVector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(CHAR, data, UINT4, length); SWIGLAL(1D_ARRAY(CHAR, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
CHAR *data; /**< Pointer to the data array. */ CHAR *data; /**< Pointer to the data array. */
} }
CHARVector; CHARVector;
/** Vector of type CHAR*, ie 'strings', see \ref ss_Vector for more details . */ /** Vector of type CHAR*, ie 'strings', see \ref ss_Vector for more details . */
typedef struct tagLALStringVector { typedef struct tagLALStringVector {
SWIGLAL_STRUCT(LALStringVector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(CHAR*, data, UINT4, length); SWIGLAL(1D_ARRAY(CHAR*, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
CHAR **data; /**< Pointer to the data array. */ CHAR **data; /**< Pointer to the data array. */
} LALStringVector; } LALStringVector;
/** Vector of type INT2, see \ref ss_Vector for more details. */ /** Vector of type INT2, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagINT2Vector tagINT2Vector
{ {
SWIGLAL_STRUCT(INT2Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(INT2, data, UINT4, length); SWIGLAL(1D_ARRAY(INT2, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
INT2 *data; /**< Pointer to the data array. */ INT2 *data; /**< Pointer to the data array. */
} }
INT2Vector; INT2Vector;
/** Vector of type UINT2, see \ref ss_Vector for more details. */ /** Vector of type UINT2, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagUINT2Vector tagUINT2Vector
{ {
SWIGLAL_STRUCT(UINT2Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(UINT2, data, UINT4, length); SWIGLAL(1D_ARRAY(UINT2, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
UINT2 *data; /**< Pointer to the data array. */ UINT2 *data; /**< Pointer to the data array. */
} }
UINT2Vector; UINT2Vector;
/** Vector of type INT4, see \ref ss_Vector for more details. */ /** Vector of type INT4, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagINT4Vector tagINT4Vector
{ {
SWIGLAL_STRUCT(INT4Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(INT4, data, UINT4, length); SWIGLAL(1D_ARRAY(INT4, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
INT4 *data; /**< Pointer to the data array. */ INT4 *data; /**< Pointer to the data array. */
} }
INT4Vector; INT4Vector;
/** Vector of type UINT4, see \ref ss_Vector for more details. */ /** Vector of type UINT4, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagUINT4Vector tagUINT4Vector
{ {
SWIGLAL_STRUCT(UINT4Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(UINT4, data, UINT4, length); SWIGLAL(1D_ARRAY(UINT4, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
UINT4 *data; /**< Pointer to the data array. */ UINT4 *data; /**< Pointer to the data array. */
} }
UINT4Vector; UINT4Vector;
/** Vector of type INT8, see \ref ss_Vector for more details. */ /** Vector of type INT8, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagINT8Vector tagINT8Vector
{ {
SWIGLAL_STRUCT(INT8Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(INT8, data, UINT4, length); SWIGLAL(1D_ARRAY(INT8, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
INT8 *data; /**< Pointer to the data array. */ INT8 *data; /**< Pointer to the data array. */
} }
INT8Vector; INT8Vector;
/** Vector of type UINT8, see \ref ss_Vector for more details. */ /** Vector of type UINT8, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagUINT8Vector tagUINT8Vector
{ {
SWIGLAL_STRUCT(UINT8Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(UINT8, data, UINT4, length); SWIGLAL(1D_ARRAY(UINT8, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
UINT8 *data; /**< Pointer to the data array. */ UINT8 *data; /**< Pointer to the data array. */
} }
UINT8Vector; UINT8Vector;
/** Vector of type REAL4, see \ref ss_Vector for more details. */ /** Vector of type REAL4, see \ref ss_Vector for more details. */
typedef struct typedef struct
tagREAL4Vector tagREAL4Vector
{ {
SWIGLAL_STRUCT(REAL4Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(REAL4, data, UINT4, length); SWIGLAL(1D_ARRAY(REAL4, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
REAL4 *data; /**< Pointer to the data array. */ REAL4 *data; /**< Pointer to the data array. */
} }
REAL4Vector; REAL4Vector;
/** Vector of type REAL8, see \ref ss_Vector for more details. */ /** Vector of type REAL8, see \ref ss_Vector for more details. */
typedef struct tagREAL8Vector typedef struct tagREAL8Vector
{ {
SWIGLAL_STRUCT(REAL8Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(REAL8, data, UINT4, length); SWIGLAL(1D_ARRAY(REAL8, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
REAL8 *data; /**< Pointer to the data array. */ REAL8 *data; /**< Pointer to the data array. */
} }
REAL8Vector; REAL8Vector;
/** Vector of type COMPLEX8, see \ref ss_Vector for more details. */ /** Vector of type COMPLEX8, see \ref ss_Vector for more details. */
typedef struct tagCOMPLEX8Vector typedef struct tagCOMPLEX8Vector
{ {
SWIGLAL_STRUCT(COMPLEX8Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(COMPLEX8, data, UINT4, length); SWIGLAL(1D_ARRAY(COMPLEX8, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
COMPLEX8 *data; /**< Pointer to the data array. */ COMPLEX8 *data; /**< Pointer to the data array. */
} }
COMPLEX8Vector; COMPLEX8Vector;
/** Vector of type COMPLEX16, see \ref ss_Vector for more details. */ /** Vector of type COMPLEX16, see \ref ss_Vector for more details. */
typedef struct tagCOMPLEX16Vector typedef struct tagCOMPLEX16Vector
{ {
SWIGLAL_STRUCT(COMPLEX16Vector); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_1DARRAY(COMPLEX16, data, UINT4, length); SWIGLAL(1D_ARRAY(COMPLEX16, data, UINT4, length));
#endif /* SWIG */
UINT4 length; /**< Number of elements in array. */ UINT4 length; /**< Number of elements in array. */
COMPLEX16 *data; /**< Pointer to the data array. */ COMPLEX16 *data; /**< Pointer to the data array. */
} }
COMPLEX16Vector; COMPLEX16Vector;
/* ---------- Array types ---------- */ /* ---------- Array types ---------- */
/** Multidimentional array of INT2, see \ref ss_Array for more details. */ /** Multidimentional array of INT2, see \ref ss_Array for more details. */
typedef struct typedef struct
tagINT2Array tagINT2Array
{ {
SWIGLAL_STRUCT(INT2Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
INT2 *data; /**< Pointer to the data array. */ INT2 *data; /**< Pointer to the data array. */
} }
INT2Array; INT2Array;
/** Multidimentional array of UINT2, see \ref ss_Array for more details. */ /** Multidimentional array of UINT2, see \ref ss_Array for more details. */
typedef struct typedef struct
tagUINT2Array tagUINT2Array
{ {
SWIGLAL_STRUCT(UINT2Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
UINT2 *data; /**< Pointer to the data array. */ UINT2 *data; /**< Pointer to the data array. */
} }
UINT2Array; UINT2Array;
/** Multidimentional array of INT4, see \ref ss_Array for more details. */ /** Multidimentional array of INT4, see \ref ss_Array for more details. */
typedef struct typedef struct
tagINT4Array tagINT4Array
{ {
SWIGLAL_STRUCT(INT4Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
INT4 *data; /**< Pointer to the data array. */ INT4 *data; /**< Pointer to the data array. */
} }
INT4Array; INT4Array;
/** Multidimentional array of UINT4, see \ref ss_Array for more details. */ /** Multidimentional array of UINT4, see \ref ss_Array for more details. */
typedef struct typedef struct
tagUINT4Array tagUINT4Array
{ {
SWIGLAL_STRUCT(UINT4Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
UINT4 *data; /**< Pointer to the data array. */ UINT4 *data; /**< Pointer to the data array. */
} }
UINT4Array; UINT4Array;
/** Multidimentional array of INT8, see \ref ss_Array for more details. */ /** Multidimentional array of INT8, see \ref ss_Array for more details. */
typedef struct typedef struct
tagINT8Array tagINT8Array
{ {
SWIGLAL_STRUCT(INT8Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
INT8 *data; /**< Pointer to the data array. */ INT8 *data; /**< Pointer to the data array. */
} }
INT8Array; INT8Array;
/** Multidimentional array of UINT8, see \ref ss_Array for more details. */ /** Multidimentional array of UINT8, see \ref ss_Array for more details. */
typedef struct typedef struct
tagUINT8Array tagUINT8Array
{ {
SWIGLAL_STRUCT(UINT8Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
UINT8 *data; /**< Pointer to the data array. */ UINT8 *data; /**< Pointer to the data array. */
} }
UINT8Array; UINT8Array;
/** Multidimentional array of REAL4, see \ref ss_Array for more details. */ /** Multidimentional array of REAL4, see \ref ss_Array for more details. */
typedef struct typedef struct
tagREAL4Array tagREAL4Array
{ {
SWIGLAL_STRUCT(REAL4Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
REAL4 *data; /**< Pointer to the data array. */ REAL4 *data; /**< Pointer to the data array. */
} }
REAL4Array; REAL4Array;
/** Multidimentional array of REAL8, see \ref ss_Array for more details. */ /** Multidimentional array of REAL8, see \ref ss_Array for more details. */
typedef struct typedef struct
tagREAL8Array tagREAL8Array
{ {
SWIGLAL_STRUCT(REAL8Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
REAL8 *data; /**< Pointer to the data array. */ REAL8 *data; /**< Pointer to the data array. */
} }
REAL8Array; REAL8Array;
/** Multidimentional array of COMPLEX8, see \ref ss_Array for more details. */ /** Multidimentional array of COMPLEX8, see \ref ss_Array for more details. */
typedef struct typedef struct
tagCOMPLEX8Array tagCOMPLEX8Array
{ {
SWIGLAL_STRUCT(COMPLEX8Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
COMPLEX8 *data; /**< Pointer to the data array. */ COMPLEX8 *data; /**< Pointer to the data array. */
} }
COMPLEX8Array; COMPLEX8Array;
/** Multidimentional array of COMPLEX16, see \ref ss_Array for more details . */ /** Multidimentional array of COMPLEX16, see \ref ss_Array for more details . */
typedef struct typedef struct
tagCOMPLEX16Array tagCOMPLEX16Array
{ {
SWIGLAL_STRUCT(COMPLEX16Array);
UINT4Vector *dimLength; /**< Vector of array dimensions. */ UINT4Vector *dimLength; /**< Vector of array dimensions. */
COMPLEX16 *data; /**< Pointer to the data array. */ COMPLEX16 *data; /**< Pointer to the data array. */
} }
COMPLEX16Array; COMPLEX16Array;
/* ---------- Sequence types ---------- */ /* ---------- Sequence types ---------- */
typedef CHARVector CHARSequence; /**< See \ref ss_Sequence for docume ntation */ typedef CHARVector CHARSequence; /**< See \ref ss_Sequence for docume ntation */
typedef INT2Vector INT2Sequence; /**< See \ref ss_Sequence for docume ntation */ typedef INT2Vector INT2Sequence; /**< See \ref ss_Sequence for docume ntation */
typedef UINT2Vector UINT2Sequence; /**< See \ref ss_Sequence for docume ntation */ typedef UINT2Vector UINT2Sequence; /**< See \ref ss_Sequence for docume ntation */
skipping to change at line 333 skipping to change at line 324
typedef REAL8Vector REAL8Sequence; /**< See \ref ss_Sequence for docume ntation */ typedef REAL8Vector REAL8Sequence; /**< See \ref ss_Sequence for docume ntation */
typedef COMPLEX8Vector COMPLEX8Sequence;/**< See \ref ss_Sequence for docu mentation */ typedef COMPLEX8Vector COMPLEX8Sequence;/**< See \ref ss_Sequence for docu mentation */
typedef COMPLEX16Vector COMPLEX16Sequence;/**< See \ref ss_Sequence for doc umentation */ typedef COMPLEX16Vector COMPLEX16Sequence;/**< See \ref ss_Sequence for doc umentation */
/* ---------- VectorSequence types ---------- */ /* ---------- VectorSequence types ---------- */
/** Sequence of CHAR Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of CHAR Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagCHARVectorSequence tagCHARVectorSequence
{ {
SWIGLAL_STRUCT(CHARVectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(CHAR, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(CHAR, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
CHAR *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ CHAR *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
CHARVectorSequence; CHARVectorSequence;
/** Sequence of INT2 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of INT2 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagINT2VectorSequence tagINT2VectorSequence
{ {
SWIGLAL_STRUCT(INT2VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(INT2, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(INT2, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
INT2 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ INT2 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
INT2VectorSequence; INT2VectorSequence;
/** Sequence of UINT2 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of UINT2 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagUINT2VectorSequence tagUINT2VectorSequence
{ {
SWIGLAL_STRUCT(UINT2VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(UINT2, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(UINT2, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
UINT2 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ UINT2 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
UINT2VectorSequence; UINT2VectorSequence;
/** Sequence of INT4 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of INT4 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagINT4VectorSequence tagINT4VectorSequence
{ {
SWIGLAL_STRUCT(INT4VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(INT4, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(INT4, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
INT4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ INT4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
INT4VectorSequence; INT4VectorSequence;
/** Sequence of UINT4 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of UINT4 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagUINT4VectorSequence tagUINT4VectorSequence
{ {
SWIGLAL_STRUCT(UINT4VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(UINT4, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(UINT4, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
UINT4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ UINT4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
UINT4VectorSequence; UINT4VectorSequence;
/** Sequence of INT8 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of INT8 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagINT8VectorSequence tagINT8VectorSequence
{ {
SWIGLAL_STRUCT(INT8VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(INT8, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(INT8, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
INT8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ INT8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
INT8VectorSequence; INT8VectorSequence;
/** Sequence of UINT8 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of UINT8 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagUINT8VectorSequence tagUINT8VectorSequence
{ {
SWIGLAL_STRUCT(UINT8VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(UINT8, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(UINT8, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
UINT8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ UINT8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
UINT8VectorSequence; UINT8VectorSequence;
/** Sequence of REAL4 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of REAL4 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagREAL4VectorSequence tagREAL4VectorSequence
{ {
SWIGLAL_STRUCT(REAL4VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(REAL4, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(REAL4, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
REAL4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ REAL4 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
REAL4VectorSequence; REAL4VectorSequence;
/** Sequence of REAL8 Vectors, see \ref ss_VectorSequence for more details. */ /** Sequence of REAL8 Vectors, see \ref ss_VectorSequence for more details. */
typedef struct typedef struct
tagREAL8VectorSequence tagREAL8VectorSequence
{ {
SWIGLAL_STRUCT(REAL8VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(REAL8, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(REAL8, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
REAL8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ REAL8 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
REAL8VectorSequence; REAL8VectorSequence;
/** Sequence of COMPLEX8 Vectors, see \ref ss_VectorSequence for more detai ls. */ /** Sequence of COMPLEX8 Vectors, see \ref ss_VectorSequence for more detai ls. */
typedef struct typedef struct
tagCOMPLEX8VectorSequence tagCOMPLEX8VectorSequence
{ {
SWIGLAL_STRUCT(COMPLEX8VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(COMPLEX8, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(COMPLEX8, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
COMPLEX8 *data; /**< Pointer to the data array. Element \a i of vector \ a j is \c data[ \a jn + \a i \c ]. */ COMPLEX8 *data; /**< Pointer to the data array. Element \a i of vector \ a j is \c data[ \a jn + \a i \c ]. */
} }
COMPLEX8VectorSequence; COMPLEX8VectorSequence;
/** Sequence of COMPLEX16 Vectors, see \ref ss_VectorSequence for more deta ils. */ /** Sequence of COMPLEX16 Vectors, see \ref ss_VectorSequence for more deta ils. */
typedef struct typedef struct
tagCOMPLEX16VectorSequence tagCOMPLEX16VectorSequence
{ {
SWIGLAL_STRUCT(COMPLEX16VectorSequence); #ifdef SWIG /* SWIG interface directives */
SWIGLAL_DYNAMIC_2DARRAY(COMPLEX16, data, UINT4, length, vectorLength); SWIGLAL(2D_ARRAY(COMPLEX16, data, UINT4, length, vectorLength));
#endif /* SWIG */
UINT4 length; /**< The number \a l of vectors. */ UINT4 length; /**< The number \a l of vectors. */
UINT4 vectorLength; /**< The length \a n of each vector. */ UINT4 vectorLength; /**< The length \a n of each vector. */
COMPLEX16 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */ COMPLEX16 *data; /**< Pointer to the data array. Element \a i of vector \a j is \c data[ \a jn + \a i \c ]. */
} }
COMPLEX16VectorSequence; COMPLEX16VectorSequence;
/* ---------- ArraySequence types ---------- */ /* ---------- ArraySequence types ---------- */
/** Sequence of INT2 multidimensional arrays, see \ref ss_ArraySequence for more details. */ /** Sequence of INT2 multidimensional arrays, see \ref ss_ArraySequence for more details. */
typedef struct typedef struct
tagINT2ArraySequence tagINT2ArraySequence
{ {
SWIGLAL_STRUCT(INT2ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
INT2 *data; /**< Pointer to the data array. */ INT2 *data; /**< Pointer to the data array. */
} }
INT2ArraySequence; INT2ArraySequence;
/** Sequence of UINT2 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */ /** Sequence of UINT2 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */
typedef struct typedef struct
tagUINT2ArraySequence tagUINT2ArraySequence
{ {
SWIGLAL_STRUCT(UINT2ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
UINT2 *data; /**< Pointer to the data array. */ UINT2 *data; /**< Pointer to the data array. */
} }
UINT2ArraySequence; UINT2ArraySequence;
/** Sequence of INT4 multidimensional arrays, see \ref ss_ArraySequence for more details. */ /** Sequence of INT4 multidimensional arrays, see \ref ss_ArraySequence for more details. */
typedef struct typedef struct
tagINT4ArraySequence tagINT4ArraySequence
{ {
SWIGLAL_STRUCT(INT4ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
INT4 *data; /**< Pointer to the data array. */ INT4 *data; /**< Pointer to the data array. */
} }
INT4ArraySequence; INT4ArraySequence;
/** Sequence of UINT4 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */ /** Sequence of UINT4 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */
typedef struct typedef struct
tagUINT4ArraySequence tagUINT4ArraySequence
{ {
SWIGLAL_STRUCT(UINT4ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
UINT4 *data; /**< Pointer to the data array. */ UINT4 *data; /**< Pointer to the data array. */
} }
UINT4ArraySequence; UINT4ArraySequence;
/** Sequence of INT8 multidimensional arrays, see \ref ss_ArraySequence for more details. */ /** Sequence of INT8 multidimensional arrays, see \ref ss_ArraySequence for more details. */
typedef struct typedef struct
tagINT8ArraySequence tagINT8ArraySequence
{ {
SWIGLAL_STRUCT(INT8ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
INT8 *data; /**< Pointer to the data array. */ INT8 *data; /**< Pointer to the data array. */
} }
INT8ArraySequence; INT8ArraySequence;
/** Sequence of UINT8 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */ /** Sequence of UINT8 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */
typedef struct typedef struct
tagUINT8ArraySequence tagUINT8ArraySequence
{ {
SWIGLAL_STRUCT(UINT8ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
UINT8 *data; /**< Pointer to the data array. */ UINT8 *data; /**< Pointer to the data array. */
} }
UINT8ArraySequence; UINT8ArraySequence;
/** Sequence of REAL4 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */ /** Sequence of REAL4 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */
typedef struct typedef struct
tagREAL4ArraySequence tagREAL4ArraySequence
{ {
SWIGLAL_STRUCT(REAL4ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
REAL4 *data; /**< Pointer to the data array. */ REAL4 *data; /**< Pointer to the data array. */
} }
REAL4ArraySequence; REAL4ArraySequence;
/** Sequence of REAL8 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */ /** Sequence of REAL8 multidimensional arrays, see \ref ss_ArraySequence fo r more details. */
typedef struct typedef struct
tagREAL8ArraySequence tagREAL8ArraySequence
{ {
SWIGLAL_STRUCT(REAL8ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
REAL8 *data; /**< Pointer to the data array. */ REAL8 *data; /**< Pointer to the data array. */
} }
REAL8ArraySequence; REAL8ArraySequence;
/** Sequence of COMPLEX8 multidimensional arrays, see \ref ss_ArraySequence for more details. */ /** Sequence of COMPLEX8 multidimensional arrays, see \ref ss_ArraySequence for more details. */
typedef struct typedef struct
tagCOMPLEX8ArraySequence tagCOMPLEX8ArraySequence
{ {
SWIGLAL_STRUCT(COMPLEX8ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he array dimensions */
COMPLEX8 *data; /**< Pointer to the data array. */ COMPLEX8 *data; /**< Pointer to the data array. */
} }
COMPLEX8ArraySequence; COMPLEX8ArraySequence;
/** Sequence of COMPLEX16 multidimensional arrays, see \ref ss_ArraySequenc e for more details. */ /** Sequence of COMPLEX16 multidimensional arrays, see \ref ss_ArraySequenc e for more details. */
typedef struct typedef struct
tagCOMPLEX16ArraySequence tagCOMPLEX16ArraySequence
{ {
SWIGLAL_STRUCT(COMPLEX16ArraySequence);
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 t he array dimensions */ UINT4Vector *dimLength; /**< Pointer to a vector of length \a m storing t he 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 * /
typedef struct typedef struct
tagLIGOTimeGPS tagLIGOTimeGPS
{ {
SWIGLAL_STRUCT(LIGOTimeGPS);
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 }
/** Indices of arrays corresponding to particular units. /** Indices of arrays corresponding to particular units.
* *
skipping to change at line 630 skipping to change at line 621
* 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}
* *
*/ */
typedef struct typedef struct
tagLALUnit tagLALUnit
{ {
SWIGLAL_STRUCT(LALUnit);
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 deno minators-minus-one. */ UINT2 unitDenominatorMinusOne[LALNumUnits]; /**< Array of unit power deno minators-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 };
/** Time series of INT2 data, see \ref ss_TimeSeries for more details. */ /** Time series of INT2 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagINT2TimeSeries tagINT2TimeSeries
{ {
SWIGLAL_STRUCT(INT2TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */ REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT2Sequence *data; /**< The sequence of sampled data. */ INT2Sequence *data; /**< The sequence of sampled data. */
} }
INT2TimeSeries; INT2TimeSeries;
/** Time series of UINT2 data, see \ref ss_TimeSeries for more details. */ /** Time series of UINT2 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagUINT2TimeSeries tagUINT2TimeSeries
{ {
SWIGLAL_STRUCT(UINT2TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */ REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT2Sequence *data; /**< The sequence of sampled data. */ UINT2Sequence *data; /**< The sequence of sampled data. */
} }
UINT2TimeSeries; UINT2TimeSeries;
/** Time series of INT4 data, see \ref ss_TimeSeries for more details. */ /** Time series of INT4 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagINT4TimeSeries tagINT4TimeSeries
{ {
SWIGLAL_STRUCT(INT4TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */ REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT4Sequence *data; /**< The sequence of sampled data. */ INT4Sequence *data; /**< The sequence of sampled data. */
} }
INT4TimeSeries; INT4TimeSeries;
/** Time series of UINT4 data, see \ref ss_TimeSeries for more details. */ /** Time series of UINT4 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagUINT4TimeSeries tagUINT4TimeSeries
{ {
SWIGLAL_STRUCT(UINT4TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */ REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT4Sequence *data; /**< The sequence of sampled data. */ UINT4Sequence *data; /**< The sequence of sampled data. */
} }
UINT4TimeSeries; UINT4TimeSeries;
/** Time series of INT8 data, see \ref ss_TimeSeries for more details. */ /** Time series of INT8 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagINT8TimeSeries tagINT8TimeSeries
{ {
SWIGLAL_STRUCT(INT8TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */ REAL8 deltaT; /**< The time step between samples of the time seri es in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT8Sequence *data; /**< The sequence of sampled data. */ INT8Sequence *data; /**< The sequence of sampled data. */
} }
INT8TimeSeries; INT8TimeSeries;
/** Time series of UINT8 data, see \ref ss_TimeSeries for more details. */ /** Time series of UINT8 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagUINT8TimeSeries tagUINT8TimeSeries
{ {
SWIGLAL_STRUCT(UINT8TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */ REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT8Sequence *data; /**< The sequence of sampled data. */ UINT8Sequence *data; /**< The sequence of sampled data. */
} }
UINT8TimeSeries; UINT8TimeSeries;
/** Time series of REAL4 data, see \ref ss_TimeSeries for more details. */ /** Time series of REAL4 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagREAL4TimeSeries tagREAL4TimeSeries
{ {
SWIGLAL_STRUCT(REAL4TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */ REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
REAL4Sequence *data; /**< The sequence of sampled data. */ REAL4Sequence *data; /**< The sequence of sampled data. */
} }
REAL4TimeSeries; REAL4TimeSeries;
/** Time series of REAL8 data, see \ref ss_TimeSeries for more details. */ /** Time series of REAL8 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagREAL8TimeSeries tagREAL8TimeSeries
{ {
SWIGLAL_STRUCT(REAL8TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */ REAL8 deltaT; /**< The time step between samples of the time ser ies in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
REAL8Sequence *data; /**< The sequence of sampled data. */ REAL8Sequence *data; /**< The sequence of sampled data. */
} }
REAL8TimeSeries; REAL8TimeSeries;
/** Time series of COMPLEX8 data, see \ref ss_TimeSeries for more details. */ /** Time series of COMPLEX8 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagCOMPLEX8TimeSeries tagCOMPLEX8TimeSeries
{ {
SWIGLAL_STRUCT(COMPLEX8TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time series in seconds. */ REAL8 deltaT; /**< The time step between samples of the time series in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity be ing sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity be ing sampled. */
COMPLEX8Sequence *data; /**< The sequence of sampled data. */ COMPLEX8Sequence *data; /**< The sequence of sampled data. */
} }
COMPLEX8TimeSeries; COMPLEX8TimeSeries;
/** Time series of COMPLEX16 data, see \ref ss_TimeSeries for more details. */ /** Time series of COMPLEX16 data, see \ref ss_TimeSeries for more details. */
typedef struct typedef struct
tagCOMPLEX16TimeSeries tagCOMPLEX16TimeSeries
{ {
SWIGLAL_STRUCT(COMPLEX16TimeSeries);
CHAR name[LALNameLength]; /**< The name of the time series. */ CHAR name[LALNameLength]; /**< The name of the time series. */
LIGOTimeGPS epoch; /**< The start time of the time series. */ LIGOTimeGPS epoch; /**< The start time of the time series. */
REAL8 deltaT; /**< The time step between samples of the time series in seconds. */ REAL8 deltaT; /**< The time step between samples of the time series in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity b eing sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity b eing sampled. */
COMPLEX16Sequence *data; /**< The sequence of sampled data. */ COMPLEX16Sequence *data; /**< The sequence of sampled data. */
} }
COMPLEX16TimeSeries; COMPLEX16TimeSeries;
/* ---------- TimeVectorSeries types ---------- */ /* ---------- TimeVectorSeries types ---------- */
/** Time series of INT2 vectors, see \ref ss_TimeVectorSeries for more deta ils. */ /** Time series of INT2 vectors, see \ref ss_TimeVectorSeries for more deta ils. */
typedef struct typedef struct
tagINT2TimeVectorSeries tagINT2TimeVectorSeries
{ {
SWIGLAL_STRUCT(INT2TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT2VectorSequence *data; /**< The sequence of sampled data vectors. */ INT2VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
INT2TimeVectorSeries; INT2TimeVectorSeries;
/** Time series of UINT2 vectors, see \ref ss_TimeVectorSeries for more det ails. */ /** Time series of UINT2 vectors, see \ref ss_TimeVectorSeries for more det ails. */
typedef struct typedef struct
tagUINT2TimeVectorSeries tagUINT2TimeVectorSeries
{ {
SWIGLAL_STRUCT(UINT2TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT2VectorSequence *data; /**< The sequence of sampled data vectors. */ UINT2VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
UINT2TimeVectorSeries; UINT2TimeVectorSeries;
/** Time series of INT4 vectors, see \ref ss_TimeVectorSeries for more deta ils. */ /** Time series of INT4 vectors, see \ref ss_TimeVectorSeries for more deta ils. */
typedef struct typedef struct
tagINT4TimeVectorSeries tagINT4TimeVectorSeries
{ {
SWIGLAL_STRUCT(INT4TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT4VectorSequence *data; /**< The sequence of sampled data vectors. */ INT4VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
INT4TimeVectorSeries; INT4TimeVectorSeries;
/** Time series of UINT4 vectors, see \ref ss_TimeVectorSeries for more det ails. */ /** Time series of UINT4 vectors, see \ref ss_TimeVectorSeries for more det ails. */
typedef struct typedef struct
tagUINT4TimeVectorSeries tagUINT4TimeVectorSeries
{ {
SWIGLAL_STRUCT(UINT4TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT4VectorSequence *data; /**< The sequence of sampled data vectors. */ UINT4VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
UINT4TimeVectorSeries; UINT4TimeVectorSeries;
/** Time series of INT8 vectors, see \ref ss_TimeVectorSeries for more deta ils. */ /** Time series of INT8 vectors, see \ref ss_TimeVectorSeries for more deta ils. */
typedef struct typedef struct
tagINT8TimeVectorSeries tagINT8TimeVectorSeries
{ {
SWIGLAL_STRUCT(INT8TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
INT8VectorSequence *data; /**< The sequence of sampled data vectors. */ INT8VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
INT8TimeVectorSeries; INT8TimeVectorSeries;
/** Time series of UINT8 vectors, see \ref ss_TimeVectorSeries for more det ails. */ /** Time series of UINT8 vectors, see \ref ss_TimeVectorSeries for more det ails. */
typedef struct typedef struct
tagUINT8TimeVectorSeries tagUINT8TimeVectorSeries
{ {
SWIGLAL_STRUCT(UINT8TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
UINT8VectorSequence *data; /**< The sequence of sampled data vectors. */ UINT8VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
UINT8TimeVectorSeries; UINT8TimeVectorSeries;
/** Time series of REAL4 vectors, see \ref ss_TimeVectorSeries for more det ails. */ /** Time series of REAL4 vectors, see \ref ss_TimeVectorSeries for more det ails. */
typedef struct typedef struct
tagREAL4TimeVectorSeries tagREAL4TimeVectorSeries
{ {
SWIGLAL_STRUCT(REAL4TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
REAL4VectorSequence *data; /**< The sequence of sampled data vectors. */ REAL4VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
REAL4TimeVectorSeries; REAL4TimeVectorSeries;
/** Time series of REAL8 vectors, see \ref ss_TimeVectorSeries for more det ails. */ /** Time series of REAL8 vectors, see \ref ss_TimeVectorSeries for more det ails. */
typedef struct typedef struct
tagREAL8TimeVectorSeries tagREAL8TimeVectorSeries
{ {
SWIGLAL_STRUCT(REAL8TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */ CHAR name[LALNameLength]; /**< The name of the time serie s of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vec tors. */
REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of the ti me series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quantity being sampled. */
REAL8VectorSequence *data; /**< The sequence of sampled data vectors. */ REAL8VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
REAL8TimeVectorSeries; REAL8TimeVectorSeries;
/** Time series of COMPLEX8 vectors, see \ref ss_TimeVectorSeries for more details. */ /** Time series of COMPLEX8 vectors, see \ref ss_TimeVectorSeries for more details. */
typedef struct typedef struct
tagCOMPLEX8TimeVectorSeries tagCOMPLEX8TimeVectorSeries
{ {
SWIGLAL_STRUCT(COMPLEX8TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time s eries of vectors. */ CHAR name[LALNameLength]; /**< The name of the time s eries of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series of vectors. */ LIGOTimeGPS epoch; /**< The start time of the time series of vectors. */
REAL8 deltaT; /**< The time step between samples of th e time series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of th e time series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz (z ero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz (z ero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the quan tity being sampled. */ LALUnit sampleUnits; /**< The physical units of the quan tity being sampled. */
COMPLEX8VectorSequence *data; /**< The sequence of sampled data vectors. */ COMPLEX8VectorSequence *data; /**< The sequence of sampled data vectors. */
} }
COMPLEX8TimeVectorSeries; COMPLEX8TimeVectorSeries;
/** Time series of COMPLEX16 vectors, see \ref ss_TimeVectorSeries for more details. */ /** Time series of COMPLEX16 vectors, see \ref ss_TimeVectorSeries for more details. */
typedef struct typedef struct
tagCOMPLEX16TimeVectorSeries tagCOMPLEX16TimeVectorSeries
{ {
SWIGLAL_STRUCT(COMPLEX16TimeVectorSeries);
CHAR name[LALNameLength]; /**< The name of the time series of vectors. */ CHAR name[LALNameLength]; /**< The name of the time series of vectors. */
LIGOTimeGPS epoch; /**< The start time of the time series o f vectors. */ LIGOTimeGPS epoch; /**< The start time of the time series o f vectors. */
REAL8 deltaT; /**< The time step between samples of t he time series of vectors in seconds. */ REAL8 deltaT; /**< The time step between samples of t he time series of vectors in seconds. */
REAL8 f0; /**< The heterodyning frequency, in Hertz ( zero if not heterodyned). */ REAL8 f0; /**< The heterodyning frequency, in Hertz ( zero if not heterodyned). */
LALUnit sampleUnits; /**< The physical units of the qua ntity being sampled. */ LALUnit sampleUnits; /**< The physical units of the qua ntity being sampled. */
COMPLEX16VectorSequence *data; /**< The sequence of sampled data vectors . */ COMPLEX16VectorSequence *data; /**< The sequence of sampled data vectors . */
} }
COMPLEX16TimeVectorSeries; COMPLEX16TimeVectorSeries;
/* ---------- TimeArraySeries ---------- */ /* ---------- TimeArraySeries ---------- */
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagINT2TimeArraySeries tagINT2TimeArraySeries
{ {
SWIGLAL_STRUCT(INT2TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
INT2ArraySequence *data; INT2ArraySequence *data;
} }
INT2TimeArraySeries; INT2TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagUINT2TimeArraySeries tagUINT2TimeArraySeries
{ {
SWIGLAL_STRUCT(UINT2TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT2ArraySequence *data; UINT2ArraySequence *data;
} }
UINT2TimeArraySeries; UINT2TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagINT4TimeArraySeries tagINT4TimeArraySeries
{ {
SWIGLAL_STRUCT(INT4TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
INT4ArraySequence *data; INT4ArraySequence *data;
} }
INT4TimeArraySeries; INT4TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagUINT4TimeArraySeries tagUINT4TimeArraySeries
{ {
SWIGLAL_STRUCT(UINT4TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT4ArraySequence *data; UINT4ArraySequence *data;
} }
UINT4TimeArraySeries; UINT4TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagINT8TimeArraySeries tagINT8TimeArraySeries
{ {
SWIGLAL_STRUCT(INT8TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
INT8ArraySequence *data; INT8ArraySequence *data;
} }
INT8TimeArraySeries; INT8TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagUINT8TimeArraySeries tagUINT8TimeArraySeries
{ {
SWIGLAL_STRUCT(UINT8TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT8ArraySequence *data; UINT8ArraySequence *data;
} }
UINT8TimeArraySeries; UINT8TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagREAL4TimeArraySeries tagREAL4TimeArraySeries
{ {
SWIGLAL_STRUCT(REAL4TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
REAL4ArraySequence *data; REAL4ArraySequence *data;
} }
REAL4TimeArraySeries; REAL4TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagREAL8TimeArraySeries tagREAL8TimeArraySeries
{ {
SWIGLAL_STRUCT(REAL8TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
REAL8ArraySequence *data; REAL8ArraySequence *data;
} }
REAL8TimeArraySeries; REAL8TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagCOMPLEX8TimeArraySeries tagCOMPLEX8TimeArraySeries
{ {
SWIGLAL_STRUCT(COMPLEX8TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
COMPLEX8ArraySequence *data; COMPLEX8ArraySequence *data;
} }
COMPLEX8TimeArraySeries; COMPLEX8TimeArraySeries;
/** See \ref ss_TimeArraySeries for documentation */ /** See \ref ss_TimeArraySeries for documentation */
typedef struct typedef struct
tagCOMPLEX16TimeArraySeries tagCOMPLEX16TimeArraySeries
{ {
SWIGLAL_STRUCT(COMPLEX16TimeArraySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 deltaT; REAL8 deltaT;
REAL8 f0; REAL8 f0;
LALUnit sampleUnits; LALUnit sampleUnits;
COMPLEX16ArraySequence *data; COMPLEX16ArraySequence *data;
} }
COMPLEX16TimeArraySeries; COMPLEX16TimeArraySeries;
/* ---------- FrequencySeries types ---------- */ /* ---------- FrequencySeries types ---------- */
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagINT2FrequencySeries tagINT2FrequencySeries
{ {
SWIGLAL_STRUCT(INT2FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
INT2Sequence *data; INT2Sequence *data;
} }
INT2FrequencySeries; INT2FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagUINT2FrequencySeries tagUINT2FrequencySeries
{ {
SWIGLAL_STRUCT(UINT2FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT2Sequence *data; UINT2Sequence *data;
} }
UINT2FrequencySeries; UINT2FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagINT4FrequencySeries tagINT4FrequencySeries
{ {
SWIGLAL_STRUCT(INT4FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
INT4Sequence *data; INT4Sequence *data;
} }
INT4FrequencySeries; INT4FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagUINT4FrequencySeries tagUINT4FrequencySeries
{ {
SWIGLAL_STRUCT(UINT4FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT4Sequence *data; UINT4Sequence *data;
} }
UINT4FrequencySeries; UINT4FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagINT8FrequencySeries tagINT8FrequencySeries
{ {
SWIGLAL_STRUCT(INT8FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
INT8Sequence *data; INT8Sequence *data;
} }
INT8FrequencySeries; INT8FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagUINT8FrequencySeries tagUINT8FrequencySeries
{ {
SWIGLAL_STRUCT(UINT8FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
UINT8Sequence *data; UINT8Sequence *data;
} }
UINT8FrequencySeries; UINT8FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagREAL4FrequencySeries tagREAL4FrequencySeries
{ {
SWIGLAL_STRUCT(REAL4FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
REAL4Sequence *data; REAL4Sequence *data;
} }
REAL4FrequencySeries; REAL4FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagREAL8FrequencySeries tagREAL8FrequencySeries
{ {
SWIGLAL_STRUCT(REAL8FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
REAL8Sequence *data; REAL8Sequence *data;
} }
REAL8FrequencySeries; REAL8FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagCOMPLEX8FrequencySeries tagCOMPLEX8FrequencySeries
{ {
SWIGLAL_STRUCT(COMPLEX8FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
COMPLEX8Sequence *data; COMPLEX8Sequence *data;
} }
COMPLEX8FrequencySeries; COMPLEX8FrequencySeries;
/** See \ref ss_FrequencySeries for documentation */ /** See \ref ss_FrequencySeries for documentation */
typedef struct typedef struct
tagCOMPLEX16FrequencySeries tagCOMPLEX16FrequencySeries
{ {
SWIGLAL_STRUCT(COMPLEX16FrequencySeries);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
LIGOTimeGPS epoch; LIGOTimeGPS epoch;
REAL8 f0; REAL8 f0;
REAL8 deltaF; REAL8 deltaF;
LALUnit sampleUnits; LALUnit sampleUnits;
COMPLEX16Sequence *data; COMPLEX16Sequence *data;
} }
COMPLEX16FrequencySeries; COMPLEX16FrequencySeries;
/* ---------- ZPGFilter types ---------- */ /* ---------- ZPGFilter types ---------- */
/** See \ref ss_ZPGFilter for details */ /** See \ref ss_ZPGFilter for details */
typedef struct typedef struct
tagCOMPLEX8ZPGFilter tagCOMPLEX8ZPGFilter
{ {
SWIGLAL_STRUCT(COMPLEX8ZPGFilter);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
REAL8 deltaT; REAL8 deltaT;
COMPLEX8Vector *zeros; COMPLEX8Vector *zeros;
COMPLEX8Vector *poles; COMPLEX8Vector *poles;
COMPLEX8 gain; COMPLEX8 gain;
} }
COMPLEX8ZPGFilter; COMPLEX8ZPGFilter;
/** See \ref ss_ZPGFilter for details */ /** See \ref ss_ZPGFilter for details */
typedef struct typedef struct
tagCOMPLEX16ZPGFilter tagCOMPLEX16ZPGFilter
{ {
SWIGLAL_STRUCT(COMPLEX16ZPGFilter);
CHAR name[LALNameLength]; CHAR name[LALNameLength];
REAL8 deltaT; REAL8 deltaT;
COMPLEX16Vector *zeros; COMPLEX16Vector *zeros;
COMPLEX16Vector *poles; COMPLEX16Vector *poles;
COMPLEX16 gain; COMPLEX16 gain;
} }
COMPLEX16ZPGFilter; COMPLEX16ZPGFilter;
/*@}*/ // end of LALDatatypes documentation group /*@}*/ // end of LALDatatypes documentation group
 End of changes. 88 change blocks. 
121 lines changed or deleted 69 lines changed or added


 LALDetectors.h   LALDetectors.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALDETECTORS_H #ifndef _LALDETECTORS_H
#define _LALDETECTORS_H #define _LALDETECTORS_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \addtogroup LALDetectors_h /** \addtogroup LALDetectors_h
\author J. T. Whelan and J. D. E. Creighton \author J. T. Whelan and J. D. E. Creighton
\brief This header defines structures to hold the basic data describing a gravitational wave detector. \brief This header defines structures to hold the basic data describing a gravitational wave detector.
skipping to change at line 229 skipping to change at line 224
} }
LALDetectorType; LALDetectorType;
/** Detector frame data structure /** Detector frame data structure
* *
* Structure to contain the data that appears in a FrDetector structure * Structure to contain the data that appears in a FrDetector structure
* in frame data. * in frame data.
*/ */
typedef struct tagLALFrDetector typedef struct tagLALFrDetector
{ {
SWIGLAL_STRUCT(LALFrDetector);
CHAR name[LALNameLength]; /**< A unique identifying string */ CHAR name[LALNameLength]; /**< A unique identifying string */
CHAR prefix[3]; /**< Two-letter prefix for detector' s channel names */ CHAR prefix[3]; /**< Two-letter prefix for detector' s channel names */
REAL8 vertexLongitudeRadians; /**< The geodetic longitude \f$\lamb da\f$ of the vertex in radians */ REAL8 vertexLongitudeRadians; /**< The geodetic longitude \f$\lamb da\f$ of the vertex in radians */
REAL8 vertexLatitudeRadians; /**< The geodetic latitude \f$\beta\ f$ of the vertex in radians */ REAL8 vertexLatitudeRadians; /**< The geodetic latitude \f$\beta\ f$ of the vertex in radians */
REAL4 vertexElevation; /**< The height of the vertex above the reference ellipsoid in meters */ REAL4 vertexElevation; /**< The height of the vertex above the reference ellipsoid in meters */
REAL4 xArmAltitudeRadians; /**< The angle \f${\mathcal{A}}_X\f$ up from the local tangent plane of the reference ellipsoid to the X arm (o r bar's cylidrical axis) in radians */ REAL4 xArmAltitudeRadians; /**< The angle \f${\mathcal{A}}_X\f$ up from the local tangent plane of the reference ellipsoid to the X arm (o r bar's cylidrical axis) in radians */
REAL4 xArmAzimuthRadians; /**< The angle \f$\zeta_X\f$ clockwi se from North to the projection of the X arm (or bar's cylidrical axis) int o the local tangent plane of the reference ellipsoid in radians */ REAL4 xArmAzimuthRadians; /**< The angle \f$\zeta_X\f$ clockwi se from North to the projection of the X arm (or bar's cylidrical axis) int o the local tangent plane of the reference ellipsoid in radians */
REAL4 yArmAltitudeRadians; /**< The angle \f${\mathcal{A}}_Y\f$ up from the local tangent plane of the reference ellipsoid to the Y arm in radians (unused for bars: set it to zero) */ REAL4 yArmAltitudeRadians; /**< The angle \f${\mathcal{A}}_Y\f$ up from the local tangent plane of the reference ellipsoid to the Y arm in radians (unused for bars: set it to zero) */
REAL4 yArmAzimuthRadians; /**< The angle \f$\zeta_Y\f$ clockwi se from North to the projection of the Y arm into the local tangent plane o f the reference ellipsoid in radians (unused for bars: set it to zero) */ REAL4 yArmAzimuthRadians; /**< The angle \f$\zeta_Y\f$ clockwi se from North to the projection of the Y arm into the local tangent plane o f the reference ellipsoid in radians (unused for bars: set it to zero) */
REAL4 xArmMidpoint; /**< The distance to the midpoint of the X arm in meters (unused for bars: set it to zero) */ REAL4 xArmMidpoint; /**< The distance to the midpoint of the X arm in meters (unused for bars: set it to zero) */
skipping to change at line 251 skipping to change at line 245
} }
LALFrDetector; LALFrDetector;
/** Detector structure /** Detector structure
* *
* Structure to contain detector data in the format most easily used * Structure to contain detector data in the format most easily used
* by the LAL routines. * by the LAL routines.
*/ */
typedef struct tagLALDetector typedef struct tagLALDetector
{ {
SWIGLAL_STRUCT(LALDetector);
REAL8 location[3]; /**< The three components, in an Ear th-fixed Cartesian coordinate system, of the position vector from the cente r of the Earth to the detector in meters */ REAL8 location[3]; /**< The three components, in an Ear th-fixed Cartesian coordinate system, of the position vector from the cente r of the Earth to the detector in meters */
REAL4 response[3][3]; /**< The Earth-fixed Cartesian compo nents of the detector's response tensor \f$d^{ab}\f$ */ REAL4 response[3][3]; /**< The Earth-fixed Cartesian compo nents of the detector's response tensor \f$d^{ab}\f$ */
LALDetectorType type; /**< The type of the detector (e.g., IFO in differential mode, cylindrical bar, etc.) */ LALDetectorType type; /**< The type of the detector (e.g., IFO in differential mode, cylindrical bar, etc.) */
LALFrDetector frDetector; /**< The original LALFrDetector stru cture from which this was created */ LALFrDetector frDetector; /**< The original LALFrDetector stru cture from which this was created */
} }
LALDetector; LALDetector;
/** Pre-existing detectors. */ /** Pre-existing detectors. */
extern const LALDetector lalCachedDetectors[LAL_NUM_DETECTORS]; extern const LALDetector lalCachedDetectors[LAL_NUM_DETECTORS];
#ifdef SWIG /* SWIG interface directives */
SWIGLAL_GLOBAL_CONST_FIXED_1DARRAY_ELEM(LALDetector, lalCachedDetectors);
#endif
/*@}*/ /*@}*/
/* Routine to create a LALDetector. */ /* Routine to create a LALDetector. */
LALDetector * XLALCreateDetector( LALDetector *detector, const LALFrDetecto r *frDetector, LALDetectorType type ); LALDetector * XLALCreateDetector( LALDetector *detector, const LALFrDetecto r *frDetector, LALDetectorType type );
void LALCreateDetector( LALStatus *status, LALDetector *output, const LALFr Detector *input, const LALDetectorType type ); void LALCreateDetector( LALStatus *status, LALDetector *output, const LALFr Detector *input, const LALDetectorType type );
/* Interferometric Detectors */ /* Interferometric Detectors */
/** \defgroup DetectorConstants Detector Constants /** \defgroup DetectorConstants Detector Constants
 End of changes. 4 change blocks. 
10 lines changed or deleted 0 lines changed or added


 LALError.h   LALError.h 
skipping to change at line 56 skipping to change at line 56
}; };
/* composite lalDebugLevels: */ /* composite lalDebugLevels: */
enum { LALMSGLVL1 = LALERROR }; enum { LALMSGLVL1 = LALERROR };
enum { LALMSGLVL2 = LALERROR | LALWARNING }; enum { LALMSGLVL2 = LALERROR | LALWARNING };
enum { LALMSGLVL3 = LALERROR | LALWARNING | LALINFO }; enum { LALMSGLVL3 = LALERROR | LALWARNING | LALINFO };
enum { LALMEMTRACE = LALTRACE | LALMEMINFO }; enum { LALMEMTRACE = LALTRACE | LALMEMINFO };
enum { LALALLDBG = ~( LALNMEMDBG | LALNMEMPAD | LALNMEMTRK ) }; enum { LALALLDBG = ~( LALNMEMDBG | LALNMEMPAD | LALNMEMTRK ) };
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
extern int ( *lalRaiseHook )( int, const char *, ... ); extern int ( *lalRaiseHook )( int, const char *, ... );
extern void ( *lalAbortHook )( const char *, ... ); extern void ( *lalAbortHook )( const char *, ... );
#endif /* SWIG */
/** \addtogroup LALError_h */ /*@{*/ /** \addtogroup LALError_h */ /*@{*/
int int
LALPrintError( const char *fmt, ... ); LALPrintError( const char *fmt, ... );
int int
LALRaise( int sig, const char *fmt, ... ); LALRaise( int sig, const char *fmt, ... );
void void
LALAbort( const char *fmt, ... ); LALAbort( const char *fmt, ... );
skipping to change at line 165 skipping to change at line 165
LALPrintError( "%s[%d]: function %s, file %s, line %d, %s\n", \ LALPrintError( "%s[%d]: function %s, file %s, line %d, %s\n", \
(exitflg) ? "Leave" : "Enter", (statusptr)->level, \ (exitflg) ? "Leave" : "Enter", (statusptr)->level, \
(statusptr)->function, (statusptr)->file, (statusptr)->line, \ (statusptr)->function, (statusptr)->file, (statusptr)->line, \
(statusptr)->Id ) \ (statusptr)->Id ) \
: 0 ) : 0 )
#endif /* NOLALMACROS */ #endif /* NOLALMACROS */
#endif /* NDEBUG */ #endif /* NDEBUG */
#endif /* SWIG */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _LALERROR_H */ #endif /* _LALERROR_H */
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 LALMalloc.h   LALMalloc.h 
skipping to change at line 38 skipping to change at line 38
#endif #endif
/** \addtogroup LALMalloc_h */ /*@{*/ /** \addtogroup LALMalloc_h */ /*@{*/
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 */
#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 */
/*@}*/ /*@}*/
#if defined NDEBUG || defined LAL_NDEBUG #if defined NDEBUG || defined LAL_NDEBUG
#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
#define LALReallocShort realloc #define LALReallocShort realloc
#define LALReallocLong( p, n, file, line ) realloc( p, n ) #define LALReallocLong( p, n, file, line ) realloc( p, n )
#define LALFree free #define LALFree free
#define LALCheckMemoryLeaks() #define LALCheckMemoryLeaks()
#endif /* SWIG */
#else #else
#ifndef SWIG /* exclude from SWIG interface */
#define LALMalloc( n ) LALMallocLong( n, __FILE__, __LINE__ ) #define LALMalloc( n ) LALMallocLong( n, __FILE__, __LINE__ )
#define LALCalloc( m, n ) LALCallocLong( m, n, __FILE__, __LINE__ ) #define LALCalloc( m, n ) LALCallocLong( m, n, __FILE__, __LINE__ )
#define LALRealloc( p, n ) LALReallocLong( p, n, __FILE__, __LINE__ ) #define LALRealloc( p, n ) LALReallocLong( p, n, __FILE__, __LINE__ )
#endif /* SWIG */
/* global variables to assist in memory debugging */ /* global variables to assist in memory debugging */
/* watch the value of these variables to find a particular alloc/free */ /* watch the value of these variables to find a particular alloc/free */
#ifndef SWIG /* exclude from SWIG interface */ #ifndef SWIG /* exclude from SWIG interface */
extern char *lalMemDbgArgPtr; /* set to ptr arg in free or realloc */ extern char *lalMemDbgArgPtr; /* set to ptr arg in free or realloc */
extern char *lalMemDbgRetPtr; /* set to ptr returned in alloc functions */ extern char *lalMemDbgRetPtr; /* set to ptr returned in alloc functions */
extern char *lalMemDbgPtr; /* set in both cases */ extern char *lalMemDbgPtr; /* set in both cases */
extern char *lalMemDbgUsrPtr; /* avaliable global memory pointer for use r */ extern char *lalMemDbgUsrPtr; /* avaliable global memory pointer for use r */
extern void **lalMemDbgUsrHndl; /* avaliable global memory handle for user */ extern void **lalMemDbgUsrHndl; /* avaliable global memory handle for user */
extern int lalIsMemDbgArgPtr; /* ( lalMemDbgUsrPtr == lalMemDbgArgPtr ) */ extern int lalIsMemDbgArgPtr; /* ( lalMemDbgUsrPtr == lalMemDbgArgPtr ) */
skipping to change at line 85 skipping to change at line 91
// ----- Prototypes // ----- Prototypes
/** \addtogroup LALMalloc_h */ /*@{*/ /** \addtogroup LALMalloc_h */ /*@{*/
void *LALMallocShort( size_t n ); void *LALMallocShort( size_t n );
void *LALMallocLong( size_t n, const char *file, int line ); void *LALMallocLong( size_t n, const char *file, int line );
void *LALCallocShort( size_t m, size_t n ); void *LALCallocShort( size_t m, size_t n );
void LALFree( void *p ); void LALFree( void *p );
void *LALCallocLong( size_t m, size_t n, const char *file, int line ); void *LALCallocLong( size_t m, size_t n, const char *file, int line );
void *LALReallocShort( void *p, size_t n ); void *LALReallocShort( void *p, size_t n );
void *LALReallocLong( void *p, size_t n, const char *file, int line ); void *LALReallocLong( void *p, size_t n, const char *file, int line );
void LALCheckMemoryLeaks( void );
/*@}*/ /*@}*/
#endif /* NDEBUG || LAL_NDEBUG */ #endif /* NDEBUG || LAL_NDEBUG */
void (LALCheckMemoryLeaks)( void );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _LALMALLOC_H */ #endif /* _LALMALLOC_H */
 End of changes. 8 change blocks. 
1 lines changed or deleted 8 lines changed or added


 LALMathematica.h   LALMathematica.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALMATHEMATICA_H #ifndef _LALMATHEMATICA_H
#define _LALMATHEMATICA_H #define _LALMATHEMATICA_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 175 skipping to change at line 170
/** This type is used by \ref LALMath3DPlot.c as an input structure to plot 3-dimensional template banks. /** This type is used by \ref LALMath3DPlot.c as an input structure to plot 3-dimensional template banks.
* It is a linked list with * It is a linked list with
* parameters for each coordinate x,y,z and a next pointer. It also has a * parameters for each coordinate x,y,z and a next pointer. It also has a
* parameter called grayLevel which must be \f$\epsilon [0,1]\f$. It speci fies * parameter called grayLevel which must be \f$\epsilon [0,1]\f$. It speci fies
* the shading of the point in the final plot with 0 representing black and * the shading of the point in the final plot with 0 representing black and
* 1 representing white. By creatively assigning its value the grayscale * 1 representing white. By creatively assigning its value the grayscale
* shade of the points may convey additional information. * shade of the points may convey additional information.
*/ */
typedef struct tagMath3DPointList{ typedef struct tagMath3DPointList{
SWIGLAL_STRUCT(Math3DPointList);
struct tagMath3DPointList *next; struct tagMath3DPointList *next;
REAL4 x; REAL4 x;
REAL4 y; REAL4 y;
REAL4 z; REAL4 z;
REAL4 grayLevel; REAL4 grayLevel;
}Math3DPointList; }Math3DPointList;
/** This type is similar to Math3DPointList except the coordinates are /** This type is similar to Math3DPointList except the coordinates are
* stored as data in the REAL4Vector \c coordinates. * stored as data in the REAL4Vector \c coordinates.
*/ */
typedef struct tagMathNDPointList{ typedef struct tagMathNDPointList{
SWIGLAL_STRUCT(MathNDPointList);
struct tagMathNDPointList *next; struct tagMathNDPointList *next;
REAL4Vector *coordinates; REAL4Vector *coordinates;
INT4 dimension; INT4 dimension;
REAL4 grayLevel; REAL4 grayLevel;
} MathNDPointList; } MathNDPointList;
/*@}*/ /*@}*/
void void
LALMath3DPlot( LALStatus *status, LALMath3DPlot( LALStatus *status,
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 LALNoiseModels.h   LALNoiseModels.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALNOISEMODELS_H #ifndef _LALNOISEMODELS_H
#define _LALNOISEMODELS_H #define _LALNOISEMODELS_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALConstants.h> #include <lal/LALConstants.h>
#include <lal/RealFFT.h> #include <lal/RealFFT.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 73 skipping to change at line 68
/*@} */ /*@} */
/** \cond DONT_DOXYGEN */ /** \cond DONT_DOXYGEN */
#define LALNOISEMODELSH_MSGENULL "Arguments contained an unexpected null po inter" #define LALNOISEMODELSH_MSGENULL "Arguments contained an unexpected null po inter"
#define LALNOISEMODELSH_MSGEMEM "Memory allocation error" #define LALNOISEMODELSH_MSGEMEM "Memory allocation error"
#define LALNOISEMODELSH_MSGECHOICE "Invalid choice for an input parameter" #define LALNOISEMODELSH_MSGECHOICE "Invalid choice for an input parameter"
#define LALNOISEMODELSH_MSGEDIV0 "Division by zero" #define LALNOISEMODELSH_MSGEDIV0 "Division by zero"
#define LALNOISEMODELSH_MSGESIZE "Invalid input size" #define LALNOISEMODELSH_MSGESIZE "Invalid input size"
/** \endcond */ /** \endcond */
typedef enum enum enumDetector
{ {
geo, geo,
ligo, ligo,
tama, tama,
virgo virgo
} };
Detector;
typedef struct typedef struct
tagAddVectorsIn tagAddVectorsIn
{ {
SWIGLAL_STRUCT(AddVectorsIn);
REAL4Vector *v1; REAL4Vector *v1;
REAL4Vector *v2; REAL4Vector *v2;
REAL8 a1; REAL8 a1;
REAL8 a2; REAL8 a2;
} }
AddVectorsIn; AddVectorsIn;
typedef struct typedef struct
tagStatsREAL4VectorOut tagStatsREAL4VectorOut
{ {
SWIGLAL_STRUCT(StatsREAL4VectorOut);
REAL8 mean; REAL8 mean;
REAL8 var; REAL8 var;
REAL8 stddev; REAL8 stddev;
REAL8 min; REAL8 min;
REAL8 max; REAL8 max;
} }
StatsREAL4VectorOut; StatsREAL4VectorOut;
/* Function prototypes */ /* Function prototypes */
 End of changes. 5 change blocks. 
10 lines changed or deleted 2 lines changed or added


 LALRunningMedian.h   LALRunningMedian.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _LALRUNNINGMEDIAN_H #ifndef _LALRUNNINGMEDIAN_H
#define _LALRUNNINGMEDIAN_H #define _LALRUNNINGMEDIAN_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup LALRunningMedian_h \addtogroup LALRunningMedian_h
\author Somya D. Mohanty, B. Machenschalk \author Somya D. Mohanty, B. Machenschalk
skipping to change at line 105 skipping to change at line 100
/* Structures. */ /* Structures. */
/** This is the parameter structure for the LALRunningMedian functions. /** This is the parameter structure for the LALRunningMedian functions.
Currently the only parameter supported is the blocksize, the number Currently the only parameter supported is the blocksize, the number
of elements a single median is calculated from. The current of elements a single median is calculated from. The current
implementation requires the blocksize to be \< 2. implementation requires the blocksize to be \< 2.
*/ */
typedef struct tagLALRunningMedianPar typedef struct tagLALRunningMedianPar
{ {
SWIGLAL_STRUCT(LALRunningMedianPar);
UINT4 blocksize; /**< the number of elements a single median is calcu lated from */ UINT4 blocksize; /**< the number of elements a single median is calcu lated from */
} }
LALRunningMedianPar; LALRunningMedianPar;
/* Function prototypes. */ /* Function prototypes. */
/** See LALRunningMedian_h for documentation */ /** See LALRunningMedian_h for documentation */
void void
LALDRunningMedian( LALStatus *status, LALDRunningMedian( LALStatus *status,
REAL8Sequence *medians, REAL8Sequence *medians,
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 LALStdlib.h   LALStdlib.h 
skipping to change at line 62 skipping to change at line 62
#ifndef _LALSTDLIB_H #ifndef _LALSTDLIB_H
#define _LALSTDLIB_H #define _LALSTDLIB_H
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/LALStatusMacros.h> #include <lal/LALStatusMacros.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <lal/LALMalloc.h> #include <lal/LALMalloc.h>
/* Redefine the restict keyword when compiling with C++ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { #undef restrict
#ifdef __GNUC__
#define restrict __restrict__
#else
#define restrict
#endif #endif
/* These are non-ANSI standard routines that will be allowed in LAL */
#ifndef SWIG /* exclude from SWIG interface */
int getopt( int, char * const *, const char * );
FILE *popen( const char *, const char * );
int pclose( FILE * );
#endif /* SWIG */
#ifdef __cplusplus
}
#endif #endif
#endif /* _LALSTDLIB_H */ #endif /* _LALSTDLIB_H */
 End of changes. 3 change blocks. 
11 lines changed or deleted 6 lines changed or added


 LALVCSInfo.h   LALVCSInfo.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
* *
* Copyright (C) 2009,2010 Adam Mercer * Copyright (C) 2009,2010 Adam Mercer
*/ */
#ifndef _LALVCSINFO_H #ifndef _LALVCSINFO_H
#define _LALVCSINFO_H #define _LALVCSINFO_H
/* remove SWIG interface directives */ #include <lal/LALLibVCSInfo.h>
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#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 "cba4e9f38c56cba4d07a365bfc7a20fa6a7607e3" #define LAL_VCS_ID "ef41578736fd6b181dcf6157f632a2fd88f099b5"
#define LAL_VCS_DATE "2012-06-13 16:02:19 +0000" #define LAL_VCS_DATE "2012-11-06 17:53:32 +0000"
#define LAL_VCS_BRANCH "None" #define LAL_VCS_BRANCH "None"
#define LAL_VCS_TAG "lal-v6.7.2" #define LAL_VCS_TAG "lal-v6.8.0"
#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: cba4e9f38c56cba4d07a365bfc7a20fa6a7607 #define LAL_VCS_IDENT_ID "$" "LALId: ef41578736fd6b181dcf6157f632a2fd88f099
e3 " "$" b5 " "$"
#define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-06-13 16:02:19 +0000 " "$" #define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-11-06 17:53:32 +0000 " "$"
#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" #define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$"
#define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.7.2 " "$" #define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.8.0 " "$"
#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 */ /* header vcs information structure */
extern const char *const lalVCSVersion;
extern const char *const lalVCSId;
extern const char *const lalVCSDate;
extern const char *const lalVCSBranch;
extern const char *const lalVCSTag;
extern const char *const lalVCSAuthor;
extern const char *const lalVCSCommitter;
extern const char *const lalVCSStatus;
/* define vcs information structure */
#ifdef SWIG /* SWIG interface directives */
%warnfilter(SWIGWARN_TYPEMAP_CHARLEAK) tagLALVCSInfo;
#endif /* SWIG */
typedef struct tagLALVCSInfo
{
SWIGLAL_STRUCT(LALVCSInfo);
const char *name;
const char *version;
const char *vcsId;
const char *vcsDate;
const char *vcsBranch;
const char *vcsTag;
const char *vcsAuthor;
const char *vcsCommitter;
const char *vcsStatus;
} LALVCSInfo;
/* header and library vcs information structures */
extern struct tagLALVCSInfo lalVCSInfo;
static const struct tagLALVCSInfo lalHeaderVCSInfo = { \ static const struct tagLALVCSInfo lalHeaderVCSInfo = { \
LAL_NAME, \ LAL_NAME, \
LAL_VERSION, \ LAL_VERSION, \
LAL_VCS_ID, \ LAL_VCS_ID, \
LAL_VCS_DATE, \ LAL_VCS_DATE, \
LAL_VCS_BRANCH, \ LAL_VCS_BRANCH, \
LAL_VCS_TAG, \ LAL_VCS_TAG, \
LAL_VCS_AUTHOR, \ LAL_VCS_AUTHOR, \
LAL_VCS_COMMITTER, \ LAL_VCS_COMMITTER, \
LAL_VCS_STATUS \ LAL_VCS_STATUS \
 End of changes. 6 change blocks. 
43 lines changed or deleted 9 lines changed or added


 ODE.h   ODE.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _ODE_H #ifndef _ODE_H
#define _ODE_H #define _ODE_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** /**
* \addtogroup ODE_h * \addtogroup ODE_h
skipping to change at line 77 skipping to change at line 72
#define ODEH_MSGESAME "Same data pointer." #define ODEH_MSGESAME "Same data pointer."
#define ODEH_MSGESIZE "Invalid size." #define ODEH_MSGESIZE "Invalid size."
#define ODEH_MSGESZMM "Size mismatch." #define ODEH_MSGESZMM "Size mismatch."
#define ODEH_MSGENSTP "Step number mismatch." #define ODEH_MSGENSTP "Step number mismatch."
/** \endcond */ /** \endcond */
/** The independent variables of the ODE (parameters to the ODE function) * / /** The independent variables of the ODE (parameters to the ODE function) * /
typedef struct typedef struct
tagREAL4ODEIndep tagREAL4ODEIndep
{ {
SWIGLAL_STRUCT(REAL4ODEIndep);
REAL4 t; /**< The independent parameter (e.g., time) that is evolved */ REAL4 t; /**< The independent parameter (e.g., time) that is evolved */
void *aux; /**< Storage for auxiliary variables used internally in the ODE routine */ void *aux; /**< Storage for auxiliary variables used internally in the ODE routine */
} }
REAL4ODEIndep; REAL4ODEIndep;
/** The parameters for the ODE step integrator */ /** The parameters for the ODE step integrator */
typedef struct typedef struct
tagREAL4ODEParams tagREAL4ODEParams
{ {
SWIGLAL_STRUCT(REAL4ODEParams);
void ( *ode )( LALStatus *, REAL4Vector *, REAL4Vector *, REAL4ODEIndep * ); /**< Pointer to the function that computes the RHS of the ODE */ void ( *ode )( LALStatus *, REAL4Vector *, REAL4Vector *, REAL4ODEIndep * ); /**< Pointer to the function that computes the RHS of the ODE */
REAL4ODEIndep *indep; /**< The independent variables of used by th is function */ REAL4ODEIndep *indep; /**< The independent variables of used by th is function */
REAL4 tstep; /**< The suggested time step to use */ REAL4 tstep; /**< The suggested time step to use */
REAL4Vector *xdot; /**< The value of the LHS of the ODE at the current time */ REAL4Vector *xdot; /**< The value of the LHS of the ODE at the current time */
REAL4Vector *xerr; /**< The estimated errors from the last ODE step */ REAL4Vector *xerr; /**< The estimated errors from the last ODE step */
REAL4 eps; /**< The allowed fractional error per step; if \c eps is \< \c LAL_REAL4_EPS, then the latter is used */ REAL4 eps; /**< The allowed fractional error per step; if \c eps is \< \c LAL_REAL4_EPS, then the latter is used */
REAL4VectorSequence *dx; /**< Workspace storage for use in the the st ep integrator; the length of the sequence depends on which integrator is us ed */ REAL4VectorSequence *dx; /**< Workspace storage for use in the the st ep integrator; the length of the sequence depends on which integrator is us ed */
} }
REAL4ODEParams; REAL4ODEParams;
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 Random.h   Random.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _RANDOM_H #ifndef _RANDOM_H
#define _RANDOM_H #define _RANDOM_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/AVFactories.h> #include <lal/AVFactories.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
* \addtogroup Random_h * \addtogroup Random_h
* \author Creighton, J. D. E. and Tibbits, M. M. * \author Creighton, J. D. E. and Tibbits, M. M.
skipping to change at line 88 skipping to change at line 83
/** \endcond */ /** \endcond */
/** \ingroup Random_h /** \ingroup Random_h
* \brief This structure contains the parameters necessary for generating t he current * \brief This structure contains the parameters necessary for generating t he current
* sequence of random numbers (based on the initial seed). * sequence of random numbers (based on the initial seed).
* \note The contents should not be manually adjusted. * \note The contents should not be manually adjusted.
*/ */
typedef struct typedef struct
tagRandomParams tagRandomParams
{ {
SWIGLAL_STRUCT(RandomParams);
INT4 i; INT4 i;
INT4 y; INT4 y;
INT4 v[32]; INT4 v[32];
} }
RandomParams; RandomParams;
typedef struct tagMTRandomParams MTRandomParams; typedef struct tagMTRandomParams MTRandomParams;
INT4 XLALBasicRandom( INT4 i ); INT4 XLALBasicRandom( INT4 i );
RandomParams * XLALCreateRandomParams( INT4 seed ); RandomParams * XLALCreateRandomParams( INT4 seed );
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 RealFFT.h   RealFFT.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _REALFFT_H #ifndef _REALFFT_H
#define _REALFFT_H #define _REALFFT_H
#include <lal/LALStdlib.h>
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
#ifdef __cplusplus
#ifdef __GNUC__
#define RESTRICT __restrict__
#else
#define RESTRICT
#endif
#else
#define RESTRICT restrict
#endif
/** /**
* *
* \addtogroup RealFFT_h * \addtogroup RealFFT_h
* \brief Performs real-to-complex and complex-to-real FFTs. * \brief Performs real-to-complex and complex-to-real FFTs.
* *
* \heading{Synopsis} * \heading{Synopsis}
* \code * \code
* #include <lal/RealFFT.h> * #include <lal/RealFFT.h>
* \endcode * \endcode
* *
skipping to change at line 403 skipping to change at line 394
* @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 argument s. * - [\c XLAL_EFAULT] A \c NULL pointer is provided as one of the argument s.
* - [\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 * RESTRICT output, const REAL4Vector * RESTRICT input, int XLALREAL4VectorFFT( REAL4Vector * restrict output, const REAL4Vector * 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 842 skipping to change at line 833
void void
LALREAL8VectorFFT( LALREAL8VectorFFT(
LALStatus *status, LALStatus *status,
REAL8Vector *output, REAL8Vector *output,
REAL8Vector *input, REAL8Vector *input,
REAL8FFTPlan *plan REAL8FFTPlan *plan
); );
/*@}*/ /*@}*/
#undef RESTRICT
#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 /* _REALFFT_H */ #endif /* _REALFFT_H */
 End of changes. 4 change blocks. 
13 lines changed or deleted 2 lines changed or added


 ResampleTimeSeries.h   ResampleTimeSeries.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/BandPassTimeSeries.h> #include <lal/BandPassTimeSeries.h>
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#ifndef _RESAMPLETIMESERIES_H #ifndef _RESAMPLETIMESERIES_H
#define _RESAMPLETIMESERIES_H #define _RESAMPLETIMESERIES_H
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** \addtogroup ResampleTimeSeries_h /** \addtogroup ResampleTimeSeries_h
skipping to change at line 123 skipping to change at line 118
* the IIR or FIR filter used to pe rform low pass filtering * the IIR or FIR filter used to pe rform low pass filtering
*/ */
} }
ResampleTSFilterParams; ResampleTSFilterParams;
/** This structure controls the behaviour of the resampling function. /** This structure controls the behaviour of the resampling function.
*/ */
typedef struct typedef struct
tagResampleTSParams tagResampleTSParams
{ {
SWIGLAL_STRUCT(ResampleTSParams);
REAL8 deltaT; /**< The sample interval desired in the down sampled time series */ REAL8 deltaT; /**< The sample interval desired in the down sampled time series */
ResampleTSFilter filterType; /**< The type of filter with which t o perform the low pass filtering */ ResampleTSFilter filterType; /**< The type of filter with which t o perform the low pass filtering */
ResampleTSFilterParams filterParams; /**< Filter parameters for t he low pass filter (Presently ignored) */ ResampleTSFilterParams filterParams; /**< Filter parameters for t he low pass filter (Presently ignored) */
} }
ResampleTSParams; ResampleTSParams;
/*@}*/ /*@}*/
/* ---------- Function prototypes ---------- */ /* ---------- Function prototypes ---------- */
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 RngMedBias.h   RngMedBias.h 
skipping to change at line 93 skipping to change at line 93
* 10. Structure, enum, union, etc., typdefs. * 10. Structure, enum, union, etc., typdefs.
*/ */
/* /*
* 11. Extern Global variables. (discouraged) * 11. Extern Global variables. (discouraged)
*/ */
/* /*
* 12. Functions Declarations (i.e., prototypes). * 12. Functions Declarations (i.e., prototypes).
*/ */
REAL8 XLALRngMedBias ( INT4 blkSize );
// ------------------------------ obsolte and deprecated LAL-interface func tions --------------------
void LALRngMedBias (LALStatus *status, void LALRngMedBias (LALStatus *status,
REAL8 *biasFactor, REAL8 *biasFactor,
INT4 blkSize INT4 blkSize
); );
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} /* Close C++ protection */ } /* Close C++ protection */
#endif #endif
#endif /* Close double-include protection _RNGMEDBIAS_H */ #endif /* Close double-include protection _RNGMEDBIAS_H */
 End of changes. 3 change blocks. 
3 lines changed or deleted 5 lines changed or added


 Segments.h   Segments.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _SEGMENTS_H #ifndef _SEGMENTS_H
#define _SEGMENTS_H #define _SEGMENTS_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/XLALError.h> #include <lal/XLALError.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** \addtogroup Segments_h /** \addtogroup Segments_h
skipping to change at line 160 skipping to change at line 155
* 'initMagic' field to provide a * 'initMagic' field to provide a
* check that the structure was * check that the structure was
* properly initialized. */ * properly initialized. */
/*------------------- Data structure definitions -------------------*/ /*------------------- Data structure definitions -------------------*/
/** Struct holding a single segment */ /** Struct holding a single segment */
typedef struct typedef struct
tagLALSeg tagLALSeg
{ {
SWIGLAL_STRUCT(LALSeg);
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 */
typedef struct typedef struct
tagLALSegList tagLALSegList
{ {
SWIGLAL_STRUCT(LALSegList);
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;
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 SeqFactories.h   SeqFactories.h 
#ifndef _SEQFACTORIES_H #ifndef _SEQFACTORIES_H
#define _SEQFACTORIES_H #define _SEQFACTORIES_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/AVFactories.h> #include <lal/AVFactories.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
\addtogroup SeqFactories_h \addtogroup SeqFactories_h
skipping to change at line 106 skipping to change at line 101
#define SEQFACTORIESH_MSGEDPTR "Null sequence data." #define SEQFACTORIESH_MSGEDPTR "Null sequence data."
#define SEQFACTORIESH_MSGEINPTR "Null input pointer." #define SEQFACTORIESH_MSGEINPTR "Null input pointer."
#define SEQFACTORIESH_MSGEMALLOC "Malloc failure." #define SEQFACTORIESH_MSGEMALLOC "Malloc failure."
/** \endcond */ /** \endcond */
/** \brief This structure stores the input required for creating a vector /** \brief This structure stores the input required for creating a vector
* sequence. This input includes the length of the sequence (i.e., the num ber of * sequence. This input includes the length of the sequence (i.e., the num ber of
* vectors) and the length of each vector. * vectors) and the length of each vector.
*/ */
typedef struct tagCreateVectorSequenceIn { typedef struct tagCreateVectorSequenceIn {
SWIGLAL_STRUCT(CreateVectorSequenceIn);
UINT4 length; /**< The sequence length */ UINT4 length; /**< The sequence length */
UINT4 vectorLength; /**< The length of each vector in the sequence */ UINT4 vectorLength; /**< The length of each vector in the sequence */
} CreateVectorSequenceIn; } CreateVectorSequenceIn;
/** \brief This structure stores the input required for creating an array /** \brief This structure stores the input required for creating an array
* sequence. This input includes the length of the sequence (i.e., the num ber of * sequence. This input includes the length of the sequence (i.e., the num ber of
* array) and the dimensions of each array index. * array) and the dimensions of each array index.
*/ */
typedef struct tagCreateArraySequenceIn { typedef struct tagCreateArraySequenceIn {
SWIGLAL_STRUCT(CreateArraySequenceIn);
UINT4 length; /**< The sequence length */ UINT4 length; /**< The sequence length */
UINT4Vector *dimLength; /**< The dimensions of each array index (the same for every array in the sequence) */ UINT4Vector *dimLength; /**< The dimensions of each array index (the same for every array in the sequence) */
} CreateArraySequenceIn; } CreateArraySequenceIn;
/*@}*/ /*@}*/
/* ---------- end:SeqFactories_h ---------- */ /* ---------- end:SeqFactories_h ---------- */
/** \defgroup ArraySequenceFactories_c Module ArraySequenceFactories.c /** \defgroup ArraySequenceFactories_c Module ArraySequenceFactories.c
\ingroup SeqFactories_h \ingroup SeqFactories_h
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 SimulateCoherentGW.h   SimulateCoherentGW.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _SIMULATECOHERENTGW_H #ifndef _SIMULATECOHERENTGW_H
#define _SIMULATECOHERENTGW_H #define _SIMULATECOHERENTGW_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/DetectorSite.h> #include <lal/DetectorSite.h>
#include <lal/SkyCoordinates.h> #include <lal/SkyCoordinates.h>
#include <lal/LALBarycenter.h> #include <lal/LALBarycenter.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 292 skipping to change at line 287
* but the waveform is treated as being zero except during those times * but the waveform is treated as being zero except during those times
* when either \c h, or both \c a and \c phi, are defined. * when either \c h, or both \c a and \c phi, are defined.
* Where \c shift is not specified, it is assumed that \f$\Phi\f$ is * Where \c shift is not specified, it is assumed that \f$\Phi\f$ is
* zero; where \c f is not specified but \c phi is, \f$f(t)\f$ can be * zero; where \c f is not specified but \c phi is, \f$f(t)\f$ can be
* computed as \f$\dot{\phi}(t)/2\pi\f$. Where \c f and \c phi * computed as \f$\dot{\phi}(t)/2\pi\f$. Where \c f and \c phi
* overlap, or where \c h and any other time series overlap, they * overlap, or where \c h and any other time series overlap, they
* must be defined consistently. * must be defined consistently.
* *
*/ */
typedef struct tagCoherentGW { typedef struct tagCoherentGW {
SWIGLAL_STRUCT(CoherentGW);
SkyPosition position; /**< The location of the source in the sky; thi s should be in equatorial celestial coordinates, but routines may be able t o do the conversion */ SkyPosition position; /**< The location of the source in the sky; thi s should be in equatorial celestial coordinates, but routines may be able t o do the conversion */
REAL4 psi; /**< The polarization angle \f$\psi\f$, in radi ans, as defined in Appendix B of [\ref Anderson_W2000] */ REAL4 psi; /**< The polarization angle \f$\psi\f$, in radi ans, as defined in Appendix B of [\ref Anderson_W2000] */
REAL4TimeVectorSeries *h; /**< A time-sampled two-dimensional vector stor ing the waveforms \f$h_+(t)\f$ and \f$h_\times(t)\f$, in dimensionless stra in */ REAL4TimeVectorSeries *h; /**< A time-sampled two-dimensional vector stor ing the waveforms \f$h_+(t)\f$ and \f$h_\times(t)\f$, in dimensionless stra in */
REAL4TimeVectorSeries *a; /**< A time-sampled two-dimensional vector stor ing the amplitudes \f$A_1(t)\f$ and \f$A_2(t)\f$, in dimensionless strain * / REAL4TimeVectorSeries *a; /**< A time-sampled two-dimensional vector stor ing the amplitudes \f$A_1(t)\f$ and \f$A_2(t)\f$, in dimensionless strain * /
REAL4TimeSeries *f; /**< A time-sampled sequence storing the instan taneous frequency \f$f(t)\f$, in Hz. */ REAL4TimeSeries *f; /**< A time-sampled sequence storing the instan taneous frequency \f$f(t)\f$, in Hz. */
REAL8TimeSeries *phi; /**< A time-sampled sequence storing the phase function \f$\phi(t)\f$, in radians */ REAL8TimeSeries *phi; /**< A time-sampled sequence storing the phase function \f$\phi(t)\f$, in radians */
REAL4TimeSeries *shift; /**< A time-sampled sequence storing the polari zation shift \f$\Phi(t)\f$, in radians */ REAL4TimeSeries *shift; /**< A time-sampled sequence storing the polari zation shift \f$\Phi(t)\f$, in radians */
} CoherentGW; } CoherentGW;
/** This structure contains information required to determine the response /** This structure contains information required to determine the response
* of a detector to a gravitational waveform. * of a detector to a gravitational waveform.
*/ */
typedef struct tagDetectorResponse { typedef struct tagDetectorResponse {
SWIGLAL_STRUCT(DetectorResponse);
COMPLEX8FrequencySeries *transfer; /**< The frequency-dependent transfe r function of the interferometer, in ADC counts per unit strain amplitude a t any given frequency; COMPLEX8FrequencySeries *transfer; /**< The frequency-dependent transfe r function of the interferometer, in ADC counts per unit strain amplitude a t any given frequency;
* if absent, the response will be given in raw strain rather than ADC output */ * if absent, the response will be given in raw strain rather than ADC output */
LALDetector *site; /**< A structure storing sit e and polarization information, used to compute the polarization response a nd the propagation delay; LALDetector *site; /**< A structure storing sit e and polarization information, used to compute the polarization response a nd the propagation delay;
* if absent, the response will be computed to the plus mode waveform with no time delay */ * if absent, the response will be computed to the plus mode waveform with no time delay */
EphemerisData *ephemerides; /**< A structure storing the positions, velocities, and accelerations of the Earth and Sun centres of m ass, used to compute EphemerisData *ephemerides; /**< A structure storing the positions, velocities, and accelerations of the Earth and Sun centres of m ass, used to compute
* the propagation delay to the sol ar system barycentre; * the propagation delay to the sol ar system barycentre;
* if absent, the propagation delay will be computed to the Earth centre (rather than a true barycentre) */ * if absent, the propagation delay will be computed to the Earth centre (rather than a true barycentre) */
LIGOTimeGPS heterodyneEpoch; /**< A reference time for he terodyned detector output time series, where the phase of the mixing signal is zero. LIGOTimeGPS heterodyneEpoch; /**< A reference time for he terodyned detector output time series, where the phase of the mixing signal is zero.
* This parameter is only used when generating detector output time series with nonzero heterodyne frequency \ c f0. * This parameter is only used when generating detector output time series with nonzero heterodyne frequency \ c f0.
* (Note: This should really be a p arameter stored in the \c TimeSeries structure along with \c f0, but it isn t, so we * (Note: This should really be a p arameter stored in the \c TimeSeries structure along with \c f0, but it isn t, so we
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 SkyCoordinates.h   SkyCoordinates.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _SKYCOORDINATES_H #ifndef _SKYCOORDINATES_H
#define _SKYCOORDINATES_H #define _SKYCOORDINATES_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \addtogroup SkyCoordinates_h /** \addtogroup SkyCoordinates_h
@{*/ @{*/
/** \name Error codes */ /** \name Error codes */
skipping to change at line 70 skipping to change at line 65
COORDINATESYSTEM_ECLIPTIC, /**< The ecliptic coordinate system. */ COORDINATESYSTEM_ECLIPTIC, /**< The ecliptic coordinate system. */
COORDINATESYSTEM_GALACTIC /**< The galactic coordinate system. */ COORDINATESYSTEM_GALACTIC /**< The galactic coordinate system. */
} CoordinateSystem; } CoordinateSystem;
/** This structure stores the two spherical coordinates of a sky position; /** This structure stores the two spherical coordinates of a sky position;
* ie a generic latitude and longitude; the structure is not defined * ie a generic latitude and longitude; the structure is not defined
* specific to a particular coordinate system, but maintains a tag * specific to a particular coordinate system, but maintains a tag
* indicating which coordinate system it is expressed in. * indicating which coordinate system it is expressed in.
*/ */
typedef struct tagSkyPosition { typedef struct tagSkyPosition {
SWIGLAL_STRUCT(SkyPosition);
REAL8 longitude; /**< The longitudinal coordinate (in radians ), as defined above.*/ REAL8 longitude; /**< The longitudinal coordinate (in radians ), as defined above.*/
REAL8 latitude; /**< The latitudinal coordinate (in radians) , as defined above. */ REAL8 latitude; /**< The latitudinal coordinate (in radians) , as defined above. */
CoordinateSystem system; /**< The coordinate system in which latitude /longitude are expressed. */ CoordinateSystem system; /**< The coordinate system in which latitude /longitude are expressed. */
} SkyPosition; } SkyPosition;
/** This structure stores the location of a point on (or near) the surface /** This structure stores the location of a point on (or near) the surface
* of the Earth in both geodetic and geocentric coordinates, as described * of the Earth in both geodetic and geocentric coordinates, as described
* in TerrestrialCoordinates.c . * in TerrestrialCoordinates.c .
*/ */
typedef struct tagEarthPosition { typedef struct tagEarthPosition {
SWIGLAL_STRUCT(EarthPosition);
SkyPosition geodetic; /**< The geographic coordinates of the SkyPosition geodetic; /**< The geographic coordinates of the
* upward vertical direction from the point; that is, the point's * upward vertical direction from the point; that is, the point's
* <em>geodetic</em> latitude and longitude. */ * <em>geodetic</em> latitude and longitude. */
REAL8 elevation; /**< The vertical distance of the point abov e the reference ellipsoid, REAL8 elevation; /**< The vertical distance of the point abov e the reference ellipsoid,
* in metres.*/ * in metres.*/
REAL8 x, y, z; /**< The Earth-fixed geocentric Cartesian co ordinates of the point, REAL8 x, y, z; /**< The Earth-fixed geocentric Cartesian co ordinates of the point,
*in metres.*/ *in metres.*/
REAL8 radius; /**< The distance of the point from the geocentre, in metres. */ REAL8 radius; /**< The distance of the point from the geocentre, in metres. */
SkyPosition geocentric; /**< The geographic coordinates of the dire ction from the centre SkyPosition geocentric; /**< The geographic coordinates of the dire ction from the centre
* of the Earth through the point; that is, the point's * of the Earth through the point; that is, the point's
* <em>geocentric</em> latitude and longitud e.*/ * <em>geocentric</em> latitude and longitud e.*/
} EarthPosition; } EarthPosition;
/** This structure stores parameters for the function <tt>LALConvertSkyPosi tion()</tt>. /** This structure stores parameters for the function <tt>LALConvertSkyPosi tion()</tt>.
*/ */
typedef struct tagConvertSkyParams { typedef struct tagConvertSkyParams {
SWIGLAL_STRUCT(ConvertSkyParams);
CoordinateSystem system; /**< The coordinate system to which one is transforming. */ CoordinateSystem system; /**< The coordinate system to which one is transforming. */
SkyPosition *zenith; /**< The position of the zenith of the horiz on coordinate system; SkyPosition *zenith; /**< The position of the zenith of the horiz on coordinate system;
* may be <tt>NULL</tt> if one is neither co nverting to nor from * may be <tt>NULL</tt> if one is neither co nverting to nor from
* a horizon system. */ * a horizon system. */
LIGOTimeGPS *gpsTime; /**< The GPS time for conversions be tween Earth-fixed and LIGOTimeGPS *gpsTime; /**< The GPS time for conversions be tween Earth-fixed and
* sky-fixed coordinates; may be <tt>NULL</t t> if no such conversion * sky-fixed coordinates; may be <tt>NULL</t t> if no such conversion
* is required (or if one is transforming to or from horizon * is required (or if one is transforming to or from horizon
* coordinates and <tt>*zenith</tt> is given in the sky-fixed * coordinates and <tt>*zenith</tt> is given in the sky-fixed
skipping to change at line 177 skipping to change at line 169
void void
LALGeocentricToGeodetic( LALStatus *, EarthPosition *location ); LALGeocentricToGeodetic( LALStatus *, EarthPosition *location );
void void
LALConvertSkyCoordinates( LALStatus *, LALConvertSkyCoordinates( LALStatus *,
SkyPosition *output, SkyPosition *output,
SkyPosition *input, SkyPosition *input,
ConvertSkyParams *params ); ConvertSkyParams *params );
void LALNormalizeSkyPosition (LALStatus *status, SkyPosition *posOut, const SkyPosition *posIn); void LALNormalizeSkyPosition (LALStatus *status, SkyPosition *posOut, const SkyPosition *posIn);
int XLALNormalizeSkyPosition ( SkyPosition *posInOut );
#ifdef SWIG // SWIG interface directives
SWIGLAL(INOUT_SCALARS(double*, longitude, latitude));
#endif
void XLALNormalizeSkyPosition ( double *restrict longitude, double *restric
t latitude );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _SKYCOORDINATES_H */ #endif /* _SKYCOORDINATES_H */
 End of changes. 5 change blocks. 
9 lines changed or deleted 7 lines changed or added


 Skymap.h   Skymap.h 
skipping to change at line 23 skipping to change at line 23
* Public License for more details. * Public License for more details.
* *
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
#ifndef SKYMAP_H #ifndef SKYMAP_H
#define SKYMAP_H #define SKYMAP_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
/* Special cases for Python bindings of functions defined in this header. /* Special cases for Python bindings of functions defined in this header.
* FIXME: add Octave section, or modify function declarations to work more * FIXME: add Octave section, or modify function declarations to work more
* smoothly with stock swiglal typemaps. */ * smoothly with stock swiglal typemaps. */
#if defined(SWIG) && defined(SWIGPYTHON) #if defined(SWIG) && defined(SWIGPYTHON)
// special typemaps for XLALSkymapPlanConstruct // special typemaps for XLALSkymapPlanConstruct
%typemap(in, noblock=1) (int n, int *detectors) (int i, PyObject *seq) { %typemap(in, noblock=1) (int n, int *detectors) (int i, PyObject *seq) {
seq = PySequence_Fast($input, "expected detectors to be a sequence"); seq = PySequence_Fast($input, "expected detectors to be a sequence");
if (!seq) SWIG_fail; if (!seq) SWIG_fail;
$1 = PySequence_Fast_GET_SIZE(seq); $1 = PySequence_Fast_GET_SIZE(seq);
skipping to change at line 61 skipping to change at line 56
Py_DECREF(seq); Py_DECREF(seq);
SWIG_fail; SWIG_fail;
} }
$2[i] = longValue; $2[i] = longValue;
} }
Py_DECREF(seq); Py_DECREF(seq);
} }
%typemap(freearg, noblock=1) (int n, int *detectors) { %typemap(freearg, noblock=1) (int n, int *detectors) {
free($2); free($2);
} }
%typemap(argout, noblock=1) (int n, int *detectors) "";
// special typemaps for XLALSkymapKernelConstruct // special typemaps for XLALSkymapKernelConstruct
// and XLALSkymapUncertainKernelConstruct // and XLALSkymapUncertainKernelConstruct
%typemap(in, noblock=1) double *wSw (int i, int n, PyObject *seq) { %typemap(in, noblock=1) double *wSw (int i, int n, PyObject *seq) {
seq = PySequence_Fast($input, "expected direction to be a sequence"); seq = PySequence_Fast($input, "expected direction to be a sequence");
if (!seq) SWIG_fail; if (!seq) SWIG_fail;
n = PySequence_Fast_GET_SIZE(seq); n = PySequence_Fast_GET_SIZE(seq);
$1 = ($1_type) calloc(n, sizeof($*1_type)); $1 = ($1_type) calloc(n, sizeof($*1_type));
skipping to change at line 94 skipping to change at line 90
SWIG_fail; SWIG_fail;
} }
$1[i] = doubleValue; $1[i] = doubleValue;
} }
Py_DECREF(seq); Py_DECREF(seq);
} }
%typemap(freearg, noblock=1) double *wSw { %typemap(freearg, noblock=1) double *wSw {
free($1); free($1);
} }
%typemap(argout, noblock=1) double *wSw "";
%apply double *wSw { double *error }; %apply double *wSw { double *error };
// special typemaps for XLALSkymapApply // special typemaps for XLALSkymapApply
%typemap(in, noblock=1) double **xSw (PyObject *seq, int n, int i) { %typemap(in, noblock=1) double **xSw (PyObject *seq, int n, int i) {
seq = PySequence_Fast($input, "expected xSw to be a sequence"); seq = PySequence_Fast($input, "expected xSw to be a sequence");
if (!seq) SWIG_fail; if (!seq) SWIG_fail;
n = PySequence_Fast_GET_SIZE(seq); n = PySequence_Fast_GET_SIZE(seq);
$1 = ($1_type) calloc(n, sizeof($*1_type)); $1 = ($1_type) calloc(n, sizeof($*1_type));
skipping to change at line 194 skipping to change at line 191
// 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
// Struct to store basic properties of the analysis: the sample rate, and // Struct to store basic properties of the analysis: the sample rate, and
// the detectors involved (described by their LAL ID numbers) // the detectors involved (described by their LAL ID numbers)
typedef struct tagXLALSkymapPlanType typedef struct tagXLALSkymapPlanType
{ {
SWIGLAL_STRUCT(XLALSkymapPlanType);
int sampleFrequency; int sampleFrequency;
int n; int n;
LALDetector site[XLALSKYMAP_N]; LALDetector site[XLALSKYMAP_N];
} XLALSkymapPlanType; } XLALSkymapPlanType;
void XLALSkymapPlanConstruct( void XLALSkymapPlanConstruct(
int sampleFrequency, int sampleFrequency,
int n, int n,
int* detectors, int* detectors,
XLALSkymapPlanType* plan XLALSkymapPlanType* plan
); );
// Struct to store reuseable pre-computed quantities for a specific // Struct to store reuseable pre-computed quantities for a specific
// direction, set of detectors, and sample rate // direction, set of detectors, and sample rate
typedef struct tagXLALSkymapDirectionPropertiesType typedef struct tagXLALSkymapDirectionPropertiesType
{ {
SWIGLAL_STRUCT(XLALSkymapDirectionPropertiesType);
double f[XLALSKYMAP_N][2]; double f[XLALSKYMAP_N][2];
double delay[XLALSKYMAP_N]; double delay[XLALSKYMAP_N];
} XLALSkymapDirectionPropertiesType; } XLALSkymapDirectionPropertiesType;
void XLALSkymapDirectionPropertiesConstruct( void XLALSkymapDirectionPropertiesConstruct(
XLALSkymapPlanType* plan, XLALSkymapPlanType* plan,
double direction[2], double direction[2],
XLALSkymapDirectionPropertiesType* properties XLALSkymapDirectionPropertiesType* properties
); );
// Struct to store reuseable pre-computed kernel for a specific direction, // Struct to store reuseable pre-computed kernel for a specific direction,
// power spectra, and sample rate // power spectra, and sample rate
typedef struct tagXLALSkymapKernelType typedef struct tagXLALSkymapKernelType
{ {
SWIGLAL_STRUCT(XLALSkymapKernelType);
double k[XLALSKYMAP_N][XLALSKYMAP_N]; double k[XLALSKYMAP_N][XLALSKYMAP_N];
double logNormalization; double logNormalization;
} XLALSkymapKernelType; } XLALSkymapKernelType;
void XLALSkymapKernelConstruct( void XLALSkymapKernelConstruct(
XLALSkymapPlanType* plan, XLALSkymapPlanType* plan,
XLALSkymapDirectionPropertiesType* properties, XLALSkymapDirectionPropertiesType* properties,
double* wSw, double* wSw,
XLALSkymapKernelType* kernel XLALSkymapKernelType* kernel
); );
 End of changes. 6 change blocks. 
8 lines changed or deleted 2 lines changed or added


 SphericalHarmonics.h   SphericalHarmonics.h 
/* /*
* Copyright (C) 2007 S.Fairhurst, B. Krishnan, L.Santamaria, C. Robinson * Copyright (C) 2007 S.Fairhurst, B. Krishnan, L.Santamaria, C. Robinson,
* C. Pankow
* *
* 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 26 skipping to change at line 27
* 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
*/ */
/* includes */ /* includes */
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALConstants.h> #include <lal/LALConstants.h>
#include <lal/Factorial.h>
#ifndef _SPHERICALHARMONICS_H #ifndef _SPHERICALHARMONICS_H
#define _SPHERICALHARMONICS_H #define _SPHERICALHARMONICS_H
#ifdef __cplusplus /* C++ protection. */ #ifdef __cplusplus /* C++ protection. */
extern "C" { extern "C" {
#endif #endif
/** /**
* \addtogroup SphericalHarmonics_h * \addtogroup SphericalHarmonics_h
* \author S.Fairhurst, B. Krishnan, L.Santamaria, C. Robinson * \author S.Fairhurst, B. Krishnan, L.Santamaria, C. Robinson, C. Pankow
* *
* \brief Library of Spin-weighted Spherical Harmonic functions * \brief Library of Spin-weighted Spherical Harmonic functions and an
* implementation of the Wigner-D matrices
* *
* *
*/ */
/*@{*/ /*@{*/
COMPLEX16 XLALSpinWeightedSphericalHarmonic( REAL8 theta, REAL8 phi, int s, int l, int m ); COMPLEX16 XLALSpinWeightedSphericalHarmonic( REAL8 theta, REAL8 phi, int s, int l, int m );
int XLALScalarSphericalHarmonic( COMPLEX16 *y, UINT4 l, INT4 m, REAL8 thet a, REAL8 phi ); int XLALScalarSphericalHarmonic( COMPLEX16 *y, UINT4 l, INT4 m, REAL8 thet a, REAL8 phi );
INT4 XLALSphHarm ( COMPLEX16 *out, UINT4 L, INT4 M, REAL4 theta, REAL4 phi ); INT4 XLALSphHarm ( COMPLEX16 *out, UINT4 L, INT4 M, REAL4 theta, REAL4 phi );
double XLALJacobiPolynomial( int n, int alpha, int beta, double x );
double XLALWignerdMatrix( int l, int mp, int m, double beta );
COMPLEX16 XLALWignerDMatrix( int l, int mp, int m, double alpha, double bet
a, double gam );
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
} /* Close C++ protection */ } /* Close C++ protection */
#endif #endif
#endif /* _SPHERICALHARMONICS_H */ #endif /* _SPHERICALHARMONICS_H */
 End of changes. 5 change blocks. 
3 lines changed or deleted 10 lines changed or added


 StringInput.h   StringInput.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _STRINGINPUT_H #ifndef _STRINGINPUT_H
#define _STRINGINPUT_H #define _STRINGINPUT_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/LALStdio.h> #include <lal/LALStdio.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
/** /**
skipping to change at line 138 skipping to change at line 133
#define STRINGINPUTH_MSGEOUT "Output handle points to a non-null pointer" #define STRINGINPUTH_MSGEOUT "Output handle points to a non-null pointer"
#define STRINGINPUTH_MSGEMEM "Memory allocation error" #define STRINGINPUTH_MSGEMEM "Memory allocation error"
/** \endcond */ /** \endcond */
/** /**
* This structure stores a number of null-terminated strings of arbitrary * This structure stores a number of null-terminated strings of arbitrary
* length. The entire list is stored flattened in a \c CHARVector, * length. The entire list is stored flattened in a \c CHARVector,
* and individual tokens are pointed to by a <tt>CHAR *[]</tt> handle. * and individual tokens are pointed to by a <tt>CHAR *[]</tt> handle.
*/ */
typedef struct tagTokenList { typedef struct tagTokenList {
SWIGLAL_STRUCT(TokenList);
UINT4 nTokens; /**< The number of tokens in the list */ UINT4 nTokens; /**< The number of tokens in the list */
CHAR **tokens; /**< A list of pointers to the individual tokens; CHAR **tokens; /**< A list of pointers to the individual tokens;
* the elements <tt>tokens[0..nTokens-1]</tt> point to tokens, and * the elements <tt>tokens[0..nTokens-1]</tt> point to tokens, and
* the element <tt>tokens[nTokens]</tt> is explicitly \ c NULL (as is * the element <tt>tokens[nTokens]</tt> is explicitly \ c NULL (as is
the convention for an \c argv argument list */ the convention for an \c argv argument list */
CHARVector *list; /**< The flattened list of tokens, separated by (and te rminated with) <tt>'\0'</tt> characters */ CHARVector *list; /**< The flattened list of tokens, separated by (and te rminated with) <tt>'\0'</tt> characters */
} TokenList; } TokenList;
/*@}*/ /*@}*/
 End of changes. 2 change blocks. 
6 lines changed or deleted 0 lines changed or added


 StringVector.h   StringVector.h 
skipping to change at line 57 skipping to change at line 57
/*@{*/ /*@{*/
/*---------- DEFINES ----------*/ /*---------- DEFINES ----------*/
/*----- Error-codes -----*/ /*----- Error-codes -----*/
/*---------- exported types ----------*/ /*---------- exported types ----------*/
/*---------- Global variables ----------*/ /*---------- Global variables ----------*/
/*---------- exported prototypes [API] ----------*/ /*---------- exported prototypes [API] ----------*/
#ifdef SWIG /* SWIG interface directives */ #ifdef SWIG /* SWIG interface directives */
/* disable keywords arguments for XLALCreateStringVector */ SWIGLAL(VARIABLE_ARGUMENT_LIST(XLALCreateStringVector, CHAR*, NULL));
%feature("kwargs", 0) XLALCreateStringVector;
/* ensure that SWIG generates "compact" default arguments,
i.e. it only generates one wrapping function where all
missing arguments are assigned NULL (it should do this
anyway, since we're inside an extern "C" block and SWIG
doesn't do any overloading for C-linkage functions) */
%feature("compactdefaultargs") XLALCreateStringVector;
/* add 20 optional arguments to XLALCreateStringVector,
so that it can be called with up to 21 arguments */
%varargs(20, CHAR *arg = NULL) XLALCreateStringVector;
/* but since XLALCreateStringVector will crash if none
of its arguments is NULL, add a contract to require
that at least the final 21st argument is NULL */
%contract XLALCreateStringVector {
require:
arg21 == NULL;
}
#endif /* SWIG */ #endif /* SWIG */
LALStringVector *XLALCreateStringVector ( const CHAR *str1, ... ); LALStringVector *XLALCreateStringVector ( const CHAR *str1, ... );
LALStringVector *XLALAppendString2Vector (LALStringVector *vect, const CHAR *string ); LALStringVector *XLALAppendString2Vector (LALStringVector *vect, const CHAR *string );
void XLALDestroyStringVector ( LALStringVector *vect ); void XLALDestroyStringVector ( LALStringVector *vect );
int XLALSortStringVector (LALStringVector *strings); int XLALSortStringVector (LALStringVector *strings);
LALStringVector *XLALParseCSV2StringVector ( const CHAR *CSVlist ); LALStringVector *XLALParseCSV2StringVector ( const CHAR *CSVlist );
INT4 XLALFindStringInVector ( const char *needle, const LALStringVector *ha ystack ); INT4 XLALFindStringInVector ( const char *needle, const LALStringVector *ha ystack );
 End of changes. 1 change blocks. 
18 lines changed or deleted 1 lines changed or added


 TimeFreqFFT.h   TimeFreqFFT.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _TIMEFREQFFT_H #ifndef _TIMEFREQFFT_H
#define _TIMEFREQFFT_H #define _TIMEFREQFFT_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#include <lal/ComplexFFT.h> #include <lal/ComplexFFT.h>
#include <lal/RealFFT.h> #include <lal/RealFFT.h>
#include <lal/Window.h> #include <lal/Window.h>
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#elif 0 #elif 0
} /* so that editors will match preceding brace */ } /* so that editors will match preceding brace */
#endif #endif
skipping to change at line 241 skipping to change at line 236
useMedian, /**< The median value of the individual power spectra comput ed will be used to compute the output power spectrum */ useMedian, /**< The median value of the individual power spectra comput ed will be used to compute the output power spectrum */
NumberAvgSpecMethods /**< gives the number of defined methods */ NumberAvgSpecMethods /**< gives the number of defined methods */
} }
AvgSpecMethod; AvgSpecMethod;
/** This structure controls the behaviour of the LALREAL4AverageSpectrum() function. /** This structure controls the behaviour of the LALREAL4AverageSpectrum() function.
*/ */
typedef struct typedef struct
tagAverageSpectrumParams tagAverageSpectrumParams
{ {
SWIGLAL_STRUCT(AverageSpectrumParams);
REAL4Window *window; /**< The windowing function to use w hen computing the individual power spectra from the input time series. REAL4Window *window; /**< The windowing function to use w hen computing the individual power spectra from the input time series.
* The input time series is broken into sma ller time series to compute power spectra * The input time series is broken into sma ller time series to compute power spectra
* for the estimate. The length of these ti me series is determined by the \c length parameter of the window vector. * for the estimate. The length of these ti me series is determined by the \c length parameter of the window vector.
*/ */
UINT4 overlap; /**< The overlap between sucessive time se ries used to compute the power spectra. */ UINT4 overlap; /**< The overlap between sucessive time se ries used to compute the power spectra. */
AvgSpecMethod method; /**< The method of computing the ave rage as describe under ::AvgSpecMethod */ AvgSpecMethod method; /**< The method of computing the ave rage as describe under ::AvgSpecMethod */
RealFFTPlan *plan; /**< The FFT plan to be used in the computat ion of the power spectrum. */ RealFFTPlan *plan; /**< The FFT plan to be used in the computat ion of the power spectrum. */
} }
AverageSpectrumParams; AverageSpectrumParams;
/** UNDOCUMENTED */ /** UNDOCUMENTED */
typedef struct typedef struct
tagLALPSDRegressor tagLALPSDRegressor
{ {
SWIGLAL_STRUCT(LALPSDRegressor);
unsigned average_samples; unsigned average_samples;
unsigned median_samples; unsigned median_samples;
unsigned n_samples; unsigned n_samples;
REAL8Sequence **history; REAL8Sequence **history;
REAL8FrequencySeries *mean_square; REAL8FrequencySeries *mean_square;
} }
LALPSDRegressor; LALPSDRegressor;
/* /*
* *
skipping to change at line 500 skipping to change at line 493
int XLALPSDRegressorSetAverageSamples( int XLALPSDRegressorSetAverageSamples(
LALPSDRegressor *r, LALPSDRegressor *r,
unsigned average_samples unsigned average_samples
); );
unsigned XLALPSDRegressorGetAverageSamples( unsigned XLALPSDRegressorGetAverageSamples(
const LALPSDRegressor *r const LALPSDRegressor *r
); );
unsigned XLALPSDRegressorGetNSamples(
const LALPSDRegressor *r
);
int XLALPSDRegressorSetMedianSamples( int XLALPSDRegressorSetMedianSamples(
LALPSDRegressor *r, LALPSDRegressor *r,
unsigned median_samples unsigned median_samples
); );
unsigned XLALPSDRegressorGetMedianSamples( unsigned XLALPSDRegressorGetMedianSamples(
const LALPSDRegressor *r const LALPSDRegressor *r
); );
int int
 End of changes. 4 change blocks. 
7 lines changed or deleted 4 lines changed or added


 Units.h   Units.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with with program; see the file COPYING. If not, write to the * along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _UNITS_H #ifndef _UNITS_H
#define _UNITS_H #define _UNITS_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** \addtogroup Units_h /** \addtogroup Units_h
\author J. T. Whelan <john.whelan@ligo.org> \author J. T. Whelan <john.whelan@ligo.org>
\brief Provides prototypes for manipulation of units and declares \brief Provides prototypes for manipulation of units and declares
skipping to change at line 161 skipping to change at line 156
#define UNITSH_MSGENONINT "Non-integer power of ten" #define UNITSH_MSGENONINT "Non-integer power of ten"
#define UNITSH_MSGEPARSE "Error parsing unit string" #define UNITSH_MSGEPARSE "Error parsing unit string"
/** \endcond */ /** \endcond */
/** A four-byte rational number, used as a parameter structure for /** A four-byte rational number, used as a parameter structure for
* LALUnitRaise(). * LALUnitRaise().
*/ */
typedef struct typedef struct
tagRAT4 tagRAT4
{ {
SWIGLAL_STRUCT(RAT4);
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.
*/ */
typedef struct typedef struct
tagLALUnitPair tagLALUnitPair
{ {
SWIGLAL_STRUCT(LALUnitPair);
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 */
/********************************************************* /*********************************************************
* * * *
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 VectorIndexRange.h   VectorIndexRange.h 
/* -*- C -*- */ /* -*- C -*- */
#include <math.h> #include <math.h>
#include <lal/LALStdlib.h> #include <lal/LALStdlib.h>
#include <lal/SeqFactories.h> #include <lal/SeqFactories.h>
#include <lal/AVFactories.h> #include <lal/AVFactories.h>
#ifndef __LALVECTORINDEXRANGE_H__ #ifndef __LALVECTORINDEXRANGE_H__
#define __LALVECTORINDEXRANGE_H__ #define __LALVECTORINDEXRANGE_H__
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* C++ */ #endif /* C++ */
/** /**
* \addtogroup VectorIndexRange_h * \addtogroup VectorIndexRange_h
* \author David Chin <dwchin@umich.edu> +1-734-709-9119 * \author David Chin <dwchin@umich.edu> +1-734-709-9119
* *
* \brief Routines to slice up vectors/sequences by specifying starting and ending indices, inclusive. * \brief Routines to slice up vectors/sequences by specifying starting and ending indices, inclusive.
* *
skipping to change at line 67 skipping to change at line 62
#define VECTORINDEXRANGEH_MSGENUMZ "Incorrect number of command line argume nts" #define VECTORINDEXRANGEH_MSGENUMZ "Incorrect number of command line argume nts"
#define VECTORINDEXRANGEH_MSGELNTH "Vector/Array of Improper Length" #define VECTORINDEXRANGEH_MSGELNTH "Vector/Array of Improper Length"
#define VECTORINDEXRANGEH_MSGENNUL "Non-Null Pointer that should be NULL" #define VECTORINDEXRANGEH_MSGENNUL "Non-Null Pointer that should be NULL"
/** \endcond */ /** \endcond */
/* ---------- typedefs ---------- */ /* ---------- typedefs ---------- */
/* CHAR */ /* CHAR */
typedef struct typedef struct
tagCHARVectorPair { tagCHARVectorPair {
SWIGLAL_STRUCT(CHARVectorPair);
CHARVector **head; CHARVector **head;
CHARVector **tail; CHARVector **tail;
} CHARVectorPair; } CHARVectorPair;
/* INT2 */ /* INT2 */
typedef struct typedef struct
tagINT2VectorPair { tagINT2VectorPair {
SWIGLAL_STRUCT(INT2VectorPair);
INT2Vector **head; INT2Vector **head;
INT2Vector **tail; INT2Vector **tail;
} INT2VectorPair; } INT2VectorPair;
/* INT4 */ /* INT4 */
typedef struct typedef struct
tagINT4VectorPair { tagINT4VectorPair {
SWIGLAL_STRUCT(INT4VectorPair);
INT4Vector **head; INT4Vector **head;
INT4Vector **tail; INT4Vector **tail;
} INT4VectorPair; } INT4VectorPair;
/* INT8 */ /* INT8 */
typedef struct typedef struct
tagINT8VectorPair { tagINT8VectorPair {
SWIGLAL_STRUCT(INT8VectorPair);
INT8Vector **head; INT8Vector **head;
INT8Vector **tail; INT8Vector **tail;
} INT8VectorPair; } INT8VectorPair;
/* UINT2 */ /* UINT2 */
typedef struct typedef struct
tagUINT2VectorPair { tagUINT2VectorPair {
SWIGLAL_STRUCT(UINT2VectorPair);
UINT2Vector **head; UINT2Vector **head;
UINT2Vector **tail; UINT2Vector **tail;
} UINT2VectorPair; } UINT2VectorPair;
/* UINT4 */ /* UINT4 */
typedef struct typedef struct
tagUINT4VectorPair { tagUINT4VectorPair {
SWIGLAL_STRUCT(UINT4VectorPair);
UINT4Vector **head; UINT4Vector **head;
UINT4Vector **tail; UINT4Vector **tail;
} UINT4VectorPair; } UINT4VectorPair;
/* UINT8 */ /* UINT8 */
typedef struct typedef struct
tagUINT8VectorPair { tagUINT8VectorPair {
SWIGLAL_STRUCT(UINT8VectorPair);
UINT8Vector **head; UINT8Vector **head;
UINT8Vector **tail; UINT8Vector **tail;
} UINT8VectorPair; } UINT8VectorPair;
/* REAL4 */ /* REAL4 */
typedef struct typedef struct
tagREAL4VectorPair { tagREAL4VectorPair {
SWIGLAL_STRUCT(REAL4VectorPair);
REAL4Vector **head; REAL4Vector **head;
REAL4Vector **tail; REAL4Vector **tail;
} REAL4VectorPair; } REAL4VectorPair;
/* REAL8 */ /* REAL8 */
typedef struct typedef struct
tagREAL8VectorPair { tagREAL8VectorPair {
SWIGLAL_STRUCT(REAL8VectorPair);
REAL8Vector **head; REAL8Vector **head;
REAL8Vector **tail; REAL8Vector **tail;
} REAL8VectorPair; } REAL8VectorPair;
/* COMPLEX8 */ /* COMPLEX8 */
typedef struct typedef struct
tagCOMPLEX8VectorPair { tagCOMPLEX8VectorPair {
SWIGLAL_STRUCT(COMPLEX8VectorPair);
COMPLEX8Vector **head; COMPLEX8Vector **head;
COMPLEX8Vector **tail; COMPLEX8Vector **tail;
} COMPLEX8VectorPair; } COMPLEX8VectorPair;
/* COMPLEX16 */ /* COMPLEX16 */
typedef struct typedef struct
tagCOMPLEX16VectorPair { tagCOMPLEX16VectorPair {
SWIGLAL_STRUCT(COMPLEX16VectorPair);
COMPLEX16Vector **head; COMPLEX16Vector **head;
COMPLEX16Vector **tail; COMPLEX16Vector **tail;
} COMPLEX16VectorPair; } COMPLEX16VectorPair;
/* ---------- Function protos ---------- */ /* ---------- Function protos ---------- */
/* CHAR */ /* CHAR */
void LALCHARVectorIndexRange ( LALStatus *status, void LALCHARVectorIndexRange ( LALStatus *status,
CHARVector **result, CHARVector **result,
CHARVector *v, CHARVector *v,
 End of changes. 12 change blocks. 
16 lines changed or deleted 0 lines changed or added


 Window.h   Window.h 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU General Public License along * 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 Free * with with program; see the file COPYING. If not, write to the Free
* Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA * 02111-1307 USA
*/ */
#ifndef _WINDOW_H #ifndef _WINDOW_H
#define _WINDOW_H #define _WINDOW_H
/* remove SWIG interface directives */
#if !defined(SWIG) && !defined(SWIGLAL_STRUCT)
#define SWIGLAL_STRUCT(...)
#endif
#include <lal/LALDatatypes.h> #include <lal/LALDatatypes.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
* \defgroup Window_h Header Window.h * \defgroup Window_h Header Window.h
* \ingroup pkg_window * \ingroup pkg_window
* \brief This header file provides routines and structures to create and s tore window functions (also called a taper, * \brief This header file provides routines and structures to create and s tore window functions (also called a taper,
skipping to change at line 212 skipping to change at line 207
or to measure a broad spectrum with a large dynamical range (a Creighton or or to measure a broad spectrum with a large dynamical range (a Creighton or
a Papoulis window). a Papoulis window).
*/ */
/*@{*/ /*@{*/
/** Structure for storing REAL4 window function data, providing storage for a sequence of samples /** Structure for storing REAL4 window function data, providing storage for a sequence of samples
* as well as metadata about the window such as the sum-of-squarse of the s amples * as well as metadata about the window such as the sum-of-squarse of the s amples
*/ */
typedef struct tagREAL4Window { typedef struct tagREAL4Window {
SWIGLAL_STRUCT(REAL4Window);
REAL4Sequence *data; /**< The window function samples */ REAL4Sequence *data; /**< The window function samples */
REAL8 sumofsquares; /**< The sum of the squares of the w indow function samples */ REAL8 sumofsquares; /**< The sum of the squares of the w indow function samples */
REAL8 sum; /**< The sum of the window function samples */ REAL8 sum; /**< The sum of the window function samples */
} REAL4Window; } REAL4Window;
/** Structure for storing REAL8 window function data, providing storage for a sequence of samples /** Structure for storing REAL8 window function data, providing storage for a sequence of samples
* as well as metadata about the window such as the sum-of-squarse of the s amples * as well as metadata about the window such as the sum-of-squarse of the s amples
*/ */
typedef struct tagREAL8Window { typedef struct tagREAL8Window {
SWIGLAL_STRUCT(REAL8Window);
REAL8Sequence *data; /**< The window function samples */ REAL8Sequence *data; /**< The window function samples */
REAL8 sumofsquares; /**< The sum of the squares of the w indow function samples */ REAL8 sumofsquares; /**< The sum of the squares of the w indow function samples */
REAL8 sum; /**< The sum of the window function samples */ REAL8 sum; /**< The sum of the window function samples */
} REAL8Window; } REAL8Window;
REAL4Window *XLALCreateREAL4WindowFromSequence(REAL4Sequence *sequence); REAL4Window *XLALCreateREAL4WindowFromSequence(REAL4Sequence *sequence);
REAL8Window *XLALCreateREAL8WindowFromSequence(REAL8Sequence *sequence); REAL8Window *XLALCreateREAL8WindowFromSequence(REAL8Sequence *sequence);
REAL4Window *XLALCreateRectangularREAL4Window(UINT4 length); REAL4Window *XLALCreateRectangularREAL4Window(UINT4 length);
REAL4Window *XLALCreateHannREAL4Window(UINT4 length); REAL4Window *XLALCreateHannREAL4Window(UINT4 length);
 End of changes. 3 change blocks. 
7 lines changed or deleted 0 lines changed or added


 XLALError.h   XLALError.h 
skipping to change at line 469 skipping to change at line 469
XLALErrorHandlerType * XLALSetSilentErrorHandler(void); XLALErrorHandlerType * XLALSetSilentErrorHandler(void);
#endif /* SWIG */ #endif /* SWIG */
/* /*
* *
* Here are the routines that set or clear the XLAL error number. * Here are the routines that set or clear the XLAL error number.
* *
*/ */
#ifdef SWIG /* SWIG interface directives */
SWIGLAL(DISABLE_EXCEPTIONS(XLALSetErrno, XLALGetBaseErrno, XLALClearErrno))
;
#endif /* SWIG */
/** Sets the XLAL error number to errnum, returns the new value. */ /** Sets the XLAL error number to errnum, returns the new value. */
int XLALSetErrno(int errnum); int XLALSetErrno(int errnum);
/** Gets the XLAL base error number ignoring the internal-function-failed f lag. */ /** Gets the XLAL base error number ignoring the internal-function-failed f lag. */
int XLALGetBaseErrno(void); int XLALGetBaseErrno(void);
/** Clears the XLAL error number, returns the old value. */ /** Clears the XLAL error number, returns the old value. */
int XLALClearErrno(void); int XLALClearErrno(void);
/* /*
skipping to change at line 555 skipping to change at line 559
* <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) XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \ if (fmt) { \
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>
* *
* \b Parameters:<ul> * \b Parameters:<ul>
* <li> \b errnum The XLAL error number to set. * <li> \b errnum The XLAL error number to set.
skipping to change at line 634 skipping to change at line 640
* Prototype: <b>XLAL_CHECK_VAL(val, assertion, errnum [, fmt [, ...]])</b> * Prototype: <b>XLAL_CHECK_VAL(val, assertion, errnum [, fmt [, ...]])</b>
* *
* \b Parameters:<ul> * \b Parameters:<ul>
* <li> \b val The value to return. * <li> \b val The value to return.
* <li> \b assertion The assertion to test. * <li> \b assertion The assertion to test.
* <li> \b errnum The XLAL error number to set if the assertion is false. * <li> \b errnum The XLAL error number to set if the assertion is false.
* <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, ...) \ #define XLAL_CHECK_VAL(val, assertion, ...) XLAL_CHECK_VAL_(val, assertion,
__VA_ARGS__, NULL, NULL)
/* Helper macro for internal use only */
#define XLAL_CHECK_VAL_(val, assertion, errnum, fmt, ...) \
do { \ do { \
if (!(assertion)) { \ if (!(assertion)) { \
XLAL_PRINT_ERROR("Check ("#assertion") failed"); \ if (fmt) { \
XLAL_ERROR_VAL(val, __VA_ARGS__); \ XLAL_PRINT_ERROR(fmt, __VA_ARGS__); \
} else { \
XLAL_PRINT_ERROR("Check failed: " #assertion
); \
} \
XLALError(__func__, __FILE__, __LINE__, errnum); \
return val; \
} \ } \
} while (0) } while (0)
/** * \brief Macro to test an assertion and invoke a failure if it is not true /** * \brief Macro to test an assertion and invoke a failure if it is not true
* in a function that returns an integer. * in a function that returns an integer.
* *
* Prototype: <b>XLAL_CHECK(assertion, errnum [, fmt [, ...]])</b> * Prototype: <b>XLAL_CHECK(assertion, errnum [, fmt [, ...]])</b>
* *
* \b Parameters:<ul> * \b Parameters:<ul>
* <li> \b assertion The assertion to test. * <li> \b assertion The assertion to test.
 End of changes. 4 change blocks. 
4 lines changed or deleted 21 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/