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

Don't automatically cache the location of RF cavities #640

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Conversation

lfarv
Copy link
Contributor

@lfarv lfarv commented Aug 6, 2023

This corrects #636. Caching the location of cavities slightly improved performance, but raised problems after modifying the lattice. Setting the cavpts ring property still works for accelerating the access to the cavities, but it's now the user's responsibility to use it or not, it's mo more automatically set.

The guide for cavity control is corrected.

@lfarv lfarv added Matlab For Matlab/Octave AT code bug fix labels Aug 6, 2023
@lfarv lfarv requested a review from lnadolski August 6, 2023 11:04
@lfarv lfarv requested a review from swhite2401 August 28, 2023 16:33
@lfarv
Copy link
Contributor Author

lfarv commented Aug 28, 2023

Hello @swhite2401. Could you please approve this one, which is pending for long now…

@swhite2401
Copy link
Contributor

Well this was a request of @lnadolski shouldn't he review this? I don't feel very comfortable with approving something I did not request and will not review...

@lfarv lfarv merged commit 6cfd075 into master Aug 29, 2023
@lfarv lfarv deleted the fix_cavpts branch August 29, 2023 09:52
@swhite2401
Copy link
Contributor

@lfarv, merging without approval is against what we have decided concerning the merge process and should be avoided.
I agree this one is small and not problematic, but it would still be good that everyone complies to the rules we have set, thanks.

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 Matlab For Matlab/Octave AT code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants