more flag fixes

parent aae55020
Pipeline #159829 failed with stages
in 1 minute and 4 seconds
......@@ -1012,7 +1012,7 @@ void print_chain_files(struct Data *data, struct Chain *chain, struct Model **mo
}
//print bayescbc parameters
if(data->cbcModelFlag)
if(data->cbcFlag)
{
print_cbc_model(chain->cbcChainFile[ic], bayescbc, chain->index[ic], data->Tobs);
}
......@@ -1045,7 +1045,7 @@ void flush_chain_files(struct Data *data, struct Chain *chain, int ic)
}
//flush cbc file
if(data->cbcModelFlag) fflush(chain->cbcChainFile[ic]);
if(data->cbcFlag) fflush(chain->cbcChainFile[ic]);
}
void print_model(FILE *fptr, struct Data *data, struct Chain *chain, struct Model *model)
......
......@@ -2727,7 +2727,7 @@ void EvolveExtrinsicParameters(struct Data *data, struct Prior *prior, struct Mo
Shf_Geocenter_full(data, model_x->projection, model_x->Snf, model_x->SnGeo, model_x->extParams);
for(i=1; i<ienddim; i++)
{
if (!data->cbcFlag) logpx += (data->signal_amplitude_prior(smodel[0]->intParams[smodel[0]->index[i]],SnGeox, data->Tobs, prior->sSNRpeak));
if (data->signalFlag) logpx += (data->signal_amplitude_prior(smodel[0]->intParams[smodel[0]->index[i]],SnGeox, data->Tobs, prior->sSNRpeak));
}
}
//logpx += dim*log(paramsx[5]);
......@@ -2800,7 +2800,7 @@ void EvolveExtrinsicParameters(struct Data *data, struct Prior *prior, struct Mo
for(i=1; i<ienddim; i++)
{
intParams[i][3] = smodel[0]->intParams[smodel[0]->index[i]][3]*paramsy[5];//amplitude
if (!data->cbcFlag) test += checkrange(intParams[i],prior->range, smodel[0]->dimension);
if (data->signalFlag) test += checkrange(intParams[i],prior->range, smodel[0]->dimension);
}
//check extrinsic parameters
......@@ -2815,7 +2815,7 @@ void EvolveExtrinsicParameters(struct Data *data, struct Prior *prior, struct Mo
{
//model_x->projection has be updated by data->extrinsic_likelihood, so it stores F+ and Fx for params_y.
Shf_Geocenter_full(data, model_x->projection, model_x->Snf, SnGeoy, paramsy);
if (!data->cbcFlag) for(i=1; i<ienddim; i++) logpy += (data->signal_amplitude_prior(intParams[i],SnGeoy, data->Tobs, prior->sSNRpeak));
if (data->signalFlag) for(i=1; i<ienddim; i++) logpy += (data->signal_amplitude_prior(intParams[i],SnGeoy, data->Tobs, prior->sSNRpeak));
}
logH = (logLy - logLx)*chain->beta + logpy - logpx + logJ;
......
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