diff --git a/tools/lib/data.py b/tools/lib/data.py index cebabfcc..02089afd 100644 --- a/tools/lib/data.py +++ b/tools/lib/data.py @@ -1,7 +1,7 @@ from collections import OrderedDict from TexSoup import TexSoup from .LaTeX import newCommand -from .utils import getValFromCell,toFloat +from .utils import getValFromCell,checkFloat from TexSoup import TexNode from enum import IntEnum,auto,unique,IntFlag from .Format import Format @@ -139,8 +139,8 @@ class dataFileBase(object): mymethod=(method("TBE(FC)"),method("TBE")) finsts=dataFileBase.convertState(table[first:last+1,1],default=default,firstState=firstState,commands=commands) for index,row in enumerate(table[first:last+1,]): - oscilatorForces=toFloat(str(row[2])) - T1 = toFloat(str(row[3])) + oscilatorForces=checkFloat(str(row[2])) + T1 = checkFloat(str(row[3])) val,unsafe = getValFromCell(row[4]) corr,unsafecorr = getValFromCell(row[7]) finst=finsts[index] diff --git a/tools/lib/utils.py b/tools/lib/utils.py index c32aba50..724a738a 100644 --- a/tools/lib/utils.py +++ b/tools/lib/utils.py @@ -27,11 +27,12 @@ def getValFromCell(cell): if type(val) is TexNode and val.name=='emph': unsafe=True val=val.string - val=toFloat(str(val)) + val=checkFloat(str(val)) return (val,unsafe) -def toFloat(x): +def checkFloat(x): try: - return float(x) + float(x) + return x except ValueError: return None \ No newline at end of file