do some clean up

doc/bayescbc.md

@@ -6,4 +6,4 @@ This page describes how the BayesCBC module for BayesWave.
 
 - `chains/cbc_model.dat.<i>` where i is the chain number (BW prints cold chain
 0 by default, with verbose flags chain files for all chains are printed)
-- `wavesCBC/*` CBC waveforms
+- `waveforms/*` CBC waveforms

src/BayesCBC.c

@@ -580,7 +580,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
     // printf("%d %f %f\n", iter, exp(paramx[0])/MSUN_SI, fs);
     for (id = 0; id < net->Nifo; ++id)
     {
-        sprintf(command, "wavesCBC/wavefcheck_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wavefcheck_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 1; i < N/2; ++i)
         {
@@ -692,7 +692,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
     
     for (id = 0; id < net->Nifo; ++id)
     {
-        sprintf(command, "wavesCBC/wave_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wave_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 0; i < N; ++i)
         {
@@ -700,7 +700,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
         }
         fclose(out);
 
-        sprintf(command, "wavesCBC/wavedata_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wavedata_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 0; i < N; ++i)
         {
@@ -711,7 +711,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
     
     for (id = 0; id < net->Nifo; ++id)
     {
-        sprintf(command, "wavesCBC/wavef_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wavef_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 1; i < N/2; ++i)
         {
@@ -735,7 +735,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
     // printf("  amplitude factor: %f\n\n",fac);
     for (id = 0; id < net->Nifo; ++id)
     {
-        sprintf(command, "wavesCBC/wavewhite_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wavewhite_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 0; i < N; ++i)
         {
@@ -743,7 +743,7 @@ void printwaveall(struct Net *net, int N, RealVector *freq, double *paramx, doub
         }
         fclose(out);
 
-        sprintf(command, "wavesCBC/wavedatawhite_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
+        sprintf(command, "waveforms/wavedatawhite_%d_%d_%d_%d.dat", iter, (int)(Tobs), (int)ttrig, net->labels[id]);
         out = fopen(command,"w");
         for (i = 0; i < N; ++i)
         {

src/BayesWave.c

@@ -159,7 +159,6 @@ int main(int argc, char *argv[])
   mode_t process_mask = umask(0);
   mkdir("chains",    S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
   mkdir("waveforms", S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-  mkdir("wavesCBC",    S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
   if(data->checkpointFlag) mkdir("checkpoint",S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
   sprintf(filename,"%ssnr",data->runName);
   mkdir(filename,   S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);