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

Fix atmaincavities #656

Merged
merged 2 commits into from
Sep 22, 2023
Merged

Fix atmaincavities #656

merged 2 commits into from
Sep 22, 2023

Conversation

lfarv
Copy link
Contributor

@lfarv lfarv commented Sep 17, 2023

Fix a bug in atmaincavities possibly returning the wrong cavities.

@lfarv lfarv added Matlab For Matlab/Octave AT code bug fix labels Sep 17, 2023
@lfarv
Copy link
Contributor Author

lfarv commented Sep 21, 2023

Without any comment, I'll merge tomorrow !

@simoneliuzzo
Copy link
Contributor

simoneliuzzo commented Sep 22, 2023

Dear @lfarv ,

I tested on the EBS lattice. The result is identical to the one in the master branch. What is the difference with the master version?

Copy link
Contributor

@simoneliuzzo simoneliuzzo left a comment

Choose a reason for hiding this comment

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

tested for EBS lattice. output did not change compared to master

@lfarv
Copy link
Contributor Author

lfarv commented Sep 22, 2023

@simoneliuzzo: the problem occurred with harmonic cavities: sometimes the wrong cavities were returned;

@lfarv lfarv merged commit 62160a5 into master Sep 22, 2023
31 checks passed
@lfarv lfarv deleted the fix_atmaincavities branch September 22, 2023 11:35
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.

None yet

2 participants