jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow bounds to be passed as args

Browse Source
This commit is contained in:
Jan Petykiewicz 2022-03-01 18:42:38 -08:00 committed by jan
parent 3f986957ac
commit 885b259fb7
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
masque/builder/devices.py
View File

@ -835,18 +835,32 @@ class Device(Copyable, Mirrorable):
self: D, self: D,
portspec: Union[str, Sequence[str]], portspec: Union[str, Sequence[str]],
ccw: Optional[bool], ccw: Optional[bool],
bound_type: str,
bound: Union[float, ArrayLike],
*, *,
spacing: Optional[Union[float, ArrayLike]] = None, spacing: Optional[Union[float, ArrayLike]] = None,
set_rotation: Optional[float] = None, set_rotation: Optional[float] = None,
tool_port_names: Sequence[str] = ('A', 'B'), tool_port_names: Sequence[str] = ('A', 'B'),
name: str = '_busL', name: str = '_busL',
**kwargs,
) -> D: ) -> D:
if self._dead: if self._dead:
logger.error('Skipping busL() since device is dead') logger.error('Skipping busL() since device is dead')
return self return self
bound_types = set()
if 'bound_type' in kwargs:
bound_types.add(kwargs['bound_type'])
bound = kwargs['bound']
for bt in ('emin', 'emax', 'pmin', 'pmax', 'min_past_furthest'):
if bt in kwargs:
bound_types.add(bt)
bound = kwargs[bt]
if not bound_types:
raise DeviceError('No bound type specified for busL')
elif len(bound_types) > 1:
raise DeviceError(f'Too many bound types specified for busL: {bound_types}')
bound_type = tuple(bound_types)[0]
if isinstance(portspec, str): if isinstance(portspec, str):
portspec = [portspec] portspec = [portspec]
ports = self[tuple(portspec)] ports = self[tuple(portspec)]