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

Merge tag 'v7.19' into develop

Browse Source 
bug fix
This commit is contained in:
Sander Roosendaal
2018-07-07 21:02:17 +02:00
parent 27023dee39 da08501f4d
commit f444d2d4cf
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/tasks.py
View File

@@ -611,9 +611,12 @@ def handle_calctrimp(id,
v4mean = wavg(df,'v4','deltat') v4mean = wavg(df,'v4','deltat')
normv = v4mean**(1./pp) normv = v4mean**(1./pp)
df['w4'] = df['driveenergy']**(pp) try:
w4mean = wavg(df,'w4','deltat') df['w4'] = df['driveenergy']**(pp)
normw = w4mean**(1./pp) w4mean = wavg(df,'w4','deltat')
normw = w4mean**(1./pp)
except KeyError:
normw = 0
if np.isnan(normv): if np.isnan(normv):