Skip to content

Update tutorial for new Cheetah and gymnasium interface #3

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
35 changes: 18 additions & 17 deletions utils/train.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from gymnasium.wrappers import (
FilterObservation,
FlattenObservation,
FrameStack,
FrameStackObservation,
RecordVideo,
RescaleAction,
TimeLimit,
Expand Down Expand Up @@ -643,7 +643,7 @@ def get_beam_parameters(self):
def get_incoming_parameters(self):
"""
Get all physical beam parameters of the incoming beam as NumPy array in order
energy, mu_x, mu_xp, mu_y, mu_yp, sigma_x, sigma_xp, sigma_y, sigma_yp, sigma_s,
energy, mu_x, mu_px, mu_y, mu_py, sigma_x, sigma_px, sigma_y, sigma_py, sigma_tau,
sigma_p.

Override with backend-specific imlementation. Optional.
Expand Down Expand Up @@ -733,7 +733,8 @@ def __init__(
self,
incoming_mode="constant",
incoming_values=np.array(
[80e6, -5e-4, 6e-5, 3e-4, 3e-5, 4e-4, 4e-5, 1e-4, 4e-5, 0, 4e-6]
[80e6, -5e-4, 6e-5, 3e-4, 3e-5, 4e-4, 4e-5, 1e-4, 4e-5, 0, 4e-6],
dtype='float32'
),
misalignment_mode="constant",
misalignment_values=np.zeros(8),
Expand Down Expand Up @@ -822,14 +823,14 @@ def reset_accelerator(self):
self.incoming = cheetah.ParameterBeam.from_parameters(
energy=torch.tensor(incoming_parameters[0]),
mu_x=torch.tensor(incoming_parameters[1]),
mu_xp=torch.tensor(incoming_parameters[2]),
mu_px=torch.tensor(incoming_parameters[2]),
mu_y=torch.tensor(incoming_parameters[3]),
mu_yp=torch.tensor(incoming_parameters[4]),
mu_py=torch.tensor(incoming_parameters[4]),
sigma_x=torch.tensor(incoming_parameters[5]),
sigma_xp=torch.tensor(incoming_parameters[6]),
sigma_px=torch.tensor(incoming_parameters[6]),
sigma_y=torch.tensor(incoming_parameters[7]),
sigma_yp=torch.tensor(incoming_parameters[8]),
sigma_s=torch.tensor(incoming_parameters[9]),
sigma_py=torch.tensor(incoming_parameters[8]),
sigma_tau=torch.tensor(incoming_parameters[9]),
sigma_p=torch.tensor(incoming_parameters[10]),
)

Expand All @@ -841,10 +842,10 @@ def reset_accelerator(self):
raise ValueError(
f'Invalid value "{self.misalignment_mode}" for misalignment_mode'
)
self.simulation.AREAMQZM1.misalignment = misalignments[0:2]
self.simulation.AREAMQZM2.misalignment = misalignments[2:4]
self.simulation.AREAMQZM3.misalignment = misalignments[4:6]
self.simulation.AREABSCR1.misalignment = misalignments[6:8]
self.simulation.AREAMQZM1.misalignment = torch.tensor(misalignments[0:2])
self.simulation.AREAMQZM2.misalignment = torch.tensor(misalignments[2:4])
self.simulation.AREAMQZM3.misalignment = torch.tensor(misalignments[4:6])
self.simulation.AREABSCR1.misalignment = torch.tensor(misalignments[6:8])

def update_accelerator(self):
self.simulation.track(self.incoming)
Expand All @@ -867,14 +868,14 @@ def get_incoming_parameters(self):
[
self.incoming.energy,
self.incoming.mu_x,
self.incoming.mu_xp,
self.incoming.mu_px,
self.incoming.mu_y,
self.incoming.mu_yp,
self.incoming.mu_py,
self.incoming.sigma_x,
self.incoming.sigma_xp,
self.incoming.sigma_px,
self.incoming.sigma_y,
self.incoming.sigma_yp,
self.incoming.sigma_s,
self.incoming.sigma_py,
self.incoming.sigma_tau,
self.incoming.sigma_p,
]
)
Expand Down