Skip to content

Commit

Permalink
Moved 'excluded_devices' section below 'additional_devices' in happi.py.
Browse files Browse the repository at this point in the history
  • Loading branch information
janeliu-slac committed Jan 31, 2025
1 parent 940f57b commit d902fb2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions hutch_python/happi.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ def get_happi_objs(
logger.warning(f'{len(containers)} active devices found for '
'this beampath')

# Do not load excluded devices
for device in containers.copy():
if device.name in exclude_devices:
containers.remove(device)

# Load additional devices
for search_val in additional_devices.values():

Expand All @@ -157,6 +152,11 @@ def get_happi_objs(
containers.extend(
res.item for res in final_results if res.item not in containers)

# Do not load excluded devices
for device in containers.copy():
if device.name in exclude_devices:
containers.remove(device)

return _load_devices(*containers)


Expand Down

0 comments on commit d902fb2

Please sign in to comment.