[med-svn] [SCM] aghermann branch, master, updated. 17c5ded0cb1e251d8640a94750eb700b2e062b2a

[Andrei Zavada]

The following commit has been merged in the master branch:
commit cf1f536fd634c405c4db08a8ff51f5f1c319244b
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Feb 11 23:30:12 2013 +0200

    calculate SWU over time

diff --git a/src/metrics/swu.cc b/src/metrics/swu.cc
index 45958c6..03147f3 100644
--- a/src/metrics/swu.cc
+++ b/src/metrics/swu.cc
@@ -48,10 +48,10 @@ reset()
 metrics::swu::CProfile::
 CProfile (const sigfile::CSource& F, int sig_no,
 	  const SPPack &params)
-	: metrics::CProfile (F, sig_no,
-			     params.pagesize,
-			     params.compute_n_bins(F.samplerate(sig_no))),
-	  Pp (params)
+      : metrics::CProfile (F, sig_no,
+			   params.pagesize,
+			   params.compute_n_bins(F.samplerate(sig_no))),
+	Pp (params)
 {
 	Pp.check();
 }
@@ -123,7 +123,7 @@ go_compute()
 				Q += q;
 		}
 		nmth_bin(p, 0) =
-			Q;
+			Q / Pp.pagesize;
 	}
 
 	return 0;

-- 
Sleep experiment manager