Skip to content

Commit 22f9d2a

Browse files
committed
Fix for python lattice generation
1 parent 806dfc8 commit 22f9d2a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

xtrack/_temp/python_lattice_writer/lattice_py_generation.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ def _elem_to_tokens(env, nn, formatter):
3636
if hasattr(ee, 'ksl'):
3737
fields += ['ksl']
3838

39-
if isinstance(ee, xt.RBend):
40-
assert 'length_straight' in fields
41-
fields = [ff for ff in fields if ff != 'length']
42-
4339
tt = env[nn].get_table()
4440
for kk in tt.name:
41+
if kk in fields:
42+
continue
4543
if tt['expr', kk] is not None and tt['expr', kk] != 'None':
4644
fields.append(kk)
4745

46+
if isinstance(ee, xt.RBend):
47+
assert 'length_straight' in fields
48+
fields = [ff for ff in fields if ff != 'length']
49+
4850
params = []
4951
for kk in fields:
5052
if kk == '__class__':

0 commit comments

Comments
 (0)