steve\'s complaining again

meldata.cc

@@ -250,7 +250,9 @@ namespace Melodic{
     	int order;
 
     	order = ppca_dim(remmean(alldat,2), RXweight, tmpPPCA, AdjEV, PercEV, Corr, pcaE, pcaD, Resels, opts.pca_est.value());	  
-
+		if (opts.paradigmfname.value().length()>0)
+			order += param.Ncols();
+			
 	  	if(opts.pca_dim.value() == 0){
       		opts.pca_dim.set_T(order);
 			PPCA=tmpPPCA;
@@ -381,9 +383,8 @@ namespace Melodic{
 		opts.pca_dim.set_T(std::max(opts.pca_dim.value(), param.Ncols()+3));		
 		if(opts.debug.value()){
 			outMsize("Paradigm",param); saveascii(param,"param");
-			outMsize("ParadigmS",paramS); saveascii(param,"paramS");
 		}
-		opts.guessfname.set_T(opts.paradigmfname.value());
+		//opts.guessfname.set_T(opts.paradigmfname.value());
 	}
 
 	//read in post-proc design matrices etc

meloptions.h

@@ -331,11 +331,11 @@ class MelodicOptions {
    debug(string("--debug"),  false,
 	   string("        switch on debug messages"), 
 	   false, no_argument),
-   guessfname(string("-g,--guess"), string(""),
-	   string("file name of guess of mixing matrix"), 
-	   false, requires_argument, false),
-   paradigmfname(string("-p,--paradigm"),  string(""),
-	   string("file name of FEAT paradigm file (design.mat)"), 
+   guessfname(string("--init_ica"), string(""),
+	   string("file name of FEAT paradigm file (design.mat) for ICA initialisation"), 
+	   false, requires_argument),
+   paradigmfname(string("--init_pca"),  string(""),
+	   string("file name of FEAT paradigm file (design.mat) for PCA initialisation"), 
 	   false, requires_argument, false),
    dummy(string("--dummy"),  0,
 	   string("number of dummy volumes"),