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.

Sign up for GitHub

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

Update to Cheetah v0.7.x #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Cheetah v0.7.x #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 52 additions & 35 deletions benchmark/cheetah/cheetah.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

198 changes: 118 additions & 80 deletions benchmark/comparison/compare_results.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified benchmark/comparison/phase_space_comparison.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions bo_prior/bo_cheetah_prior.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def simple_fodo_problem(
incoming_beam = cheetah.ParameterBeam.from_parameters(
sigma_x=torch.tensor(1e-4),
sigma_y=torch.tensor(2e-3),
sigma_xp=torch.tensor(1e-4),
sigma_yp=torch.tensor(1e-4),
sigma_px=torch.tensor(1e-4),
sigma_py=torch.tensor(1e-4),
energy=torch.tensor(100e6),
)
quad_length = torch.tensor(lattice_distances.get("quad_length", 0.1))
Expand Down
Binary file modified bo_prior/bo_cheetah_prior_result.pdf
View file
Open in desktop
Binary file not shown.
25 changes: 13 additions & 12 deletions bo_prior/plot_bo_cheetah_result.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified neural_network_space_charge_quad/correlations.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified neural_network_space_charge_quad/energy_scan_example.pdf
View file
Open in desktop
Binary file not shown.
1,257 changes: 632 additions & 625 deletions neural_network_space_charge_quad/test_space_charge_quad.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
black
botorch
git+https://github.com/desy-ml/cheetah.git@114-tests-are-failing-on-gpu-machine # TODO: Update to cheetah-accelerator>=0.6.2
cheetah-accelerator>=0.7.1
flake8
isort
jupyter
Expand Down
20 changes: 10 additions & 10 deletions system_identification/ARESlatticeStage3v1_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand All @@ -952,8 +952,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down Expand Up @@ -1036,8 +1036,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand All @@ -1049,8 +1049,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down Expand Up @@ -1312,8 +1312,8 @@
{
"length": 0.4385254383087158,
"angle": 0.8203047513961792,
"e1": 0.0,
"e2": -0.7504915595054626,
"dipole_e1": 0.0,
"dipole_e2": -0.7504915595054626,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down
146 changes: 80 additions & 66 deletions system_identification/misalignments.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified system_identification/system_id_combined.pdf
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions tuning/ARESlatticeStage3v1_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand All @@ -952,8 +952,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down Expand Up @@ -1036,8 +1036,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand All @@ -1049,8 +1049,8 @@
{
"length": 0.2199999988079071,
"angle": 0.0,
"e1": 0.0,
"e2": 0.0,
"dipole_e1": 0.0,
"dipole_e2": 0.0,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down Expand Up @@ -1312,8 +1312,8 @@
{
"length": 0.4385254383087158,
"angle": 0.8203047513961792,
"e1": 0.0,
"e2": -0.7504915595054626,
"dipole_e1": 0.0,
"dipole_e2": -0.7504915595054626,
"tilt": 0.0,
"fringe_integral": 0.0,
"fringe_integral_exit": 0.0,
Expand Down
12 changes: 6 additions & 6 deletions tuning/gradientbased.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified tuning/tuning_convergence_example.pdf
View file
Open in desktop
Binary file not shown.