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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit b9a4e3783ee98a83bcb5c5fedd2c9d2af95ef91f
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Mon Apr 29 19:16:07 2013 +0300

    update man and docs

diff --git a/doc/org/aghermann.org.in b/doc/org/aghermann.org.in
index 7a66bd2..3cf9ed9 100644
--- a/doc/org/aghermann.org.in
+++ b/doc/org/aghermann.org.in
@@ -31,12 +31,12 @@ long sleepers, early /vs/ late, etc.
 * Features
 ** Sleep experiment recording manager
 
-| Aghermann keeps the recordings in an organized fashion in a tree following an experimental design commonly used in sleep research i.e. groups of subjects sleeping several (timed) episoded per session with recordings from a number of channels. | [[file:img/measurements.png][img/measurements-t.png]]  |
-| Per-channel annotations, with an experiment-wide dialog for quickly jumping to so bookmarked episodes.                                                                                                                                             | [[file:img/annotations.png][img/annotations-t.png]]   |
+| Aghermann keeps the recordings in an organized fashion in a tree following an experimental design commonly used in sleep research, /i.e./ groups of subjects sleeping several (timed) episoded per session with recordings from a number of channels. | [[file:img/measurements.png][img/measurements-t.png]]  |
+| *Per-channel annotations*, as well as annotations *embedded in EDF+* files, with an experiment-wide dialog for quickly jumping to so bookmarked episodes.                                                                                          | [[file:img/annotations.png][img/annotations-t.png]]   |
 
 ** EDF signal viewing and scoring facility
 
-| Aghermann provides a capable facility for displaying EEG and accompanying recordings, such as EOG and EMG, saved in EDF (European Data Format) files.  These recordings can then be conveniently scored; scores can be imported/exported in plain ASCII. | [[file:img/sf.png][img/sf-t.png]]   |
+| Aghermann provides a capable facility for displaying EEG and accompanying recordings, such as EOG and EMG, saved in plain EDF or EDF+C (European Data Format) files. | [[file:img/sf.png][img/sf-t.png]]   |
 
 *** No (serious) scoring asistance
 
@@ -58,22 +58,22 @@ long sleepers, early /vs/ late, etc.
    *Artifact detection* comes as a side-effect in the computation of [[http://www.ncbi.nlm.nih.gov/pubmed/11008419][EEG
    Microcontinuity]], and may or may not meet your expectations.  Most
    parameters affecting artifact detection are exposed for your
-   tuning. Run with default settings, it tends to be a little too
+   tuning.  Run with default settings, it tends to be a little too
    eager at the task, though.
 
    You can detect *flat signal* portions, too.
 
-*** Filters
-
-   Butterworth Low-pass, high-pass and band-pass filters are
-   available as well as band-stop ("notch") filters at 50 and 60 Hz.
-
 *** Manual artifact marking
 
    EEG signals can be manually filtered for artifacts.  The PSD
    analysis is then performed on cleaner pages, greatly enhancing the
    resulting spectral power profile.
 
+*** Filters
+
+   Butterworth Low-pass, high-pass and band-pass filters are
+   available as well as band-stop ("notch") filters at 50 and 60 Hz.
+
 *** Independent Component Analysis
 
     | Independent Component Analysis using [[http://www.cs.helsinki.fi/u/ahyvarin/whatisica.shtml][FastICA]] routines from [[http://itpp.sourceforge.net/current/group__fastica.html][itpp]]. Reconstituted signals can be saved back to EDF source. |  [[file:img/ica.png][img/ica-t.png]] |
@@ -105,6 +105,10 @@ long sleepers, early /vs/ late, etc.
     determined as a shift of one signal's band-passed component against
     another such that the difference between them is minimal.
 
+*** Score import/export
+
+    Recordings can then be conveniently scored; scores can be imported/exported in plain ASCII.
+
 ** SWA profiles
 
    Three kinds of SWA profiles available for Achermann model simulations:
diff --git a/man/aghermann.1.in b/man/aghermann.1.in
index 14b4d3c..2bf2ca9 100644
--- a/man/aghermann.1.in
+++ b/man/aghermann.1.in
@@ -17,8 +17,9 @@ early vs late, etc.
 
 Also provided are general-purpose facilities for displaying EEG and
 accompanying recordings, such as EOG and EMG, saved in EDF (European
-Data Format) files.  These recordings can then be conveniently scored;
-scores can be imported/exported in plain ASCII.
+Data Format) files (plain EDF as well as EDF+C are supported).  These
+recordings can then be conveniently scored; scores can be
+imported/exported in plain ASCII.
 
 If run without arguments, your last session will be restored; an
 experiment located in \fIEXP_ROOT_DIR\fR will be selected otherwise.

-- 
Sleep experiment manager