diff --git a/src/BayesWaveMCMC.c b/src/BayesWaveMCMC.c index a8854fb882698801fe0384978b312ca9b5d823d9..942e8b15de3dce3ad06a7924a1fddab6499bf043 100644 --- a/src/BayesWaveMCMC.c +++ b/src/BayesWaveMCMC.c @@ -96,11 +96,12 @@ void kickstart_glitch_model(struct Data *data, struct Prior *prior, struct Model FILE *waveletStartFile; double *params = malloc(data->NW*(sizeof(double))); int size; - int d=0; + int d; int d_counter; for(ifo=0; ifoNI; ifo++) { + d = 0; sprintf(filename,"glitch_%s.dat",data->ifos[ifo]); if( (waveletStartFile = fopen(filename,"r")) == NULL ) { @@ -147,7 +148,16 @@ void kickstart_glitch_model(struct Data *data, struct Prior *prior, struct Model fclose(waveletStartFile); //fill residual + FILE *tempfile = fopen("tempfile.dat","w"); for(i=0; iN; i++) data->r[ifo][i] = data->s[ifo][i] - model->glitch[ifo]->templates[i]; + for(i=0; iN/2; i++) + { + data->r[ifo][i] = data->s[ifo][i] - model->glitch[ifo]->templates[i]; + fprintf(tempfile,"%lg %lg %lg\n",data->r[ifo][2*i]*data->r[ifo][2*i]+data->r[ifo][2*i+1]*data->r[ifo][2*i+1] , + data->s[ifo][2*i]*data->s[ifo][2*i]+data->s[ifo][2*i+1]*data->s[ifo][2*i+1] , + model->glitch[ifo]->templates[2*i]*model->glitch[ifo]->templates[2*i]+model->glitch[ifo]->templates[2*i+1]*model->glitch[ifo]->templates[2*i+1]); + } + fclose(tempfile); } } free(params); diff --git a/src/BayesWaveWavelet.c b/src/BayesWaveWavelet.c index 5debb2d57aa12eb9567293b5432bbcd90994c56e..de7efddc330383ba7dbf3eba6f32c939c7ad6d9c 100644 --- a/src/BayesWaveWavelet.c +++ b/src/BayesWaveWavelet.c @@ -97,14 +97,14 @@ void SineGaussianTime(double *hs, double *sigpar, int N, int flag, double Tobs) double t = imin*dt; //brute force - /* + t = 0.0; for(n=0; n