Skip to content

Commit

Permalink
Version 0.12.0 (#50)
Browse files Browse the repository at this point in the history
make_footprint_table now returns a TfsDataFrame, in which headers contain relevant information for later on plotting
The index of the dataframe is also reset to be a default integer range instead of the start of machine element name all over

added two approaches to get plottable footprint

updated make_lhc_beams energy and npart for runIII values, add sige too (taken from S Fartoukh's runIII example script)
  • Loading branch information
fsoubelet committed Aug 10, 2021
1 parent a60c47b commit e6e5ef5
Show file tree
Hide file tree
Showing 21 changed files with 413 additions and 64 deletions.
88 changes: 40 additions & 48 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions pyhdtoolkit/cpymadtools/special.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# ----- Setup Utlites ----- #


def make_lhc_beams(madx: Madx, energy: float = 6500, emittance: float = 3.75e-6, **kwargs) -> None:
def make_lhc_beams(madx: Madx, energy: float = 7000, emittance: float = 3.75e-6, **kwargs) -> None:
"""
Define beams with default configuratons for `LHCB1` and `LHCB2` sequences.
Expand All @@ -43,9 +43,10 @@ def make_lhc_beams(madx: Madx, energy: float = 6500, emittance: float = 3.75e-6,
particle="proton",
bv=1 if beam == 1 else -1,
energy=energy,
npart=1.0e10,
npart=1.15e11,
ex=geometric_emit,
ey=geometric_emit,
sige=4.5e-4,
**kwargs,
)

Expand Down
Loading

0 comments on commit e6e5ef5

Please sign in to comment.