BLonD v1.10.3. See README.md for details.

Author: dquartul

README.md

@@ -64,6 +64,9 @@ STRUCTURE
 
 VERSION CONTENTS
 ================
+2015-1-15
+v1.10.3 - Fixed two bugs in potential_well-cut and beam_profile_derivative routines
+
 2015-1-15
 v1.10.2 - Added the n_sampling option to the synchrotron_frequency_tracker.frequency_calculation method
 

beams/slices.py

@@ -257,7 +257,7 @@ def beam_profile_derivative(self, mode = 'gradient', coord = 'theta'):
         elif mode is 'gradient':
             derivative = np.gradient(self.n_macroparticles, dist_centers)
         elif mode is 'diff':
-            derivative = np.diff(self.n_macroparticles)
+            derivative = np.diff(self.n_macroparticles) / dist_centers
             diffCenters = x[0:-1] + dist_centers/2
             derivative = np.interp(x, diffCenters, derivative)
         else:

trackers/utilities.py

@@ -549,7 +549,13 @@ def potential_well_cut(theta_coord_array, potential_array):
         higher_maximum_value = np.max(max_potential_values)
         lower_maximum_theta = max_theta_positions[max_potential_values == lower_maximum_value]
         higher_maximum_theta = max_theta_positions[max_potential_values == higher_maximum_value]
-        if min_theta_positions[0] > lower_maximum_theta:
+        if len(lower_maximum_theta)==2:
+            saved_indexes = (potential_array < lower_maximum_value) * \
+                            (theta_coord_array > lower_maximum_theta[0]) * \
+                            (theta_coord_array < lower_maximum_theta[1])
+            theta_coord_sep = theta_coord_array[saved_indexes]
+            potential_well_sep = potential_array[saved_indexes]
+        elif min_theta_positions[0] > lower_maximum_theta:
             saved_indexes = (potential_array < lower_maximum_value) * \
                             (theta_coord_array > lower_maximum_theta) * \
                             (theta_coord_array < higher_maximum_theta)