v1.18.0

Author: dquartul

README.md

@@ -63,7 +63,11 @@ STRUCTURE
 
 VERSION CONTENTS 
 ================
-2017-01-18
+2017-02-10
+v1.18.0 - Fixed an important bug in linear_interp_kick.cpp: before the
+          acceleration kick was not applied if rf_kick_interp==TRUE in 
+          RingAndRFSection
+        
 v1.17.0 - Numerical synchrotron frequency distribution added (TC12)
         - Possibility to compute multi-turn wake with acceleration
           (in impedance.py)

cpp_routines/linear_interp_kick.cpp

@@ -17,7 +17,8 @@ extern "C" void linear_interp_kick(
 		double * __restrict__ voltage_array,
 		double * __restrict__ bin_centers,
         const int n_slices,
-		const int n_macroparticles){
+		const int n_macroparticles,
+		const double acc_kick){
 
 
 	const double inv_bin_width = (n_slices-1) / (bin_centers[n_slices-1] - bin_centers[0]);
@@ -33,7 +34,7 @@ extern "C" void linear_interp_kick(
     		voltageKick = 0.;
     	else
     		voltageKick = voltage_array[ffbin] + (a - bin_centers[ffbin]) * (voltage_array[ffbin+1]-voltage_array[ffbin]) * inv_bin_width;
-    	beam_dE[i] = beam_dE[i] + voltageKick;
+    	beam_dE[i] = beam_dE[i] + voltageKick + acc_kick;
     }
 
 }

impedances/impedance.py

@@ -162,7 +162,8 @@ def track(self):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(self.beam.n_macroparticles))
+                                  ctypes.c_uint(self.beam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
 
     def track_memory(self):
@@ -217,7 +218,8 @@ def track_memory(self):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(self.beam.n_macroparticles))
+                                  ctypes.c_uint(self.beam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
         # Counter update
         self.counter_turn += 1
@@ -231,7 +233,8 @@ def track_ghosts_particles(self, ghostBeam):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(ghostBeam.n_macroparticles))
+                                  ctypes.c_uint(ghostBeam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
 
 
@@ -333,7 +336,8 @@ def track(self, Beam):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(Beam.n_macroparticles))
+                                  ctypes.c_uint(Beam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
 
 class InducedVoltageFreq(object):
@@ -539,7 +543,8 @@ def track(self, Beam):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(Beam.n_macroparticles))
+                                  ctypes.c_uint(Beam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
 
 class InductiveImpedance(object):
@@ -667,7 +672,8 @@ def track(self, Beam):
                                   induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_uint(self.slices.n_slices),
-                                  ctypes.c_uint(self.beam.n_macroparticles))
+                                  ctypes.c_uint(self.beam.n_macroparticles),
+                                  ctypes.c_double(0.))
 
 
 class InputTable(object):

trackers/tracker.py

@@ -407,9 +407,11 @@ def track(self):
                     self.total_voltage = self.rf_voltage + self.TotalInducedVoltage.induced_voltage
                 else:
                     self.total_voltage = self.rf_voltage
+                
+                induced_energy = self.beam.charge * self.total_voltage
                 libblond.linear_interp_kick(self.beam.dt.ctypes.data_as(ctypes.c_void_p),
                                   self.beam.dE.ctypes.data_as(ctypes.c_void_p), 
-                                  (self.beam.charge * self.total_voltage).ctypes.data_as(ctypes.c_void_p), 
+                                  induced_energy.ctypes.data_as(ctypes.c_void_p), 
                                   self.slices.bin_centers.ctypes.data_as(ctypes.c_void_p), 
                                   ctypes.c_int(self.slices.n_slices),
                                   ctypes.c_int(self.beam.n_macroparticles),