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

Create BndStrMPoleSymplectic4RadPass #665

Merged
merged 2 commits into from
Oct 11, 2023
Merged

Conversation

catohxb
Copy link
Contributor

@catohxb catohxb commented Oct 3, 2023

Hung-Chun Chao created BndStrMPoleSymplectic4RadPass to include synchrotron radiation damping for the straight-geometry bending magnet.

Copy link
Contributor

@lfarv lfarv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice addition

@lfarv
Copy link
Contributor

lfarv commented Oct 5, 2023

Any other comment? For me it's ok for merging.

@swhite2401
Copy link
Contributor

Ok for me!

Copy link
Member

@carmignani carmignani left a 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);
Copy link
Member

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);
Copy link
Member

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);

Copy link

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!

@swhite2401
Copy link
Contributor

Anyone implementing these changes?

@carmignani
Copy link
Member

I could do the change, but I'm not sure to be able to do a commit on the forked version of AT from @catohxb. I can do the change by creating a branch in the atcollab official AT and then a new pull request. I will do that tomorrow, unless @catohxb will change his version before.

@carmignani
Copy link
Member

Ok, actually I could do the commit directly online from gitHub on the forked version.

@swhite2401
Copy link
Contributor

@carmignani If you add me as reviewer I can re-approve (needed after your changes and cannot be you)

@carmignani carmignani merged commit 1a0707f into atcollab:master Oct 11, 2023
14 checks passed
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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants