reverting one commit,

rowers/dataprep.py

@@ -1621,27 +1621,31 @@ def get_existing_job(w):
 def workout_trimp(w, reset=False):
     r = w.user
 
-    if w.trimp is None:
+    # below is temporary
-        if get_existing_job(w):
+    if w.trimp > -1 and not reset:
-            return 0, 0
+         return w.trimp, w.hrtss
-    elif w.averagehr is None:
+
-        if get_existing_job(w):
+#    if w.trimp is None:
-            return w.trimp, 0
+#        if get_existing_job(w):
-    elif w.trimp <= 0 and w.averagehr > 0:
+#            return 0, 0
-        ftp = float(r.ftp)
+#    elif w.averagehr is None:
-        _ = myqueue(
+#        if get_existing_job(w):
-            queuehigh,
+#            return w.trimp, 0
-            handle_calctrimp,
+#    elif w.trimp <= 0 and w.averagehr > 0:
-            w.id,
+#        ftp = float(r.ftp)
-            w.csvfilename,
+#        _ = myqueue(
-            ftp,
+#            queuehigh,
-            r.sex,
+#            handle_calctrimp,
-            r.hrftp,
+#            w.id,
-            r.max,
+#            w.csvfilename,
-            r.rest)
+#            ftp,
-        return w.trimp, w.hrtss
+#            r.sex,
-    elif w.trimp > -1 and not reset:
+#            r.hrftp,
-        return w.trimp, w.hrtss
+#            r.max,
+#            r.rest)
+#        return w.trimp, w.hrtss
+#    elif w.trimp > -1 and not reset:
+#        return w.trimp, w.hrtss
 
     if get_existing_job(w):
         return 0, 0

rowers/utils.py

@@ -365,6 +365,8 @@ def myqueue(queue, function, *args, **kwargs):
         kwargs['jobkey'] = job_id
         kwargs['timeout'] = 3600
 
+        dologging('queue.log',function.__name__)
+
         job = queue.enqueue(function, *args, **kwargs)
 
     return job  # pragma: no cover