Bugfix for int vs longint in aperture module

Author: giadarol

aperture/aperture.pyx

@@ -223,16 +223,16 @@ class RFBucketAperture(Aperture):
 
 @cython.boundscheck(False)
 @cython.wraparound(False)
-cpdef cytag_lost_rectangular(double[::1] u, unsigned int[::1] alive,
+cpdef cytag_lost_rectangular(double[::1] u, int[::1] alive,
                            double low_lim, double high_lim):
     ''' Cython function for fast identification and tagging of particles
     lost at a rectangular aperture element, i.e. it tags particles with
     a spatial coord u (beam.x, beam.y or beam.z) lying outside the
     interval (low_lim, high_lim) as lost. Returns whether or not any
     lost particles were found. '''
-    cdef unsigned int n = alive.shape[0]
-    cdef unsigned int losses = 0
-    cdef unsigned int i
+    cdef int n = alive.shape[0]
+    cdef int losses = 0
+    cdef int i
     for i in xrange(n):
         if u[i] < low_lim or u[i] > high_lim:
             alive[i] = 0
@@ -242,16 +242,16 @@ cpdef cytag_lost_rectangular(double[::1] u, unsigned int[::1] alive,
 @cython.boundscheck(False)
 @cython.wraparound(False)
 cpdef cytag_lost_circular(
-    double[::1] u, double[::1] v, unsigned int[::1] alive,
+    double[::1] u, double[::1] v, int[::1] alive,
     double radius_square):
     ''' Cython function for fast identification and tagging of particles
     lost at a circular transverse aperture element of a given radius,
     i.e. it tags particles with spatial coords u, v (usually (beam.x,
     beam.y)) fulfilling u**2 + v**2 > radius_square as lost. Returns
     whether or not any lost particles were found. '''
-    cdef unsigned int n = alive.shape[0]
-    cdef unsigned int losses = 0
-    cdef unsigned int i
+    cdef int n = alive.shape[0]
+    cdef int losses = 0
+    cdef int i
     for i in xrange(n):
         if (u[i]*u[i] + v[i]*v[i]) > radius_square:
             alive[i] = 0

particles/cython_functions.pyx

@@ -36,12 +36,12 @@ def relocate_lost_particles(beam):
     cdef double[::1] xp = beam.xp
     cdef double[::1] yp = beam.yp
     cdef double[::1] dp = beam.dp
-    cdef unsigned int[::1] id = beam.id
-    cdef unsigned int[::1] alive = beam.alive
+    cdef int[::1] id = beam.id
+    cdef int[::1] alive = beam.alive
 
     # Temporary variables for swapping entries.
     cdef double t_x, t_xp, t_y, t_yp, t_z, t_dp
-    cdef unsigned int t_alive, t_id
+    cdef int t_alive, t_id
 
     # Find last_alive index.
     cdef int n_alive_pri = alive.shape[0]

particles/particles.py

@@ -68,12 +68,12 @@ def __init__(self, macroparticlenumber, particlenumber_per_mp, charge,
         '''ID of particles in order to keep track of single entries
         in the coordinate and momentum arrays.
         '''
-        self.id_all = np.arange(1, self.macroparticlenumber+1, dtype=np.uint)
+        self.id_all = np.arange(1, self.macroparticlenumber+1, dtype=np.int32)
         self.id = self.id_all.view()
 
         '''Alive flag to handle the loss of particles
         '''
-        self.alive_all = np.ones(self.macroparticlenumber, dtype=np.uint)
+        self.alive_all = np.ones(self.macroparticlenumber, dtype=np.int32)
         self.alive = self.alive_all.view()
 
         self.update(coords_n_momenta_dict)