added --keep_meanvol and --keep_meantc

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 ...");

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);