fixed meldata.cc

Makefile

@@ -24,17 +24,19 @@ FSL_MVLM_OBJS = melhlprfns.o fsl_mvlm.o
 
 FSL_REGFILT_OBJS = melhlprfns.o fsl_regfilt.o
 
+FSL_INSTACORR_OBJS = melhlprfns.o fsl_instacorr.o
+
 MELODIC_OBJS =  meloptions.o melhlprfns.o melgmix.o meldata.o melpca.o melica.o melreport.o melodic.o 
 
 TESTXFILES = test
 
-XFILES = fsl_glm fsl_sbca fsl_mvlm fsl_regfilt melodic
+XFILES = fsl_glm fsl_sbca fsl_mvlm fsl_regfilt fsl_instacorr melodic
 
 RUNTCLS = Melodic
 
 SCRIPTS = melodicreport
 
-all: ggmix fsl_regfilt fsl_glm melodic fsl_sbca fsl_mvlm
+all: ggmix fsl_regfilt fsl_glm melodic fsl_sbca fsl_mvlm fsl_instacorr
 
 ggmix: ${GGMIX_OBJS}
 	${AR} -r libggmix.a ${GGMIX_OBJS} 
@@ -51,6 +53,9 @@ fsl_glm: ${FSL_GLM_OBJS}
 fsl_sbca: ${FSL_SBCA_OBJS}
 		$(CXX) ${CXXFLAGS} ${LDFLAGS} -o $@ ${FSL_SBCA_OBJS} ${LIBS}
 
+fsl_instacorr: ${FSL_INSTACORR_OBJS}
+				$(CXX) ${CXXFLAGS} ${LDFLAGS} -o $@ ${FSL_INSTACORR_OBJS} ${LIBS}
+
 fsl_mvlm: ${FSL_MVLM_OBJS}
 		$(CXX) ${CXXFLAGS} ${LDFLAGS} -o $@ ${FSL_MVLM_OBJS} ${LIBS}
 

meldata.cc

@@ -210,7 +210,7 @@ namespace Melodic{
 		outMsize("tmp",tmp);
 		outMsize("tmpT",tmpT);
 		outMsize("tmpS",tmpS);
-		if(opts.approach.value()==string("tica")){		
+	//	if(opts.approach.value()==string("tica")){		
     		Tmodes.clear(); Smodes.clear();
     		for(int ctr = 1; ctr <= tmp.Ncols(); ctr++){
 				tmpT3 << reshape(tmp.Column(ctr),tmpT.Nrows(),numfiles);
@@ -227,7 +227,7 @@ namespace Melodic{
       			add_Tmodes(tmpT2);
       			add_Smodes(tmpS2);
     		}
-		}
+	//	}
 		
 	//add GLM OLS fit
 	if(Tdes.Storage()){
@@ -317,11 +317,11 @@ namespace Melodic{
     	RowVector AdjEV, PercEV;
     	Matrix Corr, tmpE;
     	int order;
-	cerr << "here1" << endl;
+		//	cerr << "here1" << endl;
     	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();
-		cerr << "here2" << endl;		
+		// cerr << "here2" << endl;		
 	  	if(opts.pca_dim.value() == 0){
       		opts.pca_dim.set_T(order);
 			PPCA=tmpPPCA;