Commit 9c1c4db7 authored by Karl Wette's avatar Karl Wette
Browse files

LALInspiral: replace constants oneby3, twoby3, etc. with literals

- no benefit from having these as constants, since any modern compiler
  will compute them at compile time
- not consistently used, some codes define their own constants, etc.
- not used in newer LALSimulation codes
- ninty4by3etc kept, but moved into source files where it is used
- LALINSPIRAL_PNTHETA and LALINRPIAL_PNLAMBDA removed, not used anywhere
- passes 'make check'
Original: b45db11e74a2548127f1000b7e1c50d7de7c634c
parent e6f08b63
......@@ -166,13 +166,11 @@ LALFindChirpBCVSpinTemplate (
REAL8 rootDenominator;
REAL8 denominator1;
REAL8 numerator1;
REAL4 Twoby3 = 2.0/3.0;
REAL8 deltaTto2by3;
REAL8 *A1Vec = NULL;
REAL8 *A2Vec = NULL;
REAL8 *A3Vec = NULL;
REAL4 deltaT;
REAL4 rLSOto3by2 = 0.0;
INITSTATUS(status);
ATTATCHSTATUSPTR( status );
......@@ -236,7 +234,7 @@ LALFindChirpBCVSpinTemplate (
/* parameters */
deltaT = params->deltaT;
deltaTto2by3 = pow(deltaT, Twoby3);
deltaTto2by3 = pow(deltaT, (2./3.));
deltaF = 1.0 / ( (REAL4) params->deltaT * (REAL4) numPoints );
x1 = pow( deltaF, -1.0/3.0 );
fFinal = tmplt->fFinal;
......@@ -249,7 +247,7 @@ LALFindChirpBCVSpinTemplate (
if (fFinal == 0.0)
{
rLSOto3by2 = 14.69693846; /* 6 to 3by2) */
const REAL4 rLSOto3by2 = 14.69693846; /* 6 to 3by2) */
fFinal = (-psi00 * 16 * LAL_PI) / (psi15 * rLSOto3by2);
......
......@@ -86,8 +86,7 @@ LALBCVWaveform(
{
REAL8 f, df;
REAL8 shift, phi, psi, amp0, amp;
REAL8 Sevenby6, Fiveby3, Twoby3, alpha;
REAL8 shift, phi, psi, amp0, amp, alpha;
INT4 n, i;
INITSTATUS(status);
......@@ -101,13 +100,10 @@ LALBCVWaveform(
ASSERT (params->tSampling > 0, status, LALINSPIRALH_ESIZE, LALINSPIRALH_MSGESIZE);
n = signalvec->length;
Twoby3 = 2.L/3.L;
Sevenby6 = 7.L/6.L;
Fiveby3 = 5.L/3.L;
df = params->tSampling/(REAL8)n;
params->fFinal = params->fCutoff;
alpha = params->alpha / pow(params->fCutoff, Twoby3);
alpha = params->alpha / pow(params->fCutoff, (2./3.));
/* to do : check that a_f in [0,1]??*/
......@@ -119,15 +115,15 @@ LALBCVWaveform(
*/
/*
shift = LAL_TWOPI * ((double) params->nStartPad/params->tSampling + params->startTime);
phi = params->startPhase + params->psi0 * pow(params->fLower, -Fiveby3)
+ params->psi3 * pow(params->fLower, -Twoby3);
phi = params->startPhase + params->psi0 * pow(params->fLower, -(5./3.))
+ params->psi3 * pow(params->fLower, -(2./3.));
*/
shift = -LAL_TWOPI * ((double)params->nStartPad/params->tSampling);
phi = - params->startPhase;
/*
amp0 = params->signalAmplitude * pow(5./(384.*params->eta), 0.5) *
totalMass * pow(LAL_PI * totalMass,-Sevenby6) *
totalMass * pow(LAL_PI * totalMass,-(7./6.)) *
params->tSampling * (2. / signalvec->length);
*/
......@@ -154,8 +150,8 @@ LALBCVWaveform(
else
{
/* What shall we put for sign phi? for uspa it must be "-" */
psi = (shift*f + phi + params->psi0*pow(f,-Fiveby3) + params->psi3*pow(f,-Twoby3));
amp = amp0 * (1. - alpha * pow(f,Twoby3)) * pow(f,-Sevenby6);
psi = (shift*f + phi + params->psi0*pow(f,-(5./3.)) + params->psi3*pow(f,-(2./3.)));
amp = amp0 * (1. - alpha * pow(f,(2./3.))) * pow(f,-(7./6.));
signalvec->data[i] = (REAL4) (amp * cos(psi));
signalvec->data[n-i] = (REAL4) (-amp * sin(psi));
......@@ -180,7 +176,6 @@ LALBCVSpinWaveform(
REAL8 f, df;
REAL8 shift, phi, psi, amp0, ampRe, ampIm, modphase;
REAL8 Sevenby6, Fiveby3, Twoby3;
INT4 n, i;
INITSTATUS(status);
......@@ -194,9 +189,6 @@ LALBCVSpinWaveform(
ASSERT (params->tSampling > 0, status, LALINSPIRALH_ESIZE, LALINSPIRALH_MSGESIZE);
n = signalvec->length;
Twoby3 = 2.L/3.L;
Sevenby6 = 7.L/6.L;
Fiveby3 = 5.L/3.L;
df = params->tSampling/(REAL8)n;
......@@ -214,7 +206,7 @@ LALBCVSpinWaveform(
/*
amp0 = params->signalAmplitude * pow(5./(384.*params->eta), 0.5) *
totalMass * pow(LAL_PI * totalMass,-Sevenby6) *
totalMass * pow(LAL_PI * totalMass,-(7./6.)) *
params->tSampling * (2. / signalvec->length);
*/
......@@ -240,14 +232,14 @@ LALBCVSpinWaveform(
{
/* What shall we put for sign phi? for uspa it must be "-" */
psi = (shift*f + phi + params->psi0*pow(f,-Fiveby3) + params->psi3*pow(f,-Twoby3));
modphase = params->beta * pow(f,-Twoby3);
psi = (shift*f + phi + params->psi0*pow(f,-(5./3.)) + params->psi3*pow(f,-(2./3.)));
modphase = params->beta * pow(f,-(2./3.));
ampRe = amp0 * pow(f,-Sevenby6)
ampRe = amp0 * pow(f,-(7./6.))
* (params->alpha1
+ (params->alpha2 * cos(modphase))
+ (params->alpha3 * sin(modphase)));
ampIm = amp0 * pow(f,-Sevenby6)
ampIm = amp0 * pow(f,-(7./6.))
* (params->alpha4
+ (params->alpha5 * cos(modphase))
+ (params->alpha6 * sin(modphase)));
......
......@@ -59,6 +59,7 @@ Pan et al, arXiv:1106.1021v1 [gr-qc].
#include <gsl/gsl_sf_gamma.h>
#define ninty4by3etc 18.687902694437592603 /* (94/3 -41/31*pi*pi) */
static const int EOBNRV2_NUM_MODES_MAX = 5;
......
......@@ -117,6 +117,8 @@ at the last stable orbit. It is recommended that a rather generous
#define UNUSED
#endif
#define ninty4by3etc 18.687902694437592603 /* (94/3 -41/31*pi*pi) */
typedef struct tagrOfOmegaIn {
REAL8 eta, omega;
} rOfOmegaIn;
......
......@@ -30,7 +30,7 @@ void LALEstimateEffectiveDistance (
REAL8 *effDistance
)
{
REAL8 msevenby3, powerNorm, totalMass, flso, distanceNorm;
REAL8 powerNorm, totalMass, flso, distanceNorm;
REAL8 f, ins_amp;
INT4 i;
REAL8 dynRange = 1.0;
......@@ -38,7 +38,6 @@ void LALEstimateEffectiveDistance (
INITSTATUS(status);
ATTATCHSTATUSPTR (status);
msevenby3 = -7.L/3.L;
powerNorm = 0.;
totalMass = param.totalMass*LAL_MTSUN_SI;
......@@ -48,7 +47,7 @@ void LALEstimateEffectiveDistance (
for (i=1; i<(INT4)psd->length; i++) {
f = i*df;
if (f > flso) break;
if (psd->data[i]) powerNorm += pow(f,msevenby3)/psd->data[i];
if (psd->data[i]) powerNorm += pow(f,(-7./3.))/psd->data[i];
}
/* I am not sure if there should be a factor of 2.0 here inside the sqrt ()
......
......@@ -56,24 +56,6 @@ extern "C" {
*/
/*@{*/
/** \cond DONT_DOXYGEN */
# define oneby3 0.333333333333333333333333333
# define twoby3 0.666666666666666666666666667
# define fourby3 1.333333333333333333333333333
# define fiveby3 1.666666666666666666666666667
# define sevenby3 2.333333333333333333333333333
# define eightby3 2.666666666666666666666666667
# define tenby3 3.333333333333333333333333333
# define elevenby3 3.666666666666666666666666666
# define threeby8 0.375
# define fiveby8 0.625
# define threeby4 0.75
# define sevenby8 0.875
# define ninty4by3etc 18.687902694437592603 /* (94/3 -41/31*pi*pi) */
# define LALINSPIRAL_PNTHETA -11831.L/9240.L
# define LALINRPIAL_PNLAMBDA -1987.L/3080.L
/** \endcond */
/**\name Error Codes */
/*@{*/
#define LALINSPIRALH_ENULL 1 /**< Arguments contained an unexpected null pointer */
......
......@@ -496,13 +496,10 @@ LALPSItoMasses (
{
REAL8 totalMass;
REAL8 eta;
REAL8 eightBy3 = 8.L/3.L;
REAL8 twoBy3 = 2.L/3.L;
REAL8 fiveBy3 = 5.L/3.L;
/*we estimate the total mass and then fFinal*/
params->totalMass = -params->psi3/(16.L*LAL_PI * LAL_PI * params->psi0);
eta = params->eta =
3.L/(128.L * params->psi0 * pow(LAL_PI*params->totalMass, fiveBy3));
3.L/(128.L * params->psi0 * pow(LAL_PI*params->totalMass, (5./3.)));
totalMass = params->totalMass;
params->fFinal = 1.L/( LAL_PI * pow(HighGM, 1.5L) * params->totalMass );
params->totalMass /= LAL_MTSUN_SI;
......@@ -521,10 +518,10 @@ LALPSItoMasses (
}
#endif
params->t0 = 5.0 / ( 256.0*eta*pow(totalMass, fiveby3) *
pow(LAL_PI * params->fLower, eightBy3));
params->t3 = LAL_PI/(8.0*eta*pow(totalMass, twoBy3) *
pow(LAL_PI * params->fLower, fiveBy3));
params->t0 = 5.0 / ( 256.0*eta*pow(totalMass, (5./3.)) *
pow(LAL_PI * params->fLower, (8./3.)));
params->t3 = LAL_PI/(8.0*eta*pow(totalMass, (2./3.)) *
pow(LAL_PI * params->fLower, (5./3.)));
}
DETATCHSTATUSPTR(status);
RETURN (status);
......
......@@ -51,7 +51,7 @@ LALInspiralComputeChisq
)
{
REAL8 c2, flso, df, duration, totalModelSNR, SNRPerBin, binSNR, totalSNR, diffSNR, mSevenBy3;
REAL8 c2, flso, df, duration, totalModelSNR, SNRPerBin, binSNR, totalSNR, diffSNR;
INT4 n, k_0, k_N, /*ki,*/ count, k, k_start, k_end, i;
UINT4 binIndexLength;
INT4Vector *binIndexes = NULL;
......@@ -83,10 +83,9 @@ LALInspiralComputeChisq
*/
totalModelSNR = 0.0;
mSevenBy3 = -7.L/3.L;
for(k=k_0; k<=k_N; k++)
{
if (input->psd->data[k]) totalModelSNR += pow( (float)k*df, mSevenBy3) / input->psd->data[k];
if (input->psd->data[k]) totalModelSNR += pow( (float)k*df, (-7./3.)) / input->psd->data[k];
}
c2 = SNRPerBin = totalModelSNR/(double)params->nBins;
......@@ -109,7 +108,7 @@ LALInspiralComputeChisq
for(k=k_start; k<=k_N; k++)
{
double dSNR=0., ePlus=0., eMinus=0.;
if (input->psd->data[k]) binSNR += (dSNR=pow( (float)k*df, mSevenBy3) / input->psd->data[k]);
if (input->psd->data[k]) binSNR += (dSNR=pow( (float)k*df, (-7./3.)) / input->psd->data[k]);
if (binSNR > SNRPerBin)
{
......@@ -146,7 +145,7 @@ LALInspiralComputeChisq
binSNR = 0.;
for(k=k_start; k<=k_N; k++)
{
if (input->psd->data[k]) binSNR += pow( (float)k*df, mSevenBy3) / input->psd->data[k];
if (input->psd->data[k]) binSNR += pow( (float)k*df, (-7./3.)) / input->psd->data[k];
}
binIndexes->data[count] = k_N;
......@@ -165,7 +164,7 @@ LALInspiralComputeChisq
for(k=1; k < input->psd->length; k++)
{
if (input->psd->data[k])
fprintf(stdout, "%e %e \n", (float)k*df, (pow((float)k * df, mSevenBy3) / input->psd->data[k]));
fprintf(stdout, "%e %e \n", (float)k*df, (pow((float)k * df, (-7./3.)) / input->psd->data[k]));
}
fprintf(stdout, "&\n");
for(i=0; i < binIndexLength; i++)
......
......@@ -71,7 +71,6 @@ LALInspiralFindEvents
REAL8 norm;
REAL8 flso;
REAL8 distanceNorm;
REAL8 msevenby3;
REAL8 x;
REAL8 y;
REAL8 z;
......@@ -213,7 +212,6 @@ LALInspiralFindEvents
}
*nEvents = 0;
msevenby3 = -7.L/3.L;
distanceNorm = 0.;
totalMass = findeventsin->param.totalMass*LAL_MTSUN_SI;
eta = findeventsin->param.eta;
......@@ -222,7 +220,7 @@ LALInspiralFindEvents
{
f = i*df;
if (f > flso) break;
if (findeventsin->psd.data[i]) distanceNorm += pow(f,msevenby3)/findeventsin->psd.data[i];
if (findeventsin->psd.data[i]) distanceNorm += pow(f,(-7./3.))/findeventsin->psd.data[i];
}
distanceNorm = sqrt(distanceNorm);
distanceNorm *= df * pow(totalMass, 5.L/6.L) * sqrt(5.L*eta/12.L)/pow(LAL_PI,2.L/3.L) ;
......
......@@ -82,7 +82,6 @@ LALInspiralFindEventsCluster
REAL8 phase = 0;
REAL8 distanceNorm;
REAL8 flso;
REAL8 msevenby3;
REAL8 x;
REAL8 y;
REAL8 z;
......@@ -256,7 +255,6 @@ LALInspiralFindEventsCluster
}
printf("&\n");
}
msevenby3 = -7.L/3.L;
distanceNorm = 0.;
totalMass = findeventsin->param.totalMass*LAL_MTSUN_SI;
eta = findeventsin->param.eta;
......@@ -265,7 +263,7 @@ LALInspiralFindEventsCluster
{
f = i*df;
if (f > flso) break;
if (findeventsin->psd.data[i]) distanceNorm += pow(f,msevenby3)/findeventsin->psd.data[i];
if (findeventsin->psd.data[i]) distanceNorm += pow(f,(-7./3.))/findeventsin->psd.data[i];
}
distanceNorm = sqrt(distanceNorm);
distanceNorm *= df * pow(totalMass, 5.L/6.L) * sqrt(5.L*eta/12.L)/pow(LAL_PI,2.L/3.L) ;
......
......@@ -70,7 +70,6 @@ LALInspiralFindLoudestEvent
REAL8 norm;
REAL8 distanceNorm;
REAL8 flso;
REAL8 msevenby3;
REAL8 x;
REAL8 y;
REAL8 z;
......@@ -274,7 +273,6 @@ LALInspiralFindLoudestEvent
}
printf("&\n");
}
msevenby3 = -7.L/3.L;
distanceNorm = 0.;
totalMass = findeventsin->param.totalMass*LAL_MTSUN_SI;
eta = findeventsin->param.eta;
......@@ -283,7 +281,7 @@ LALInspiralFindLoudestEvent
{
f = i*df;
if (f > flso) break;
if (findeventsin->psd.data[i]) distanceNorm += pow(f,msevenby3)/findeventsin->psd.data[i];
if (findeventsin->psd.data[i]) distanceNorm += pow(f,(-7./3.))/findeventsin->psd.data[i];
}
distanceNorm = sqrt(distanceNorm);
distanceNorm *= df * pow(totalMass, 5.L/6.L) * sqrt(5.L*eta/12.L)/pow(LAL_PI,2.L/3.L) ;
......
......@@ -956,7 +956,7 @@ LALFindPosition(LALStatus *status,
/* given t0, t3 we get the totalMass and eta.
We do not need to call ParameterCalc again and again here. */
totalMass = A0 * paramsIn->t3/(A3 * paramsIn->t0);
eta = A0/(paramsIn->t0 * pow(totalMass, fiveby3));
eta = A0/(paramsIn->t0 * pow(totalMass, (5./3.)));
/* be sure eta is inside the space if it is suppose to be */
if (eta > oneby4) {
......
......@@ -247,7 +247,7 @@ XLALInspiralParameterCalc (
if (params->t2 <= 0)
XLAL_ERROR(XLAL_EDOM);
A0 = 5./ pow(piFl, eightby3)/256.;
A0 = 5./ pow(piFl, (8./3.))/256.;
A2 = 3715.0/(64512.0*pow(piFl,2.0));
B2 = 4620.0/3715 * ieta;
Tau2In.t2 = params->t2;
......@@ -296,10 +296,10 @@ XLALInspiralParameterCalc (
if (params->t3 <= 0)
XLAL_ERROR(XLAL_EDOM);
A0 = 5./ pow(piFl, eightby3)/256.;
A3 = LAL_PI / pow(piFl, fiveby3)/8.;
A0 = 5./ pow(piFl, (8./3.))/256.;
A3 = LAL_PI / pow(piFl, (5./3.))/8.;
totalMass = A0 * params->t3/(A3 * params->t0);
eta = A0/(params->t0 * pow(totalMass, fiveby3));
eta = A0/(params->t0 * pow(totalMass, (5./3.)));
if (eta > oneby4) {
eta-=tiny;
......@@ -322,8 +322,8 @@ XLALInspiralParameterCalc (
if (params->t4 <= 0)
XLAL_ERROR(XLAL_EDOM);
A0 = 5./(256. * pow(piFl, eightby3));
A4 = 5./(128.0 * pow(piFl,fourby3)) * 3058673./1016064.;
A0 = 5./(256. * pow(piFl, (8./3.)));
A4 = 5./(128.0 * pow(piFl,(4./3.))) * 3058673./1016064.;
B4 = 5429./1008 * 1016064./3058673. * ieta;
C4 = 617./144. * 1016064./3058673. * ieta;
Tau4In.t4 = params->t4;
......@@ -371,7 +371,7 @@ XLALInspiralParameterCalc (
if (params->psi0 > 0 && params->psi3 < 0)
{
params->totalMass = totalMass = -params->psi3/(16.L * LAL_PI * LAL_PI * params->psi0)/LAL_MTSUN_SI;
params->eta = eta = 3.L/(128.L * params->psi0 * pow (LAL_PI * totalMass*LAL_MTSUN_SI, fiveby3));
params->eta = eta = 3.L/(128.L * params->psi0 * pow (LAL_PI * totalMass*LAL_MTSUN_SI, (5./3.)));
/* if eta < 1/4 amd M > 0 then physical values*/
if (eta <= oneby4)
......@@ -405,10 +405,10 @@ XLALInspiralParameterCalc (
v = pow(piFl * totalMass, 1.L/3.L);
tN = 5.L/256.L / eta * totalMass / pow(v,8.L);
params->t0 = 5.0L/(256.0L*eta*pow(totalMass,fiveby3)*pow(piFl,eightby3));
params->t0 = 5.0L/(256.0L*eta*pow(totalMass,(5./3.))*pow(piFl,(8./3.)));
params->t2 = (3715.0L + (4620.0L*ieta*eta))/(64512.0*eta*totalMass*pow(piFl,2.0));
params->t3 = LAL_PI/(8.0*eta*pow(totalMass,twoby3)*pow(piFl,fiveby3));
params->t4 = (5.0/(128.0*eta*pow(totalMass,oneby3)*pow(piFl,fourby3)))
params->t3 = LAL_PI/(8.0*eta*pow(totalMass,(2./3.))*pow(piFl,(5./3.)));
params->t4 = (5.0/(128.0*eta*pow(totalMass,(1./3.))*pow(piFl,(4./3.))))
* (3058673./1016064. + 5429.*ieta*eta/1008. +617.*ieta*eta*eta/144.);
params->t5 = -5.*(7729./252. - 13./3.*ieta*eta)/(256.*eta*params->fLower);
/* This is a ddraft. t6 and t7 need to be checked propely*/
......@@ -419,8 +419,8 @@ XLALInspiralParameterCalc (
params->t6 = tN * (params->t6 + 6848.L/105.L*log(4.*v)) * pow(v,6);
params->t7 = (-15419335.L/127008.L-75703.L/756.L*ieta*eta+14809.L/378.L*ieta*eta*eta) * LAL_PI * tN * pow(v,7);
params->psi0 = 3.L/(128.L * eta * pow(LAL_PI * totalMass, fiveby3));
params->psi3 = -3.L * LAL_PI/(8.L * eta * pow(LAL_PI * totalMass, twoby3));
params->psi0 = 3.L/(128.L * eta * pow(LAL_PI * totalMass, (5./3.)));
params->psi3 = -3.L * LAL_PI/(8.L * eta * pow(LAL_PI * totalMass, (2./3.)));
switch (params->order) {
......
......@@ -162,7 +162,7 @@ XLALInspiralSetup (
/* Set initial velocity according to initial frequency */
ak->v0 = pow (LAL_PI * ak->totalmass * ak->f0, oneby3);
ak->v0 = pow (LAL_PI * ak->totalmass * ak->f0, (1./3.));
/* Taylor coefficients of E(x) */
ak->ETaN = -eta/2.;
......
......@@ -216,7 +216,7 @@ XLALInspiralStationaryPhaseApprox1 (
}
else
{
ak.vf = v = pow(pimmc * f, oneby3);
ak.vf = v = pow(pimmc * f, (1./3.));
if (v==ak.v0)
{
psif = 0.;
......
......@@ -128,7 +128,7 @@ XLALInspiralStationaryPhaseApprox2 (
InspiralTemplate *params
)
{
REAL8 Oneby3, UNUSED h1, UNUSED h2, pimmc, f, v, df, shft, phi, amp0, amp, psif, psi;
REAL8 UNUSED h1, UNUSED h2, pimmc, f, v, df, shft, phi, amp0, amp, psif, psi;
INT4 n, nby2, i, f0, fn;
expnCoeffs ak;
expnFunc func;
......@@ -188,12 +188,11 @@ XLALInspiralStationaryPhaseApprox2 (
XLAL_ERROR(XLAL_EFUNC);
/* compute some basic variables */
Oneby3 = 1.L/3.L;
df = params->tSampling/signalvec->length;
pimmc = LAL_PI * params->totalMass * LAL_MTSUN_SI;
f0 = params->fLower;
fn = (params->fCutoff < ak.fn) ? params->fCutoff : ak.fn;
v = pow(pimmc*f0, Oneby3);
v = pow(pimmc*f0, (1./3.));
/* If we want to pad with zeroes in the beginning then the instant of
* coalescence will be the chirp time + the duration for which padding
......@@ -223,7 +222,7 @@ XLALInspiralStationaryPhaseApprox2 (
}
else
{
v = pow(pimmc * f, Oneby3);
v = pow(pimmc * f, (1./3.));
psif = XLALInspiralTaylorF2Phasing(v, &ak);
psi = shft * f + phi + psif;
/*
......
......@@ -100,7 +100,7 @@ XLALInspiralTiming2_0PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v8 = pow(v,8.);
toff = - toffIn->t + toffIn->tc
......@@ -153,7 +153,7 @@ XLALInspiralTiming2_2PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v2 = v*v;
v8 = v2*v2*v2*v2;
......@@ -208,7 +208,7 @@ XLALInspiralTiming2_3PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v2 = v*v;
v3 = v2*v;
v8 = v3*v3*v2;
......@@ -265,7 +265,7 @@ XLALInspiralTiming2_4PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v2 = v*v;
v3 = v2*v;
v4 = v3*v;
......@@ -324,7 +324,7 @@ XLALInspiralTiming2_5PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v2 = v*v;
v3 = v2*v;
v4 = v3*v;
......@@ -386,7 +386,7 @@ XLALInspiralTiming2_6PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM * f,oneby3);
v = pow(toffIn->piM * f,(1./3.));
v2 = v*v;
v3 = v2*v;
v4 = v3*v;
......@@ -449,7 +449,7 @@ XLALInspiralTiming2_7PN (
XLAL_ERROR_REAL8(XLAL_EDOM);
v = pow(toffIn->piM*f, oneby3);
v = pow(toffIn->piM*f, (1./3.));
v2 = v*v;
v3 = v2*v;
v4 = v3*v;
......
......@@ -529,7 +529,7 @@ XLALInspiralWave2Engine(
toffIn.tc = -tC;
/* Determine the initial phase: it is phasing2(v0) with ak.phiC=0 */
v = pow(fs * LAL_PI * totalMass, oneby3);
v = pow(fs * LAL_PI * totalMass, (1./3.));
ak.phiC = 0.0;
phase = func.phasing2(v, &ak);
if (XLAL_IS_REAL8_FAIL_NAN(phase))
......@@ -578,7 +578,7 @@ XLALInspiralWave2Engine(
}
fOld = freq;
v = pow(freq*toffIn.piM, oneby3);
v = pow(freq*toffIn.piM, (1./3.));
phase = func.phasing2(v, &ak); /* phase at given v */
if (XLAL_IS_REAL8_FAIL_NAN(phase))
XLAL_ERROR(XLAL_EFUNC);
......
......@@ -664,7 +664,7 @@ XLALInspiralWave3Engine(
}
fOld = f;
v = pow(f*LAL_PI*totalMass, oneby3);