Skip to content

Commit 6c8e16e

Browse files
committed
loader_mad: adding kicker, collimator and elseparator elements
Addressing #27
1 parent 229b809 commit 6c8e16e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

pysixtrack/loader_mad.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ def iter_from_madx_sequence(
4141
"monitor",
4242
"hmonitor",
4343
"vmonitor",
44+
"collimator",
4445
"rcollimator",
46+
"elseparator",
4547
"instrument",
4648
"solenoid",
4749
"drift",
@@ -58,7 +60,7 @@ def iter_from_madx_sequence(
5860
knl=list(knl), ksl=list(ksl), hxl=knl[0], hyl=0, length=ee.lrad
5961
)
6062

61-
elif mad_etype == "tkicker":
63+
elif mad_etype == "tkicker" or mad_etype == "kicker":
6264
hkick = [-ee.hkick] if hasattr(ee, "hkick") else []
6365
vkick = [ee.vkick] if hasattr(ee, "vkick") else []
6466
newele = classes.Multipole(

0 commit comments

Comments
 (0)