Skip to content

Commit

Permalink
Reword Rotation Error Docstring
Browse files Browse the repository at this point in the history
Now: `rotation error in the transverse plane`
  • Loading branch information
ax3l committed Jan 3, 2024
1 parent 0aabd98 commit ef51e58
Show file tree
Hide file tree
Showing 26 changed files with 70 additions and 70 deletions.
44 changes: 22 additions & 22 deletions docs/source/usage/parameters.rst

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions docs/source/usage/python.rst
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ This module provides elements for the accelerator lattice.
k < 0 horizontal defocusing
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.ConstF(ds, kx, ky, kt, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -484,7 +484,7 @@ This module provides elements for the accelerator lattice.
:param kt: Focusing strength for t in 1/m.
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:property:: kx
Expand Down Expand Up @@ -517,7 +517,7 @@ This module provides elements for the accelerator lattice.
:param K2: Fringe field integral (unitless)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.Drift(ds, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -535,7 +535,7 @@ This module provides elements for the accelerator lattice.
:param ds: Segment length in m
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.ExactDrift(ds, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -545,7 +545,7 @@ This module provides elements for the accelerator lattice.
:param ds: Segment length in m
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.Kicker(xkick, ykick, units, dx=0, dy=0, rotation=0)
Expand All @@ -565,7 +565,7 @@ This module provides elements for the accelerator lattice.
:param K_skew: Integrated skew multipole coefficient (1/meter^m)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py::class:: impactx.elements.None
Expand All @@ -584,7 +584,7 @@ This module provides elements for the accelerator lattice.
:param cnll: distance of singularities from the origin (m)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.BeamMonitor(name, backend="default", encoding="g")
Expand Down Expand Up @@ -641,7 +641,7 @@ This module provides elements for the accelerator lattice.
k < 0 horizontal defocusing
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.ChrQuad(ds, k, units, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -659,7 +659,7 @@ This module provides elements for the accelerator lattice.
:param units: specification of units for quadrupole field strength
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.RFCavity(ds, escale, freq, phase, dx=0, dy=0, rotation=0, mapsteps=1, nslice=1)
Expand All @@ -676,7 +676,7 @@ This module provides elements for the accelerator lattice.
:param cos_coefficients: array of ``float`` sine coefficients in Fourier expansion of on-axis electric field Ez (optional); default is a 9-cell TESLA superconducting cavity model from `DOI:10.1103/PhysRevSTAB.3.092001 <https://doi.org/10.1103/PhysRevSTAB.3.092001>`__
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param mapsteps: number of integration steps per slice used for map and reference particle push in applied fields
:param nslice: number of slices used for the application of space charge

Expand All @@ -688,7 +688,7 @@ This module provides elements for the accelerator lattice.
:param rc: Radius of curvature in m.
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.ExactSbend(ds, phi, B, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -706,7 +706,7 @@ This module provides elements for the accelerator lattice.
:param B: Magnetic field in Tesla; when B = 0 (default), the reference bending radius is defined by r0 = length / (angle in rad), corresponding to a magnetic field of B = rigidity / r0; otherwise the reference bending radius is defined by r0 = rigidity / B.
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.Buncher(V, k, dx=0, dy=0, rotation=0)
Expand All @@ -717,7 +717,7 @@ This module provides elements for the accelerator lattice.
:param k: Wavenumber of RF in 1/m
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.ShortRF(V, freq, phase, dx=0, dy=0, rotation=0)
Expand All @@ -728,7 +728,7 @@ This module provides elements for the accelerator lattice.
:param phase: RF synchronous phase in degrees (phase = 0 corresponds to maximum energy gain, phase = -90 corresponds go zero energy gain for bunching)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.ChrUniformAcc(ds, k, dx=0, dy=0, rotation=0, nslice=1)
Expand All @@ -743,7 +743,7 @@ This module provides elements for the accelerator lattice.
= (particle charge in C * field Bz in T) / (particle mass in kg * speed of light in m/s)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.SoftSolenoid(ds, bscale, cos_coefficients, sin_coefficients, dx=0, dy=0, rotation=0, mapsteps=1, nslice=1)
Expand All @@ -758,7 +758,7 @@ This module provides elements for the accelerator lattice.
(optional); default is a thin-shell model from `DOI:10.1016/J.NIMA.2022.166706 <https://doi.org/10.1016/j.nima.2022.166706>`__
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param mapsteps: number of integration steps per slice used for map and reference particle push in applied fields
:param nslice: number of slices used for the application of space charge

Expand All @@ -770,7 +770,7 @@ This module provides elements for the accelerator lattice.
:param ks: Solenoid strength in m^(-1) (MADX convention) in (magnetic field Bz in T) / (rigidity in T-m)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param nslice: number of slices used for the application of space charge

.. py:class:: impactx.elements.PRot(phi_in, phi_out)
Expand All @@ -781,7 +781,7 @@ This module provides elements for the accelerator lattice.
:param phi_out: angle of the reference particle with respect to the longitudinal (z) axis in the rotated frame in degrees
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.Aperture(xmax, ymax, shape="rectangular", dx=0, dy=0, rotation=0)
Expand All @@ -792,7 +792,7 @@ This module provides elements for the accelerator lattice.
:param shape: aperture boundary shape: ``"rectangular"`` (default) or ``"elliptical"``
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

.. py:class:: impactx.elements.SoftQuadrupole(ds, gscale, cos_coefficients, sin_coefficients, dx=0, dy=0, rotation=0, mapsteps=1, nslice=1)
Expand All @@ -806,7 +806,7 @@ This module provides elements for the accelerator lattice.
(optional); default is a tanh fringe field model based on `<http://www.physics.umd.edu/dsat/docs/MaryLieMan.pdf>`__
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]
:param mapsteps: number of integration steps per slice used for map and reference particle push in applied fields
:param nslice: number of slices used for the application of space charge

Expand All @@ -818,7 +818,7 @@ This module provides elements for the accelerator lattice.
:param rc: Effective curvature radius (meters)
:param dx: horizontal translation error in m
:param dy: vertical translation error in m
:param rotation: rotation error around the s axis (in the x-y plane) [degrees]
:param rotation: rotation error in the transverse plane [degrees]

Reference:

Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Aperture.H
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace impactx
* @param ymax maximum value of vertical coordinate (m)
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
Aperture (
amrex::ParticleReal xmax,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Buncher.H
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace impactx
* @param k Wavenumber of RF in 1/m
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
Buncher (
amrex::ParticleReal V,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/CFbend.H
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace impactx
* k < 0 horizontal defocusing
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
CFbend (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ChrDrift.H
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace impactx
* @param ds Segment length in m
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ChrDrift (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ChrQuad.H
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ namespace impactx
* unit = 1 MaryLie convention
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ChrQuad (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ChrUniformAcc.H
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace impactx
* = (charge * magnetic field Bz in T) / (m*c)
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ChrAcc (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ConstF.H
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace impactx
* @param kt Focusing strength for t in 1/m.
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ConstF (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/DipEdge.H
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace impactx
* @param K2 Fringe field integral (unitless).
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
DipEdge (
amrex::ParticleReal psi,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Drift.H
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace impactx
* @param ds Segment length in m
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
Drift (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ExactDrift.H
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace impactx
* @param ds Segment length in m
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ExactDrift (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/ExactSbend.H
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ namespace impactx
* a magnetic field of B = rigidity / r0; otherwise the reference bending radius is defined by r0 = rigidity / B.
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
ExactSbend (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Kicker.H
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace impactx
* @param unit units of xkick and ykick
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
Kicker (
amrex::ParticleReal xkick,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Multipole.H
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace impactx
* @param K_skew Integrated skew multipole coefficient (1/meter^m)
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
Multipole (
int multipole,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/NonlinearLens.H
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace impactx
* @param cnll distance of singularities from the origin (m)
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
*/
NonlinearLens (
amrex::ParticleReal knll,
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Quad.H
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace impactx
* k < 0 horizontal defocusing
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
Quad (
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/RFCavity.H
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ namespace RFCavityData
* @param sin_coef TODO
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param mapsteps number of integration steps per slice used for
* map and reference particle push in applied fields
* @param nslice number of slices used for the application of space charge
Expand Down
2 changes: 1 addition & 1 deletion src/particles/elements/Sbend.H
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace impactx
* @param rc Radius of curvature in m.
* @param dx horizontal translation error in m
* @param dy vertical translation error in m
* @param rotation_degree rotation error around the s axis (in the x-y plane) [degrees]
* @param rotation_degree rotation error in the transverse plane [degrees]
* @param nslice number of slices used for the application of space charge
*/
Sbend (
Expand Down
Loading

0 comments on commit ef51e58

Please sign in to comment.