PTEROSOR/QUESTDB_website
10
0
Fork 0
mirror of https://github.com/LCPQ/QUESTDB_website.git synced 2024-12-24 13:23:40 +01:00
Code Releases Activity

Remove kwargs to use explicit optional arguments

Browse Source
This commit is contained in:
Mickaël Véril 2020-04-21 17:43:25 +02:00
parent 8224f76d4e
commit 617e50dc03
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/lib/data.py
View File

@ -224,7 +224,7 @@ class dataFileBase(object):
vs=[val,corr]
uns=[unsafe,unsafecorr]
for i in range(2):
datamtbe[i].excitations.append(excitationValue(firstState,finst[0],vs[i],type=finst[2],T1=T1,forces=oscilatorForces,isUnsafe=uns[i]))
datamtbe[i].excitations.append(excitationValue(firstState,finst[0],vs[i],type=finst[2],T1=T1,oscilatorForces=oscilatorForces,isUnsafe=uns[i]))
for value in datacls.values():
for dat in value:
datalist.append(dat)
@ -359,19 +359,15 @@ class FluoDataFile(oneStateDataFileBase):
class excitationBase:
def __init__(self,initial, final, **kwargs):
def __init__(self,initial, final,type=None, T1=None,isUnsafe=False):
self.initial = initial
self.final = final
self.type = kwargs["type"] if "type" in kwargs else None
self.T1 = kwargs["T1"] if "T1" in kwargs else None
self.isUnsafe = kwargs["isUnsafe"] if "isUnsafe" in kwargs else False
self.type = type
self.T1 = T1
self.isUnsafe = isUnsafe
class excitationValue(excitationBase):
def __init__(self,initial, final, value,**kwarg):
supkwarg=kwarg.copy()
for item in ["forces","corrected"]:
if item in supkwarg:
supkwarg.pop(item)
super(excitationValue,self).__init__(initial, final,**supkwarg)
def __init__(self,initial, final, value, type=None, T1=None,isUnsafe=False,oscilatorForces=None):
super(excitationValue,self).__init__(initial, final,type=type,T1=T1,isUnsafe=False)
self.value = value
self.oscilatorForces=kwarg["forces"] if "forces" in kwarg else None
self.oscilatorForces = oscilatorForces