Skip to content

Commit 2eb53cc

Browse files
committed
release-script: Merge branch 'release/v1.11.5'
2 parents c454478 + bcf9d89 commit 2eb53cc

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

PyHEADTAIL/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.11.4'
1+
__version__ = '1.11.5'

PyHEADTAIL/machines/synchrotron.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ def _construct_transverse_map(
251251
raise ValueError('optics_mode not recognized')
252252

253253
detuners = []
254-
if Qp_x != 0 or Qp_y != 0:
254+
if any(np.atleast_1d(Qp_x) != 0) or \
255+
any(np.atleast_1d(Qp_y) != 0):
255256
detuners.append(Chromaticity(Qp_x, Qp_y))
256257
if app_x != 0 or app_y != 0 or app_xy != 0:
257258
detuners.append(AmplitudeDetuning(app_x, app_y, app_xy))

PyHEADTAIL/trackers/transverse_tracking.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ def __init__(self, s, alpha_x, beta_x, D_x, alpha_y, beta_y, D_y,
268268
self._generate_segment_maps()
269269

270270
if self.D_x.any() or self.D_y.any():
271-
self.prints('Non-zero dispersion; '
272-
'ensure the beam has been "blown-up" '
273-
'accordingly upon creation!')
271+
self.prints('Non-zero dispersion in tracking: '
272+
'ensure the beam has been generated '
273+
'being matched to the correct dispersion!')
274274

275275
def _generate_segment_maps(self):
276276
""" This method is called at instantiation of a TransverseMap

0 commit comments

Comments
 (0)