Skip to content

master 2 dev_gen merge#287

Merged
sserkez merged 123 commits into
dev_genfrom
master
Jul 30, 2025
Merged

master 2 dev_gen merge#287
sserkez merged 123 commits into
dev_genfrom
master

Conversation

@sserkez

@sserkez sserkez commented Jul 30, 2025

Copy link
Copy Markdown
Collaborator

No description provided.

st-walker and others added 30 commits March 8, 2024 14:03
makes Twiss instances from SliceParameters instance
There are definitely no imports on my machine now involving chicane library.
Replace deprecated functions in scipy v1.14.0.  Fixes issue #256
# Conflicts:
#	ocelot/common/math_op.py
#	ocelot/cpbd/beam_params.py
#	ocelot/cpbd/chromaticity.py
#	ocelot/rad/radiation_py.py
delaossa and others added 29 commits June 4, 2025 13:41
Allow the user to pass a custom `get_twiss` function to `track`
…here transverse beam sizes caclulated and added docstrings
…tter plot and color of the individual particle will correspond to density - slower but maybe can be visual pleasing for presentations
@sserkez
sserkez merged commit 3851f8f into dev_gen Jul 30, 2025
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.

6 participants