Skip to content

Commit

Permalink
Merge pull request #114 from PyCOMPLETE/release/v1.14.1
Browse files Browse the repository at this point in the history
Release/v1.14.1
  • Loading branch information
lmether authored Jan 27, 2020
2 parents a512238 + bd270ca commit 36104e9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion PyHEADTAIL/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.14.0'
__version__ = '1.14.1'
20 changes: 10 additions & 10 deletions PyHEADTAIL/machines/synchrotron.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ def __init__(
optics_mode : 'smooth', 'non-smooth'
- 'smooth': the optics parameters are the same for all segments;
- 'non-smooth': the optics parameters are differetn for each segments.
- 'non-smooth': the optics parameters are different for each segment.
charge : C
reference particle charge in Coulomb
reference particle charge in Coulomb.
mass : kg
reference particle mass in Kg
reference particle mass in Kg.
p0 : kg m/s
reference particle momentum
reference particle momentum.
circumference : m
ring circumference (to be provided only if optics_mode is 'smooth').
Expand Down Expand Up @@ -146,13 +146,13 @@ def __init__(
is shared over segments.
app_x,app_y,app_xy :
Amplitude detining coefficients (anharmonicities).
Amplitude detuning coefficients (anharmonicities).
longitudinal_mode : 'linear', 'non-linear'
Longitudinal mode:
- 'linear': linear longitudinal force (RF cavity)
- 'non-linear': sinusoidal longitudinal force (RF cavities). Multiple
harmonics can be deifined in this case.
harmonics can be defined in this case.
Q_s :
Synchrotron tune. It can be defined only if longitudinal_mode is
Expand All @@ -172,9 +172,9 @@ def __init__(
dphi_RF : rad
Phase of the RF system with respect to the reference
particle (z=0). For a single harmonic, in the absence of acceleration
or enegy losses:
- below transition z = 0 is the stable fixed-point if dphi_RF = pi;
- below transition z = 0 is the stable fixed-point if dphi_RF = 0.
or energy losses:
- above transition z = 0 is the stable fixed-point if dphi_RF = 0;
- below transition z = 0 is the stable fixed-point if dphi_RF = pi.
p_increment : kg m / s
Acceleration, reference particle momentum change
Expand All @@ -184,7 +184,7 @@ def __init__(
Position of the longitudinal map in the ring.
wrap_z : True, False
Wrap longitudinal position using the accelerator length
Wrap longitudinal position using the accelerator length.
other_detuners :
List of other detuners to be applied
Expand Down
1 change: 1 addition & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-leap-day

0 comments on commit 36104e9

Please sign in to comment.