Skip to content

Allow BLACS to use conversion classes defined outside labscript_utils #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philipstarkey merged 2 commits into from
Jun 25, 2020
Merged

Allow BLACS to use conversion classes defined outside labscript_utils #77

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ed2890
Allow BLACS to use conversion classes defined outside labscript_utils
chrisjbillington Jun 24, 2020
0a3df34
Fix error message formatting args being the wrong way around
chrisjbillington Jun 25, 2020
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
27 changes: 16 additions & 11 deletions blacs/output_classes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
from labscript_utils.qtwidgets.digitaloutput import DigitalOutput, InvertedDigitalOutput
from labscript_utils.qtwidgets.ddsoutput import DDSOutput
from labscript_utils.qtwidgets.imageoutput import ImageOutput
try:
from labscript_utils.unitconversions import *
except Exception:
print('failed to import unit conversion classes')
from labscript_utils.unitconversions import get_unit_conversion_class


class AO(object):
Expand Down Expand Up @@ -54,22 +51,30 @@ def __init__(self, hardware_name, connection_name, device_name, program_function
# Initialise Calibrations
self._comboboxmodel.appendRow(QStandardItem(self._base_unit))
if calib_class is not None:
if calib_class not in globals() or not isinstance(calib_params,dict) or globals()[calib_class].base_unit != default_units:
try:
cls = get_unit_conversion_class(calib_class)
# ImportError if module doesn't exist. Attribute error if it does but the
# class name does not exist within it. KeyError if the unit conversion class
# is an old-style unqualified class name expected to be in the globals()
# dict of the unitconversions module, but does not exist.
except (ImportError, AttributeError, KeyError):
cls = None
if cls is None or not isinstance(calib_params, dict) or cls.base_unit != default_units:
# log an error:
reason = ''
if calib_class not in globals():
reason = 'The unit conversion class was not imported. Is it in the correct folder? Is it imported when you call "from unitconversions import *" from a python terminal?'
elif not isinstance(calib_params,dict):
if calib_class is None:
reason = f'The unit conversion class {calib_class} could not be imported. Ensure it is available on the computer running BLACS.'
elif not isinstance(calib_params, dict):
reason = 'The parameters for the unit conversion class are not a dictionary. Check your connection table code for errors and recompile it'
elif globals()[calib_class].base_unit != default_units:
reason = 'The base unit of your unit conversion class does not match this hardware channel. The hardware channel has base units %s while your unit conversion class uses %s'%(globals()[calib_class].base_unit,default_units)
elif cls.base_unit != default_units:
reason = f'The base unit of your unit conversion class does not match this hardware channel. The hardware channel has base units {default_units} while your unit conversion class uses {cls.base_unit}'
self._logger.error('The unit conversion class (%s) could not be loaded. Reason: %s'%(calib_class,reason))
# Use default units
self._calibration = None
else:
try:
# initialise calibration class
self._calibration = globals()[calib_class](calib_params)
self._calibration = cls(calib_params)
self._logger.debug('unit conversion class instantiated')
for unit in self._calibration.derived_units:
try:
Expand Down