-
Notifications
You must be signed in to change notification settings - Fork 32
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
Create BndStrMPoleSymplectic4RadPass #665
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice addition
Any other comment? For me it's ok for merging. |
Ok for me! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are two small modifications to do in the mexfunction.
} | ||
else if (nrhs == 0) { | ||
/* list of required fields */ | ||
plhs[0] = mxCreateCellMatrix(8,1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello,
it's a small detail, but this should be plhs[0] = mxCreateCellMatrix(9,1);
mxSetCell(plhs[0],7,mxCreateString("NumIntSteps")); | ||
mxSetCell(plhs[0],8,mxCreateString("Energy")); | ||
if(nlhs>1) { /* list of optional fields */ | ||
plhs[1] = mxCreateCellMatrix(7,1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And this should be plhs[1] = mxCreateCellMatrix(10,1);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the catch!
Anyone implementing these changes? |
Ok, actually I could do the commit directly online from gitHub on the forked version. |
@carmignani If you add me as reviewer I can re-approve (needed after your changes and cannot be you) |
# 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
Hung-Chun Chao created BndStrMPoleSymplectic4RadPass to include synchrotron radiation damping for the straight-geometry bending magnet.