[chronojump] encoder: fixed force calculation

[Xavier de Blas <xaviblas src gnome org>]

commit 24bc9506ee2278f471a435beca00291a98b995c8
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri May 18 20:27:03 2012 +0200

    encoder: fixed force calculation

 encoder/graph.R           |    8 ++++----
 encoder/pyserial_pyper.py |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 75cf486..c8a2198 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -99,8 +99,8 @@ kinematicsF <- function(a, mass, g) {
 	accel <- predict( speed, deriv=1 )
 	accel$y <- accel$y * 1000 #input data is in mm, conversion to m
 
-	force <- mass*accel$y
-	if(isJump)
+#	force <- mass*accel$y
+#	if(isJump)
 		force <- mass*(accel$y+g)	#g:9.81 (used when movement is against gravity)
 
 	power <- force*speed$y
@@ -241,8 +241,8 @@ paint <- function(rawdata, eccon, xmin, xmax, yrange, knRanges, superpose, highl
 	accel <- predict( speed, deriv=1 )
 	accel$y <- accel$y * 1000 #input data is in mm, conversion to m
 #print(c(knRanges$accely, max(accel$y), min(accel$y)))
-	force <- mass*accel$y
-	if(isJump)
+#	force <- mass*accel$y
+#	if(isJump)
 		force <- mass*(accel$y+g)	#g:9.81 (used when movement is against gravity)
 	if(draw) {
 		ylim=c(-max(abs(range(force))),max(abs(range(force))))	 #put 0 in the middle
diff --git a/encoder/pyserial_pyper.py b/encoder/pyserial_pyper.py
index 2ce3509..8f64b48 100644
--- a/encoder/pyserial_pyper.py
+++ b/encoder/pyserial_pyper.py
@@ -178,10 +178,10 @@ def calculate_all_in_r(temp, top_values, bottom_values, direction_now, smoothing
 		myR.run('range <- abs(a.cumsum[length(a)]-a.cumsum[1])')
 		myR.run('accel <- predict( speed, deriv=1 )')
 		myR.run('accel$y <- accel$y * 1000') #input data is in mm, conversion to m
-		if isJump == "True":
-			myR.run('force <- mass*(accel$y+9.81)')
-		else:
-			myR.run('force <- mass*accel$y')
+#		if isJump == "True":
+		myR.run('force <- mass*(accel$y+9.81)')
+#		else:
+#			myR.run('force <- mass*accel$y')
 		myR.run('power <- force*speed$y')
 		myR.run('meanPower <- mean(abs(power))')
 		myR.run('peakPower <- max(power)')