Commit 6b4a9bf8 authored by Tyson Littenberg's avatar Tyson Littenberg

Merge branch 'modelx' into 'master'

modely->modelx

See merge request !183
parents d6ce5394 e48f0a89
Pipeline #146828 passed with stages
in 7 minutes and 32 seconds
......@@ -2293,13 +2293,13 @@ void EvolveIntrinsicParameters(struct Data *data, struct Prior *prior, struct Mo
if(det==-1)
{
data->signal_amplitude_proposal(paramsy[ii], model_x->SnGeo, seed, data->Tobs, prior->range, prior->sSNRpeak);
logqy += ( data->signal_amplitude_prior(paramsy[ii], model_y->SnGeo, data->Tobs, prior->sSNRpeak) );
logqy += ( data->signal_amplitude_prior(paramsy[ii], model_x->SnGeo, data->Tobs, prior->sSNRpeak) );
logqx += ( data->signal_amplitude_prior(paramsx[ii], model_x->SnGeo, data->Tobs, prior->sSNRpeak) );
}
else
{
data->glitch_amplitude_proposal(paramsy[ii], model_x->Snf[det], seed, data->Tobs, prior->range, prior->gSNRpeak);
logqy += ( data->glitch_amplitude_prior(paramsy[ii], model_y->Snf[n], data->Tobs, prior->gSNRpeak) );
logqy += ( data->glitch_amplitude_prior(paramsy[ii], model_x->Snf[n], data->Tobs, prior->gSNRpeak) );
logqx += ( data->glitch_amplitude_prior(paramsx[ii], model_x->Snf[n], data->Tobs, prior->gSNRpeak) );
}
}
......
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