Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct the axis definition in plot_sigma #648

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Correct the axis definition in plot_sigma #648

merged 2 commits into from
Aug 29, 2023

Conversation

lfarv
Copy link
Contributor

@lfarv lfarv commented Aug 28, 2023

The axis definition at input of plot_sigma uses the incorrect 'xp' code instead of 'px'. Accordingly, the axis labels on the plot also display x' instead of px.

This is corrected here by using the at.axis_() function, allowing one of:
1, 'px' or 'PX' to describe the px axis (and so on…)

'xp' is still accepted for compatibility.

@lfarv lfarv added Python For python AT code bug fix labels Aug 28, 2023
@lfarv lfarv requested a review from swhite2401 August 28, 2023 16:53
@lfarv lfarv merged commit b118cd5 into master Aug 29, 2023
31 checks passed
@lfarv lfarv deleted the plot_sigma branch August 29, 2023 09:52
lnadolski added a commit that referenced this pull request Oct 25, 2023
# By Laurent Farvacque (14) and others
# Via GitHub
* master: (28 commits)
  Add passive beamloading cavity (#586)
  Create BndStrMPoleSymplectic4RadPass (#665)
  Documentation fixes (#669)
  Update of the build process (#659)
  New Matlab function atsimplering (#657)
  Collective bugfix (#664)
  Correct the attribute name of solenoids in Matlab (#663)
  Error parsing args for twiss_in and r_4d (#662)
  Fix atmaincavities (#656)
  Fix attribute names in Simple Ring (#655)
  Remove collective passes from internal lattice_pass (#650)
  The DPStep keyword in linopt6 raises an error for 4D lattices (#651)
  Bug fix in atdisable_6d: keep the Energy field in cavities. (#654)
  fix: ring phase advances in computeRDT.m (#652)
  Correct the axis definition in plot_sigma (#648)
  Don't automatically cache the location of RF cavities (#640)
  Simple ring model (#643)
  Correct Dipole tapering (#623)
  Chromatic functions extended (#644)
  Repair the Matlab tests (#645)
  ...

# Conflicts:
#	atmat/Contents.m
#	atmat/atphysics/Radiation/atdisable_6d.m
#	atmat/atphysics/Radiation/atenable_6d.m
#	atmat/lattice/at2str.m
#	atmat/pubtools/create_elems/atidtable_dat.m
#	pyat/at/lattice/elements.py
#	pyat/at/lattice/lattice_object.py
#	pyat/at/physics/matrix.py
#	pyat/at/physics/radiation.py
#	pyat/examples/CollectiveEffects/RobinsonInstability.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix Python For python AT code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants