[med-svn] [SCM] aghermann branch, master, updated. 99b1d5a023eee9df74b0e0d6f894516fc79435ad

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 0e7ec80e3f9b68378a6b897ab715ff945ec54045
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Fri May 24 18:14:01 2013 +0300

    use user-defined band ranges in rk1968::score

diff --git a/src/aghermann/rk1968/rk1968.cc b/src/aghermann/rk1968/rk1968.cc
index 9e73fa7..19279af 100644
--- a/src/aghermann/rk1968/rk1968.cc
+++ b/src/aghermann/rk1968/rk1968.cc
@@ -15,6 +15,8 @@
 #include "libsigfile/page.hh"
 #include "libsigfile/source.hh"
 #include "aghermann/expdesign/recording.hh"
+#include "aghermann/expdesign/primaries.hh"
+#include "aghermann/metrics/bands.hh"
 
 #include "rk1968.hh"
 
@@ -34,8 +36,14 @@ score( agh::CSubject::SEpisode& E)
 		courses_delta,
 		courses_theta;
 	for ( auto &H : HH ) {
-		courses_delta.emplace_front( H->psd_profile.course( 2., 3.));
-		courses_theta.emplace_front( H->psd_profile.course( 5., 8.));
+		courses_delta.emplace_front(
+			H->psd_profile.course(
+				agh::CExpDesign::freq_bands[metrics::TBand::delta][0],
+				agh::CExpDesign::freq_bands[metrics::TBand::delta][1]));
+		courses_theta.emplace_front(
+			H->psd_profile.course(
+				agh::CExpDesign::freq_bands[metrics::TBand::theta][0],
+				agh::CExpDesign::freq_bands[metrics::TBand::theta][1]));
 	}
 
 	auto& firstsource = E.sources.front();

-- 
Sleep experiment manager