Skip to content

Commit b046ee2

Browse files
committed
Allow installing collimators when family=None (e.g. from json colldb).
1 parent 3aa5cf5 commit b046ee2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

xcoll/colldb.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,8 @@ def _create_collimator(self, cls, line, name, **kwargs):
551551
prop_dict.update(kwargs)
552552
el = cls(**prop_dict)
553553
el.emittance = [self.nemitt_x, self.nemitt_y]
554-
if 'family' in self[name] and self[name]['family'].lower() != 'unknown':
554+
if 'family' in self[name] and self[name]['family'] \
555+
and self[name]['family'].lower() != 'unknown':
555556
if self[name]['family'] == name:
556557
raise ValueError(f"Collimator {name} has the same name as its family!")
557558
el.family = self[name]['family']

0 commit comments

Comments
 (0)