Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2016-12-08 21:50:49 +01:00
parent 7817de6f3d
commit 2bff507c2d
4 changed files with 40 additions and 6 deletions

View File

@@ -118,7 +118,10 @@ def rdata(file,rower=rrower()):
try:
res = rrdata(file,rower=rower)
except IOError:
res = 0
try:
res = rrdata(file+'.gz',rower=rower)
except IOError:
res = 0
return res
@@ -280,7 +283,18 @@ def smalldataprep(therows,xparam,yparam1,yparam2):
)
df = pd.concat([df,rowdata],ignore_index=True)
except IOError:
pass
try:
rowdata = dataprep(rrdata(f1+'.gz').df)
rowdata = pd.DataFrame({xparam: rowdata[xparam],
yparam1: rowdata[yparam1],
yparam2: rowdata[yparam2],
'distance': rowdata['distance'],
'spm': rowdata['spm'],
}
)
df = pd.concat([df,rowdata],ignore_index=True)
except IOError:
pass
return df