From 6df706f3baeffe6264e1e13f40c04310d35b2ce4 Mon Sep 17 00:00:00 2001
From: Tyson Littenberg <tyson.littenberg@ligo.org>
Date: Wed, 27 Feb 2019 11:22:29 -0600
Subject: [PATCH] removed psdfit flags
---
src/BayesWave.c | 6 ------
src/BayesWave.h | 1 -
src/BayesWaveIO.c | 29 -----------------------------
3 files changed, 36 deletions(-)
diff --git a/src/BayesWave.c b/src/BayesWave.c
index ff818bfd..44fe59fd 100644
--- a/src/BayesWave.c
+++ b/src/BayesWave.c
@@ -605,7 +605,6 @@ int main(int argc, char *argv[])
data->signalFlag = 0;
data->runPhase = 0;
- if(data->bayesLineFlag) data->psdFitFlag = 0;
initialize_chain(chain,1);
@@ -753,8 +752,6 @@ int main(int argc, char *argv[])
//Shut off BayesLine in favor of PSD fitting
data->cleanModelFlag = 0;
- //data->bayesLineFlag = 0;
- //data->psdFitFlag = 1;
}
@@ -943,7 +940,6 @@ int main(int argc, char *argv[])
data->runPhase = 1;
reset_priors(data, prior);
- if(data->bayesLineFlag) data->psdFitFlag = 0;
//Initialize proposal ratios for GW search phase
chain->rjmcmcRate = 0.0;
@@ -995,8 +991,6 @@ int main(int argc, char *argv[])
data->glitchFlag = 1;
data->signalFlag = 1;
- if(data->bayesLineFlag) data->psdFitFlag = 0;
-
initialize_chain(chain,1);
reset_likelihood(data);
diff --git a/src/BayesWave.h b/src/BayesWave.h
index 63138894..fb585e99 100644
--- a/src/BayesWave.h
+++ b/src/BayesWave.h
@@ -278,7 +278,6 @@ struct Data
int Dmin;
int runPhase;
- int psdFitFlag;
int noiseSimFlag;
int bayesLineFlag;
int stochasticFlag;
diff --git a/src/BayesWaveIO.c b/src/BayesWaveIO.c
index 7658fc00..1f95c444 100644
--- a/src/BayesWaveIO.c
+++ b/src/BayesWaveIO.c
@@ -835,11 +835,6 @@ void print_run_flags(FILE *fptr, struct Data *data, struct Prior *prior)
else fprintf(fptr, "DISABLED");
fprintf(fptr, "\n");
- fprintf(fptr, " PSD fitting is ........... ");
- if(data->psdFitFlag) fprintf(fptr, "ENABLED");
- else fprintf(fptr, "DISABLED");
- fprintf(fptr, "\n");
-
fprintf(fptr, " BayesLine PSD model is ... ");
if(data->bayesLineFlag) fprintf(fptr, "ENABLED");
else fprintf(fptr, "DISABLED");
@@ -1568,10 +1563,6 @@ void parse_command_line(struct Data *data, struct Chain *chain, struct Prior *pr
if(ppt) sprintf(data->outputDirectory,"%s/",ppt->value);
else sprintf(data->outputDirectory,"./");
- ppt = LALInferenceGetProcParamVal(commandLine, "--noPSDfit");
- if(ppt) data->psdFitFlag = 0;
- else data->psdFitFlag = 1;
-
ppt = LALInferenceGetProcParamVal(commandLine, "--bayesLine");
if(ppt) data->bayesLineFlag = 1;
else data->bayesLineFlag = 0;
@@ -1685,26 +1676,6 @@ void parse_command_line(struct Data *data, struct Chain *chain, struct Prior *pr
fprintf(stdout,"*********************************************************\n");
data->splineEvidenceFlag = 0;
}
-
- if(data->psdFitFlag && !data->noiseSimFlag)
- {
- fprintf(stdout,"************************ WARNING ************************\n");
- fprintf(stdout,"0noise runs do not get along with PSD fitting \n");
- fprintf(stdout,"Disabling PSD fitting \n");
- fprintf(stdout,"Silence warning with --noPSDfit \n");
- fprintf(stdout,"*********************************************************\n");
- data->psdFitFlag = 0;
- }
-
- /*if(data->waveletPriorFlag)
- {
- fprintf(stdout,"************************ WARNING ************************\n");
- fprintf(stdout,"waveletPrior flag overrides --Dmax \n");
- fprintf(stdout,"Setting Dmax = 100 \n");
- fprintf(stdout,"Remove --waveletPrior if you really want to cap N \n");
- fprintf(stdout,"*********************************************************\n");
- data->Dmax = 100;
- }*/
}
void parse_bayesline_parameters(struct Data *data, struct Model *model, FILE **splinechain, FILE **linechain, double **psd)
--
GitLab