Commit ff26971b authored by Karl Wette's avatar Karl Wette

SWIG: enforce tagnames for typedef'd enums

- Enums without tagnames can trigger bugs in SWIG, e.g. for an enum
     typedef enum { ... } myenum
  and a function
     void myfunction(const myenum *e);
  SWIG generates the incorrect cast
     (enum myenum const*) e
  whereas if the enum is given a tagname
     typedef enum tagmyenum { ... } myenum
  SWIG generates the correct cast
     (enum tagmyenum const*) e
Original: 02dad312c4563c6ff2c1e4e7f008503eb4abfd22
parent 049240b7
......@@ -215,6 +215,7 @@ extern "C" {
* spectra and computes the average using one of the following methods.
*/
typedef enum
tagAvgSpecMethod
{
useUnity, /**< A constant PSD of value unity will be returned independent of the input data given; this is used for testing purposes */
useMean, /**< The arithmetic mean of the individual power spectra computed will be used to compute the output power spectrum */
......
......@@ -53,7 +53,7 @@ extern "C" {
* This enumerated type is used to identify data as being in one of the
* coordinate systems discussed in \ref SkyCoordinates_h.
*/
typedef enum {
typedef enum tagCoordinateSystem {
COORDINATESYSTEM_HORIZON, /**< A horizon coordinate system. */
COORDINATESYSTEM_GEOGRAPHIC, /**< The Earth-fixed geographic coordinate system. */
COORDINATESYSTEM_EQUATORIAL, /**< The sky-fixed equatorial coordinate system. */
......
......@@ -46,7 +46,7 @@ enum {
};
/** Type codes: use these type codes to identify a LAL atomic data type, see \ref LALDatatypes for more details. */
typedef enum {
typedef enum tagLALTYPECODE {
LAL_CHAR_TYPE_CODE = LAL_1_BYTE_TYPE_SIZE, /**< CHAR type code (0) */
LAL_I2_TYPE_CODE = LAL_2_BYTE_TYPE_SIZE, /**< INT2 type code (1) */
LAL_I4_TYPE_CODE = LAL_4_BYTE_TYPE_SIZE, /**< INT4 type code (2) */
......
......@@ -49,7 +49,7 @@ extern "C" {
/*---------- TYPES ----------*/
/** Argument-type for LogPrintf(): determines log-level of this message */
typedef enum
typedef enum tagLogLevel_t
{
LOG_NONE = 0, /**< internal: don't use */
LOG_CRITICAL, /**< log-level for critical errors */
......
......@@ -158,7 +158,7 @@ someEpoch = {2147483596 s, 816000000 ns}, RA = 2.727813 rad, DEC = -0.523599 rad
XLALRegister ##type## UserVar( &(uvar-> name), #name, option, UVAR_CATEGORY_ ## category, __VA_ARGS__)
/// (mutually exclusive) UserVariable categories: optional, required, help, developer, ...
typedef enum {
typedef enum tagUserVarCategory {
UVAR_CATEGORY_START = 0, ///< internal start marker for range checking
UVAR_CATEGORY_OPTIONAL, ///< optional
......@@ -182,7 +182,7 @@ typedef enum {
* Format for logging User-input: configFile- or cmdLine-style.
* This determines the format of the string returned from XLALUserVarGetLog().
*/
typedef enum {
typedef enum tagUserVarLogFormat {
UVAR_LOGFMT_CFGFILE, /**< return UserVars as a config-file */
UVAR_LOGFMT_CMDLINE, /**< return UserVars as a command-line */
UVAR_LOGFMT_PROCPARAMS, /**< return UserVars suitable for filling in process-params struct */
......
......@@ -65,6 +65,7 @@ extern "C" {
/** UNDOCUMENTED */
typedef enum
tagCalibrationType
{
CalibrationAmplitude = 001,
CalibrationOffset = 002,
......
......@@ -219,7 +219,7 @@ enum {
* provides a way to keep track of that.
*
*/
typedef enum {
typedef enum tagLALDetectorType {
LALDETECTORTYPE_ABSENT, /**< No FrDetector associated with this detector */
LALDETECTORTYPE_IFODIFF, /**< IFO in differential mode */
LALDETECTORTYPE_IFOXARM, /**< IFO in one-armed mode (X arm) */
......
......@@ -84,6 +84,7 @@ extern "C" {
* time series due to aliasing.
*/
typedef enum
tagResampleTSFilter
{
defaultButterworth, /**< An IIR butterwoth filter of order 20 with attenuation 0.1 at the new Nyquist frequency.
* See the package tdfilters for documentation of butterworth filters in LAL.
......
......@@ -147,6 +147,7 @@ extern "C" {
* integrand should vanish exponentially for large \f$x\f$.
*/
typedef enum
tagIntegralType
{
ClosedInterval, /**< evaluate integral on a closed interval */
OpenInterval, /**< evaluate integral on an open interval */
......
......@@ -36,7 +36,7 @@ extern "C" {
// Test various combinations of 1D and 2D fixed arrays
// with structs, struct/enum type, and global variables.
typedef enum {
typedef enum tagswig_lal_test_enum {
swig_lal_test_enum_a,
swig_lal_test_enum_b,
swig_lal_test_enum_c
......
......@@ -168,8 +168,11 @@ for header_name in headers:
constants[constant_name] = constant
constant_names[constant_name] = constant_name
# enumeration constants
# enumerations and enumeration constants
for enum in headers[header_name].findall('enum'):
enum_name = get_swig_attr(enum, 'name')
if get_swig_attr(enum, 'unnamed') != None:
fail("enum '%s' in header '%s' has no tag-name" % (enum_name, header_name))
for enumitem in enum.findall('enumitem'):
enumitem_name = get_swig_attr(enumitem, 'name')
constants[enumitem_name] = cdecl
......
......@@ -28,7 +28,7 @@
extern "C" {
#endif
typedef enum {
typedef enum tagLALGType {
LALGTYPE_NONE = 0,
LALGTYPE_INT,
LALGTYPE_DBL,
......
......@@ -67,7 +67,7 @@ extern "C" {
*/
/** Enum listing different stream states */
typedef enum {
typedef enum tagLALFrStreamState {
LAL_FR_STREAM_OK = 0, /**< nominal */
LAL_FR_STREAM_ERR = 1, /**< error in frame stream */
LAL_FR_STREAM_END = 2, /**< end of frame stream */
......@@ -77,7 +77,7 @@ typedef enum {
} LALFrStreamState;
/** Enum listing different stream modes */
typedef enum {
typedef enum tagLALFrStreamMode {
LAL_FR_STREAM_SILENT_MODE = 0, /**< silent mode */
LAL_FR_STREAM_TIMEWARN_MODE = 1, /**< display warning for invalid time requests */
LAL_FR_STREAM_GAPINFO_MODE = 2, /**< display info for gaps in data */
......@@ -277,7 +277,7 @@ COMPLEX16FrequencySeries
#define FRAMESTREAMH_MSGEDGAP "Gap in the data"
/*@}*/
typedef enum {
typedef enum tagFrChanType {
LAL_ADC_CHAN, LAL_SIM_CHAN, LAL_PROC_CHAN
} FrChanType;
......
......@@ -104,7 +104,7 @@ struct tagLALInferenceModel;
* An enumerated type for denoting the type of a variable. Several LAL
* types are supported as well as others.
*/
typedef enum {
typedef enum tagLALInferenceVariableType {
LALINFERENCE_INT4_t,
LALINFERENCE_INT8_t,
LALINFERENCE_UINT4_t,
......@@ -127,7 +127,7 @@ typedef enum {
* This information is used by the sampling routines when deciding
* what to vary in a proposal, etc.
*/
typedef enum {
typedef enum tagLALInferenceParamVaryType {
LALINFERENCE_PARAM_LINEAR, /** A parameter that simply has a maximum and a minimum */
LALINFERENCE_PARAM_CIRCULAR, /** A parameter that is cyclic, such as an angle between 0 and 2pi */
LALINFERENCE_PARAM_FIXED, /** A parameter that never changes, functions should respect this */
......@@ -180,7 +180,7 @@ tagLALInferenceVariables
* Phase of MCMC run (depending on burn-in status, different actions
* are performed during the run, and this tag controls the activity).
*/
typedef enum {
typedef enum tagLALInferenceMCMCRunPhase {
LALINFERENCE_ONLY_PT, /** Run only parallel tempers. */
LALINFERENCE_TEMP_PT, /** In the parallel tempering phase of an annealed run */
LALINFERENCE_ANNEALING, /** In the annealing phase of an annealed run */
......
......@@ -50,7 +50,7 @@ int XLALCheckBurstApproximantFromString(const CHAR *inString);
/** Enum that specifies the PN approximant to be used in computing the waveform.
*/
typedef enum {
typedef enum tagBurstApproximant {
SineGaussianFFast,
SineGaussianF,
SineGaussian,
......
......@@ -317,7 +317,9 @@ FindChirpTmpltParams;
* This structure contains the possible methods by which
* to maximize over a chirp in a data segment.
*/
typedef enum {
typedef enum
tagFindChirpClustering
{
FindChirpClustering_none, /**< The decision to do no clustering of events */
FindChirpClustering_tmplt, /**< Cluster over the length of the data segment */
FindChirpClustering_window, /**< Cluster over a given number of seconds given by the argument to the flag
......
......@@ -67,7 +67,7 @@ extern "C" {
/** \endcond */
/** UNDOCUMENTED */
typedef enum{
typedef enum tagSimRingType {
Ringdown
} SimRingType;
......
......@@ -32,6 +32,7 @@ extern "C" {
* injections can be distributed
*/
typedef enum
taglalinspiral_time_distribution
{
LALINSPIRAL_UNKNOWN_TIME_DIST,
LALINSPIRAL_FIXED_TIME_DIST,
......@@ -46,6 +47,7 @@ lalinspiral_time_distribution;
* injections can be distributed
*/
typedef enum
tagLoudnessDistribution
{
unknownLoudnessDist,
distFromSourceFile,
......@@ -65,6 +67,7 @@ LoudnessDistribution;
* injections can be distributed
*/
typedef enum
tagSkyLocationDistribution
{
unknownLocationDist,
locationFromSourceFile,
......@@ -80,6 +83,7 @@ SkyLocationDistribution;
* injections can be distributed
*/
typedef enum
tagMassDistribution
{
unknownMassDist,
massFromSourceFile,
......@@ -101,6 +105,7 @@ MassDistribution;
* injections can be distributed
*/
typedef enum
tagInclDistribution
{
unknownInclDist,
uniformInclDist,
......@@ -114,6 +119,7 @@ InclDistribution;
* injections can be distributed
*/
typedef enum
tagSpinDistribution
{
unknownSpinDist,
uniformSpinDist,
......@@ -126,6 +132,7 @@ SpinDistribution;
* depending on the waveform family
*/
typedef enum
tagAlignmentType
{
alongzAxis,
inxzPlane,
......
......@@ -119,7 +119,7 @@ int XLALGetInteractionFromString(const CHAR *inString);
* generation. Their combination also can be used by the bitwise or.
* DEPRECATED: USE LALSimInspiralSpinOrder, LALSimInspiralTidalOrder INSTEAD
*/
typedef enum {
typedef enum tagLALInspiralInteraction {
LAL_INSPIRAL_INTERACTION_NONE = 0, /**< No spin, tidal or other interactions */
LAL_INSPIRAL_INTERACTION_SPIN_ORBIT_15PN = 1, /**< Leading order spin-orbit interaction */
LAL_INSPIRAL_INTERACTION_SPIN_SPIN_2PN = 1 << 1, /**< Spin-spin interaction */
......@@ -181,7 +181,7 @@ tagEtaTau04In
* bhns, fixedMasses, fixedPsi, fixedTau
*
*/
typedef enum {
typedef enum tagInputMasses {
m1Andm2, /**< component masses */
totalMassAndEta, /**< total mass and symmetric mass ratio */
totalMassUAndEta, /**< total mass and eta but uniform distribution in totalMass */
......
......@@ -85,6 +85,7 @@ extern "C" {
/** UNDOCUMENTED */
typedef enum
tagComputeMoments
{
disable,
enable
......@@ -108,6 +109,7 @@ ComputeMoments;
* space (intrinsic and extrinsic parameters).
*/
typedef enum
tagCoordinateSpace
{
Tau0Tau2, /**< \f$(\tau_0, \tau_2)\f$ space of chirptimes */
Tau0Tau3, /**< \f$(\tau_0, \tau_3)\f$ space of chirptimes */
......@@ -127,6 +129,7 @@ CoordinateSpace;
* which should be used for future searches.
*/
typedef enum
tagGridSpacing
{
SquareNotOriented, /**< UNDOCUMENTED */
Square, /**< UNDOCUMENTED */
......@@ -144,6 +147,7 @@ GridSpacing;
* covers two boundaries(upper and lower).
*/
typedef enum
tagPosition
{
In, /**< UNDOCUMENTED */
Above, /**< UNDOCUMENTED */
......@@ -158,6 +162,7 @@ Position;
* purpose of BCV placement but can be used in an other context.
*/
typedef enum
tagInsidePolygonEnum
{
False,
True
......@@ -169,6 +174,7 @@ InsidePolygonEnum;
* by the Hexagonal placement.
*/
typedef enum
tagGeneration
{
Sterile,
Fertile
......@@ -187,6 +193,7 @@ Generation;
* \c InspiralCoarseIn structure below.
*/
typedef enum
tagInspiralBankMassRange
{
MinComponentMassMaxTotalMass,
MinMaxComponentMass,
......@@ -200,6 +207,7 @@ InspiralBankMassRange;
* frequency cutoff.
*/
typedef enum
tagFreqCut
{
FreqCut_SchwarzISCO, /**< the innermost stable circular orbit (ISCO) for a test particle orbiting a Schwarzschild black hole */
FreqCut_BKLISCO, /**< a mass ratio dependent ISCO derived from estimates of the final spin of a merged black found in a
......
......@@ -198,7 +198,7 @@ int XLALSQTPNDerivator(UNUSED REAL8 t, const REAL8 values[], REAL8 dvalues[],
/**
* Enumeration to index the dynamic variables in the LALSQTPNGenerator function.
*/
typedef enum {
typedef enum tagLALSQTPNGeneratorVariables {
LALSQTPN_PHASE, ///< index of the phase
LALSQTPN_OMEGA, ///< index of the \f$M\omega\f$
LALSQTPN_LNH_1, ///< index of the \f$\hat{L}_N\f$'s x component
......
......@@ -46,7 +46,9 @@
/*@{*/
/** UNDOCUMENTED */
typedef enum {
typedef enum
tagtrigScanType
{
trigScanNone, /**< UNDOCUMENTED */
T0T3Tc, /**< UNDOCUMENTED */
Psi0Psi3Tc, /**< UNDOCUMENTED */
......@@ -65,6 +67,7 @@ tagTrigScanCluster
/** UNDOCUMENTED */
typedef enum
tagTrigScanStatus
{
TRIGSCAN_SUCCESS, /**< UNDOCUMENTED */
TRIGSCAN_ERROR, /**< UNDOCUMENTED */
......
......@@ -42,6 +42,7 @@ extern "C" {
* tests of mass parameters which are used.
*/
typedef enum
tagSnglInspiralParameterTest
{
unspecified_test,
no_test,
......@@ -134,6 +135,7 @@ CoincInspiralStatParams;
* in arXiv:1111.7314.
*/
typedef enum
tagSnglInspiralClusterChoice
{
SNGL_INSPIRAL_CLUSTER_CHOICE_NONE,
snr_and_chisq,
......@@ -156,6 +158,7 @@ SnglInspiralClusterChoice;
* \c new_snrsq, \c bitten_lsq, \c ifar.
*/
typedef enum
tagCoincInspiralStatistic
{
no_stat,
snrsq,
......@@ -175,6 +178,7 @@ CoincInspiralStatistic;
* clustering returns the trigger with the smallest null-statistic value.
*/
typedef enum
tagMultiInspiralClusterChoice
{
no_statistic,
nullstat,
......@@ -195,6 +199,7 @@ MultiInspiralClusterChoice;
* analysis (cohbank) or the outputs of multiple single-ifo filtering.
*/
typedef enum
tagCohbankRunType
{
cohbank,
cohinspbank
......
......@@ -30,6 +30,7 @@ extern "C" {
*
*/
typedef enum
tagSnglRingdownParameterTest
{
LALRINGDOWN_UNKNOWN_TEST,
LALRINGDOWN_F_AND_Q,
......@@ -39,6 +40,7 @@ typedef enum
SnglRingdownParameterTest;
typedef enum
taglalringdown_inject_type
{
LALRINGDOWN_RING_INJECT,
LALRINGDOWN_IMR_INJECT,
......@@ -49,6 +51,7 @@ typedef enum
lalringdown_inject_type;
typedef enum
taglalringdown_spectrum_type
{
LALRINGDOWN_SPECTRUM_MEDIAN,
LALRINGDOWN_SPECTRUM_MEDIAN_MEAN
......@@ -56,6 +59,7 @@ typedef enum
lalringdown_spectrum_type;
typedef enum
taglalringdown_data_type
{
LALRINGDOWN_DATATYPE_SIM,
LALRINGDOWN_DATATYPE_ZERO,
......
......@@ -73,7 +73,7 @@ extern "C" {
#define NINJA_MAX_MODE 5
/** enum for list of numrel groups */
typedef enum{
typedef enum tagNumRelGroup {
NINJA_GROUP_AEI = 0,
NINJA_GROUP_CIT,
NINJA_GROUP_LSU,
......
......@@ -66,7 +66,7 @@
#define TEMPLATEBANKGENERATIONH_MSGENULL "Unexpected NULL pointer to an input type"
/*@}*/
typedef enum {
typedef enum tagTemplateBankType {
/* Binary Inspiral Searches 100-199 */
BCVType,
BCVSpinType,
......
......@@ -99,6 +99,7 @@ extern "C" {
* database tables that are provided.
*/
typedef enum
tagMetadataTableType
{
no_table,
process_table,
......@@ -130,6 +131,7 @@ MetadataTableType;
* interferometer.
*/
typedef enum
tagInterferometerNumber
{
LAL_IFO_G1,
LAL_IFO_H1,
......
......@@ -91,7 +91,7 @@ extern "C" {
* The \c LALPlaygroundDataMask contains an enum type for describing the
* subset of data to be used, \c playground_only, \c exclude_play and \c all_data.
*/
typedef enum
typedef enum tagLALPlaygroundDataMask
{
unspecified_data_type,
playground_only,
......
......@@ -79,7 +79,7 @@ extern "C" {
/*---------- external types ----------*/
/** Different 'states' a Doppler-scan can be in */
typedef enum {
typedef enum tagscan_state_t {
STATE_IDLE = 0, /**< not initialized yet */
STATE_READY, /**< initialized and ready */
STATE_FINISHED, /**< all templates have been read */
......@@ -87,8 +87,7 @@ typedef enum {
} scan_state_t;
/** different types of grids: */
typedef enum
{
typedef enum tagDopplerGridType {
/* ----- factored grid-types: sky x f0dot x f1dot x f2dot x f3dot */
GRID_FLAT = 0, /**< "flat" sky-grid: fixed step-size (dAlpha,dDelta) */
GRID_ISOTROPIC = 1, /**< approximately isotropic sky-grid */
......
......@@ -86,7 +86,7 @@ extern "C" {
* (\c TIMECORRECTION_TEMPO2 is so-called because the pulsar timing software
* TEMPO2 uses the TCB time system by default).
*/
typedef enum{
typedef enum tagTimeCorrectionType {
TIMECORRECTION_NONE = 0,
TIMECORRECTION_TDB,
TIMECORRECTION_TCB,
......@@ -100,7 +100,7 @@ typedef enum{
* \brief Enumerated type denoting the JPL solar system ephemeris to be used
* in calculating barycentre time corrections.
*/
typedef enum {
typedef enum tagEphemerisType {
EPHEM_NONE = 0,
EPHEM_DE200,
EPHEM_DE405,
......
......@@ -46,7 +46,7 @@ extern "C" {
/*---------- exported types ----------*/
/** Translate TDI arm indices to C-indexing */
typedef enum {
typedef enum tagLISAarmT {
LISA_ARM1 = 0,
LISA_ARM2,
LISA_ARM3
......
......@@ -92,7 +92,7 @@ extern "C" {
/** Constants defining different types of pulsar-metrics. */
typedef enum
typedef enum tagLALPulsarMetricType
{
LAL_PMETRIC_NONE = 0,
LAL_PMETRIC_COH_PTOLE_ANALYTIC,
......
......@@ -80,7 +80,7 @@ extern "C" {
* Structure, enum, union, etc., typdefs.
*/
typedef enum
typedef enum tagDetChoice
{ SAME,
DIFFERENT,
ALL
......
......@@ -96,7 +96,7 @@ typedef struct tagPulsarDopplerParams {
// ---------- transient-CW related types ----------
/** Struct to define parameters of a 'transient window' to be applied to obtain transient signals */
typedef enum {
typedef enum tagtransientWindowType_t {
TRANSIENT_NONE = 0, /**< Note: in this case the window-parameters will be ignored, and treated as rect={data},
* i.e. a simple rectangular window covering all the data => this should always reproduce the
* standard F-statistic computation. */
......
......@@ -66,7 +66,7 @@ extern "C" {
/** An enumerated type for denoting the type of a variable. Several LAL types are supported. */
typedef enum {
typedef enum tagPulsarParamType {
PULSARTYPE_UINT4_t = 0,
PULSARTYPE_REAL8_t,
PULSARTYPE_REAL8Vector_t,
......
......@@ -41,7 +41,7 @@ extern "C" {
/*---------- exported types ----------*/
/** The precision in calculating the barycentric transformation */
typedef enum {
typedef enum tagSSBprecision {
SSBPREC_NEWTONIAN, /**< simple Newtonian: \f$\tau = t + \vec{r}\cdot\vec{n}/c\f$ */
SSBPREC_RELATIVISTIC, /**< detailed relativistic: \f$\tau=\tau(t; \vec{n}, \vec{r})\f$ */
SSBPREC_RELATIVISTICOPT, /**< optimized relativistic, numerically equivalent to #SSBPREC_RELATIVISTIC, but faster */
......
......@@ -59,7 +59,7 @@ extern "C" {
/**
* Enumeration of allowed amplitude-prior types
*/
typedef enum {
typedef enum tagAmpPriorType_t {
AMP_PRIOR_TYPE_PHYSICAL = 0, /**< 'physical' priors: isotropic pdf{cosi,psi,phi0} AND flat pdf(h0) */
AMP_PRIOR_TYPE_CANONICAL, /**< 'canonical' priors: uniform in A^mu up to h_max */
AMP_PRIOR_TYPE_LAST
......
......@@ -90,7 +90,7 @@ typedef struct tagPosVel3D_t {
/** Bitfield of different types of detector-motion to use in order to compute the Doppler-metric */
typedef enum {
typedef enum tagDetectorMotionType {
DETMOTION_SPIN = 0x01, /**< Full spin motion */
DETMOTION_SPINZ = 0x02, /**< Ecliptic-Z component of spin motion only */
DETMOTION_SPINXY = 0x03, /**< Ecliptic-X+Y components of spin motion only */
......@@ -106,7 +106,7 @@ typedef enum {
* enum listing symbolic 'names' for all Doppler Coordinates
* supported by the metric codes in FstatMetric
*/
typedef enum {
typedef enum tagDopplerCoordinateID {
DOPPLERCOORD_NONE = -1, /**< No Doppler component */
DOPPLERCOORD_FREQ, /**< Frequency [Units: Hz]. */
......
......@@ -59,7 +59,7 @@ extern "C" {
*/
#define EOB_RD_EFOLDS 10.0
typedef enum {
typedef enum tagIMRPhenomP_version_type {
IMRPhenomPv1_V, /**< version 1: based on IMRPhenomC */
IMRPhenomPv2_V /**< version 2: based on IMRPhenomD */
} IMRPhenomP_version_type;
......
......@@ -216,7 +216,7 @@ extern "C" {
/**
* Enum that specifies the PN approximant to be used in computing the waveform.
*/
typedef enum {
typedef enum tagApproximant {
TaylorT1, /**< Time domain Taylor approximant in which the energy and flux are both kept
* as Taylor expansions and a first order ordinary differential equation is solved
* or the GW phase as a function of \f$t\f$; Outputs a time-domain wave.
......@@ -365,7 +365,7 @@ typedef enum {
} Approximant;
/** Enum of various frequency functions */
typedef enum {
typedef enum tagFrequencyFunction {
fSchwarzISCO, /**< Schwarzschild ISCO */
fIMRPhenomAFinal, /**< Final frequency of IMRPhenomA */
fIMRPhenomBFinal, /**< Final of IMRPhenomB */
......@@ -381,7 +381,7 @@ typedef enum {
} FrequencyFunction;
/** Enum of possible values to use for post-Newtonian order. */
typedef enum {
typedef enum tagLALPNOrder {
LAL_PNORDER_NEWTONIAN, /**< Newtonain (leading) order */
LAL_PNORDER_HALF, /**< 0.5PN <==> O(v) */
LAL_PNORDER_ONE, /**< 1PN <==> O(v^2) */
......@@ -395,7 +395,7 @@ typedef enum {
} LALPNOrder;
/** Enumeration to specify the tapering method to apply to the waveform */
typedef enum
typedef enum tagLALSimInspiralApplyTaper
{
LAL_SIM_INSPIRAL_TAPER_NONE, /**< No tapering */
LAL_SIM_INSPIRAL_TAPER_START, /**< Taper the start of the waveform */
......@@ -405,12 +405,12 @@ typedef enum
} LALSimInspiralApplyTaper;
/** Enumeration to specify time or frequency domain */