sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

better selecting

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-21 15:32:07 +02:00
parent 82d1418bcb
commit 146d070cfd
3 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/interactiveplots.py
View File

@@ -2882,7 +2882,7 @@ def interactive_agegroupcpchart(age,normalized=False):
def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
title=''):
title='',type='water'):
powerdf = powerdf[~(powerdf == 0).any(axis=1)]
# plot tools
if (promember==1):
@@ -2910,8 +2910,12 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
p1,fitt,fitpower,ratio = datautils.cpfit(powerdf)
if cpfit == 'automatic' and r is not None:
p1 = [r.p0,r.p1,r.p2,r.p3]
ratio = r.cpratio
if type == 'water':
p1 = [r.p0,r.p1,r.p2,r.p3]
ratio = r.cpratio
else:
p1 = [r.ep0,r.ep1,r.ep2,r.ep3]
ratio = r.ecpratio
fitfunc = lambda pars,x: abs(pars[0])/(1+(x/abs(pars[2]))) + abs(pars[1])/(1+(x/abs(pars[3])))
fitpower = fitfunc(p1,fitt)