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

Jump to bottom

Hl fixes #428

Merged
merged 6 commits into from
Sep 20, 2023
Merged

Hl fixes #428

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76a5a54
empty list for important phases
awegsche Sep 18, 2023
cb08c16
printing more decimal spaces for delta_k
awegsche Sep 20, 2023
9a629ee
Merge branch 'special_phase_advances_hl' into hl_fixes
awegsche Sep 20, 2023
01582c4
implement suggestions
awegsche Sep 20, 2023
daad240
.15e formatting
awegsche Sep 20, 2023
595c618
Merge branch 'master' into hl_fixes
JoschD Sep 20, 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
4 changes: 2 additions & 2 deletions omc3/correction/response_madx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ def _generate_madx_jobs(
break
var = variables[var_idx]
incr_dict[var] = delta_k
current_job += f"{var}={var}{delta_k:+f};\n"
current_job += f"{var} = {var}{delta_k:+.15f};\n"
current_job += f"twiss, file='{str(temp_dir / f'twiss.{var}')}';\n"
current_job += f"{var}={var}{-delta_k:+f};\n\n"
current_job += f"{var} = {var}{-delta_k:+.15f};\n\n"
JoschD marked this conversation as resolved.
Show resolved Hide resolved

if proc_idx == num_proc - 1:
current_job += f"twiss, file='{str(temp_dir / 'twiss.0')}';\n"
Expand Down
4 changes: 4 additions & 0 deletions omc3/model/accelerators/lhc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,10 @@ def get_exciter_bpm(self, plane: str, commonbpms: List[str]):
return None

def important_phase_advances(self) -> List[List[str]]:
if "hl" in self.year.lower():
# skip if HiLumi, TODO: insert phase advances when they are finalised
return []

if self.beam == 2:
return [["MKD.O5R6.B2", "TCTPH.4R1.B2"], ["MKD.O5R6.B2", "TCTPH.4R5.B2"]]
if self.beam == 1:
Expand Down
Loading