Skip to content
Snippets Groups Projects
Commit a5cbd8c1 authored by Christian Beckmann's avatar Christian Beckmann
Browse files

steve\'s complaining again

parent 3f66ff1e
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,9 @@ using namespace std; ...@@ -57,6 +57,9 @@ using namespace std;
Option<bool> perfvn(string("--vn"),FALSE, Option<bool> perfvn(string("--vn"),FALSE,
string(" perform MELODIC variance-normalisation on data"), string(" perform MELODIC variance-normalisation on data"),
false, no_argument); false, no_argument);
Option<bool> perf_demean(string("--demean"),FALSE,
string(" switch on de-meaning of design and data"),
false, no_argument);
Option<int> help(string("-h,--help"), 0, Option<int> help(string("-h,--help"), 0,
string("display this help text"), string("display this help text"),
false,no_argument); false,no_argument);
...@@ -159,7 +162,8 @@ int setup(){ ...@@ -159,7 +162,8 @@ int setup(){
data = tmpdata.matrix(mask); data = tmpdata.matrix(mask);
voxels = data.Ncols(); voxels = data.Ncols();
data = remmean(data,1); if(perf_demean.value())
data = remmean(data,1);
if(perfvn.value()) if(perfvn.value())
vnscales = Melodic::varnorm(data); vnscales = Melodic::varnorm(data);
} }
...@@ -180,8 +184,10 @@ int setup(){ ...@@ -180,8 +184,10 @@ int setup(){
} }
meanR=mean(data,1); meanR=mean(data,1);
data = remmean(data,1); if(perf_demean.value()){
design = remmean(design,1); data = remmean(data,1);
design = remmean(design,1);
}
if(normdes.value()) if(normdes.value())
design = SP(design,ones(design.Nrows(),1)*pow(stdev(design,1),-1)); design = SP(design,ones(design.Nrows(),1)*pow(stdev(design,1),-1));
...@@ -252,6 +258,7 @@ int main(int argc,char *argv[]){ ...@@ -252,6 +258,7 @@ int main(int argc,char *argv[]){
options.add(dofset); options.add(dofset);
options.add(normdes); options.add(normdes);
options.add(perfvn); options.add(perfvn);
options.add(perf_demean);
options.add(help); options.add(help);
options.add(outcope); options.add(outcope);
options.add(outz); options.add(outz);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment