ConfigFile.h | ConfigFile.h | |||
---|---|---|---|---|
skipping to change at line 147 | skipping to change at line 147 | |||
} 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 *); | |||
int | int | |||
XLALReadConfigBOOLVariable (BOOLEAN *varp, | XLALReadConfigBOOLVariable (BOOLEAN *varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const CHAR *secName, | const CHAR *secName, | |||
const CHAR *varName, | const CHAR *varName, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int | int | |||
XLALReadConfigINT4Variable (INT4 *varp, | XLALReadConfigINT4Variable (INT4 *varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const CHAR *secName, | const CHAR *secName, | |||
const CHAR *varName, | const CHAR *varName, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int | int | |||
XLALReadConfigREAL8Variable (REAL8 *varp, | XLALReadConfigREAL8Variable (REAL8 *varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const CHAR *secName, | const CHAR *secName, | |||
const CHAR *varName, | const CHAR *varName, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int | int | |||
XLALReadConfigSTRINGVariable (CHAR **varp, | XLALReadConfigSTRINGVariable (CHAR **varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const CHAR *secName, | const CHAR *secName, | |||
const CHAR *varName, | const CHAR *varName, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int | int | |||
XLALReadConfigSTRINGNVariable (CHARVector *varp, | XLALReadConfigSTRINGNVariable (CHARVector *varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const CHAR *secName, | const CHAR *secName, | |||
const CHAR *varName, | const CHAR *varName, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int | int | |||
XLALReadConfigVariable (void *varp, | XLALReadConfigVariable (void *varp, | |||
const LALParsedDataFile *cfgdata, | const LALParsedDataFile *cfgdata, | |||
const LALConfigVar *param, | const LALConfigVar *param, | |||
BOOLEAN *wasRead); | BOOLEAN *wasRead); | |||
int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict); | int XLALCheckConfigReadComplete (const LALParsedDataFile *cfgdata, ConfigSt rictness strict); | |||
int XLALLowerCaseString (CHAR *string); | int XLALLowerCaseString (CHAR *string); | |||
/* ========== DEPRECATED LAL INTERFACE FUNCTIONS, which have been replaced by XLAL functions, | /* ========== DEPRECATED LAL INTERFACE FUNCTIONS, which have been replaced by XLAL functions, | |||
* These functions are just wrappers around the XLAL functions | * These functions are just wrappers around the XLAL functions | |||
*/ | */ | |||
/** \name Error codes */ | /** \name Error codes */ | |||
/*@{*/ | /*@{*/ | |||
skipping to change at line 208 | skipping to change at line 208 | |||
#define CONFIGFILEH_ETOKENS 5 /**< The input ConfigData s eems corrupted. */ | #define CONFIGFILEH_ETOKENS 5 /**< The input ConfigData s eems corrupted. */ | |||
#define CONFIGFILEH_ENONULL 6 /**< Output pointer is not NULL */ | #define CONFIGFILEH_ENONULL 6 /**< Output pointer is not NULL */ | |||
#define CONFIGFILEH_EUNKNOWN 8 /**< Unknown config-file en try found */ | #define CONFIGFILEH_EUNKNOWN 8 /**< Unknown config-file en try found */ | |||
#define CONFIGFILEH_EMEM 9 /**< Out of memory */ | #define CONFIGFILEH_EMEM 9 /**< Out of memory */ | |||
#define CONFIGFILEH_EBOOL 10 /**< Illegal BOOLEAN entry */ | #define CONFIGFILEH_EBOOL 10 /**< Illegal BOOLEAN entry */ | |||
#define CONFIGFILEH_ESTRING 11 /**< Malformed quoted strin g */ | #define CONFIGFILEH_ESTRING 11 /**< Malformed quoted strin g */ | |||
#define CONFIGFILEH_EXLAL 12 /**< Failure in XLAL functi on */ | #define CONFIGFILEH_EXLAL 12 /**< Failure in XLAL functi on */ | |||
/*@}*/ | /*@}*/ | |||
/** \cond DONT_DOXYGEN */ | /** \cond DONT_DOXYGEN */ | |||
#define CONFIGFILEH_MSGENULL "Arguments contained an unexpected n ull pointer." | #define CONFIGFILEH_MSGENULL "Arguments contained an unexpected null pointer." | |||
#define CONFIGFILEH_MSGEFILE "File error." | #define CONFIGFILEH_MSGEFILE "File error." | |||
#define CONFIGFILEH_MSGEVAR "Config variable not found." | #define CONFIGFILEH_MSGEVAR "Config variable not found." | |||
#define CONFIGFILEH_MSGEFMT "Config variable not readable using given format-string." | #define CONFIGFILEH_MSGEFMT "Config variable not readable using given format-string." | |||
#define CONFIGFILEH_MSGETOKENS "The input ConfigData seems corrupte d." | #define CONFIGFILEH_MSGETOKENS "The input ConfigData seems corrupte d." | |||
#define CONFIGFILEH_MSGENONULL "Output pointer is not NULL" | #define CONFIGFILEH_MSGENONULL "Output pointer is not NULL" | |||
#define CONFIGFILEH_MSGEUNKNOWN "Unknown config-file entry f ound" | #define CONFIGFILEH_MSGEUNKNOWN "Unknown config-file entry f ound" | |||
#define CONFIGFILEH_MSGEMEM "Out of memory" | #define CONFIGFILEH_MSGEMEM "Out of memory" | |||
#define CONFIGFILEH_MSGEBOOL "Illegal BOOLEAN entry" | #define CONFIGFILEH_MSGEBOOL "Illegal BOOLEAN entry" | |||
#define CONFIGFILEH_MSGESTRING "Malformed quoted string" | #define CONFIGFILEH_MSGESTRING "Malformed quoted string" | |||
#define CONFIGFILEH_MSGEXLAL "Failure in XLAL function" | #define CONFIGFILEH_MSGEXLAL "Failure in XLAL function" | |||
End of changes. 7 change blocks. | ||||
24 lines changed or deleted | 24 lines changed or added | |||
FlatLatticeTiling.h | FlatLatticeTiling.h | |||
---|---|---|---|---|
skipping to change at line 52 | skipping to change at line 52 | |||
#endif | #endif | |||
/// | /// | |||
/// Flat lattice tiling bound function | /// Flat lattice tiling bound function | |||
/// | /// | |||
typedef void (*FlatLatticeBound)( | typedef void (*FlatLatticeBound)( | |||
const size_t dimension, ///< [in] Dimension on which bound applies | const size_t dimension, ///< [in] Dimension on which bound applies | |||
const gsl_vector_uint* bound, ///< [in] Indices of current bounds | const gsl_vector_uint* bound, ///< [in] Indices of current bounds | |||
const gsl_vector* point, ///< [in] Point on which to find bounds | const gsl_vector* point, ///< [in] Point on which to find bounds | |||
const void* data, ///< [in] Arbitrary data describing paramete r space | const void* data, ///< [in] Arbitrary data describing paramete r space | |||
const gsl_vector* incr, ///< [in] Increments of the lattice tiling g | ||||
enerator | ||||
const gsl_vector* bbox, ///< [in] Metric ellipse bounding box extent | ||||
s | ||||
gsl_vector* lower, ///< [out] Lower bounds on point in dimensio n | gsl_vector* lower, ///< [out] Lower bounds on point in dimensio n | |||
gsl_vector* upper ///< [out] Upper bounds on point in dimensio | gsl_vector* upper, ///< [out] Upper bounds on point in dimensio | |||
n | n | |||
double* lower_pad, ///< [out] Padding of lower parameter space | ||||
bounds | ||||
double* upper_pad ///< [out] Padding of upper parameter space | ||||
bounds | ||||
); | ); | |||
/// | /// | |||
/// Flat tiling lattice generator function | /// Flat tiling lattice generator function | |||
/// | /// | |||
typedef int (*FlatLatticeGenerator)( | typedef int (*FlatLatticeGenerator)( | |||
const size_t dimensions, ///< [in] Number of dimensions | const size_t dimensions, ///< [in] Number of dimensions | |||
gsl_matrix** generator, ///< [out] Generator matrix | gsl_matrix** generator, ///< [out] Generator matrix | |||
double* norm_thickness ///< [out] Normalised thickness | double* norm_thickness ///< [out] Normalised thickness | |||
); | ); | |||
skipping to change at line 92 | skipping to change at line 96 | |||
); | ); | |||
/// | /// | |||
/// Return the number of dimensions being tiled | /// Return the number of dimensions being tiled | |||
/// | /// | |||
size_t XLALGetFlatLatticeDimensions( | size_t XLALGetFlatLatticeDimensions( | |||
FlatLatticeTiling* tiling ///< [in] Tiling state | FlatLatticeTiling* tiling ///< [in] Tiling state | |||
); | ); | |||
/// | /// | |||
/// Return the current lattice tiling parameter space point | ||||
/// | ||||
const gsl_vector* XLALGetFlatLatticePoint( | ||||
FlatLatticeTiling* tiling ///< [in] Tiling state | ||||
); | ||||
/// | ||||
/// Return the current number of flat lattice tiling parameter space points | /// Return the current number of flat lattice tiling parameter space points | |||
/// | /// | |||
unsigned long XLALGetFlatLatticePointCount( | unsigned long XLALGetFlatLatticePointCount( | |||
FlatLatticeTiling* tiling ///< [in] Tiling state | FlatLatticeTiling* tiling ///< [in] Tiling state | |||
); | ); | |||
/// | /// | |||
/// Add a parameter space bound to the flat lattice tiling | /// Set a parameter space bound on the flat lattice tiling | |||
/// | /// | |||
int XLALSetFlatLatticeBound( | int XLALSetFlatLatticeBound( | |||
FlatLatticeTiling* tiling, ///< [in] Tiling state | FlatLatticeTiling* tiling, ///< [in] Tiling state | |||
const size_t dimension, ///< [in] Dimension on which bound a pplies | const size_t dimension, ///< [in] Dimension on which bound a pplies | |||
const bool singular, ///< [in] Is bound composed of singl e points? | const bool singular, ///< [in] Is bound composed of singl e points? | |||
const FlatLatticeBound func, ///< [in] Parameter space bound func tion | const FlatLatticeBound func, ///< [in] Parameter space bound func tion | |||
void* data ///< [in] Arbitrary data describing parameter space | void* data ///< [in] Arbitrary data describing parameter space | |||
); | ); | |||
/// | /// | |||
skipping to change at line 130 | skipping to change at line 141 | |||
int XLALSetFlatLatticeMetric( | int XLALSetFlatLatticeMetric( | |||
FlatLatticeTiling* tiling, ///< [in] Tiling state | FlatLatticeTiling* tiling, ///< [in] Tiling state | |||
const gsl_matrix* metric, ///< [in] Parameter space metric | const gsl_matrix* metric, ///< [in] Parameter space metric | |||
const double max_mismatch ///< [in] Maximum prescribed mismatc h | const double max_mismatch ///< [in] Maximum prescribed mismatc h | |||
); | ); | |||
#ifdef SWIG // SWIG interface directives | #ifdef SWIG // SWIG interface directives | |||
SWIGLAL(NO_NEW_OBJECT(XLALNextFlatLatticePoint)); | SWIGLAL(NO_NEW_OBJECT(XLALNextFlatLatticePoint)); | |||
#endif | #endif | |||
/// | /// | |||
/// Return the next point in the flat lattice tiling parameter space | /// Move to the next point in the flat lattice tiling parameter space. | |||
/// Returns the index of the lowest dimension where the point has changed, | ||||
/// or a negative number when the template bank is exhausted. | ||||
/// | /// | |||
gsl_vector* XLALNextFlatLatticePoint( | int XLALNextFlatLatticePoint( | |||
FlatLatticeTiling* tiling ///< [in] Tiling state | FlatLatticeTiling* tiling ///< [in] Tiling state | |||
); | ); | |||
/// | /// | |||
/// Return to the beginning of a flat lattice tiling | /// Return to the beginning of a flat lattice tiling | |||
/// | /// | |||
int XLALRestartFlatLatticeTiling( | int XLALRestartFlatLatticeTiling( | |||
FlatLatticeTiling* tiling ///< [in] Tiling state | FlatLatticeTiling* tiling ///< [in] Tiling state | |||
); | ); | |||
/// | /// | |||
/// Calculate the total number of flat lattice tiling parameter space point s | /// Calculate the total number of flat lattice tiling parameter space point s | |||
/// | /// | |||
unsigned long XLALCountTotalFlatLatticePoints( | unsigned long XLALCountTotalFlatLatticePoints( | |||
FlatLatticeTiling* tiling ///< [in] Tiling state | FlatLatticeTiling* tiling ///< [in] Tiling state | |||
); | ); | |||
#ifdef SWIG // SWIG interface directives | #ifdef SWIG // SWIG interface directives | |||
SWIGLAL(INOUT_STRUCTS(gsl_matrix**, random_points, workspace)); | ||||
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_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 | ||||
); | ||||
/// | ||||
/// Find the bounding box of the mismatch ellipses of a metric | ||||
/// | ||||
gsl_vector* XLALMetricEllipseBoundingBox( | ||||
const gsl_matrix* metric, ///< [in] Metric to bound | ||||
const double max_mismatch ///< [in] Maximum mismatch with respect to m | ||||
etric | ||||
); | ||||
/// | ||||
/// Find the lattice increment vectors for a given metric and mismatch | ||||
/// | ||||
gsl_matrix* XLALMetricLatticeIncrements( | ||||
const FlatLatticeGenerator generator, ///< [in] Lattice generator | ||||
function | ||||
const gsl_matrix* metric, ///< [in] Parameter space metric | ||||
const double max_mismatch ///< [in] Maximum prescribed mismatc | ||||
h | ||||
); | ||||
#ifdef SWIG // SWIG interface directives | ||||
SWIGLAL(FUNCTION_POINTER(XLALCubicLatticeGenerator)); | SWIGLAL(FUNCTION_POINTER(XLALCubicLatticeGenerator)); | |||
#endif | #endif | |||
/// | /// | |||
/// Calculate the generator matrix for a cubic (\f$Z_n\f$) lattice | /// Calculate the generator matrix for a cubic (\f$Z_n\f$) lattice | |||
/// | /// | |||
int XLALCubicLatticeGenerator( | int XLALCubicLatticeGenerator( | |||
const size_t dimensions, ///< [in] Number of dimensions | const size_t dimensions, ///< [in] Number of dimensions | |||
gsl_matrix** generator, ///< [out] Generator matrix | gsl_matrix** generator, ///< [out] Generator matrix | |||
double* norm_thickness ///< [out] Normalised thickness | double* norm_thickness ///< [out] Normalised thickness | |||
); | ); | |||
skipping to change at line 175 | skipping to change at line 224 | |||
/// | /// | |||
/// Calculate the generator matrix for a \f$A_n^*\f$ lattice | /// Calculate the generator matrix for a \f$A_n^*\f$ lattice | |||
/// | /// | |||
int XLALAnstarLatticeGenerator( | int XLALAnstarLatticeGenerator( | |||
const size_t dimensions, ///< [in] Number of dimensions | const size_t dimensions, ///< [in] Number of dimensions | |||
gsl_matrix** generator, ///< [out] Generator matrix | gsl_matrix** generator, ///< [out] Generator matrix | |||
double* norm_thickness ///< [out] Normalised thickness | double* norm_thickness ///< [out] Normalised thickness | |||
); | ); | |||
/// | /// | |||
/// Add a constant parameter space bound, given by the minimum and | /// Set a constant parameter space bound, given by the minimum and | |||
/// maximum of the two supplied bounds, to the flat lattice tiling | /// maximum of the two supplied bounds, on the flat lattice tiling | |||
/// | /// | |||
int XLALSetFlatLatticeConstantBound( | int XLALSetFlatLatticeConstantBound( | |||
FlatLatticeTiling* tiling, ///< [in] Tiling state | FlatLatticeTiling* tiling, ///< [in] Tiling state | |||
const size_t dimension, ///< [in] Dimension on which bound applies | const size_t dimension, ///< [in] Dimension on which bound applies | |||
const double bound1, ///< [in] First bound on dimension | const double bound1, ///< [in] First bound on dimension | |||
const double bound2 ///< [in] Second bound on dimension | const double bound2 ///< [in] Second bound on dimension | |||
); | ); | |||
/// | /// | |||
/// Find the bounding box of the mismatch ellipses of a metric | /// Set elliptical bounds in two dimensions on the flat lattice tiling | |||
/// | ||||
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( | int XLALSetFlatLatticeEllipticalBounds( | |||
gsl_matrix* generator ///< [in] Generator matrix of lattic | FlatLatticeTiling* tiling, ///< [in] Tiling state | |||
e | const size_t dimension, ///< [in] Dimension of X bound (Y bound is o | |||
); | ne higher) | |||
const double x_centre, ///< [in] X centre of ellipse | ||||
/// | const double y_centre, ///< [in] Y centre of ellipse | |||
/// Normalise a lattice generator matrix to have a specified covering radiu | const double x_semi, ///< [in] Length of X semi-diameter | |||
s | const double y_semi ///< [in] Length of Y semi-diameter | |||
/// | ||||
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 | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif | #endif | |||
/// @} | /// @} | |||
End of changes. 10 change blocks. | ||||
68 lines changed or deleted | 77 lines changed or added | |||
LALBarycenter.h | LALBarycenter.h | |||
---|---|---|---|---|
skipping to change at line 70 | skipping to change at line 70 | |||
/*@}*/ | /*@}*/ | |||
/** \cond DONT_DOXYGEN */ | /** \cond DONT_DOXYGEN */ | |||
#define LALBARYCENTERH_MSGENULL "Null input to Barycenter routine." | #define LALBARYCENTERH_MSGENULL "Null input to Barycenter routine." | |||
#define LALBARYCENTERH_MSGEOUTOFRANGEE "tgps not in range of earth.dat fil e" | #define LALBARYCENTERH_MSGEOUTOFRANGEE "tgps not in range of earth.dat fil e" | |||
#define LALBARYCENTERH_MSGEOUTOFRANGES "tgps not in range of sun.dat file" | #define LALBARYCENTERH_MSGEOUTOFRANGES "tgps not in range of sun.dat file" | |||
#define LALBARYCENTERH_MSGEBADSOURCEPOS "source position not in standard ra nge" | #define LALBARYCENTERH_MSGEBADSOURCEPOS "source position not in standard ra nge" | |||
#define LALBARYCENTERH_MSGEXLAL "XLAL function failed." | #define LALBARYCENTERH_MSGEXLAL "XLAL function failed." | |||
/** \endcond */ | /** \endcond */ | |||
/** \brief [DEPRECATED] Used as input for LALInitBarycenter(), this structu | /** \brief Enumerated type denoting the time system type to be produced in | |||
re contains | * the solar system barycentring routines. | |||
* | ||||
* The type denotes the time system in which solar system barycentred times | ||||
* should be given. \c TIMECORRECTION_TDB and \c TIMECORRECTION_TEMPO will | ||||
mean | ||||
* times are in the Barycentric Dynamical Time (TDB) system, where the | ||||
* conversion has been performed using a time correction ephemeris look-up | ||||
* table as used by TEMPO2 (\c TIMECORRECTION_TEMPO is so-called because th | ||||
e | ||||
* pulsar timing software TEMPO uses the TDB time system by default); \c | ||||
* TIMECORRECTION_ORIGINAL will mean times are in the TDB system, but with | ||||
the | ||||
* conversion performed using the original \c XLALBarycenterEarth function; | ||||
and, | ||||
* \c TIMECORRECTION_TCB and \c TIMECORRECTION_TEMPO2 will mean times are i | ||||
n the | ||||
* Coordinate Barycentric Time (TCB) system, where the conversion has been | ||||
* performed using a time correction ephemeris look-up table as used by TEM | ||||
PO2 | ||||
* (\c TIMECORRECTION_TEMPO2 is so-called because the pulsar timing softwar | ||||
e | ||||
* TEMPO2 uses the TCB time system by default). */ | ||||
typedef enum{ | ||||
TIMECORRECTION_NONE = 0, | ||||
TIMECORRECTION_TDB, | ||||
TIMECORRECTION_TCB, | ||||
TIMECORRECTION_TEMPO, | ||||
TIMECORRECTION_TEMPO2, | ||||
TIMECORRECTION_ORIGINAL, | ||||
TIMECORRECTION_LAST | ||||
} TimeCorrectionType; | ||||
/** \brief Enumerated type denoting the JPL solar system ephemeris to be us | ||||
ed | ||||
* in calculating barycentre time corrections. | ||||
*/ | ||||
typedef enum { | ||||
EPHEM_NONE = 0, | ||||
EPHEM_DE200, | ||||
EPHEM_DE405, | ||||
EPHEM_DE414, | ||||
EPHEM_DE421, | ||||
EPHEM_LAST | ||||
} EphemerisType; | ||||
/** \name Constants from Irwin and Fukushima, A&A, 348, 1999 (taken from TE | ||||
MPO2) | ||||
* used for ephemeris conversions. */ | ||||
#define IFTE_JD0 2443144.5003725 /**< Epoch of TCB, TCG and TT in Julian D | ||||
ays */ | ||||
#define IFTE_MJD0 43144.0003725 /**< Epoch of TCB, TCG and TT in Modified J | ||||
ulian Days */ | ||||
#define IFTE_TEPH0 -65.564518e-6 /**< Equation 17 of Irwin and Fukushima. * | ||||
/ | ||||
#define IFTE_LC 1.48082686742e-8 /**< Equation 20 of Irwin and Fukushima. * | ||||
/ | ||||
#define IFTE_KM1 1.55051979176e-8 /**< Value of K-1, defined using the IAU | ||||
definition of L_B = 1.55051976772e-8 and K=1/(1-L_B) (see TEMPO2). */ | ||||
#define IFTE_K (((long double)1.0) + ((long double)IFTE_KM1)) /**< Factor r | ||||
elating ephemeris units for time and distance to corresponding SI units, fr | ||||
om Equation 2 of Irwin and Fukushima. */ | ||||
#define JPL_AU_DE405 149597870.6910000 /**< Definition of 1 AU from the JPL | ||||
DE405 ephemeris in km */ | ||||
#define JPL_AU_DE200 149597870.6600000 /**< Definition of 1 AU from the JPL | ||||
DE200 ephemeris in km */ | ||||
#define CURT_AU 149597870.6600 /* 1 AU from create_solar_system_barycenter. | ||||
c as used in Curt's original routines */ | ||||
/** \brief This structure contains | ||||
* two pointers to the ephemeris data files containing arrays | * two pointers to the ephemeris data files containing arrays | |||
* of center-of-mass positions for the Earth and Sun, respectively. | * of center-of-mass positions for the Earth and Sun, respectively. | |||
* | * | |||
* The tables are derived from the JPL ephemeris. | * The tables are derived from the JPL ephemeris. | |||
* | * | |||
* Files tabulate positions for one calendar year | * Files tabulate positions for one calendar year | |||
* (actually, a little more than one year, to deal | * (actually, a little more than one year, to deal | |||
* with overlaps). The first line of each table summarizes | * with overlaps). The first line of each table summarizes | |||
* 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. | ||||
*/ | */ | |||
typedef struct tagEphemerisFilenames | typedef struct tagEphemerisFilenames | |||
{ | { | |||
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 accelerati | |||
* acceleration vector. */ | on vector. */ | |||
typedef struct tagPosVelAcc | typedef struct tagPosVelAcc | |||
{ | { | |||
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 | |||
skipping to change at line 119 | skipping to change at line 168 | |||
typedef struct tagEphemerisData | typedef struct tagEphemerisData | |||
{ | { | |||
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 */ | #ifdef SWIG /* SWIG interface directives */ | |||
SWIGLAL(1D_ARRAY(PosVelAcc, ephemE, INT4, nentriesE)); | SWIGLAL(1D_ARRAY(PosVelAcc, ephemE, INT4, nentriesE)); | |||
SWIGLAL(1D_ARRAY(PosVelAcc, ephemS, INT4, nentriesS)); | SWIGLAL(1D_ARRAY(PosVelAcc, ephemS, INT4, nentriesS)); | |||
#endif /* SWIG */ | #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 instant | |||
REAL8 dtStable; /**< The spacing in sec between consecutive intants | s in Earth ephemeris table.*/ | |||
in Sun ephemeris table.*/ | REAL8 dtStable; /**< The spacing in sec between consecutive instant | |||
s 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) */ | |||
EphemerisType etype; /**< The ephemeris type e.g. DE405 */ | ||||
} | } | |||
EphemerisData; | EphemerisData; | |||
/** This structure will contain a vector of time corrections | ||||
* used during conversion from TT to TDB/TCB/Teph */ | ||||
typedef struct tagTimeCorrectionData{ | ||||
CHAR *timeEphemeris; /**< File containing the time ephemeris */ | ||||
UINT4 nentriesT; /**< The number of entries in Time ephemeris table | ||||
. */ | ||||
REAL8 dtTtable; /**< The spacing in sec between consecutive instan | ||||
ts in Time ephemeris table.*/ | ||||
REAL8 *timeCorrs; /**< Array of time delays for converting TT to TDB | ||||
/TCB from the Time table (seconds).*/ | ||||
REAL8 timeCorrStart; /**< The initial GPS time of the time delay table. | ||||
*/ | ||||
} TimeCorrectionData; | ||||
/** Basic output structure of LALBarycenterEarth.c. | /** Basic output structure of LALBarycenterEarth.c. | |||
*/ | */ | |||
typedef struct tagEarthState | typedef struct tagEarthState | |||
{ | { | |||
REAL8 einstein; /**< the einstein delay equiv TDB - TDT */ | REAL8 einstein; /**< the einstein delay equiv TDB - TDT or TCB - T DT */ | |||
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; | |||
* Is basically the angle thru which Earth has spun at | * Is basically the angle thru which Earth has spun at | |||
skipping to change at line 156 | skipping to change at line 220 | |||
REAL8 zA; /**< variable describing effect of lunisolar preces sion, at tgps */ | REAL8 zA; /**< variable describing effect of lunisolar preces sion, at tgps */ | |||
REAL8 thetaA; /**< variable describing effect of lunisolar preces sion, at tgps */ | REAL8 thetaA; /**< variable describing effect of lunisolar preces sion, at tgps */ | |||
REAL8 delpsi; /**< variable describing effect of Earth nutation, at tgps*/ | REAL8 delpsi; /**< variable describing effect of Earth nutation, at tgps*/ | |||
REAL8 deleps; /**< variable describing effect of Earth nutation, at tgps*/ | REAL8 deleps; /**< variable describing effect of Earth nutation, at tgps*/ | |||
REAL8 se[3]; /**< vector that points from Sun to Earth at instan t tgps, | REAL8 se[3]; /**< vector that points from Sun to Earth at instan t tgps, | |||
* in DE405 coords; units = sec */ | * in DE405 coords; units = sec */ | |||
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 */ | |||
TimeCorrectionType ttype; /**< Time correction type */ | ||||
} | } | |||
EarthState; | EarthState; | |||
/** Basic input structure to LALBarycenter.c. | /** Basic input structure to LALBarycenter.c. | |||
*/ | */ | |||
typedef struct tagBarycenterInput | typedef struct tagBarycenterInput | |||
{ | { | |||
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. | |||
skipping to change at line 192 | skipping to change at line 258 | |||
BarycenterInput; | BarycenterInput; | |||
/*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1. | /*Curt: probably best to take 1.0 OUT of tDot--ie., output tDot-1. | |||
But most users would immediately add back the one anyway. | But most users would immediately add back the one anyway. | |||
*/ | */ | |||
/*Curt: rem te is ``time pulse would arrive at a GPS clock | /*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 | 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'' */ | 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 | |||
{ | { | |||
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. */ | |||
REAL8 roemer; /**< the Roemer delay */ | ||||
REAL8 droemer; /**< d(Roemer)/d(tgps) */ | ||||
REAL8 shapiro; /**< the Shapiro delay */ | ||||
REAL8 dshapiro; /**< d(Shapiro)/d(tgps) */ | ||||
REAL8 erot; /**< Earth rotation delay */ | ||||
REAL8 derot; /**< d(erot)/d(tgps) */ | ||||
} | } | |||
EmissionTime; | EmissionTime; | |||
/// internal (opaque) buffer type for optimized Barycentering function | ||||
typedef struct tagBarycenterBuffer BarycenterBuffer; | ||||
/* 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 | int XLALBarycenterOpt ( EmissionTime *emit, const BarycenterInput *baryinpu | |||
t, const EarthState *earth, BarycenterBuffer *buffer); | t, const EarthState *earth, BarycenterBuffer **buffer); | |||
/* Function that uses time delay look-up tables to calculate time delays */ | ||||
int XLALBarycenterEarthNew ( EarthState *earth, | ||||
const LIGOTimeGPS *tGPS, | ||||
const EphemerisData *edat, | ||||
const TimeCorrectionData *tdat, | ||||
TimeCorrectionType ttype ); | ||||
/* Function to calculate positions */ | ||||
void precessionMatrix( REAL8 prn[3][3], | ||||
REAL8 mjd, | ||||
REAL8 dpsi, | ||||
REAL8 deps ); | ||||
void observatoryEarth( REAL8 obsearth[3], | ||||
const LALDetector det, | ||||
const LIGOTimeGPS *tgps, | ||||
REAL8 gmst, | ||||
REAL8 dpsi, | ||||
REAL8 deps ); | ||||
// deprecated LAL interface | // 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. 13 change blocks. | ||||
51 lines changed or deleted | 133 lines changed or added | |||
LALComplex.h | LALComplex.h | |||
---|---|---|---|---|
skipping to change at line 62 | skipping to change at line 62 | |||
#define LAL_SET_REAL(zp,x) do {(zp)->re=(x);} while(0) | #define LAL_SET_REAL(zp,x) do {(zp)->re=(x);} while(0) | |||
#define LAL_SET_IMAG(zp,y) do {(zp)->im=(y);} while(0) | #define LAL_SET_IMAG(zp,y) do {(zp)->im=(y);} while(0) | |||
#define LAL_COMPLEX16_ONE (XLALCOMPLEX16Rect(1.0,0.0)) | #define LAL_COMPLEX16_ONE (XLALCOMPLEX16Rect(1.0,0.0)) | |||
#define LAL_COMPLEX16_ZERO (XLALCOMPLEX16Rect(0.0,0.0)) | #define LAL_COMPLEX16_ZERO (XLALCOMPLEX16Rect(0.0,0.0)) | |||
#define LAL_COMPLEX16_NEGONE (XLALCOMPLEX16Rect(-1.0,0.0)) | #define LAL_COMPLEX16_NEGONE (XLALCOMPLEX16Rect(-1.0,0.0)) | |||
#define LAL_COMPLEX16_I (XLALCOMPLEX16Rect(0.0,1.0)) | #define LAL_COMPLEX16_I (XLALCOMPLEX16Rect(0.0,1.0)) | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define creal(z) ((z).re) | ||||
#define cimag(z) ((z).im) | ||||
#define crect(x,y) (XLALCOMPLEX16Rect((x),(y))) | #define crect(x,y) (XLALCOMPLEX16Rect((x),(y))) | |||
#define csetr(x) (XLALCOMPLEX16Rect((x),0.0)) | #define csetr(x) (XLALCOMPLEX16Rect((x),0.0)) | |||
#define cseti(y) (XLALCOMPLEX16Rect(0.0,(y))) | #define cseti(y) (XLALCOMPLEX16Rect(0.0,(y))) | |||
#define cpolar(x,y) (XLALCOMPLEX16Polar((x),(y))) | #define cpolar(x,y) (XLALCOMPLEX16Polar((x),(y))) | |||
#define cisequal(z1,z2) (((z1).re == (z2).re) && ((z1).im == (z2).im)) | #define cisequal(z1,z2) (((z1).re == (z2).re) && ((z1).im == (z2).im)) | |||
#define cunit (XLALCOMPLEX16Rect(1.0,0.0)) | #define cunit (XLALCOMPLEX16Rect(1.0,0.0)) | |||
#define czero (XLALCOMPLEX16Rect(0.0,0.0)) | #define czero (XLALCOMPLEX16Rect(0.0,0.0)) | |||
#define cnegone (XLALCOMPLEX16Rect(-1.0,0.0)) | #define cnegone (XLALCOMPLEX16Rect(-1.0,0.0)) | |||
#define I (XLALCOMPLEX16Rect(0.0,1.0)) | ||||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Rect (REAL8 x, REAL8 y); | COMPLEX16 XLALCOMPLEX16Rect (REAL8 x, REAL8 y); | |||
COMPLEX16 XLALCOMPLEX16Polar (REAL8 x, REAL8 y); | COMPLEX16 XLALCOMPLEX16Polar (REAL8 x, REAL8 y); | |||
REAL8 XLALCOMPLEX16Arg (COMPLEX16 z); | REAL8 XLALCOMPLEX16Arg (COMPLEX16 z); | |||
REAL8 XLALCOMPLEX16Abs (COMPLEX16 z); | REAL8 XLALCOMPLEX16Abs (COMPLEX16 z); | |||
REAL8 XLALCOMPLEX16Abs2 (COMPLEX16 z); | REAL8 XLALCOMPLEX16Abs2 (COMPLEX16 z); | |||
REAL8 XLALCOMPLEX16LogAbs (COMPLEX16 z); | REAL8 XLALCOMPLEX16LogAbs (COMPLEX16 z); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CARG(z) (XLALCOMPLEX16Arg(z)) | #define LAL_CARG(z) (XLALCOMPLEX16Arg(z)) | |||
#define LAL_CABS(z) (XLALCOMPLEX16Abs(z)) | #define LAL_CABS(z) (XLALCOMPLEX16Abs(z)) | |||
#define LAL_CABS2(z) (XLALCOMPLEX16Abs2(z)) | #define LAL_CABS2(z) (XLALCOMPLEX16Abs2(z)) | |||
#define LAL_CLOGABS(z) (XLALCOMPLEX16LogAbs(z)) | #define LAL_CLOGABS(z) (XLALCOMPLEX16LogAbs(z)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define carg(z) (XLALCOMPLEX16Arg(z)) | ||||
#define cabs(z) (XLALCOMPLEX16Abs(z)) | ||||
#define cabs2(z) (XLALCOMPLEX16Abs2(z)) | #define cabs2(z) (XLALCOMPLEX16Abs2(z)) | |||
#define clogabs(z) (XLALCOMPLEX16LogAbs(z)) | #define clogabs(z) (XLALCOMPLEX16LogAbs(z)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Add (COMPLEX16 a, COMPLEX16 b); | COMPLEX16 XLALCOMPLEX16Add (COMPLEX16 a, COMPLEX16 b); | |||
COMPLEX16 XLALCOMPLEX16Sub (COMPLEX16 a, COMPLEX16 b); | COMPLEX16 XLALCOMPLEX16Sub (COMPLEX16 a, COMPLEX16 b); | |||
COMPLEX16 XLALCOMPLEX16Mul (COMPLEX16 a, COMPLEX16 b); | COMPLEX16 XLALCOMPLEX16Mul (COMPLEX16 a, COMPLEX16 b); | |||
COMPLEX16 XLALCOMPLEX16Div (COMPLEX16 a, COMPLEX16 b); | COMPLEX16 XLALCOMPLEX16Div (COMPLEX16 a, COMPLEX16 b); | |||
skipping to change at line 151 | skipping to change at line 146 | |||
#define caddr(a,x) (XLALCOMPLEX16AddReal((a),(x))) | #define caddr(a,x) (XLALCOMPLEX16AddReal((a),(x))) | |||
#define csubr(a,x) (XLALCOMPLEX16SubReal((a),(x))) | #define csubr(a,x) (XLALCOMPLEX16SubReal((a),(x))) | |||
#define cmulr(a,x) (XLALCOMPLEX16MulReal((a),(x))) | #define cmulr(a,x) (XLALCOMPLEX16MulReal((a),(x))) | |||
#define cdivr(a,x) (XLALCOMPLEX16DivReal((a),(x))) | #define cdivr(a,x) (XLALCOMPLEX16DivReal((a),(x))) | |||
#define caddi(a,y) (XLALCOMPLEX16AddImag((a),(y))) | #define caddi(a,y) (XLALCOMPLEX16AddImag((a),(y))) | |||
#define csubi(a,y) (XLALCOMPLEX16SubImag((a),(y))) | #define csubi(a,y) (XLALCOMPLEX16SubImag((a),(y))) | |||
#define cmuli(a,y) (XLALCOMPLEX16MulImag((a),(y))) | #define cmuli(a,y) (XLALCOMPLEX16MulImag((a),(y))) | |||
#define cdivi(a,y) (XLALCOMPLEX16DivImag((a),(y))) | #define cdivi(a,y) (XLALCOMPLEX16DivImag((a),(y))) | |||
#define conj(z) (XLALCOMPLEX16Conjugate(z)) | ||||
#define cinv(a) (XLALCOMPLEX16Inverse(a)) | #define cinv(a) (XLALCOMPLEX16Inverse(a)) | |||
#define cneg(a) (XLALCOMPLEX16Negative(a)) | #define cneg(a) (XLALCOMPLEX16Negative(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Sqrt (COMPLEX16 z); | COMPLEX16 XLALCOMPLEX16Sqrt (COMPLEX16 z); | |||
COMPLEX16 XLALCOMPLEX16SqrtReal (REAL8 x); | COMPLEX16 XLALCOMPLEX16SqrtReal (REAL8 x); | |||
COMPLEX16 XLALCOMPLEX16Pow (COMPLEX16 a, COMPLEX16 b); | COMPLEX16 XLALCOMPLEX16Pow (COMPLEX16 a, COMPLEX16 b); | |||
COMPLEX16 XLALCOMPLEX16PowReal (COMPLEX16 a, REAL8 x); | COMPLEX16 XLALCOMPLEX16PowReal (COMPLEX16 a, REAL8 x); | |||
skipping to change at line 179 | skipping to change at line 173 | |||
#define LAL_CSQRT_REAL(x) (XLALCOMPLEX16SqrtReal(x)) | #define LAL_CSQRT_REAL(x) (XLALCOMPLEX16SqrtReal(x)) | |||
#define LAL_CPOW(a,b) (XLALCOMPLEX16Pow((a),(b))) | #define LAL_CPOW(a,b) (XLALCOMPLEX16Pow((a),(b))) | |||
#define LAL_CPOW_REAL(a,x) (XLALCOMPLEX16PowReal((a),(x))) | #define LAL_CPOW_REAL(a,x) (XLALCOMPLEX16PowReal((a),(x))) | |||
#define LAL_CEXP(a) (XLALCOMPLEX16Exp(a)) | #define LAL_CEXP(a) (XLALCOMPLEX16Exp(a)) | |||
#define LAL_CLOG(a) (XLALCOMPLEX16Log(a)) | #define LAL_CLOG(a) (XLALCOMPLEX16Log(a)) | |||
#define LAL_CLOG10(a) (XLALCOMPLEX16Log10(a)) | #define LAL_CLOG10(a) (XLALCOMPLEX16Log10(a)) | |||
#define LAL_CLOGB(a,b) (XLALCOMPLEX16LogB((a),(b))) | #define LAL_CLOGB(a,b) (XLALCOMPLEX16LogB((a),(b))) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csqrt(z) (XLALCOMPLEX16Sqrt(z)) | ||||
#define csqrtr(x) (XLALCOMPLEX16SqrtReal(x)) | #define csqrtr(x) (XLALCOMPLEX16SqrtReal(x)) | |||
#define cpow(a,b) (XLALCOMPLEX16Pow((a),(b))) | ||||
#define cpowr(a,x) (XLALCOMPLEX16PowReal((a),(x))) | #define cpowr(a,x) (XLALCOMPLEX16PowReal((a),(x))) | |||
#define cexp(a) (XLALCOMPLEX16Exp(a)) | ||||
#define clog(a) (XLALCOMPLEX16Log(a)) | ||||
#define clog10(a) (XLALCOMPLEX16Log10(a)) | ||||
#define clogb(a,b) (XLALCOMPLEX16LogB((a),(b))) | #define clogb(a,b) (XLALCOMPLEX16LogB((a),(b))) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Sin (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Sin (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Cos (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Cos (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Sec (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Sec (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Csc (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Csc (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Tan (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Tan (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Cot (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Cot (COMPLEX16 a); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CSIN(a) (XLALCOMPLEX16Sin(a)) | #define LAL_CSIN(a) (XLALCOMPLEX16Sin(a)) | |||
#define LAL_CCOS(a) (XLALCOMPLEX16Cos(a)) | #define LAL_CCOS(a) (XLALCOMPLEX16Cos(a)) | |||
#define LAL_CSEC(a) (XLALCOMPLEX16Sec(a)) | #define LAL_CSEC(a) (XLALCOMPLEX16Sec(a)) | |||
#define LAL_CCSC(a) (XLALCOMPLEX16Csc(a)) | #define LAL_CCSC(a) (XLALCOMPLEX16Csc(a)) | |||
#define LAL_CTAN(a) (XLALCOMPLEX16Tan(a)) | #define LAL_CTAN(a) (XLALCOMPLEX16Tan(a)) | |||
#define LAL_CCOT(a) (XLALCOMPLEX16Cot(a)) | #define LAL_CCOT(a) (XLALCOMPLEX16Cot(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csin(a) (XLALCOMPLEX16Sin(a)) | ||||
#define ccos(a) (XLALCOMPLEX16Cos(a)) | ||||
#define csec(a) (XLALCOMPLEX16Sec(a)) | #define csec(a) (XLALCOMPLEX16Sec(a)) | |||
#define ccsc(a) (XLALCOMPLEX16Csc(a)) | #define ccsc(a) (XLALCOMPLEX16Csc(a)) | |||
#define ctan(a) (XLALCOMPLEX16Tan(a)) | ||||
#define ccot(a) (XLALCOMPLEX16Cot(a)) | #define ccot(a) (XLALCOMPLEX16Cot(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Arcsin (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arcsin (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16ArcsinReal (REAL8 x); | COMPLEX16 XLALCOMPLEX16ArcsinReal (REAL8 x); | |||
COMPLEX16 XLALCOMPLEX16Arccos (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arccos (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16ArccosReal (REAL8 x); | COMPLEX16 XLALCOMPLEX16ArccosReal (REAL8 x); | |||
COMPLEX16 XLALCOMPLEX16Arcsec (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arcsec (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16ArcsecReal (REAL8 x); | COMPLEX16 XLALCOMPLEX16ArcsecReal (REAL8 x); | |||
skipping to change at line 237 | skipping to change at line 223 | |||
#define LAL_CASIN_REAL(x) (XLALCOMPLEX16ArcsinReal(x)) | #define LAL_CASIN_REAL(x) (XLALCOMPLEX16ArcsinReal(x)) | |||
#define LAL_CACOS(a) (XLALCOMPLEX16Arccos(a)) | #define LAL_CACOS(a) (XLALCOMPLEX16Arccos(a)) | |||
#define LAL_CACOS_REAL(x) (XLALCOMPLEX16ArccosReal(x)) | #define LAL_CACOS_REAL(x) (XLALCOMPLEX16ArccosReal(x)) | |||
#define LAL_CASEC(a) (XLALCOMPLEX16Arcsec(a)) | #define LAL_CASEC(a) (XLALCOMPLEX16Arcsec(a)) | |||
#define LAL_CASEC_REAL(x) (XLALCOMPLEX16ArcsecReal(x)) | #define LAL_CASEC_REAL(x) (XLALCOMPLEX16ArcsecReal(x)) | |||
#define LAL_CACSC(a) (XLALCOMPLEX16Arccsc(a)) | #define LAL_CACSC(a) (XLALCOMPLEX16Arccsc(a)) | |||
#define LAL_CACSC_REAL(x) (XLALCOMPLEX16ArccscReal(x)) | #define LAL_CACSC_REAL(x) (XLALCOMPLEX16ArccscReal(x)) | |||
#define LAL_CATAN(a) (XLALCOMPLEX16Arctan(a)) | #define LAL_CATAN(a) (XLALCOMPLEX16Arctan(a)) | |||
#define LAL_CACOT(a) (XLALCOMPLEX16Arccot(a)) | #define LAL_CACOT(a) (XLALCOMPLEX16Arccot(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define casin(a) (XLALCOMPLEX16Arcsin(a)) | ||||
#define casinr(x) (XLALCOMPLEX16ArcsinReal(x)) | #define casinr(x) (XLALCOMPLEX16ArcsinReal(x)) | |||
#define cacos(a) (XLALCOMPLEX16Arccos(a)) | ||||
#define cacosr(x) (XLALCOMPLEX16ArccosReal(x)) | #define cacosr(x) (XLALCOMPLEX16ArccosReal(x)) | |||
#define casec(a) (XLALCOMPLEX16Arcsec(a)) | #define casec(a) (XLALCOMPLEX16Arcsec(a)) | |||
#define casecr(x) (XLALCOMPLEX16ArcsecReal(x)) | #define casecr(x) (XLALCOMPLEX16ArcsecReal(x)) | |||
#define cacsc(a) (XLALCOMPLEX16Arccsc(a)) | #define cacsc(a) (XLALCOMPLEX16Arccsc(a)) | |||
#define cacscr(x) (XLALCOMPLEX16ArccscReal(x)) | #define cacscr(x) (XLALCOMPLEX16ArccscReal(x)) | |||
#define catan(a) (XLALCOMPLEX16Arctan(a)) | ||||
#define cacot(a) (XLALCOMPLEX16Arccot(a)) | #define cacot(a) (XLALCOMPLEX16Arccot(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Sinh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Sinh (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Cosh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Cosh (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Sech (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Sech (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Csch (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Csch (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Tanh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Tanh (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Coth (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Coth (COMPLEX16 a); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CSINH(a) (XLALCOMPLEX16Sinh(a)) | #define LAL_CSINH(a) (XLALCOMPLEX16Sinh(a)) | |||
#define LAL_CCOSH(a) (XLALCOMPLEX16Cosh(a)) | #define LAL_CCOSH(a) (XLALCOMPLEX16Cosh(a)) | |||
#define LAL_CSECH(a) (XLALCOMPLEX16Sech(a)) | #define LAL_CSECH(a) (XLALCOMPLEX16Sech(a)) | |||
#define LAL_CCSCH(a) (XLALCOMPLEX16Csch(a)) | #define LAL_CCSCH(a) (XLALCOMPLEX16Csch(a)) | |||
#define LAL_CTANH(a) (XLALCOMPLEX16Tanh(a)) | #define LAL_CTANH(a) (XLALCOMPLEX16Tanh(a)) | |||
#define LAL_CCOTH(a) (XLALCOMPLEX16Coth(a)) | #define LAL_CCOTH(a) (XLALCOMPLEX16Coth(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csinh(a) (XLALCOMPLEX16Sinh(a)) | ||||
#define ccosh(a) (XLALCOMPLEX16Cosh(a)) | ||||
#define csech(a) (XLALCOMPLEX16Sech(a)) | #define csech(a) (XLALCOMPLEX16Sech(a)) | |||
#define ccsch(a) (XLALCOMPLEX16Csch(a)) | #define ccsch(a) (XLALCOMPLEX16Csch(a)) | |||
#define ctanh(a) (XLALCOMPLEX16Tanh(a)) | ||||
#define ccoth(a) (XLALCOMPLEX16Coth(a)) | #define ccoth(a) (XLALCOMPLEX16Coth(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX16 XLALCOMPLEX16Arcsinh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arcsinh (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Arccosh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arccosh (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16ArccoshReal (REAL8 x); | COMPLEX16 XLALCOMPLEX16ArccoshReal (REAL8 x); | |||
COMPLEX16 XLALCOMPLEX16Arcsech (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arcsech (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Arccsch (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arccsch (COMPLEX16 a); | |||
COMPLEX16 XLALCOMPLEX16Arctanh (COMPLEX16 a); | COMPLEX16 XLALCOMPLEX16Arctanh (COMPLEX16 a); | |||
skipping to change at line 291 | skipping to change at line 271 | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CASINH(a) (XLALCOMPLEX16Arcsinh(a)) | #define LAL_CASINH(a) (XLALCOMPLEX16Arcsinh(a)) | |||
#define LAL_CACOSH(a) (XLALCOMPLEX16Arccosh(a)) | #define LAL_CACOSH(a) (XLALCOMPLEX16Arccosh(a)) | |||
#define LAL_CACOSH_REAL(x) (XLALCOMPLEX16ArccoshReal(x)) | #define LAL_CACOSH_REAL(x) (XLALCOMPLEX16ArccoshReal(x)) | |||
#define LAL_CASECH(a) (XLALCOMPLEX16Arcsech(a)) | #define LAL_CASECH(a) (XLALCOMPLEX16Arcsech(a)) | |||
#define LAL_CACSCH(a) (XLALCOMPLEX16Arccsch(a)) | #define LAL_CACSCH(a) (XLALCOMPLEX16Arccsch(a)) | |||
#define LAL_CATANH(a) (XLALCOMPLEX16Arctanh(a)) | #define LAL_CATANH(a) (XLALCOMPLEX16Arctanh(a)) | |||
#define LAL_CATANH_REAL(x) (XLALCOMPLEX16ArctanhReal(x)) | #define LAL_CATANH_REAL(x) (XLALCOMPLEX16ArctanhReal(x)) | |||
#define LAL_CACOTH(a) (XLALCOMPLEX16Arccoth(a)) | #define LAL_CACOTH(a) (XLALCOMPLEX16Arccoth(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define casinh(a) (XLALCOMPLEX16Arcsinh(a)) | ||||
#define cacosh(a) (XLALCOMPLEX16Arccosh(a)) | ||||
#define cacoshr(x) (XLALCOMPLEX16ArccoshReal(x)) | #define cacoshr(x) (XLALCOMPLEX16ArccoshReal(x)) | |||
#define casech(a) (XLALCOMPLEX16Arcsech(a)) | #define casech(a) (XLALCOMPLEX16Arcsech(a)) | |||
#define cacsch(a) (XLALCOMPLEX16Arccsch(a)) | #define cacsch(a) (XLALCOMPLEX16Arccsch(a)) | |||
#define catanh(a) (XLALCOMPLEX16Arctanh(a)) | ||||
#define catanhr(x) (XLALCOMPLEX16ArctanhReal(x)) | #define catanhr(x) (XLALCOMPLEX16ArctanhReal(x)) | |||
#define cacoth(a) (XLALCOMPLEX16Arccoth(a)) | #define cacoth(a) (XLALCOMPLEX16Arccoth(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
#define LAL_COMPLEX8_ONE (XLALCOMPLEX8Rect(1.0,0.0)) | #define LAL_COMPLEX8_ONE (XLALCOMPLEX8Rect(1.0,0.0)) | |||
#define LAL_COMPLEX8_ZERO (XLALCOMPLEX8Rect(0.0,0.0)) | #define LAL_COMPLEX8_ZERO (XLALCOMPLEX8Rect(0.0,0.0)) | |||
#define LAL_COMPLEX8_NEGONE (XLALCOMPLEX8Rect(-1.0,0.0)) | #define LAL_COMPLEX8_NEGONE (XLALCOMPLEX8Rect(-1.0,0.0)) | |||
#define LAL_COMPLEX8_I (XLALCOMPLEX8Rect(0.0,1.0)) | #define LAL_COMPLEX8_I (XLALCOMPLEX8Rect(0.0,1.0)) | |||
skipping to change at line 334 | skipping to change at line 311 | |||
REAL4 XLALCOMPLEX8Arg (COMPLEX8 z); | REAL4 XLALCOMPLEX8Arg (COMPLEX8 z); | |||
REAL4 XLALCOMPLEX8Abs (COMPLEX8 z); | REAL4 XLALCOMPLEX8Abs (COMPLEX8 z); | |||
REAL4 XLALCOMPLEX8Abs2 (COMPLEX8 z); | REAL4 XLALCOMPLEX8Abs2 (COMPLEX8 z); | |||
REAL4 XLALCOMPLEX8LogAbs (COMPLEX8 z); | REAL4 XLALCOMPLEX8LogAbs (COMPLEX8 z); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CARGF(z) (XLALCOMPLEX8Arg(z)) | #define LAL_CARGF(z) (XLALCOMPLEX8Arg(z)) | |||
#define LAL_CABSF(z) (XLALCOMPLEX8Abs(z)) | #define LAL_CABSF(z) (XLALCOMPLEX8Abs(z)) | |||
#define LAL_CABS2F(z) (XLALCOMPLEX8Abs2(z)) | #define LAL_CABS2F(z) (XLALCOMPLEX8Abs2(z)) | |||
#define LAL_CLOGABSF(z) (XLALCOMPLEX8LogAbs(z)) | #define LAL_CLOGABSF(z) (XLALCOMPLEX8LogAbs(z)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define cargf(z) (XLALCOMPLEX8Arg(z)) | ||||
#define cabsf(z) (XLALCOMPLEX8Abs(z)) | ||||
#define cabs2f(z) (XLALCOMPLEX8Abs2(z)) | #define cabs2f(z) (XLALCOMPLEX8Abs2(z)) | |||
#define clogabsf(z) (XLALCOMPLEX8LogAbs(z)) | #define clogabsf(z) (XLALCOMPLEX8LogAbs(z)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Add (COMPLEX8 a, COMPLEX8 b); | COMPLEX8 XLALCOMPLEX8Add (COMPLEX8 a, COMPLEX8 b); | |||
COMPLEX8 XLALCOMPLEX8Sub (COMPLEX8 a, COMPLEX8 b); | COMPLEX8 XLALCOMPLEX8Sub (COMPLEX8 a, COMPLEX8 b); | |||
COMPLEX8 XLALCOMPLEX8Mul (COMPLEX8 a, COMPLEX8 b); | COMPLEX8 XLALCOMPLEX8Mul (COMPLEX8 a, COMPLEX8 b); | |||
COMPLEX8 XLALCOMPLEX8Div (COMPLEX8 a, COMPLEX8 b); | COMPLEX8 XLALCOMPLEX8Div (COMPLEX8 a, COMPLEX8 b); | |||
skipping to change at line 395 | skipping to change at line 370 | |||
#define caddrf(a,x) (XLALCOMPLEX8AddReal((a),(x))) | #define caddrf(a,x) (XLALCOMPLEX8AddReal((a),(x))) | |||
#define csubrf(a,x) (XLALCOMPLEX8SubReal((a),(x))) | #define csubrf(a,x) (XLALCOMPLEX8SubReal((a),(x))) | |||
#define cmulrf(a,x) (XLALCOMPLEX8MulReal((a),(x))) | #define cmulrf(a,x) (XLALCOMPLEX8MulReal((a),(x))) | |||
#define cdivrf(a,x) (XLALCOMPLEX8DivReal((a),(x))) | #define cdivrf(a,x) (XLALCOMPLEX8DivReal((a),(x))) | |||
#define caddif(a,y) (XLALCOMPLEX8AddImag((a),(y))) | #define caddif(a,y) (XLALCOMPLEX8AddImag((a),(y))) | |||
#define csubif(a,y) (XLALCOMPLEX8SubImag((a),(y))) | #define csubif(a,y) (XLALCOMPLEX8SubImag((a),(y))) | |||
#define cmulif(a,y) (XLALCOMPLEX8MulImag((a),(y))) | #define cmulif(a,y) (XLALCOMPLEX8MulImag((a),(y))) | |||
#define cdivif(a,y) (XLALCOMPLEX8DivImag((a),(y))) | #define cdivif(a,y) (XLALCOMPLEX8DivImag((a),(y))) | |||
#define conjf(z) (XLALCOMPLEX8Conjugate(z)) | ||||
#define cinvf(a) (XLALCOMPLEX8Inverse(a)) | #define cinvf(a) (XLALCOMPLEX8Inverse(a)) | |||
#define cnegf(a) (XLALCOMPLEX8Negative(a)) | #define cnegf(a) (XLALCOMPLEX8Negative(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Sqrt (COMPLEX8 z); | COMPLEX8 XLALCOMPLEX8Sqrt (COMPLEX8 z); | |||
COMPLEX8 XLALCOMPLEX8SqrtReal (REAL4 x); | COMPLEX8 XLALCOMPLEX8SqrtReal (REAL4 x); | |||
COMPLEX8 XLALCOMPLEX8Pow (COMPLEX8 a, COMPLEX8 b); | COMPLEX8 XLALCOMPLEX8Pow (COMPLEX8 a, COMPLEX8 b); | |||
COMPLEX8 XLALCOMPLEX8PowReal (COMPLEX8 a, REAL4 x); | COMPLEX8 XLALCOMPLEX8PowReal (COMPLEX8 a, REAL4 x); | |||
skipping to change at line 423 | skipping to change at line 397 | |||
#define LAL_CSQRT_REALF(x) (XLALCOMPLEX8SqrtReal(x)) | #define LAL_CSQRT_REALF(x) (XLALCOMPLEX8SqrtReal(x)) | |||
#define LAL_CPOWF(a,b) (XLALCOMPLEX8Pow((a),(b))) | #define LAL_CPOWF(a,b) (XLALCOMPLEX8Pow((a),(b))) | |||
#define LAL_CPOW_REALF(a,x) (XLALCOMPLEX8PowReal((a),(x))) | #define LAL_CPOW_REALF(a,x) (XLALCOMPLEX8PowReal((a),(x))) | |||
#define LAL_CEXPF(a) (XLALCOMPLEX8Exp(a)) | #define LAL_CEXPF(a) (XLALCOMPLEX8Exp(a)) | |||
#define LAL_CLOGF(a) (XLALCOMPLEX8Log(a)) | #define LAL_CLOGF(a) (XLALCOMPLEX8Log(a)) | |||
#define LAL_CLOG10F(a) (XLALCOMPLEX8Log10(a)) | #define LAL_CLOG10F(a) (XLALCOMPLEX8Log10(a)) | |||
#define LAL_CLOGBF(a,b) (XLALCOMPLEX8LogB((a),(b))) | #define LAL_CLOGBF(a,b) (XLALCOMPLEX8LogB((a),(b))) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csqrtf(z) (XLALCOMPLEX8Sqrt(z)) | ||||
#define csqrtrf(x) (XLALCOMPLEX8SqrtReal(x)) | #define csqrtrf(x) (XLALCOMPLEX8SqrtReal(x)) | |||
#define cpowf(a,b) (XLALCOMPLEX8Pow((a),(b))) | ||||
#define cpowrf(a,x) (XLALCOMPLEX8PowReal((a),(x))) | #define cpowrf(a,x) (XLALCOMPLEX8PowReal((a),(x))) | |||
#define cexpf(a) (XLALCOMPLEX8Exp(a)) | ||||
#define clogf(a) (XLALCOMPLEX8Log(a)) | ||||
#define clog10f(a) (XLALCOMPLEX8Log10(a)) | ||||
#define clogbf(a,b) (XLALCOMPLEX8LogB((a),(b))) | #define clogbf(a,b) (XLALCOMPLEX8LogB((a),(b))) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Sin (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Sin (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Cos (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Cos (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Sec (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Sec (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Csc (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Csc (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Tan (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Tan (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Cot (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Cot (COMPLEX8 a); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CSINF(a) (XLALCOMPLEX8Sin(a)) | #define LAL_CSINF(a) (XLALCOMPLEX8Sin(a)) | |||
#define LAL_CCOSF(a) (XLALCOMPLEX8Cos(a)) | #define LAL_CCOSF(a) (XLALCOMPLEX8Cos(a)) | |||
#define LAL_CSECF(a) (XLALCOMPLEX8Sec(a)) | #define LAL_CSECF(a) (XLALCOMPLEX8Sec(a)) | |||
#define LAL_CCSCF(a) (XLALCOMPLEX8Csc(a)) | #define LAL_CCSCF(a) (XLALCOMPLEX8Csc(a)) | |||
#define LAL_CTANF(a) (XLALCOMPLEX8Tan(a)) | #define LAL_CTANF(a) (XLALCOMPLEX8Tan(a)) | |||
#define LAL_CCOTF(a) (XLALCOMPLEX8Cot(a)) | #define LAL_CCOTF(a) (XLALCOMPLEX8Cot(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csinf(a) (XLALCOMPLEX8Sin(a)) | ||||
#define ccosf(a) (XLALCOMPLEX8Cos(a)) | ||||
#define csecf(a) (XLALCOMPLEX8Sec(a)) | #define csecf(a) (XLALCOMPLEX8Sec(a)) | |||
#define ccscf(a) (XLALCOMPLEX8Csc(a)) | #define ccscf(a) (XLALCOMPLEX8Csc(a)) | |||
#define ctanf(a) (XLALCOMPLEX8Tan(a)) | ||||
#define ccotf(a) (XLALCOMPLEX8Cot(a)) | #define ccotf(a) (XLALCOMPLEX8Cot(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Arcsin (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arcsin (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8ArcsinReal (REAL4 x); | COMPLEX8 XLALCOMPLEX8ArcsinReal (REAL4 x); | |||
COMPLEX8 XLALCOMPLEX8Arccos (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arccos (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8ArccosReal (REAL4 x); | COMPLEX8 XLALCOMPLEX8ArccosReal (REAL4 x); | |||
COMPLEX8 XLALCOMPLEX8Arcsec (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arcsec (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8ArcsecReal (REAL4 x); | COMPLEX8 XLALCOMPLEX8ArcsecReal (REAL4 x); | |||
skipping to change at line 481 | skipping to change at line 447 | |||
#define LAL_CASIN_REALF(x) (XLALCOMPLEX8ArcsinReal(x)) | #define LAL_CASIN_REALF(x) (XLALCOMPLEX8ArcsinReal(x)) | |||
#define LAL_CACOSF(a) (XLALCOMPLEX8Arccos(a)) | #define LAL_CACOSF(a) (XLALCOMPLEX8Arccos(a)) | |||
#define LAL_CACOS_REALF(x) (XLALCOMPLEX8ArccosReal(x)) | #define LAL_CACOS_REALF(x) (XLALCOMPLEX8ArccosReal(x)) | |||
#define LAL_CASECF(a) (XLALCOMPLEX8Arcsec(a)) | #define LAL_CASECF(a) (XLALCOMPLEX8Arcsec(a)) | |||
#define LAL_CASEC_REALF(x) (XLALCOMPLEX8ArcsecReal(x)) | #define LAL_CASEC_REALF(x) (XLALCOMPLEX8ArcsecReal(x)) | |||
#define LAL_CACSCF(a) (XLALCOMPLEX8Arccsc(a)) | #define LAL_CACSCF(a) (XLALCOMPLEX8Arccsc(a)) | |||
#define LAL_CACSC_REALF(x) (XLALCOMPLEX8ArccscReal(x)) | #define LAL_CACSC_REALF(x) (XLALCOMPLEX8ArccscReal(x)) | |||
#define LAL_CATANF(a) (XLALCOMPLEX8Arctan(a)) | #define LAL_CATANF(a) (XLALCOMPLEX8Arctan(a)) | |||
#define LAL_CACOTF(a) (XLALCOMPLEX8Arccot(a)) | #define LAL_CACOTF(a) (XLALCOMPLEX8Arccot(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define casinf(a) (XLALCOMPLEX8Arcsin(a)) | ||||
#define casinrf(x) (XLALCOMPLEX8ArcsinReal(x)) | #define casinrf(x) (XLALCOMPLEX8ArcsinReal(x)) | |||
#define cacosf(a) (XLALCOMPLEX8Arccos(a)) | ||||
#define cacosrf(x) (XLALCOMPLEX8ArccosReal(x)) | #define cacosrf(x) (XLALCOMPLEX8ArccosReal(x)) | |||
#define casecf(a) (XLALCOMPLEX8Arcsec(a)) | #define casecf(a) (XLALCOMPLEX8Arcsec(a)) | |||
#define casecrf(x) (XLALCOMPLEX8ArcsecReal(x)) | #define casecrf(x) (XLALCOMPLEX8ArcsecReal(x)) | |||
#define cacscf(a) (XLALCOMPLEX8Arccsc(a)) | #define cacscf(a) (XLALCOMPLEX8Arccsc(a)) | |||
#define cacscrf(x) (XLALCOMPLEX8ArccscReal(x)) | #define cacscrf(x) (XLALCOMPLEX8ArccscReal(x)) | |||
#define catanf(a) (XLALCOMPLEX8Arctan(a)) | ||||
#define cacotf(a) (XLALCOMPLEX8Arccot(a)) | #define cacotf(a) (XLALCOMPLEX8Arccot(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Sinh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Sinh (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Cosh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Cosh (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Sech (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Sech (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Csch (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Csch (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Tanh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Tanh (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Coth (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Coth (COMPLEX8 a); | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CSINHF(a) (XLALCOMPLEX8Sinh(a)) | #define LAL_CSINHF(a) (XLALCOMPLEX8Sinh(a)) | |||
#define LAL_CCOSHF(a) (XLALCOMPLEX8Cosh(a)) | #define LAL_CCOSHF(a) (XLALCOMPLEX8Cosh(a)) | |||
#define LAL_CSECHF(a) (XLALCOMPLEX8Sech(a)) | #define LAL_CSECHF(a) (XLALCOMPLEX8Sech(a)) | |||
#define LAL_CCSCHF(a) (XLALCOMPLEX8Csch(a)) | #define LAL_CCSCHF(a) (XLALCOMPLEX8Csch(a)) | |||
#define LAL_CTANHF(a) (XLALCOMPLEX8Tanh(a)) | #define LAL_CTANHF(a) (XLALCOMPLEX8Tanh(a)) | |||
#define LAL_CCOTHF(a) (XLALCOMPLEX8Coth(a)) | #define LAL_CCOTHF(a) (XLALCOMPLEX8Coth(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define csinhf(a) (XLALCOMPLEX8Sinh(a)) | ||||
#define ccoshf(a) (XLALCOMPLEX8Cosh(a)) | ||||
#define csechf(a) (XLALCOMPLEX8Sech(a)) | #define csechf(a) (XLALCOMPLEX8Sech(a)) | |||
#define ccschf(a) (XLALCOMPLEX8Csch(a)) | #define ccschf(a) (XLALCOMPLEX8Csch(a)) | |||
#define ctanhf(a) (XLALCOMPLEX8Tanh(a)) | ||||
#define ccothf(a) (XLALCOMPLEX8Coth(a)) | #define ccothf(a) (XLALCOMPLEX8Coth(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
COMPLEX8 XLALCOMPLEX8Arcsinh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arcsinh (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Arccosh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arccosh (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8ArccoshReal (REAL4 x); | COMPLEX8 XLALCOMPLEX8ArccoshReal (REAL4 x); | |||
COMPLEX8 XLALCOMPLEX8Arcsech (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arcsech (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Arccsch (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arccsch (COMPLEX8 a); | |||
COMPLEX8 XLALCOMPLEX8Arctanh (COMPLEX8 a); | COMPLEX8 XLALCOMPLEX8Arctanh (COMPLEX8 a); | |||
skipping to change at line 535 | skipping to change at line 495 | |||
#ifdef LAL_USE_COMPLEX_MACROS | #ifdef LAL_USE_COMPLEX_MACROS | |||
#define LAL_CASINHF(a) (XLALCOMPLEX8Arcsinh(a)) | #define LAL_CASINHF(a) (XLALCOMPLEX8Arcsinh(a)) | |||
#define LAL_CACOSHF(a) (XLALCOMPLEX8Arccosh(a)) | #define LAL_CACOSHF(a) (XLALCOMPLEX8Arccosh(a)) | |||
#define LAL_CACOSH_REALF(x) (XLALCOMPLEX8ArccoshReal(x)) | #define LAL_CACOSH_REALF(x) (XLALCOMPLEX8ArccoshReal(x)) | |||
#define LAL_CASECHF(a) (XLALCOMPLEX8Arcsech(a)) | #define LAL_CASECHF(a) (XLALCOMPLEX8Arcsech(a)) | |||
#define LAL_CACSCHF(a) (XLALCOMPLEX8Arccsch(a)) | #define LAL_CACSCHF(a) (XLALCOMPLEX8Arccsch(a)) | |||
#define LAL_CATANHF(a) (XLALCOMPLEX8Arctanh(a)) | #define LAL_CATANHF(a) (XLALCOMPLEX8Arctanh(a)) | |||
#define LAL_CATANH_REALF(x) (XLALCOMPLEX8ArctanhReal(x)) | #define LAL_CATANH_REALF(x) (XLALCOMPLEX8ArctanhReal(x)) | |||
#define LAL_CACOTHF(a) (XLALCOMPLEX8Arccoth(a)) | #define LAL_CACOTHF(a) (XLALCOMPLEX8Arccoth(a)) | |||
#ifdef LAL_USE_COMPLEX_SHORT_MACROS | #ifdef LAL_USE_COMPLEX_SHORT_MACROS | |||
#define casinhf(a) (XLALCOMPLEX8Arcsinh(a)) | ||||
#define cacoshf(a) (XLALCOMPLEX8Arccosh(a)) | ||||
#define cacoshrf(x) (XLALCOMPLEX8ArccoshReal(x)) | #define cacoshrf(x) (XLALCOMPLEX8ArccoshReal(x)) | |||
#define casechf(a) (XLALCOMPLEX8Arcsech(a)) | #define casechf(a) (XLALCOMPLEX8Arcsech(a)) | |||
#define cacschf(a) (XLALCOMPLEX8Arccsch(a)) | #define cacschf(a) (XLALCOMPLEX8Arccsch(a)) | |||
#define catanhf(a) (XLALCOMPLEX8Arctanh(a)) | ||||
#define catanhrf(x) (XLALCOMPLEX8ArctanhReal(x)) | #define catanhrf(x) (XLALCOMPLEX8ArctanhReal(x)) | |||
#define cacothf(a) (XLALCOMPLEX8Arccoth(a)) | #define cacothf(a) (XLALCOMPLEX8Arccoth(a)) | |||
#endif | #endif | |||
#endif | #endif | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif /* LAL_USE_OLD_COMPLEX_STRUCTS */ | #endif /* LAL_USE_OLD_COMPLEX_STRUCTS */ | |||
End of changes. 30 change blocks. | ||||
43 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.8.0" | #define LAL_VERSION "6.9.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 8 | #define LAL_VERSION_MINOR 9 | |||
/* LAL Version Micro Number */ | /* LAL Version Micro Number */ | |||
#define LAL_VERSION_MICRO 0 | #define LAL_VERSION_MICRO 0 | |||
/* LAL Version Devel Number */ | /* LAL Version Devel Number */ | |||
#define LAL_VERSION_DEVEL 0 | #define LAL_VERSION_DEVEL 0 | |||
/* LAL Configure Arguments */ | /* LAL Configure Arguments */ | |||
#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'" | #define LAL_CONFIGURE_ARGS " '--enable-shared' '--prefix=/home/ut/testing/l al/6.9.0' '--exec-prefix=/home/ut/testing/lal/6.9.0' '--sysconfdir=/home/ut /testing/lal/6.9.0' '--datadir=/home/ut/testing/lal/6.9.0/share' 'CFLAGS=-w -fpermissive' 'CXXFLAGS=-w -fpermissive'" | |||
/* LAL Configure Date */ | /* LAL Configure Date */ | |||
#define LAL_CONFIGURE_DATE "2012-11-07T03:01:58+0400" | #define LAL_CONFIGURE_DATE "2012-12-12T02:29:44+0400" | |||
/* LAL Install Prefix */ | ||||
#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 */ | |||
/* Use pthread mutex lock for threadsafety */ | /* Use pthread mutex lock for threadsafety */ | |||
/* #undef LAL_PTHREAD_LOCK */ | /* #undef LAL_PTHREAD_LOCK */ | |||
End of changes. 4 change blocks. | ||||
7 lines changed or deleted | 4 lines changed or added | |||
LALInitBarycenter.h | LALInitBarycenter.h | |||
---|---|---|---|---|
skipping to change at line 35 | skipping to change at line 35 | |||
#endif | #endif | |||
#include <lal/LALBarycenter.h> | #include <lal/LALBarycenter.h> | |||
/** \cond DONT_DOXYGEN */ | /** \cond DONT_DOXYGEN */ | |||
/* exported API Function prototypes. */ | /* exported API Function prototypes. */ | |||
EphemerisData * XLALInitBarycenter ( const CHAR *earthEphemerisFile, const CHAR *sunEphemerisFile ); | EphemerisData * XLALInitBarycenter ( const CHAR *earthEphemerisFile, const CHAR *sunEphemerisFile ); | |||
void XLALDestroyEphemerisData ( EphemerisData *edat ); | void XLALDestroyEphemerisData ( EphemerisData *edat ); | |||
TimeCorrectionData *XLALInitTimeCorrections ( const CHAR *timeCorrectionFil | ||||
e ); | ||||
void XLALDestroyTimeCorrectionData( TimeCorrectionData *tcd ); | ||||
/* ==================== deprecated LAL interface ========================= =========================*/ | /* ==================== deprecated LAL interface ========================= =========================*/ | |||
#define LALINITBARYCENTERH_EOPEN 1 | #define LALINITBARYCENTERH_EOPEN 1 | |||
#define LALINITBARYCENTERH_EMEM 2 | #define LALINITBARYCENTERH_EMEM 2 | |||
#define LALINITBARYCENTERH_EEPHFILE 32 | #define LALINITBARYCENTERH_EEPHFILE 32 | |||
#define LALINITBARYCENTERH_MSGEOPEN "Could not open ephemeris file" | #define LALINITBARYCENTERH_MSGEOPEN "Could not open ephemeris file" | |||
#define LALINITBARYCENTERH_MSGEMEM "Out of memory" | #define LALINITBARYCENTERH_MSGEMEM "Out of memory" | |||
#define LALINITBARYCENTERH_MSGEEPHFILE "Error in reading an ephemeris file" | #define LALINITBARYCENTERH_MSGEEPHFILE "Error in reading an ephemeris file" | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||
LALVCSInfo.h | LALVCSInfo.h | |||
---|---|---|---|---|
/* | /* | |||
* LALVCSInfo.h.in - LAL VCS Information Header | * LALVCSInfo.h - LAL VCS Information Header | |||
* | * | |||
* This program is free software; you can redistribute it and/or modify | * This program is free software; you can redistribute it and/or modify | |||
* it under the terms of the GNU General Public License as published by | * it under the terms of the GNU General Public License as published by | |||
* the Free Software Foundation; either version 2 of the License, or (at | * the Free Software Foundation; either version 2 of the License, or (at | |||
* your option) any later version. | * your option) any later version. | |||
* | * | |||
* This program is distributed in the hope that it will be useful, but | * This program is distributed in the hope that it will be useful, but | |||
* WITHOUT ANY WARRANTY; without even the implied warranty of | * WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* General Public License for more details. | * General Public License for more details. | |||
skipping to change at line 33 | skipping to change at line 33 | |||
#define _LALVCSINFO_H | #define _LALVCSINFO_H | |||
#include <lal/LALLibVCSInfo.h> | #include <lal/LALLibVCSInfo.h> | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/* vcs information defines */ | /* vcs information defines */ | |||
#define LAL_NAME "LAL" | #define LAL_NAME "LAL" | |||
#define LAL_VCS_ID "ef41578736fd6b181dcf6157f632a2fd88f099b5" | #define LAL_VCS_ID "6373bfb922f5e31768c47af4cb901b7d745f7957" | |||
#define LAL_VCS_DATE "2012-11-06 17:53:32 +0000" | #define LAL_VCS_DATE "2012-12-10 22:25:21 +0000" | |||
#define LAL_VCS_BRANCH "None" | #define LAL_VCS_BRANCH "None" | |||
#define LAL_VCS_TAG "lal-v6.8.0" | #define LAL_VCS_TAG "lal-v6.9.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: ef41578736fd6b181dcf6157f632a2fd88f099 | #define LAL_VCS_IDENT_ID "$" "LALId: 6373bfb922f5e31768c47af4cb901b7d745f79 | |||
b5 " "$" | 57 " "$" | |||
#define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-11-06 17:53:32 +0000 " "$" | #define LAL_VCS_IDENT_DATE "$" "LALDate: 2012-12-10 22:25:21 +0000 " "$" | |||
#define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" | #define LAL_VCS_IDENT_BRANCH "$" "LALBranch: None " "$" | |||
#define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.8.0 " "$" | #define LAL_VCS_IDENT_TAG "$" "LALTag: lal-v6.9.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 " "$" | |||
/* header vcs information structure */ | /* header vcs information structure */ | |||
static const struct tagLALVCSInfo lalHeaderVCSInfo = { \ | static const struct tagLALVCSInfo lalHeaderVCSInfo = { \ | |||
LAL_NAME, \ | LAL_NAME, \ | |||
LAL_VERSION, \ | LAL_VERSION, \ | |||
LAL_VCS_ID, \ | LAL_VCS_ID, \ | |||
LAL_VCS_DATE, \ | LAL_VCS_DATE, \ | |||
End of changes. 5 change blocks. | ||||
8 lines changed or deleted | 8 lines changed or added | |||
StreamInput.h | StreamInput.h | |||
---|---|---|---|---|
skipping to change at line 290 | skipping to change at line 290 | |||
indicated, for instance, by the inability of dealing with comments), | indicated, for instance, by the inability of dealing with comments), | |||
and increases the number of potential points-of-failure (by requiring | and increases the number of potential points-of-failure (by requiring | |||
a consistent implementation across platforms of <tt>getc()</tt> and | a consistent implementation across platforms of <tt>getc()</tt> and | |||
<tt>fscanf()</tt>, rather than the single function <tt>fgets()</tt> used | <tt>fscanf()</tt>, rather than the single function <tt>fgets()</tt> used | |||
by other stream input routines). However, these sacrifices are | by other stream input routines). However, these sacrifices are | |||
necessary to allow LAL applications to ingest large quantities of | necessary to allow LAL applications to ingest large quantities of | |||
numerical data efficiently. | numerical data efficiently. | |||
*/ | */ | |||
/*@{*/ | /*@{*/ | |||
int XLALCHARReadSequence( CHARSequence **sequence, FILE *stream ); | ||||
void LALCHARReadSequence( LALStatus *status, CHARSequence **sequence, FILE *stream ); | void LALCHARReadSequence( LALStatus *status, CHARSequence **sequence, FILE *stream ); | |||
void LALI2ReadSequence( LALStatus *status, INT2Sequence **sequence, FILE *s tream ); | void LALI2ReadSequence( LALStatus *status, INT2Sequence **sequence, FILE *s tream ); | |||
void LALI4ReadSequence( LALStatus *status, INT4Sequence **sequence, FILE *s tream ); | void LALI4ReadSequence( LALStatus *status, INT4Sequence **sequence, FILE *s tream ); | |||
void LALI8ReadSequence( LALStatus *status, INT8Sequence **sequence, FILE *s tream ); | void LALI8ReadSequence( LALStatus *status, INT8Sequence **sequence, FILE *s tream ); | |||
void LALU2ReadSequence( LALStatus *status, UINT2Sequence **sequence, FILE * stream ); | void LALU2ReadSequence( LALStatus *status, UINT2Sequence **sequence, FILE * stream ); | |||
void LALU4ReadSequence( LALStatus *status, UINT4Sequence **sequence, FILE * stream ); | void LALU4ReadSequence( LALStatus *status, UINT4Sequence **sequence, FILE * stream ); | |||
void LALU8ReadSequence( LALStatus *status, UINT8Sequence **sequence, FILE * stream ); | void LALU8ReadSequence( LALStatus *status, UINT8Sequence **sequence, FILE * stream ); | |||
void LALSReadSequence( LALStatus *status, REAL4Sequence **sequence, FILE *s tream ); | void LALSReadSequence( LALStatus *status, REAL4Sequence **sequence, FILE *s tream ); | |||
void LALDReadSequence( LALStatus *status, REAL8Sequence **sequence, FILE *s tream ); | void LALDReadSequence( LALStatus *status, REAL8Sequence **sequence, FILE *s tream ); | |||
void LALCReadSequence( LALStatus *status, COMPLEX8Sequence **sequence, FILE *stream ); | void LALCReadSequence( LALStatus *status, COMPLEX8Sequence **sequence, FILE *stream ); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 1 lines changed or added | |||