10
0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-26 14:23:42 +01:00

Merge branch 'master' into ADC

This commit is contained in:
Mickaël Véril 2020-08-13 11:01:25 +02:00
commit 434fca9dc9

View File

@ -112,13 +112,13 @@ class dataFileBase(object):
molsoup=TexSoup(self.molecule) molsoup=TexSoup(self.molecule)
molcomp=list(molsoup.contents)[0] molcomp=list(molsoup.contents)[0]
molfilename=self.molecule if isinstance(molcomp,str) else molcomp.args[0].value molfilename=self.molecule if isinstance(molcomp,str) else molcomp.args[0].value
molfilename=molfilename.lower().replace(" ","_") molfilename=molfilename.lower()
fileNameComp=[molfilename,self.method.name] fileNameComp=[molfilename,self.method.name]
if self.method.basis: if self.method.basis:
fileNameComp.append(self.method.basis) fileNameComp.append(self.method.basis)
if suffix: if suffix:
fileNameComp.append(suffix) fileNameComp.append(suffix)
fileName="_".join(fileNameComp)+".dat" fileName="_".join(fileNameComp).replace(" ","_")+".dat"
file=subpath/fileName file=subpath/fileName
if not file.exists(): if not file.exists():
with file.open("w") as f: with file.open("w") as f: