Commit e91ba194 authored by John Douglas Veitch's avatar John Douglas Veitch

LALInference: Replace use of dprecated XLALGetStringFromApproximant()

with XLALSimInspiralGetStringFromApproximant()
Original: 55ce2ee2075b5c98777da6da6f6557388da1dfdd
parent c6c68811
......@@ -835,7 +835,7 @@ LALInferenceModel *LALInferenceInitCBCModel(LALInferenceRunState *state) {
}
if(approx==NumApproximants){
approx=TaylorF2; /* Defaults to TF2 */
XLALPrintWarning("You did not provide an approximant for the templates. Using default %s, which might now be what you want!\n",XLALGetStringFromApproximant(approx));
XLALPrintWarning("You did not provide an approximant for the templates. Using default %s, which might now be what you want!\n",XLALSimInspiralGetStringFromApproximant(approx));
}
/* Set the model domain appropriately */
......@@ -1244,7 +1244,7 @@ LALInferenceModel *LALInferenceInitCBCModel(LALInferenceRunState *state) {
/* Print info about orders and waveflags used for templates */
fprintf(stdout,"Templates will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i tidal order %i in the %s domain.\n",approx,XLALGetStringFromApproximant(approx),PhaseOrder,AmpOrder,(int) spinO, (int) tideO, model->domain==LAL_SIM_DOMAIN_TIME?"time":"frequency");
fprintf(stdout,"Templates will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i tidal order %i in the %s domain.\n",approx,XLALSimInspiralGetStringFromApproximant(approx),PhaseOrder,AmpOrder,(int) spinO, (int) tideO, model->domain==LAL_SIM_DOMAIN_TIME?"time":"frequency");
fprintf(stdout,"---\t\t ---\n\n");
}//end of signal only flag
else
......@@ -1494,7 +1494,7 @@ static void print_flags_orders_warning(SimInspiralTable *injt, ProcessParamsTabl
/* check approximant is given */
if (approx==NumApproximants){
approx=XLALGetApproximantFromString(injt->waveform);
XLALPrintWarning("WARNING: You did not provide an approximant for the templates. Using value in injtable (%s), which might not what you want!\n",XLALGetStringFromApproximant(approx));
XLALPrintWarning("WARNING: You did not provide an approximant for the templates. Using value in injtable (%s), which might not what you want!\n",XLALSimInspiralGetStringFromApproximant(approx));
}
/* check inj/rec amporder */
......
......@@ -1597,7 +1597,7 @@ void LALInferenceInjectInspiralSignal(LALInferenceIFOData *IFOdata, ProcessParam
}
LALSimInspiralTestGRParam *nonGRparams = NULL;
/* Print a line with information about approximant, amporder, phaseorder, tide order and spin order */
fprintf(stdout,"Injection will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i, tidal order %i, in the time domain with a reference frequency of %f.\n",approximant,XLALGetStringFromApproximant(approximant),order,amporder,(int) spinO, (int) tideO, (float) fref);
fprintf(stdout,"Injection will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i, tidal order %i, in the time domain with a reference frequency of %f.\n",approximant,XLALSimInspiralGetStringFromApproximant(approximant),order,amporder,(int) spinO, (int) tideO, (float) fref);
/* ChooseWaveform starts the (2,2) mode of the waveform at the given minimum frequency. We want the highest order contribution to start at the f_lower of the injection file */
REAL8 f_min = fLow2fStart(injEvent->f_lower, amporder, approximant);
......@@ -2294,7 +2294,7 @@ void InjectFD(LALInferenceIFOData *IFOdata, SimInspiralTable *inj_table, Process
/* Print a line with information about approximant, amp_order, phaseorder, tide order and spin order */
fprintf(stdout,"\n\n---\t\t ---\n");
fprintf(stdout,"Injection will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i, tidal order %i, in the frequency domain.\n",approximant,XLALGetStringFromApproximant(approximant),phase_order,amp_order,(int) spinO,(int) tideO);
fprintf(stdout,"Injection will run using Approximant %i (%s), phase order %i, amp order %i, spin order %i, tidal order %i, in the frequency domain.\n",approximant,XLALSimInspiralGetStringFromApproximant(approximant),phase_order,amp_order,(int) spinO,(int) tideO);
fprintf(stdout,"---\t\t ---\n\n");
COMPLEX16FrequencySeries *hptilde=NULL, *hctilde=NULL;
......
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