Commit 3a7f2fc0 authored by Marcella Wijngaarden's avatar Marcella Wijngaarden

Update CBC model at end of extinsic updates + show run model output

parent 91aafad6
......@@ -6391,7 +6391,7 @@ void skymcmc(struct Net *net, int MCX, int *mxc, FILE *chain, double **paramx, d
printf("MCMC Acceptance = %f\n", (double)ac/(double)(mcount));
printf("Ring Acceptance = %f\n", (double)rca/(double)(rc));
printf("Fisher Acceptance = %f\n", (double)fac/(double)(fc));
printf("Jiggle Acceptance = %f\n", (double)usac/(double)(uc));
printf("Jiggle Acceptance = %f\n", (double)uac/(double)(uc));
......
......@@ -967,6 +967,12 @@ void print_cbc_run_stats(FILE *fptr, struct Data *data, struct bayesCBC *bayescb
else fprintf(fptr, "UNKNOWN");
fprintf(fptr, "\n");
fprintf(fptr, " running model ");
if(data->signalFlag == 1) fprintf(fptr,"signal");
else if(data->glitchFlag == 1) fprintf(fptr,"glitch");
else fprintf(fptr, "CBC only");
fprintf(fptr, "\n");
fprintf(fptr, " evolve extrinsic/sky in burnin ");
if(bayescbc->intrinsic_only == 0) fprintf(fptr,"ENABLED");
else fprintf(fptr, "DISABLED");
......
......@@ -2883,6 +2883,8 @@ void EvolveExtrinsicParameters(struct Data *data, struct Prior *prior, struct Mo
waveformProject(data, model_x->projection, model_x->extParams, model_x->response, model_x->h, data->fmin, data->fmax);
Shf_Geocenter_full(data, model_x->projection, model_x->Snf, model_x->SnGeo, model_x->extParams);
if (data->cbcFlag) projectCBCWaveform(model_x->cbcamphase, data->N, NI, data->fmin, data->Tobs, model_x->extParams, model_x->cbctemplate, model_x->projection->dtimes, model_x->projection->Fplus, model_x->projection->Fcross);
free(glitch);
free_double_vector(paramsy);
......
......@@ -1035,7 +1035,7 @@ void initialize_bayescbc(struct bayesCBC *bayescbc, struct Data *data, struct Ch
bayescbc->ladder = chain->tempStep; // temperature ladder
bayescbc->twidth = 0.1; // width of prior on merger time (used when given non-integer merger time)
bayescbc->intrinsic_only = 1; // evolve only semi-intrinsic parameters (NX), not sky
bayescbc->intrinsic_only = 0; // start with off to evolve extrinsic params in burnin
bayescbc->logLx = double_vector(bayescbc->NC);
bayescbc->net = malloc(sizeof(struct Net));
bayescbc->global = double_tensor(bayescbc->NQ,bayescbc->NM,N+1);
......
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