v1.29.5 (822f3734) · Commits · github_fork / Homer3

DataTree/SubjClass.m

+10 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,16 @@ classdef SubjClass < TreeNodeClass
		obj.outputVars.nTrialsRuns{r.iRun} = r.procStream.output.GetVar('nTrials');
		obj.outputVars.stimRuns{r.iRun} = r.GetVar('stim');

		% a) Find all variables needed by proc stream
		args = obj.procStream.GetInputArgs();

		% b) Find these variables in this run
		for ii = 1:length(args)
		if ~eval( sprintf('isproperty(obj.outputVars, ''%s'')', args{ii}) )
		eval( sprintf('obj.outputVars.%s = obj.GetVar(args{ii});', args{ii}) );
		end
		end

		% Free run memory
		r.FreeMemory()
		end

FuncRegistry/UserFunctions/tcca_glm/hmrR_tCCA.m

+5 −2

Original line number	Diff line number	Diff line
		@@ -146,8 +146,11 @@ if flagtCCA
		end
		lstSS = lst(find(rhoSD<=rhoSD_ssThresh & MeasListAct(lst)==1)); %#ok<*FNDSB>
		lstLS = lst(find(rhoSD>rhoSD_ssThresh & MeasListAct(lst)==1));
		if length(lstSS) == 0
		errordlg('No short separation channels fall within rhoSD_ssThresh!');

		% Changed from "if ss_ch_inx ~= 0" which generated an error sometimes to the following
		% JD - Jan 15, 2020
		if all(ss_ch_inx > 0)
		lstSS = lstSS(ss_ch_on);
		end

FuncRegistry/UserFunctions/tcca_glm/hmrS_tCCA.m

0 → 100644

+43 −0

Original line number	Diff line number	Diff line
		% SYNTAX:
		% status = hmrS_tCCA(subjIdx, subjName)
		%
		% UI NAME:
		% hmrS_tCCA
		%
		% DESCRIPTION:
		%
		% INPUT:
		% subjName - the name of the subject in a group
		%
		% OUTPUTS:
		% status - error status
		%
		% USAGE OPTIONS:
		% tCCA_filter: status = hmrS_tCCA(iSubj, name)
		%
		function status = hmrS_tCCA(subjIdx, subjName)

		status = 0;

		filenamePrefixNum = sprintf('tCCAfilter_%d', subjIdx);
		filenamePrefixName = sprintf('tCCAfilter_%s', subjName);

		files = dir(['./', filenamePrefixNum, '*']);
		try
		for ii = 1:length(files)
		if files(ii).isdir
		continue
		end
		k = findstr(filenamePrefixNum, files(ii).name);
		suffix = files(ii).name(k+length(filenamePrefixNum):end);
		if ~exist(subjName, 'dir')
		movefile(files(ii).name, [filenamePrefixName, suffix]);
		continue;
		end
		movefile(files(ii).name, [subjName, '/', filenamePrefixName, suffix]);
		end
		catch
		status = -1;
		end

FuncRegistry/UserFunctions/tcca_glm/processOpt_tcca.cfg

+6 −4

Original line number	Diff line number	Diff line
		% Homer3 (v1.25)
		% Homer3 (v1.25.6)

		% group
		@ hmrG_SubjAvg [dcAvg,nTrials] (dcAvgSubjs,nTrialsSubjs
		@@ -8,14 +8,16 @@
		% subj
		@ hmrS_RunAvg [dcAvg,nTrials] (dcAvgRuns,mlActRuns,nTrialsRuns
		@ hmrS_RunAvgStd2 dcAvgStd (dcAvgRuns,dcSum2Runs,mlActRuns,nTrialsRuns
		@ hmrS_tCCA status (iSubj,name


		% run
		@ hmrR_Intensity2OD dod (data
		@ hmrR_BandpassFilt dod (dod hpf %0.3f 0 lpf %0.3f 0.5
		@ hmrR_BandpassFilt aux (aux hpf %0.3f 0 lpf %0.3f 0.5
		@ hmrR_OD2Conc_new dc (dod,probe ppf %0.1f_%0.1f 1_1
		@ hmrR_tCCA [Aaux,rcMap] (dc,aux,probe,iRun,iSubj flagtCCA %d 1 tCCAparams %d_%0.2f_%0.1f 3_0.08_0.3 tCCAaux_inx %d_%d_%d_%d_%d_%d_%d_%d 1_2_3_4_5_6_7_8 rhoSD_ssThresh %0.1f 15 ss_ch_inx %d_%d_%d_%d_%d_%d 1_2_3_4_5 runIdxResting %d 1 tResting %d_%d 30_210
		@ hmrR_GLM [dcAvg,dcAvgStd,nTrials,dcNew,dcResid,dcSum2,beta,R] (dc,stim,probe,mlActAuto,Aaux,tIncAuto,rcMap trange %0.1f_%0.1f -2_20 glmSolveMethod %d 1 idxBasis %d 2 paramsBasis %0.1f_%0.1f_%0.1f_%0.1f_%0.1f_%0.1f 0.1_3_10_1.8_3_10 rhoSD_ssThresh %0.1f 15 flagNuisanceRMethod %d 1 driftOrder %d 3 flagMotionCorrect %d 0
		@ hmrR_OD2Conc dc (dod,probe ppf %0.1f_%0.1f_%0.1f 1_1_1
		@ hmrR_tCCA [Aaux,rcMap] (dc,aux,probe,iRun,iSubj flagtCCA %d 1 tCCAparams %d_%0.2f_%0.1f 3_0.08_5.0 tCCAaux_inx %d_%d_%d_%d_%d_%d_%d_%d 0_0_0_0_0_0_0_0 rhoSD_ssThresh %0.1f 15 ss_ch_inx %d_%d_%d_%d_%d_%d 1_2_3_4_5 runIdxResting %d 1 tResting %d_%d 30_210
		@ hmrR_GLM [dcAvg,dcAvgStd,nTrials,dcNew,dcResid,dcSum2,beta,R] (dc,stim,probe,mlActAuto,Aaux,tIncAuto,rcMap trange %0.1f_%0.1f -2.0_20.0 glmSolveMethod %d 1 idxBasis %d 2 paramsBasis %0.1f_%0.1f_%0.1f_%0.1f_%0.1f_%0.1f 0.1_3.0_10.0_1.8_3.0_10.0 rhoSD_ssThresh %0.1f 15.0 flagNuisanceRMethod %d 1 driftOrder %d 3

Utils/getVernum.m

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@ function vrnnum = getVernum()

		vrnnum{1} = '1'; % Major version #
		vrnnum{2} = '29'; % Major sub-version #
		vrnnum{3} = '4'; % Minor version #
		vrnnum{3} = '5'; % Minor version #
		vrnnum{4} = '0'; % Minor sub-version # or patch #: 'p1', 'p2', etc

Admin message