Skip to content

Commit 0b187ae

Browse files
committed
update camera reference name
1 parent 01d97a2 commit 0b187ae

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

src/navigate/model/device_startup_functions.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,26 +1368,22 @@ def load_devices(configuration, is_synthetic=False, plugin_devices={}) -> dict:
13681368
camera = plugin_devices["camera"]["load_device"](
13691369
configuration, id, is_synthetic
13701370
)
1371+
else:
1372+
raise e
13711373

13721374
if (not is_synthetic) and device["type"].startswith("Hamamatsu"):
13731375
camera_serial_number = str(camera._serial_number)
1374-
device_ref_name = build_ref_name(
1375-
"_", device["type"], camera_serial_number
1376-
)
1376+
device_ref_name = camera_serial_number
13771377
# if the serial number has leading zeros,
13781378
# the yaml reader will convert it to an octal number
13791379
if camera_serial_number.startswith("0"):
13801380
try:
13811381
oct_num = int(camera_serial_number, 8)
1382-
devices["camera"][
1383-
build_ref_name("_", device["type"], oct_num)
1384-
] = camera
1382+
device_ref_name = str(oct_num)
13851383
except ValueError:
13861384
pass
13871385
else:
1388-
device_ref_name = build_ref_name(
1389-
"_", device["type"], device["serial_number"]
1390-
)
1386+
device_ref_name = str(device["serial_number"])
13911387
devices["camera"][device_ref_name] = camera
13921388

13931389
# load mirror

src/navigate/model/microscope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def __init__(
115115
return
116116

117117
device_ref_dict = {
118-
"camera": ["type", "serial_number"],
118+
"camera": ["serial_number"],
119119
"filter_wheel": ["type"],
120120
"zoom": ["type", "servo_id"],
121121
"shutter": ["type", "channel"],

0 commit comments

Comments
 (0)