release-script: Merge branch 'release/v1.11.5'

PyCOMPLETE · Jun 6, 2017 · 2eb53cc · 2eb53cc
2 parents c454478 + bcf9d89
commit 2eb53cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/PyHEADTAIL/_version.py b/PyHEADTAIL/_version.py
@@ -1 +1 @@
-__version__ = '1.11.4'
+__version__ = '1.11.5'
diff --git a/PyHEADTAIL/machines/synchrotron.py b/PyHEADTAIL/machines/synchrotron.py
@@ -251,7 +251,8 @@ def _construct_transverse_map(
             raise ValueError('optics_mode not recognized')
 
         detuners = []
-        if Qp_x != 0 or Qp_y != 0:
+        if any(np.atleast_1d(Qp_x) != 0) or \
+                any(np.atleast_1d(Qp_y) != 0):
             detuners.append(Chromaticity(Qp_x, Qp_y))
         if app_x != 0 or app_y != 0 or app_xy != 0:
             detuners.append(AmplitudeDetuning(app_x, app_y, app_xy))

diff --git a/PyHEADTAIL/trackers/transverse_tracking.py b/PyHEADTAIL/trackers/transverse_tracking.py
@@ -268,9 +268,9 @@ def __init__(self, s, alpha_x, beta_x, D_x, alpha_y, beta_y, D_y,
         self._generate_segment_maps()
 
         if self.D_x.any() or self.D_y.any():
-            self.prints('Non-zero dispersion; '
-                        'ensure the beam has been "blown-up" '
-                        'accordingly upon creation!')
+            self.prints('Non-zero dispersion in tracking: '
+                        'ensure the beam has been generated '
+                        'being matched to the correct dispersion!')
 
     def _generate_segment_maps(self):
         """ This method is called at instantiation of a TransverseMap