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

Read Bmad lattice files #65

Merged
merged 86 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
c9c96cf
Prototyped clean and recursive reading of lattice file lines
jank324 Sep 3, 2023
c479ca4
Protoyping pattern matching of expressions in bmad lattice files with…
jank324 Sep 4, 2023
d1910b3
Continue designing regex patterns until realised there are incomplete…
jank324 Sep 4, 2023
523cfe9
Function to merge lines that end in ampersand
jank324 Sep 4, 2023
2838a01
Merge comma-continued lines from Bmad lattice files
jank324 Sep 4, 2023
5cf78bf
Figured out pattern matches for different types of lines
jank324 Sep 4, 2023
0fe6a00
Prototype basic parsing (no logic) into dictionaries
jank324 Sep 4, 2023
a319edd
Probably match all types of lines to functions that understand them
jank324 Sep 4, 2023
e695adf
Make sure the Bmad conversion module is visible
jank324 Sep 4, 2023
3940642
Commit before switching back to first evaluating elements as dictiona…
jank324 Sep 4, 2023
4a096dd
Prototype fully parses (not necesarily correctly)
jank324 Sep 4, 2023
109750c
Example test of parsed context
jank324 Sep 4, 2023
8806b00
Integrate prototyped parsing
jank324 Sep 4, 2023
c55990e
Integrate full parsing code
jank324 Sep 4, 2023
09ed77a
Prototype first part of conversion
jank324 Sep 4, 2023
80443df
Rename Monitor to Marker
jank324 Sep 4, 2023
61c075e
Prototype obviosu conversions of elements
jank324 Sep 5, 2023
2a43bf6
Implement flattening of segments with subsegments
jank324 Sep 5, 2023
491ada6
Fix Solenoid __repr__
jank324 Sep 5, 2023
c4c8076
Implement kicker conversion
jank324 Sep 5, 2023
35a979b
Rename Bmad adapter source file
jank324 Sep 5, 2023
1c9b04d
Fix x_limit and y_limit on collimators being parsed as limit
jank324 Sep 5, 2023
23d141f
Implement conversion of collimators
jank324 Sep 5, 2023
39db6d9
Prototype undulator/wiggler conversion
jank324 Sep 5, 2023
59e56e8
Add dummy translation for patch elements
jank324 Sep 5, 2023
bf4b208
Integrate prototyped Bmad conversion functions
jank324 Sep 5, 2023
959c082
Silence flake8 warning on regex patterns
jank324 Sep 5, 2023
3e2fec3
Integrate full lattice conversion code from prototype
jank324 Sep 5, 2023
56d4b6f
Add convenience method to Segment class
jank324 Sep 5, 2023
33acbda
Fix failing Monitor/Marker tests
jank324 Sep 5, 2023
529988f
Fix flake8 warning
jank324 Sep 5, 2023
85c5d9b
Implement sband conversion
jank324 Sep 5, 2023
99d91c8
Enforce that elements have a plot method
jank324 Sep 5, 2023
f801c45
Remove grid from lattice plot
jank324 Sep 5, 2023
528f145
Merge branch 'master' into 64-read-bmad-lattices
jank324 Sep 5, 2023
563784b
Add bmad conversion source file to docs
jank324 Sep 5, 2023
4b0a662
Implement twiss parameter over s plot
jank324 Sep 5, 2023
4bb0d4e
Add missing type annotations
jank324 Sep 5, 2023
8759b74
Add tilt to quadrupole __repr__
jank324 Sep 5, 2023
9dd9663
Fix tensor dimension error for titlted quads
jank324 Sep 5, 2023
2e5a861
Fix dontbmad docs
jank324 Sep 5, 2023
bd0c4a3
Test conversion of Bmad Tao tutorial lattice
jank324 Sep 5, 2023
4e4c04f
Dipole __repr__ match property names
jank324 Sep 5, 2023
f09e1f5
Tests comparing RBend and SBend to Ocelot
jank324 Sep 5, 2023
dcbccf6
Add test that catches cavity fault
jank324 Sep 5, 2023
0e0eed4
Create docstring for base_rmatrix function
jank324 Sep 6, 2023
8b04082
First test implementation of Cavity cpoied from Ocelot
jank324 Sep 8, 2023
c169630
Remove Cavity transfer matrix test
jank324 Sep 8, 2023
979bdd2
Remove duplicate definition of __call__
jank324 Sep 8, 2023
90bb79d
Fix typo
jank324 Sep 8, 2023
5e825bd
Design test for Cavity that compares to Ocelot and also matches Bmad
jank324 Sep 8, 2023
1127f7c
Fix cavity test
jank324 Sep 8, 2023
0ef0c07
Return empty particle beam if no particles left
jank324 Sep 8, 2023
6faa30b
Implement cavity for parameter beam
jank324 Sep 8, 2023
bbcb1f9
Better test file name
jank324 Sep 8, 2023
c7be520
Compare more properties of the beams
jank324 Sep 8, 2023
5931d9c
Add beam type comparison tests for some "trusted" elements
jank324 Sep 8, 2023
3e0e9ab
Correctly translate cavity parameters from Bmad
jank324 Sep 8, 2023
d9805cd
Fix beam type comparison tests for cavity
jank324 Sep 9, 2023
134c48f
Merge branch 'master' into 64-read-bmad-lattices
jank324 Sep 9, 2023
1df50d7
Reduce sporadic test failures
jank324 Sep 9, 2023
190c6b2
Fix cavity phase unit in Bmad conversion
jank324 Sep 9, 2023
837a85f
Compare cavity with phase not equal zero to Ocelot
jank324 Sep 9, 2023
fcf7494
Tests if LCLS project can be done without cavity fix
jank324 Sep 9, 2023
3cb3c5c
Test changing phase for original cavity test example
jank324 Sep 9, 2023
5085299
Play around comparing both beam types throug cavity elements
jank324 Sep 9, 2023
d502715
Consolidate cavity beam type tracking methods into one
jank324 Sep 9, 2023
52718d9
Fix all but sigma_p of ParameterBeam through cavity
jank324 Sep 9, 2023
6d1cdf0
Force split method implementation
jank324 Sep 9, 2023
d9d23d7
Add more split tests
jank324 Sep 9, 2023
6175c3a
Address duplicate name issue
jank324 Sep 9, 2023
40ce4d0
Remove and cleanup dataclasses
jank324 Sep 9, 2023
26a88c7
Further testing when skipping cavity for the time being
jank324 Sep 9, 2023
93fe74d
Scans over cavity parameters to find issue
jank324 Sep 11, 2023
eddbb03
Use degree radians conversion function instead of doing it by hand
jank324 Sep 11, 2023
5d1782c
Fix indentation
jank324 Sep 11, 2023
60ab6e8
Fix "break" in voltage scan
jank324 Sep 11, 2023
cd4ba1b
Fix plotting cheetah beams as ocelot
jank324 Sep 11, 2023
249aa21
Use torch for deg2rad
jank324 Sep 11, 2023
940dbcc
Fix mistakenly removed cos
jank324 Sep 11, 2023
be96a03
Fix incoming beam used by Ocelot experiment
jank324 Sep 12, 2023
7a4c5b0
Fix Bmad values for length scan
jank324 Sep 12, 2023
ede5149
Test minimal working example of LCLS cavity
jank324 Sep 12, 2023
a87bbd6
Remove debugging print statements
jank324 Sep 12, 2023
ffe972c
Fix sporadic test failure due to too small tolerance
jank324 Sep 12, 2023
501d113
Remove test notebook
jank324 Sep 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cheetah/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# flake8: noqa
import cheetah.dontbmad
from cheetah.accelerator import *
from cheetah.particles import *
Loading