From 1e7b76c745b880cef32793a43c938c8a458e2f57 Mon Sep 17 00:00:00 2001 From: Daniel Brown <ddb@star.sr.bham.ac.uk> Date: Tue, 4 Feb 2014 18:07:25 +0000 Subject: [PATCH] removing some higher SI suffixes as the Exa was making inputting exponents a pain --- pykat/SIfloat.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pykat/SIfloat.py b/pykat/SIfloat.py index 43fc323..4276cc4 100644 --- a/pykat/SIfloat.py +++ b/pykat/SIfloat.py @@ -9,7 +9,7 @@ def SIfloat(value): return convertToFloat(value) def convertToFloat(value): - __prefix = {'y': 'e-24', # yocto + __suffix = {'y': 'e-24', # yocto 'z': 'e-21', # zepto 'a': 'e-18', # atto 'f': 'e-15', # femto @@ -23,12 +23,12 @@ def convertToFloat(value): 'M': 'e6', # mega 'G': 'e9', # giga 'T': 'e12', # tera - 'P': 'e15', # peta - 'E': 'e18', # exa - 'Z': 'e21', # zetta - 'Y': 'e24', # yotta + 'P': 'e15' # peta } + value = str(value) - for i, j in __prefix.iteritems(): + + for i, j in __suffix.iteritems(): value=value.replace(i, str(j)) + return float(value) -- GitLab