From 13ea1361c29d0150b4af6c4c7e0cea3a5431909d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= Date: Thu, 8 Oct 2020 18:41:13 +0200 Subject: [PATCH] self.Command is now uppercase --- tools/lib/formats/default/TBEHandler.py | 2 +- tools/lib/formats/default/columnHandler.py | 2 +- tools/lib/formats/default/doubleColumnHandler.py | 2 +- tools/lib/formats/default/doubleTBEHandler.py | 2 +- tools/lib/formats/default/exoticColumnHandler.py | 8 ++++---- tools/lib/formats/default/fromXLSToLaTeXHandler.py | 8 ++++---- tools/lib/formats/default/lineHandler.py | 2 +- tools/lib/formats/formatHandlerBase.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/lib/formats/default/TBEHandler.py b/tools/lib/formats/default/TBEHandler.py index 55ed2395..34b2d67a 100644 --- a/tools/lib/formats/default/TBEHandler.py +++ b/tools/lib/formats/default/TBEHandler.py @@ -12,7 +12,7 @@ class TBEHandler(formatHandlerBase): mymolecule=str(table[myrange[0],0]) initialState=self.TexOps.initialStates[mymolecule] mymethod=(method("TBE","aug-cc-pVTZ"),method("TBE(Full)","CBS")) - finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.commands) + finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.Commands) for index,row in enumerate(table[myrange,]): oscilatorForces=checkFloat(str(row[2])) T1 = checkFloat(str(row[3])) diff --git a/tools/lib/formats/default/columnHandler.py b/tools/lib/formats/default/columnHandler.py index cd220928..ea1ef50a 100644 --- a/tools/lib/formats/default/columnHandler.py +++ b/tools/lib/formats/default/columnHandler.py @@ -15,7 +15,7 @@ class columnHandler(formatHandlerBase): mymolecule=str(table[myrange[0],0]) initialState=self.TexOps.initialStates[mymolecule] mymethod=method(str(col[1]),str(col[0])) - finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.commands) + finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.Commands) for index,cell in enumerate(col[myrange]): if str(cell)!="": val,unsafe=getValFromCell(cell) diff --git a/tools/lib/formats/default/doubleColumnHandler.py b/tools/lib/formats/default/doubleColumnHandler.py index 96139a81..6a962cff 100644 --- a/tools/lib/formats/default/doubleColumnHandler.py +++ b/tools/lib/formats/default/doubleColumnHandler.py @@ -21,7 +21,7 @@ class doubleColumnHandler(formatHandlerBase): mytransdesc=mytrans[0:2,1] for i in range(2): - mathsoup=extractMath(mytransdesc[i],Soup=True,commands=self.commands) + mathsoup=extractMath(mytransdesc[i],Soup=True,commands=self.Commands) mytransdesc[i]=str(mathsoup) for colindex in range(3,np.size(table,1)): col=mytrans[:,colindex] diff --git a/tools/lib/formats/default/doubleTBEHandler.py b/tools/lib/formats/default/doubleTBEHandler.py index b6f89211..27196872 100644 --- a/tools/lib/formats/default/doubleTBEHandler.py +++ b/tools/lib/formats/default/doubleTBEHandler.py @@ -15,7 +15,7 @@ class doubleTBEHandler(formatHandlerBase): data.molecule=str(table[rangeMol[0],0]) data.method=method("TBE","CBS") for mytrans in table[rangeMol]: - mathsoup=extractMath(mytrans[1],Soup=True,commands=self.commands) + mathsoup=extractMath(mytrans[1],Soup=True,commands=self.Commands) mytransdesc=str(mathsoup) infin=mytransdesc.split(r"\rightarrow") for i,item in enumerate(infin): diff --git a/tools/lib/formats/default/exoticColumnHandler.py b/tools/lib/formats/default/exoticColumnHandler.py index 9b000878..5e30d86f 100644 --- a/tools/lib/formats/default/exoticColumnHandler.py +++ b/tools/lib/formats/default/exoticColumnHandler.py @@ -21,19 +21,19 @@ class exoticColumnHandler(formatHandlerBase): mymethcell=list(col[1]) if isinstance(mymethcell[0],TexNode) and mymethcell[0].name=="$": kindSoup=TexSoup("".join(list(mymethcell[0].expr.all))) - newCommand.runAll(kindSoup,self.commands) + newCommand.runAll(kindSoup,self.Commands) kind=str(kindSoup) methodnameSoup=TexSoup(mymethcell[1].value) - newCommand.runAll(methodnameSoup,self.commands) + newCommand.runAll(methodnameSoup,self.Commands) methodname=str(methodnameSoup) else: kind="" methtex=col[1] - newCommand.runAll(methtex,self.commands) + newCommand.runAll(methtex,self.Commands) methodname=str(methtex) mymethod=method(methodname,basis) methkey=json.dumps(mymethod.__dict__) - finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.commands) + finsts=dataFileBase.convertState(table[myrange,1],initialState,default=self.TexOps.defaultType,commands=self.Commands) for index,cell in enumerate(col[myrange]): if str(cell)!="": val,unsafe=getValFromCell(cell) diff --git a/tools/lib/formats/default/fromXLSToLaTeXHandler.py b/tools/lib/formats/default/fromXLSToLaTeXHandler.py index 2d6032e2..48db194e 100644 --- a/tools/lib/formats/default/fromXLSToLaTeXHandler.py +++ b/tools/lib/formats/default/fromXLSToLaTeXHandler.py @@ -62,20 +62,20 @@ class fromXLSToLaTeXHandler(formatHandlerBase): continue if isinstance(mymethcell[0],TexNode) and mymethcell[0].name=="$": kindSoup=TexSoup("".join(list(mymethcell[0].expr.all))) - newCommand.runAll(kindSoup,self.commands) + newCommand.runAll(kindSoup,self.Commands) kind=str(kindSoup) methodnameSoup=TexSoup(mymethcell[1].value) - newCommand.runAll(methodnameSoup,self.commands) + newCommand.runAll(methodnameSoup,self.Commands) methodname=str(methodnameSoup) else: kind="" methtex=col[0] - newCommand.runAll(methtex,self.commands) + newCommand.runAll(methtex,self.Commands) methodname=str(methtex) mymethod=method(methodname,basis) methkey=json.dumps(mymethod.__dict__) mathstates=[GetFullState(table[i,4],VR=str(table[i,6]),typeAcronym=str(table[i,7]),Soup=True) for i in myrange] - finsts=dataFileBase.convertState(mathstates,initialState,default=self.TexOps.defaultType,commands=self.commands) + finsts=dataFileBase.convertState(mathstates,initialState,default=self.TexOps.defaultType,commands=self.Commands) for index,cell in enumerate(col[myrange]): if str(cell)!="": val=str(cell) diff --git a/tools/lib/formats/default/lineHandler.py b/tools/lib/formats/default/lineHandler.py index 8b2150a7..1e33a263 100644 --- a/tools/lib/formats/default/lineHandler.py +++ b/tools/lib/formats/default/lineHandler.py @@ -12,7 +12,7 @@ class lineHandler(formatHandlerBase): mymolecule=str(col[0]) mymethod=method(str(col[2]),str(col[1])) initialState=self.TexOps.initialStates[mymolecule] - finsts=dataFileBase.convertState(table[3:,0],initialState,default=self.TexOps.defaultType,commands=self.commands) + finsts=dataFileBase.convertState(table[3:,0],initialState,default=self.TexOps.defaultType,commands=self.Commands) datacls=dict() for index,cell in enumerate(col[3:]): if str(cell)!="": diff --git a/tools/lib/formats/formatHandlerBase.py b/tools/lib/formats/formatHandlerBase.py index dbbf5407..ec0ae01e 100644 --- a/tools/lib/formats/formatHandlerBase.py +++ b/tools/lib/formats/formatHandlerBase.py @@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod class formatHandlerBase(object, metaclass=ABCMeta): def __init__(self,TexOps, commands=[]): self.TexOps=TexOps - self.commands=commands + self.Commands=commands @abstractmethod def readFromTable(self,table): raise NotImplementedError() \ No newline at end of file