Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

mbtrack2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Model experiments

Snippets Groups Projects

77b09b37

Commit 77b09b37 authored 3 years ago by Gamelin Alexis

Downloads
- Plain Diff

Merge branch 'Beam_coupling'

# Conflicts:
#	tracking/element.py

parents cbd90bb7 c4e06696

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

tracking/__init__.py 2 additions, 1 deletion

tracking/__init__.py
tracking/element.py 37 additions, 12 deletions

tracking/element.py
tracking/monitors/monitors.py 6 additions, 3 deletions

tracking/monitors/monitors.py
tracking/monitors/plotting.py 24 additions, 17 deletions

tracking/monitors/plotting.py
tracking/particles.py 11 additions, 7 deletions

tracking/particles.py
tracking/synchrotron.py 4 additions, 4 deletions

tracking/synchrotron.py

with 84 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

The place to be for your source code