Commit ac91d690 authored by Vivien Raymond's avatar Vivien Raymond
Browse files

Update to the interface of SpinTaylorFrameless

Original: 7b3b1bdec2e8ec778fb6ee4d6c2226977b6442cc
parent 95569c6a
......@@ -221,7 +221,14 @@ LALGenerateInspiral(
LALInfo( status, warnMsg );
ABORT( status, LALINSPIRALH_ENOWAVEFORM, LALINSPIRALH_MSGENOWAVEFORM );
}
if ( waveform->h == NULL && ( approximant == AmpCorPPN || approximant == PhenSpinTaylorRD || approximant == SpinTaylorFrameless ) )
{
snprintf( warnMsg, sizeof(warnMsg)/sizeof(*warnMsg),
"No waveform generated (check lower frequency)\n");
LALInfo( status, warnMsg );
ABORT( status, LALINSPIRALH_ENOWAVEFORM, LALINSPIRALH_MSGENOWAVEFORM );
}
/* If sampling problem. (AmpCorPPN may not be compatible) */
if ( ppnParams->dfdt > 2.0 && approximant != AmpCorPPN )
......
......@@ -506,6 +506,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -551,6 +552,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -594,6 +596,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -640,6 +643,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -690,6 +694,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -741,6 +746,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -792,6 +798,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -848,6 +855,7 @@ LALInspiralChooseModel(
case TaylorT3:
case TaylorF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......@@ -879,6 +887,7 @@ LALInspiralChooseModel(
case PadeT1:
case PadeF1:
case TaylorF2:
case SpinTaylorFrameless:
case SpinTaylorT3:
case SpinTaylor:
case PhenSpinTaylorRD:
......
......@@ -407,18 +407,18 @@ LALInspiralWaveForInjection(
case SpinTaylorFrameless:
LALSTPNWaveformFramelessForInjection(status->statusPtr, waveform, inspiralParams, ppnParams);
CHECKSTATUSPTR(status);
break;
break;
case SpinTaylor:
LALSTPNWaveformForInjection(status->statusPtr, waveform, inspiralParams, ppnParams);
CHECKSTATUSPTR(status);
break;
break;
case PhenSpinTaylorRD:
LALPSpinInspiralRDForInjection(status->statusPtr, waveform, inspiralParams, ppnParams);
CHECKSTATUSPTR(status);
break;
case SpinQuadTaylor:
TRY(LALSQTPNWaveformForInjection(status->statusPtr, waveform, inspiralParams, ppnParams), status);
break;
break;
case AmpCorPPN:
LALInspiralAmplitudeCorrectedWaveForInjection(status->statusPtr, waveform, inspiralParams, ppnParams);
CHECKSTATUSPTR(status);
......
Markdown is supported
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