From e922643b42a4591ab47eed8e80cc2e5a48d03dfb Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Thu, 24 Nov 2022 12:40:35 +0100
Subject: [PATCH] fix bug when calibrating float parameters
---
Ccs/ccs_function_lib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index 8b27fbc..8e728b7 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -1292,7 +1292,7 @@ def get_calibrated(pcf_name, rawval, properties=None, numerical=False, dbcon=Non
fetch = dbres.fetchall()
dbcon.close()
if len(fetch) == 0:
- return rawval if isinstance(rawval, int) else rawval[0]
+ return rawval if isinstance(rawval, (int, float)) else rawval[0]
ptc, pfc, categ, curtx = fetch[0]
@@ -1303,7 +1303,7 @@ def get_calibrated(pcf_name, rawval, properties=None, numerical=False, dbcon=Non
type_par = ptt(ptc, pfc)
except NotImplementedError:
try:
- return rawval if isinstance(rawval, int) else rawval[0]
+ return rawval if isinstance(rawval, (int, float)) else rawval[0]
except IndexError:
return rawval
@@ -1316,7 +1316,7 @@ def get_calibrated(pcf_name, rawval, properties=None, numerical=False, dbcon=Non
return rawval.hex().upper()
elif curtx is None:
try:
- return rawval if isinstance(rawval, int) else rawval[0]
+ return rawval if isinstance(rawval, (int, float)) else rawval[0]
except IndexError:
return rawval
elif curtx is not None and categ == 'N':
--
GitLab