From 8945717096f47e2c627592027279025fe4e85800 Mon Sep 17 00:00:00 2001
From: Christian Beckmann <c.beckmann@donders.ru.nl>
Date: Fri, 31 Oct 2008 22:56:19 +0000
Subject: [PATCH] added --keep_meanvol and --keep_meantc
---
meldata.cc | 20 +++++++++++++-------
meloptions.h | 9 +++++++--
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/meldata.cc b/meldata.cc
index e9beff5..86dba71 100644
--- a/meldata.cc
+++ b/meldata.cc
@@ -56,15 +56,21 @@ namespace Melodic{
message(" done" << endl);
}
else{
- message(string(" Removing mean image ..."));
- meanR = mean(tmpData);
- tmpData = remmean(tmpData);
- message(" done" << endl);
+ if(opts.remove_meanvol.value())
+ {
+ message(string(" Removing mean image ..."));
+ meanR = mean(tmpData);
+ tmpData = remmean(tmpData);
+ message(" done" << endl);
+ }
+ else meanR=ones(1,tmpData.Ncols());
}
- // meanC = mean(tmpData,2);
- // tmpData = remmean(tmpData,2);
-
+ if(opts.remove_meantc.value()){
+ meanC = mean(tmpData,2);
+ tmpData = remmean(tmpData,2);
+ }
+
//convert to power spectra
if(opts.pspec.value()){
message(" Converting data to powerspectra ...");
diff --git a/meloptions.h b/meloptions.h
index 1db4589..08ff421 100644
--- a/meloptions.h
+++ b/meloptions.h
@@ -119,7 +119,8 @@ class MelodicOptions {
Option<float> smooth_probmap;
Option<bool> remove_meanvol;
- Option<bool> remove_endslices;
+ Option<bool> remove_meantc;
+ Option<bool> remove_endslices;
Option<bool> rescale_nht;
Option<bool> guess_remderiv;
@@ -351,9 +352,12 @@ class MelodicOptions {
smooth_probmap(string("--smooth_pm"), 0.0,
string("width of smoothing kernel for probability maps"),
false, requires_argument, false),
- remove_meanvol(string("--keepmeanvol"), true,
+ remove_meanvol(string("--keep_meanvol"), true,
string("do not subtract mean volume"),
false, no_argument, false),
+ remove_meantc(string("--keep_meantc"), true,
+ string("do not remove mean time course"),
+ false, no_argument, false),
remove_endslices(string("--remEndslices"), false,
string("delete end slices (motion correction artefacts)"),
false, no_argument,false),
@@ -439,6 +443,7 @@ class MelodicOptions {
options.add(nlconst2);
options.add(smooth_probmap);
options.add(remove_meanvol);
+ options.add(remove_meantc);
options.add(remove_endslices);
options.add(rescale_nht);
options.add(guess_remderiv);
--
GitLab