Merge pull request #112 from PyCOMPLETE/release/v1.14.0

Release/v1.14.0

Author: lmether

PyHEADTAIL/__init__.py

@@ -22,13 +22,11 @@
     from ._version import __version__
     dirty = False
 
-print ('PyHEADTAIL v' + __version__)
+print(('PyHEADTAIL v' + __version__))
 if dirty:
     print ('(dirty git work tree)')
 print ('\n')
 
-from .general.element import Element, Printing
-from .general import utils
 # print '                                                                                                                             '
 # print '                                                                ;Cfttttt11111111tttt1f0f.                                    '
 # print '                                                                ,GttttfG0GGG00000GGG0G0G0G0G0G0Ct1t1fG:                      '

PyHEADTAIL/_version.py

@@ -1 +1 @@
-__version__ = '1.13.5'
+__version__ = '1.14.0'

PyHEADTAIL/aperture/__init__.py

@@ -1,4 +1 @@
-from .. import Element
-from ..particles.slicing import clean_slices
-from .. import __version__
 

PyHEADTAIL/aperture/aperture.py

@@ -1,4 +1,3 @@
-from __future__ import division
 '''
 Aperture module to manage particle losses. An aperture is
 defined as a condition on the phase space coordinates. Particles
@@ -11,26 +10,26 @@
          Michael Schenk
 '''
 
-from . import Element, clean_slices
 
-from abc import ABCMeta, abstractmethod
 
-from ..general import pmath as pm
 import numpy as np
+from abc import ABCMeta, abstractmethod
+
+from PyHEADTAIL.general.element import Element, Printing
+from PyHEADTAIL.general import pmath as pm
+from PyHEADTAIL.particles.slicing import clean_slices
 
 def make_int32(array):
     return array.astype(np.int32)
 
 
-class Aperture(Element):
+class Aperture(Element, metaclass=ABCMeta):
     '''Abstract base class for Aperture elements. An aperture is
     generally defined as a condition on the phase space coordinates.
     Particles not fulfilling this condition are tagged as lost and
     are removed from the beam directly after.
     '''
 
-    __metaclass__ = ABCMeta
-
     @clean_slices
     def track(self, beam):
         '''Tag particles not passing through the aperture as lost. If

PyHEADTAIL/aperture/aperture_cython.pyx

@@ -17,7 +17,7 @@ cimport cython
 import numpy as np
 cimport numpy as np
 
-import aperture
+import PyHEADTAIL.aperture.aperture as aperture
 
 class Aperture(aperture.Aperture):
     '''Pendant to aperture.Aperture with the relocate algorithm

PyHEADTAIL/cobra_functions/__init__.py

@@ -1 +0,0 @@
-from .. import __version__

PyHEADTAIL/cobra_functions/curve_tools.py

@@ -1,4 +1,4 @@
-from __future__ import division
+
 
 import numpy as np
 from scipy.optimize import brentq
@@ -20,4 +20,4 @@ def extrema(x, y=None):
     zix = np.where(np.abs(np.diff(np.sign(np.diff(x)))) == 2)[0]
     return zix
     if not y:
-        print zix
+        print(zix)

PyHEADTAIL/cobra_functions/pdf_integrators_2d.py

@@ -3,9 +3,9 @@
 @date 21.06.2017
 @brief 2D distribution integration methods for y(x) parametrised domains
 '''
-from scipy.integrate import quad, dblquad, cumtrapz, romb
 
 import numpy as np
+from scipy.integrate import quad, dblquad, cumtrapz, romb
 
 
 def quad2d(f, ylimits, xmin, xmax):

PyHEADTAIL/cobra_functions/stats.pyx

@@ -5,6 +5,7 @@
        of bunch and slice_set data.
 @copyright CERN
 """
+
 import numpy as np
 cimport numpy as np
 cimport libc.math as cmath

PyHEADTAIL/feedback/__init__.py

@@ -1,2 +0,0 @@
-from .. import __version__
-from .. import Element