-
Notifications
You must be signed in to change notification settings - Fork 29
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
New Matlab function atsimplering #657
Conversation
Dear @lfarv @lcarver and @swhite2401 , what is the difference with atfastring? The imputs are parameters rather than an AT lattice? I will try to test it thank you, best regards |
The idea is to be able to generate a ring with only a table of
parameters. No initial lattice needed.
|
Dear @lcarver @lfarv and @swhite2401, if the output is ought to be the same, why having two functions rather than simply adding inputs to For example: best regards |
Dear @lfarv @lcarver and @swhite2401, do you have a test function checking that the output elements are strictly the same for atfastring(ring) and atsimplering(parameters_of_ring) ? |
@simoneliuzzo
The test you propose is a good idea. But the comparison is not easy because the generated lattice are different, though they should behave the same… |
8835824
to
305f91d
Compare
Looks good to me. Thanks a lot |
fc2b463
to
24b6935
Compare
@lcarver : I had to solve a conflict with the updated master. Could you approve again? Thanks @simoneliuzzo : any more comments on this function? |
After solving a conflict with the master branch (Matlab version number), I need another review. |
# 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
The new function
atsimplering
creates a simple lattice according to a set of ring properties. A "simple ring" consists of:It is defined by:
plus optional parameters:
It is similar to the python
simplering
introduced in #643