Version 1.0.9.

Bugfix: Use numpy float comparison in transverse_tracking.py and
transverse_tracking_cython.pyx to ensure that s[-1] == C.

Other float comparisons have been eliminated e.g. in the particles.py
and the generators.py modules. However, some are still present in
the code (e.g. in wakes.py, tbc).

Author: michuschenk

_version.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.8"
+__version__ = "1.0.9"
 

particles/generators.py

@@ -210,7 +210,7 @@ def __init__(self, macroparticlenumber, intensity, charge, mass,
         the correspondingly matched coordinate and its conjugate
         momentum.
         '''
-        if alpha != 0:
+        if not np.allclose(alpha, 0., atol=1e-15):
             raise NotImplementedError("alpha != 0 is not yet taken into" +
                                       " account")
         coordssig = self.coords_n_momenta_with_sigmas(coords, epsn_geo, beta)
@@ -275,7 +275,7 @@ def __init__(self, macroparticlenumber, intensity, charge, mass,
         epsn_geo_y = epsn_y / betagamma
         alpha_x, beta_x, alpha_y, beta_y = transverse_map.get_injection_optics()
 
-        if alpha_x != 0 or alpha_y != 0:
+        if not np.allclose([alpha_x, alpha_y], [0., 0.], atol=1e-15):
             raise NotImplementedError("alpha != 0 is not yet taken into" +
                                       " account")
 

particles/particles.py

@@ -28,7 +28,7 @@ def __init__(self, macroparticlenumber, particlenumber_per_mp, charge,
         self.particlenumber_per_mp = particlenumber_per_mp
 
         self.charge = charge
-        if self.charge != e:
+        if not np.allclose(self.charge, e, atol=1e-24):
             raise NotImplementedError('PyHEADTAIL currently features many "e" '
                                       + 'all over the place, these need to be '
                                       + 'consistently replaced by '

trackers/transverse_tracking.py

@@ -47,7 +47,8 @@ def __init__(self,
         self.dQ_x = dQ_x
         self.dQ_y = dQ_y
 
-        if (D_x_s0 != 0 or D_x_s1 != 0 or D_y_s0 != 0 or D_y_s1 != 0):
+        if not np.allclose([D_x_s0, D_x_s1, D_y_s0, D_y_s1],
+                           [0., 0., 0., 0.], atol=1e-15):
             raise NotImplementedError('Non-zero values have been \n' +
                 'specified for the dispersion coefficients D_{x,y}.\n' +
                 'But, the effects of dispersion are not yet implemented. \n')
@@ -185,7 +186,7 @@ def __init__(self, C, s, alpha_x, beta_x, D_x, alpha_y, beta_y, D_y,
             knows how to generate and store its SegmentDetuner objects
             to 'distribute' the detuning proportionally along the
             accelerator circumference. """
-        if s[0] != 0 or s[-1] != C:
+        if not np.allclose([s[0], s[-1]], [0., C]):
             raise ValueError('The first element of s must be zero \n' +
                 'and the last element must be equal to the \n' +
                 'accelerator circumference C. \n')

trackers/transverse_tracking_cython.pyx

@@ -82,7 +82,8 @@ class TransverseSegmentMap(object):
         self.dQ_x = dQ_x
         self.dQ_y = dQ_y
 
-        if (D_x_s0 != 0 or D_x_s1 != 0 or D_y_s0 != 0 or D_y_s1 != 0):
+        if not np.allclose([D_x_s0, D_x_s1, D_y_s0, D_y_s1],
+                           [0., 0., 0., 0.], atol=1e-15):
             raise NotImplementedError('Non-zero values have been \n' +
                 'specified for the dispersion coefficients D_{x,y}.\n' +
                 'But, the effects of dispersion are not yet implemented. \n')
@@ -323,7 +324,7 @@ class TransverseMap(object):
             knows how to generate and store its SegmentDetuner objects
             to 'distribute' the detuning proportionally along the
             accelerator circumference. """
-        if s[0] != 0 or s[-1] != C:
+        if not np.allclose([s[0], s[-1]], [0., C]):
             raise ValueError('The first element of s must be zero \n' +
                 'and the last element must be equal to the \n' +
                 'accelerator circumference C. \n')