Commit 1df089d0 authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.25.1 

-- Fix loss of error stack when error is caught in running proc stream calculation in MainGUI pushbuttonCalcProcStream_Callback(), instead it silently exits. We need to rethrow error to get the call stack to know where error occurred.
-- Update processOpt_tcca.cfg to match current default tcca processing stream
parent 54ad7ee8

MainGUI/MainGUI.m

+4 −3
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ t = tic; 
% also call DisplayData

try

    maingui.dataTree.CalcCurrElem();

catch

catch ME

    MainGUI_EnableDisableGUI(handles,'on');

    return

	rethrow(ME)



end

      

% Restore original selection listboxGroupTree

UnitTests/Example6_GrpTap/processOpt_tcca.cfg

+5 −4
Original line number Diff line number Diff line 
% Homer3 (v1.19.3)

% Homer3 (v1.25)



% group

@ hmrG_SubjAvg [dcAvg,nTrials] (dcAvgSubjs,nTrialsSubjs
@@ -12,9 +12,10 @@ 


% run

@ hmrR_Intensity2OD dod (data

@ hmrR_BandpassFilt dod (dod hpf %0.3f 0.01 lpf %0.3f 0.5

@ 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 flagtCCA %d 1 flagICRegressors %d 0 tCCAparams %d_%d_%0.1f 3_2_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 runIdxResting %d 1

@ hmrR_BlockAvg [dcAvg,dcAvgStd,nTrials,dcSum2] (dc,stim trange %0.1f_%0.1f -2_20

@ hmrR_tCCA [Aaux,rcMap] (dc,aux,probe,iRun 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 0 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

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} = '25';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

CRA Git | Maintained and supported by SUSTech CRA and CCSE