folder name in noise generation, c++ where routine

Author: dquartul

cpp_routines/mean_std_whereint.cpp

@@ -31,7 +31,7 @@ extern "C" int where(const double *__restrict__ dt, const int n_macroparticles,
     int s = 0;
    #pragma omp parallel for reduction(+:s)
    for (int i = 0; i < n_macroparticles; i++) {
-      s += (dt[i]< constant) ? 1 : 0;
+      s += (dt[i]< constant && dt[i]>0) ? 1 : 0;
    }
    return s;
 }

llrf/rf_noise.py

@@ -34,7 +34,7 @@ class FlatSpectrum(object):
     def __init__(self, GeneralParameters, RFSectionParameters, delta_f = 1, 
                  corr_time = 10000, fmin_s0 = 0.8571, fmax_s0 = 1.1, 
                  initial_amplitude = 1.e-6, seed1 = 1234, seed2 = 7564, 
-                 predistortion = None, continuous_phase = False):
+                 predistortion = None, continuous_phase = False, folder_plots = 'fig_noise'):
 
         '''
         Generate phase noise from a band-limited spectrum.
@@ -65,6 +65,7 @@ def __init__(self, GeneralParameters, RFSectionParameters, delta_f = 1,
         self.continuous_phase = continuous_phase
         if self.continuous_phase:
             self.dphi2 = np.zeros(self.n_turns+1+self.corr/4)
+        self.folder_plots = folder_plots    
 
 
     def spectrum_to_phase_noise(self, freq, spectrum, transform=None):
@@ -205,11 +206,12 @@ def generate(self):
                 self.seed2 +=158
                 self.dphi2[(k+self.corr/4):(kmax+self.corr/4)] = self.dphi_output[0:(kmax-k)]
 
-            fig_folder('fig_noise')
-            plot_noise_spectrum(freq, spectrum, sampling=1, figno=i, 
-                                dirname = 'fig_noise')
-            plot_phase_noise(self.t[0:(kmax-k)], self.dphi_output[0:(kmax-k)], 
-                             sampling=1, figno=i, dirname = 'fig_noise')
+            if self.folder_plots != None:
+                fig_folder(self.folder_plots)
+                plot_noise_spectrum(freq, spectrum, sampling=1, figno=i, 
+                                    dirname = self.folder_plots)
+                plot_phase_noise(self.t[0:(kmax-k)], self.dphi_output[0:(kmax-k)], 
+                                 sampling=1, figno=i, dirname = self.folder_plots)
             rms_noise = np.std(self.dphi_output)
             print("RF noise for time step %.4e s (iter %d) has r.m.s. phase %.4e rad (%.3e deg)" \
                 %(self.t[1], i, rms_noise, rms_noise*180/np.pi))