Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions src/harvesters/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2887,12 +2887,14 @@ def __init__(self, *, profile=False, logger: Optional[Logger] = None,

super().__init__()

self._cti_files = []
self._producers = []
self._systems = []
self._ifaces = []
self._device_info_list = []
self._ias = []
self._cti_files: list[str] = []
self._producers: list[Producer] = []
self._systems: list[System] = []
self._i_info_id: list[str] = []
self._raw_ifaces: list = []
self._ifaces: list[Interface] = []
self._device_info_list: list[DeviceInfo] = []
self._ias: list[ImageAcquirer] = []
self._has_revised_device_list = False
self._clean_up = \
ParameterSet.get(ParameterKey.ENABLE_CLEANING_UP_INTERMEDIATE_FILES, True, config) if config else do_clean_up
Expand Down Expand Up @@ -3443,31 +3445,31 @@ def update(self) -> None:
the Harvester.create_image_acquire method.
"""
global _logger

self._release_acquires()
self._release_gentl_producers()


try:
self._open_gentl_producers()
self._open_systems()
for system_proxy in self._systems:
system_proxy.update_interface_info_list(self.timeout_for_update)

for i_info in system_proxy.interface_info_list:
raw_iface = i_info.create_interface()
try:
raw_iface.open()
if i_info.id_ not in self._i_info_id:
raw_iface = i_info.create_interface()
self._i_info_id.append(i_info.id_)
self._raw_ifaces.append(raw_iface)
raw_iface.open()
_logger.debug('opened: {0}'.format(_family_tree(raw_iface)))
iface_ = Interface(module=raw_iface, parent=system_proxy)
if iface_ not in self._ifaces:
self._ifaces.append(iface_)
except GenTL_GenericException as e:
_logger.error(e, exc_info=True)
else:
_logger.debug('opened: {0}'.format(_family_tree(raw_iface)))

iface_ = Interface(module=raw_iface, parent=system_proxy)
self._ifaces.append(iface_)

raw_iface.update_device_info_list(self.timeout_for_update)
for dev_info in raw_iface.device_info_list:
self.device_info_list.append(
_logger.error(e, exc_info=True)
self._device_info_list = []
for raw_iface, iface_ in zip(self._raw_ifaces, self._ifaces):
raw_iface.update_device_info_list(self.timeout_for_update)
for dev_info in raw_iface.device_info_list:
self.device_info_list.append(
DeviceInfo(module=dev_info, parent=iface_))

except GenTL_GenericException as e:
Expand Down