Commit 92354182 authored by NV KRISHNENDU's avatar NV KRISHNENDU
Browse files

xp changes committed wf structure needs to be updated

parent 77e266c6
Pipeline #241148 failed with stages
in 36 minutes and 34 seconds
......@@ -146,9 +146,9 @@ int IMRPhenomXSetWaveformVariables(
UNUSED const UINT4 debug
)
{
/* Copy model version to struct */
wf->IMRPhenomXInspiralPhaseVersion = XLALSimInspiralWaveformParamsLookupPhenomXInspiralPhaseVersion(LALParams);
wf->LALparams = LALParams;
wf->IMRPhenomXIntermediatePhaseVersion = XLALSimInspiralWaveformParamsLookupPhenomXIntermediatePhaseVersion(LALParams);
wf->IMRPhenomXRingdownPhaseVersion = XLALSimInspiralWaveformParamsLookupPhenomXRingdownPhaseVersion(LALParams);
......@@ -888,7 +888,6 @@ int IMRPhenomXGetPhaseCoefficients(
//IMRPhenomXPhaseCoefficients *pPhase = (IMRPhenomXPhaseCoefficients *) XLALMalloc(sizeof(IMRPhenomXPhaseCoefficients));
const INT4 debug = PHENOMXDEBUG; // pWF->debug;
/* GSL objects for solving system of equations via LU decomposition */
gsl_vector *b, *x;
gsl_matrix *A;
......@@ -956,6 +955,8 @@ int IMRPhenomXGetPhaseCoefficients(
REAL8 delta = pWF->delta;
LALDict *LALparams = pWF->LALparams;
/* Pre-initialize all phenomenological coefficients */
pPhase->a0 = 0.0;
pPhase->a1 = 0.0;
......@@ -1611,6 +1612,9 @@ int IMRPhenomXGetPhaseCoefficients(
pPhase->phi6L = 0.0;
pPhase->phi8L = 0.0;
pPhase->phi9L = 0.0;
REAL8 qm_def1 = 1.+XLALSimInspiralWaveformParamsLookupdQuadMon1(LALparams);
REAL8 qm_def2 = 1.+XLALSimInspiralWaveformParamsLookupdQuadMon2(LALparams);
/* **** TaylorF2 PN Coefficients: Phase **** */
......@@ -1654,7 +1658,7 @@ int IMRPhenomXGetPhaseCoefficients(
pPhase->phi4 = ( 15293365/508032. + (27145*eta)/504. + (3085*eta2)/72. ) * powers_of_lalpi.four_thirds ;
/* 2.0 PN, Spin-Spin */
pPhase->phi4 += ( (-5*(81*chi1L2*(1 + delta - 2*eta) + 316*chi1L2L*eta - 81*chi2L2*(-1 + delta + 2*eta)))/16. ) * powers_of_lalpi.four_thirds;
pPhase->phi4 += (0.25*(chi1L - chi2L)*(chi1L + chi2L)*(-50.0 * (qm_def1 - qm_def2) + 100.0*eta*(qm_def1 - qm_def2)) + 0.25*(chi1L + chi2L)*(chi1L + chi2L)*(-(5/8.) - (195*eta)/2. - 25*(qm_def1 + qm_def2)+50.0*eta*(qm_def1 + qm_def2)) + 0.25*(chi1L - chi2L)*(chi1L - chi2L)* (-(5./8) + 100*eta - 25*(qm_def1 + qm_def2) + 50.0*eta*(qm_def1 + qm_def2)) + delta*(-6.25*(chi1L - chi2L)*(chi1L - chi2L)*(qm_def1 - qm_def2) - 6.25*(chi1L + chi2L)*(chi1L + chi2L)*(qm_def1 - qm_def2) + 0.25*(chi1L - chi2L)*(chi1L + chi2L)*(-(5./4) - 50.0*(qm_def1 + qm_def2))))*powers_of_lalpi.four_thirds;
/* 2.5PN, Non-Spinning */
pPhase->phi5L = ( (5*(46374 - 6552*eta)*LAL_PI)/4536. ) * powers_of_lalpi.five_thirds;
......@@ -1669,17 +1673,19 @@ int IMRPhenomXGetPhaseCoefficients(
pPhase->phi6 = ( 11583231236531/4.69421568e9 - (5*eta*(3147553127 + 588*eta*(-45633 + 102260*eta)))/3.048192e6 - (6848*LAL_GAMMA)/21. -
(640*powers_of_lalpi.two)/3. + (2255*eta*powers_of_lalpi.two)/12. - (13696*log(2))/21. - (6848*powers_of_lalpi.log)/63. ) * powers_of_lalpi.two;
/* 3.0 PN, Spin-Orbit */
pPhase->phi6 += (0.5*(chi1L + chi2L)*((2270.0*powers_of_lalpi.two)/3 - 520.0*eta*powers_of_lalpi.two + 0.5*(chi1L - chi2L)*((26015.0*(qm_def1 - qm_def2))/28.0 - (44255/21.)*eta*(qm_def1 - qm_def2)- 240.0*eta*eta*(qm_def1 - qm_def2))) + 0.25*(chi1L - chi2L)*(chi1L - chi2L)*(-(1344475/2016.0) + (267815*eta)/252.0 - 240.0 * eta * eta + (26015.0*(qm_def1 + qm_def2))/56.0 - (44255/42.0)*eta*(qm_def1 + qm_def2)-120.0*eta*eta*(qm_def1 + qm_def2)) + 0.25*(chi1L + chi2L)*(chi1L + chi2L)*(-(1344475/2016.0) + (829705*eta)/504. + (3415*eta*eta)/9. + (26015 * ((qm_def1 + qm_def2))/56.0) -(44255/42.) * eta * (qm_def1 + qm_def2) - 120.0 * eta * eta * (qm_def1 + qm_def2)) + delta * (1188.57 * (chi1L - chi2L) + 0.25 * (chi1L - chi2L)* (chi1L - chi2L) * ((26015 * ((qm_def1 - qm_def2))/56.0) - (1495/12.) * eta * (qm_def1 - qm_def2)) + 0.25 * (chi1L + chi2L) * (chi1L + chi2L) * ((26015.0 * ((qm_def1 - qm_def2))/56.0) - (1495/12.) * eta * (qm_def1 - qm_def2)) + 0.25 * (chi1L - chi2L) * (chi1L + chi2L)*(-(1344475/1008.0) + ((745.0*eta)/18.0) + (26015.0 * (qm_def1 + qm_def2))/28. - (1495/6) * eta * (qm_def1 + qm_def2)))) * powers_of_lalpi.two;
/* 3.0 PN, Spin-Orbit
pPhase->phi6 += ( (5*(227*(chi1L + chi2L + chi1L*delta - chi2L*delta) - 156*(chi1L + chi2L)*eta)*LAL_PI)/3. ) * powers_of_lalpi.two;
/* 3.0 PN, Spin-Spin */
3.0 PN, Spin-Spin
pPhase->phi6 += ( (5*(20*chi1L2L*eta*(11763 + 12488*eta) + 7*chi2L2*(-15103*(-1 + delta) + 2*(-21683 + 6580*delta)*eta - 9808*eta2) -
7*chi1L2*(-15103*(1 + delta) + 2*(21683 + 6580*delta)*eta + 9808*eta2)))/4032. ) * powers_of_lalpi.two;
/* 3.0 PN, Log Term */
3.0 PN, Log Term
pPhase->phi6L = (-6848/63.) * powers_of_lalpi.two;
/* 3.5PN, Non-Spinning */
3.5PN, Non-Spinning */
pPhase->phi7 = ( (5*(15419335 + 168*(75703 - 29618*eta)*eta)*LAL_PI)/254016. ) * powers_of_lalpi.seven_thirds;
/* 3.5PN, Spin-Orbit */
......@@ -2412,13 +2418,13 @@ double IMRPhenomX_Amplitude_22(double ff, IMRPhenomX_UsefulPowers *powers_of_f,
/* Function to check if the input mode array contains unsupported modes */
INT4 check_input_mode_array(LALDict *lalParams)
INT4 check_input_mode_array(LALDict *LALparams)
{
UINT4 flagTrue = 0;
if(lalParams == NULL) return XLAL_SUCCESS;
if(LALparams == NULL) return XLAL_SUCCESS;
LALValue *ModeArray = XLALSimInspiralWaveformParamsLookupModeArray(lalParams);
LALValue *ModeArray = XLALSimInspiralWaveformParamsLookupModeArray(LALparams);
if(ModeArray!=NULL)
{
......
......@@ -166,6 +166,7 @@ typedef struct tagIMRPhenomXWaveformStruct
REAL8 distance;
REAL8 inclination;
REAL8 beta;
LALDict *LALparams;
} IMRPhenomXWaveformStruct;
......
......@@ -77,6 +77,7 @@ int IMRPhenomXGetAndSetPrecessionVariables(
/* Pre-cache useful powers here */
pPrec->sqrt2 = 1.4142135623730951;
pWF->LALparams = lalParams;
pPrec->sqrt5 = 2.23606797749978981;
pPrec->sqrt6 = 2.44948974278317788;
pPrec->sqrt7 = 2.64575131106459072;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment