esbo_ds/ESBO-ETC
esbo_ds/ESBO-ETC
11
0
Fork 1
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Apply unit as default during check

Browse Source
This commit is contained in:
Lukas Klass 2020-05-26 22:10:41 +02:00
parent 628f69845a
commit 283517060a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esbo_etc/classes/Entry.py
View File

@ -51,7 +51,7 @@ class Entry(object):
if hasattr(self, "val") and type(self.val) == str and self.val.lower() in ["false", "true"]:
self.val = (self.val.lower() == "true")
def check_quantity(self, name: str, unit: u.Unit) -> Union[None, str]:
def check_quantity(self, name: str, unit: u.Unit, use_default: bool = True) -> Union[None, str]:
"""
Check a parameter as type quantity
@ -71,9 +71,9 @@ class Entry(object):
return "Parameter '" + name + "' not found."
attr = getattr(self, name)
if type(attr) != u.Quantity:
if unit == u.dimensionless_unscaled:
if unit == u.dimensionless_unscaled or use_default:
try:
self.__setattr__(name, float(attr) * u.dimensionless_unscaled)
self.__setattr__(name, float(attr) * unit)
except ValueError:
return "Expected parameter '" + name + "' with unit '" + unit.to_string() + \
"' but got no unit and cannot convert '" + attr + "' to a numeric value."