diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b16f5c7204cda41f0a8a81e70c4e7f23a6cec568..ac622c824eac1778349dc21d06d6e4bd55966bb8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,16 +5,16 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/ambv/black
- rev: 19.10b0
+ rev: 20.8b1
hooks:
- id: black
args: ['--line-length', '140']
- - repo: https://gitlab.com/pycqa/flake8
- rev: 3.8.2
+ - repo: https://gitlab.com/pycqa/flake8.git
+ rev: 3.8.4
hooks:
- id: flake8
args: ['--max-line-length=140', '--ignore=E203,E402']
- repo: https://github.com/pre-commit/mirrors-mypy
- rev: v0.770
+ rev: v0.790
hooks:
- id: mypy
diff --git a/TraceWinCondor/submit.py b/TraceWinCondor/submit.py
index f9afe1ac437ca44c8c77ffd5b595b92b7190c01e..b8848f95475e95ef2d5aabe531876a74684dfdf3 100644
--- a/TraceWinCondor/submit.py
+++ b/TraceWinCondor/submit.py
@@ -27,7 +27,8 @@ def setup_exec_folder():
for OpSys in ["LINUX", "OSX"]:
for Arch in ["INTEL", "X86_64"]:
shutil.copy(
- os.path.join(orig_path, "trace" + o[OpSys] + a[Arch]), os.path.join("TraceWin_exe", "tracewin.%s.%s" % (OpSys, Arch)),
+ os.path.join(orig_path, "trace" + o[OpSys] + a[Arch]),
+ os.path.join("TraceWin_exe", "tracewin.%s.%s" % (OpSys, Arch)),
)
diff --git a/ess/TraceWin.py b/ess/TraceWin.py
index c3ab57d670563fa8fe00349659c3fc841988a742..5b7e8302dea8e6f34e5c08691e4c1f4ce685c765 100644
--- a/ess/TraceWin.py
+++ b/ess/TraceWin.py
@@ -242,12 +242,20 @@ class dst:
hist, bin_edges = np.histogram(dx, bins=nb)
b = bin_edges[:-1] + 0.5 * (bin_edges[1] - bin_edges[0])
plt.plot(
- b, hist * 0.2 * (max(dy) - min(dy)) / max(hist) + min(dy), "k", lw=1.5, drawstyle="steps",
+ b,
+ hist * 0.2 * (max(dy) - min(dy)) / max(hist) + min(dy),
+ "k",
+ lw=1.5,
+ drawstyle="steps",
)
hist, bin_edges = np.histogram(dy, bins=nb)
b = bin_edges[:-1] + 0.0 * (bin_edges[1] - bin_edges[0])
plt.plot(
- hist * 0.2 * (max(dx) - min(dx)) / max(hist) + min(dx), b, "k", lw=1.5, drawstyle="steps",
+ hist * 0.2 * (max(dx) - min(dx)) / max(hist) + min(dx),
+ b,
+ "k",
+ lw=1.5,
+ drawstyle="steps",
)
else:
# plot a simple 1D histogram..
@@ -726,7 +734,15 @@ class density_file:
"""
Unused?
"""
- return dict(x=array[0], y=array[1], phase=array[2], energy=array[3], r=array[4], z=array[5], dpp=array[6],)
+ return dict(
+ x=array[0],
+ y=array[1],
+ phase=array[2],
+ energy=array[3],
+ r=array[4],
+ z=array[5],
+ dpp=array[6],
+ )
def _getFullContent(self):
@@ -1425,7 +1441,8 @@ class field_map:
print(self.z)
elif len(self.start) == 2:
self.z, self.x = numpy.mgrid[
- self.start[0] : self.end[0] : numindexes[0] * 1j, self.start[1] : self.end[1] : numindexes[1] * 1j,
+ self.start[0] : self.end[0] : numindexes[0] * 1j,
+ self.start[1] : self.end[1] : numindexes[1] * 1j,
]
elif len(self.start) == 3:
self.z, self.x, self.y = numpy.mgrid[
@@ -1466,7 +1483,8 @@ class field_map:
if len(self.start) == 2:
points = numpy.array([self.z.flatten(), self.x.flatten()]).transpose()
self.z, self.x = numpy.mgrid[
- self.start[0] : self.end[0] : npoints[0] * 1j, self.start[1] : self.end[1] : npoints[1] * 1j,
+ self.start[0] : self.end[0] : npoints[0] * 1j,
+ self.start[1] : self.end[1] : npoints[1] * 1j,
]
self.map = griddata(points, values, (self.z, self.x))
if len(self.start) == 3:
diff --git a/ess/__init__.py b/ess/__init__.py
index dc61eadf9edcd5e87e29222617e2a23a3aa2649a..91e715e34befc4027bd5a130e8f0353e73f10b53 100644
--- a/ess/__init__.py
+++ b/ess/__init__.py
@@ -23,7 +23,7 @@ __all__ = [
__name__ = "ess-python-tools"
try:
- __version__ = metadata.version(__name__)
+ __version__ = metadata.version(__name__) # type: ignore
except ModuleNotFoundError:
# package is not installed
pass
diff --git a/ess/fieldmap.py b/ess/fieldmap.py
index f9cd691475ee321bf08b072f2cf57288b432f2c7..155b20c36c724a60eb889438c0ef24b575dee763 100644
--- a/ess/fieldmap.py
+++ b/ess/fieldmap.py
@@ -235,7 +235,11 @@ def read_fieldmap(filepath: str, fieldmap_dim: int, file_type: str):
def cut_fieldmap_length(
- filepath: str, fieldmap_dim: int, entrance_rows_cut: int, exit_rows_cut: int, file_type: str,
+ filepath: str,
+ fieldmap_dim: int,
+ entrance_rows_cut: int,
+ exit_rows_cut: int,
+ file_type: str,
):
"""
parameters
@@ -557,7 +561,11 @@ def unify_grid_size(old_x: list, old_y: list, new_x: list, kind="linear", save_t
def batch_cut_fieldmap(
- fieldmaps_path: str, fieldmap_dim: int, entrance_rows_cut: int, exit_rows_cut: int, file_type: str,
+ fieldmaps_path: str,
+ fieldmap_dim: int,
+ entrance_rows_cut: int,
+ exit_rows_cut: int,
+ file_type: str,
):
"""
Saves a TraceWin readable ASCII file
@@ -706,5 +714,7 @@ def create_tw_fieldmap(
filename_wo_ext = os.path.splitext(tabular_file_name)[0]
for i in range(fieldmap_dim, fieldmap_dim + n_col):
save_to_ascii(
- Header, field_array[:, i], os.path.join(fieldmaps_path, filename_wo_ext + "." + extensions[i - fieldmap_dim]),
+ Header,
+ field_array[:, i],
+ os.path.join(fieldmaps_path, filename_wo_ext + "." + extensions[i - fieldmap_dim]),
)
diff --git a/ess/lib_tw.py b/ess/lib_tw.py
index 6030b5e219b614b4f734dd2cca2fa370280b3056..365f564debe45094073fc29fcbc10ae71804fab1 100644
--- a/ess/lib_tw.py
+++ b/ess/lib_tw.py
@@ -27,8 +27,7 @@ from . import lib_tw_elem
class LATTICE:
- """
- """
+ """"""
def __init__(self, file_name_lat, file_name_fmap=[], freq=352.21, gamma=1.0):
"""
@@ -230,7 +229,7 @@ class LATTICE:
def update_st(self, file_name):
"""
- Assign/update steerer values from "Steerer_Values.txt".
+ Assign/update steerer values from "Steerer_Values.txt".
"""
# Extract BLx and BLy from the file
with open(file_name, "r") as file:
@@ -262,11 +261,11 @@ class LATTICE:
def update_adj(self, file_name="Adjusted_Values.txt"):
"""
- Assign/update correction values from "Adjusted_Values.txt".
+ Assign/update correction values from "Adjusted_Values.txt".
- WARNING: many corner cases, what happens if multiple adjust
- commands have corrected same element for example?
- Use with care!
+ WARNING: many corner cases, what happens if multiple adjust
+ commands have corrected same element for example?
+ Use with care!
"""
with open(file_name, "r") as file:
# First we read in all corrections into dictionaries
@@ -394,10 +393,10 @@ class LATTICE:
class PROJECT:
"""
- - This is for running multiple simulations 1-by-1 under 1 project.
- - Maybe not very useful...
+ - This is for running multiple simulations 1-by-1 under 1 project.
+ - Maybe not very useful...
- 2015.10.15
+ 2015.10.15
"""
def __init__(self, file_name_proj="proj.ini"):
@@ -432,17 +431,17 @@ class PROJECT:
class PARTRAN:
"""
- Note:
+ Note:
- - The list not complete. Add parameters as needed.
+ - The list not complete. Add parameters as needed.
- History:
+ History:
- - 2016-02-17: Changed how to identify the line of indices.
- - 2016-02-17: Added a logic to avoid #/0 for LEBT.
- - 2020-08-28: Adopted to python3.
- - 2020-08-28: 99% emittance added.
- - 2020-08-28: alfz was wrong (in power of gamma) and fixed.
+ - 2016-02-17: Changed how to identify the line of indices.
+ - 2016-02-17: Added a logic to avoid #/0 for LEBT.
+ - 2020-08-28: Adopted to python3.
+ - 2020-08-28: 99% emittance added.
+ - 2020-08-28: alfz was wrong (in power of gamma) and fixed.
"""
@@ -609,12 +608,12 @@ class PARTRAN:
class DST:
"""
- Class for a TraceWin's .dst file.
+ Class for a TraceWin's .dst file.
- - TraceWin seems using beta and gamma for each particle
- so the conversion to (z,z') is based on this assumption.
+ - TraceWin seems using beta and gamma for each particle
+ so the conversion to (z,z') is based on this assumption.
- 2015.10.06
+ 2015.10.06
"""
def __init__(self, file_name, unit_x="cm", unit_px="rad", unit_z="rad", unit_pz="MeV"):
@@ -657,28 +656,28 @@ class DST:
class DENSITY:
"""
- - Note instances are not identical for Nrun=1 and Nrun>1.
- - Be careful with # of steps for an envelope file.
- - When Nrun>1, ave and rms in a file are sum and squared sum.
- - Double check before a production !!!!
- - Dim of arrays:
+ - Note instances are not identical for Nrun=1 and Nrun>1.
+ - Be careful with # of steps for an envelope file.
+ - When Nrun>1, ave and rms in a file are sum and squared sum.
+ - Double check before a production !!!!
+ - Dim of arrays:
- Nelem(Nidx): idx_elem, s, Nptcl, Ibeam
+ Nelem(Nidx): idx_elem, s, Nptcl, Ibeam
- 4 x Nelem(Nidx): apt # x, y, dx, dy
- 3 x Nelem(Nidx): accpt # phs+, phs-, ken
- 7 x Nelem(Nidx): cent_(..), sig, xmax, xmin # x, y, phs, ken, r, z, dpp
- 3 x Nelem(Nidx): eps # x, y, phs
+ 4 x Nelem(Nidx): apt # x, y, dx, dy
+ 3 x Nelem(Nidx): accpt # phs+, phs-, ken
+ 7 x Nelem(Nidx): cent_(..), sig, xmax, xmin # x, y, phs, ken, r, z, dpp
+ 3 x Nelem(Nidx): eps # x, y, phs
- Nrun x Nelem: loss
- Nelem : loss_num_(..), loss_pow_(..)
+ Nrun x Nelem: loss
+ Nelem : loss_num_(..), loss_pow_(..)
- Nelem x Nstep: den
+ Nelem x Nstep: den
- - History:
+ - History:
- * 2015.11.12: Baseline ver
- * 2016.03.29: Adapted to ver 9 (apt includes shifts)
+ * 2015.11.12: Baseline ver
+ * 2016.03.29: Adapted to ver 9 (apt includes shifts)
"""
def __init__(self, file_name):
@@ -938,13 +937,13 @@ class DENSITY:
def x2dst(x, mass, freq, Ibeam, path_file="part_dtl1_new.dst"):
"""
- Output a TraceWin's .dst file from x and etc.
+ Output a TraceWin's .dst file from x and etc.
- Input: x (Nptcl,6)
+ Input: x (Nptcl,6)
- For binary characters see https://docs.python.org/2/library/struct.html
+ For binary characters see https://docs.python.org/2/library/struct.html
- 2014.10.03
+ 2014.10.03
"""
fname = open(path_file, "w")
@@ -964,14 +963,14 @@ def x2dst(x, mass, freq, Ibeam, path_file="part_dtl1_new.dst"):
def plt2x(path_file):
"""
- Extract x and etc from a TraceWin's binary .plt file.
- The units are (cm,rad,cm,rad,rad,MeV,loss).
+ Extract x and etc from a TraceWin's binary .plt file.
+ The units are (cm,rad,cm,rad,rad,MeV,loss).
- Output: x (Nelem,Nptcl,7)
+ Output: x (Nelem,Nptcl,7)
- For binary characters see https://docs.python.org/2/library/struct.html
+ For binary characters see https://docs.python.org/2/library/struct.html
- 2014.10.06
+ 2014.10.06
"""
file = open(path_file, "r")
@@ -1010,13 +1009,13 @@ def plt2x(path_file):
def x2plt(x, mass, freq, Ibeam, i_unk, i_elem, s, phs, ken, path_file="dtl1_new.plt"):
"""
- Output a TraceWin's .plt file from x and etc.
+ Output a TraceWin's .plt file from x and etc.
- Input: x (Nelem,Nptcl,7)
+ Input: x (Nelem,Nptcl,7)
- For binary characters see https://docs.python.org/2/library/struct.html
+ For binary characters see https://docs.python.org/2/library/struct.html
- 2014.10.07
+ 2014.10.07
"""
fname = open(path_file, "w")
@@ -1046,12 +1045,12 @@ def x2plt(x, mass, freq, Ibeam, i_unk, i_elem, s, phs, ken, path_file="dtl1_new.
def x2twiss(x):
"""
- Calculate twiss from x. Note sig = sqrt(bet*eps).
+ Calculate twiss from x. Note sig = sqrt(bet*eps).
- Input : x (Nptcl,6)
- Output: eps,bet,alf,gam
+ Input : x (Nptcl,6)
+ Output: eps,bet,alf,gam
- 2015.07.30
+ 2015.07.30
"""
x = [x_i - numpy.mean(x_i) for x_i in numpy.array(x).transpose()]
@@ -1066,13 +1065,13 @@ def x2twiss(x):
def x2twiss_halo(x, sig_cut=(None, None, None)):
"""
- Calculate twiss of halo particles (r > sig_cut).
- Note halo particles are different for each plane.
+ Calculate twiss of halo particles (r > sig_cut).
+ Note halo particles are different for each plane.
- Input : x (Nptcl,6), sig_cut
- Output: eps,bet,alf,gam
+ Input : x (Nptcl,6), sig_cut
+ Output: eps,bet,alf,gam
- 2015.07.30
+ 2015.07.30
"""
eps, bet, alf, gam = x2twiss(x)
@@ -1093,10 +1092,10 @@ def x2twiss_halo(x, sig_cut=(None, None, None)):
def loss_elem2den(s, loss, file_name_dt="", dlt_dt=5e-6):
"""
- This function calculates loss density [W/m] from s and loss
- together with the file of the DTL's cell and DT lengths.
+ This function calculates loss density [W/m] from s and loss
+ together with the file of the DTL's cell and DT lengths.
- 2016.01.15
+ 2016.01.15
"""
# Define L
@@ -1240,11 +1239,11 @@ def loss_elem2den(s, loss, file_name_dt="", dlt_dt=5e-6):
def partran_end_all(file_name_in_all, file_name_out):
"""
- - Reads multiple partran1.out files and extracts the data at the end.
- - The same format as partran1.out allows to be used by PARTRAN class.
- - The elem # is replaced with the file #.
+ - Reads multiple partran1.out files and extracts the data at the end.
+ - The same format as partran1.out allows to be used by PARTRAN class.
+ - The elem # is replaced with the file #.
- 2015.11.25
+ 2015.11.25
"""
# Extract header from 1 file.
diff --git a/ess/lib_tw_elem.py b/ess/lib_tw_elem.py
index f5713754448fd1638cdd6fd85c69418533bf5f14..5a241c42043337dcd8469d90a4b6309a72066c49 100644
--- a/ess/lib_tw_elem.py
+++ b/ess/lib_tw_elem.py
@@ -109,7 +109,7 @@ def Brho(gamma):
class FIELD_MAP_DATA:
"""
- - Only 1D (Ez) supported for now.
+ - Only 1D (Ez) supported for now.
"""
def __init__(self, file_name):
@@ -135,8 +135,7 @@ class FIELD_MAP_DATA:
class ELEM:
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -188,7 +187,7 @@ class ELEM:
class COMM:
"""
- - Same inputs as ELEM class but some may not be needed ...
+ - Same inputs as ELEM class but some may not be needed ...
"""
def __init__(self, name, typ, para):
@@ -225,7 +224,7 @@ class COMM:
class FIELD_MAP(ELEM):
"""
- - Calculation of gamma only 1D (Ez) supported.
+ - Calculation of gamma only 1D (Ez) supported.
"""
def __init__(self, name, typ, para, dic_fmap):
@@ -344,8 +343,7 @@ class FIELD_MAP(ELEM):
class DRIFT(ELEM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -421,7 +419,7 @@ class DRIFT(ELEM):
class QUAD(ELEM):
"""
- - Tilt not supported.
+ - Tilt not supported.
"""
def __init__(self, name, typ, para):
@@ -515,8 +513,8 @@ class QUAD(ELEM):
class THIN_STEERING(ELEM):
"""
- - Only magnetic steerer supported.
- - Info of plane missing.
+ - Only magnetic steerer supported.
+ - Info of plane missing.
"""
def __init__(self, name, typ, para):
@@ -582,7 +580,7 @@ class THIN_STEERING(ELEM):
class GAP(ELEM):
"""
- - Note there are E0T0L (for TW) and E0TL (for other codes).
+ - Note there are E0T0L (for TW) and E0TL (for other codes).
"""
def __init__(self, name, typ, para):
@@ -681,7 +679,7 @@ class GAP(ELEM):
class DTL_CEL(ELEM):
"""
- - Note there are E0T0L (for TW) and E0TL (for other codes).
+ - Note there are E0T0L (for TW) and E0TL (for other codes).
"""
def __init__(self, name, typ, para):
@@ -876,10 +874,10 @@ class DTL_CEL(ELEM):
class BEND(ELEM):
"""
- - For MADX, keeping the sbend+edge structure.
- - For MADX, if don't export edge, append instances of EDGE.
- (Otherwise, the matrix is wrong in MADX.)
- - For MARS/Fluka, assuming the rbend.
+ - For MADX, keeping the sbend+edge structure.
+ - For MADX, if don't export edge, append instances of EDGE.
+ (Otherwise, the matrix is wrong in MADX.)
+ - For MARS/Fluka, assuming the rbend.
"""
def __init__(self, name, typ, para):
@@ -951,7 +949,7 @@ class BEND(ELEM):
class EDGE(ELEM):
"""
- - For MARS, assuming rbend and the export is commented out.
+ - For MARS, assuming rbend and the export is commented out.
"""
def __init__(self, name, typ, para):
@@ -993,7 +991,7 @@ class EDGE(ELEM):
class APERTURE(ELEM):
"""
- - For MADX, tried "collimator" but didn't work ...?
+ - For MADX, tried "collimator" but didn't work ...?
"""
def __init__(self, name, typ, para):
@@ -1049,8 +1047,7 @@ class APERTURE(ELEM):
class DIAG(ELEM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1087,8 +1084,7 @@ class DIAG(ELEM):
class DIAG_POSITION(DIAG):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1102,8 +1098,8 @@ class DIAG_POSITION(DIAG):
class STEERER(COMM):
"""
- - Only magnetic steerers supported.
- - Only the ESS type non-linearity supported.
+ - Only magnetic steerers supported.
+ - Only the ESS type non-linearity supported.
"""
def __init__(self, name, typ, para):
@@ -1141,8 +1137,7 @@ class STEERER(COMM):
class CHOPPER(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1174,8 +1169,7 @@ class CHOPPER(COMM):
class FREQ(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1191,8 +1185,7 @@ class FREQ(COMM):
class MARKER(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1226,8 +1219,7 @@ class MARKER(COMM):
class ADJUST(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1262,8 +1254,7 @@ class ADJUST(COMM):
class ERROR_BEAM(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1411,8 +1402,7 @@ class ERROR_BEAM(COMM):
class ERROR_BEAM_STAT(ERROR_BEAM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1420,8 +1410,7 @@ class ERROR_BEAM_STAT(ERROR_BEAM):
class ERROR_BEAM_DYN(ERROR_BEAM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1432,8 +1421,7 @@ class ERROR_BEAM_DYN(ERROR_BEAM):
class ERROR_QUAD(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1513,8 +1501,7 @@ class ERROR_QUAD(COMM):
class ERROR_QUAD_NCPL_STAT(ERROR_QUAD):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1522,8 +1509,7 @@ class ERROR_QUAD_NCPL_STAT(ERROR_QUAD):
class ERROR_QUAD_CPL_STAT(ERROR_QUAD):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1534,8 +1520,7 @@ class ERROR_QUAD_CPL_STAT(ERROR_QUAD):
class ERROR_CAV(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1595,8 +1580,7 @@ class ERROR_CAV(COMM):
class ERROR_CAV_NCPL_STAT(ERROR_CAV):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1604,8 +1588,7 @@ class ERROR_CAV_NCPL_STAT(ERROR_CAV):
class ERROR_CAV_CPL_STAT(ERROR_CAV):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1613,8 +1596,7 @@ class ERROR_CAV_CPL_STAT(ERROR_CAV):
class ERROR_CAV_NCPL_DYN(ERROR_CAV):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1622,8 +1604,7 @@ class ERROR_CAV_NCPL_DYN(ERROR_CAV):
class ERROR_CAV_CPL_DYN(ERROR_CAV):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1634,8 +1615,7 @@ class ERROR_CAV_CPL_DYN(ERROR_CAV):
class ERROR_FILE(COMM):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1656,8 +1636,7 @@ class ERROR_FILE(COMM):
class ERROR_STAT_FILE(ERROR_FILE):
- """
- """
+ """"""
def __init__(self, name, typ, para):
@@ -1665,8 +1644,7 @@ class ERROR_STAT_FILE(ERROR_FILE):
class ERROR_DYN_FILE(ERROR_FILE):
- """
- """
+ """"""
def __init__(self, name, typ, para):
diff --git a/examples/manipulate_lattice/manipulate_lattice.py b/examples/manipulate_lattice/manipulate_lattice.py
index 1aca4840877d595bbec7373dcb320330f00ed530..459ae77e95c3b5c2bb397f299cd270eab99ee659 100644
--- a/examples/manipulate_lattice/manipulate_lattice.py
+++ b/examples/manipulate_lattice/manipulate_lattice.py
@@ -159,7 +159,9 @@ for i in idx_st_y:
for i in set(idx_st_x + idx_st_y):
if lat.lst[i].max <= 0:
print(
- "Max B/BL not defined for elem #", str(lat.lst[i].idx_elem + 1), ". Exiting...",
+ "Max B/BL not defined for elem #",
+ str(lat.lst[i].idx_elem + 1),
+ ". Exiting...",
)
exit()
diff --git a/examples/ttf/ttf.py b/examples/ttf/ttf.py
index bf2455c32fd06b6ba90c12eab00028cd4211c10c..651a076c0b70b1599041cdf558341b7669db1cf1 100644
--- a/examples/ttf/ttf.py
+++ b/examples/ttf/ttf.py
@@ -8,7 +8,10 @@ dz = Header[1] / Header[0]
z_points = dz * z
print(
- "Int_E:", ttf.Field_integral(fz, dz), "[TTF, Phase_Max_Energy]: ", ttf.Field_TTF(fz, dz, 704.42, 700, 938, True),
+ "Int_E:",
+ ttf.Field_integral(fz, dz),
+ "[TTF, Phase_Max_Energy]: ",
+ ttf.Field_TTF(fz, dz, 704.42, 700, 938, True),
)
TTFb = ttf.TTF_beta(fz, dz, 704.42, 938)
diff --git a/scripts/ibsimu2tw b/scripts/ibsimu2tw
index c859834189980486160e3b862f41e5a6458eba15..1f9980255e35db6e63af3f014d4ffe0d97b44160 100755
--- a/scripts/ibsimu2tw
+++ b/scripts/ibsimu2tw
@@ -34,11 +34,21 @@ parser.add_argument("-i", "--inp", dest="infile", help="Input file", required=Tr
parser.add_argument("-o", "--out", dest="outfile", help="Output file", required=True)
parser.add_argument(
- "--h2", dest="h2", action="store_const", help="Include H2", const=True, default=False,
+ "--h2",
+ dest="h2",
+ action="store_const",
+ help="Include H2",
+ const=True,
+ default=False,
)
parser.add_argument(
- "--h3", dest="h3", action="store_const", help="Include H3", const=True, default=False,
+ "--h3",
+ dest="h3",
+ action="store_const",
+ help="Include H3",
+ const=True,
+ default=False,
)
parser.add_argument("-m", dest="mc2_H1", default=938.272, type=float, help="H1 mass [MeV/c2]")
@@ -70,9 +80,9 @@ if args.h3:
def save_dst(file_name, x6, Ibeam, mc2=938.272, freq=352.21):
"""
- - x6 dimensions can be either (Nptcl, 6) or (Nptcl*6)
- - Coordinates: ( x, x', y, y', phi, W)
- - Units : ( cm, rad, cm, rad, rad, MeV)
+ - x6 dimensions can be either (Nptcl, 6) or (Nptcl*6)
+ - Coordinates: ( x, x', y, y', phi, W)
+ - Units : ( cm, rad, cm, rad, rad, MeV)
"""
dst = TraceWin.dst(Ib=Ibeam, freq=freq, mass=mc2)
dst.append_many(x6)