Commit 65ea30c2 authored by jayd1860's avatar jayd1860 Committed by Jay Dubb
Browse files

v1.31.14

-- Fix matlab error bug when processing subject standard deviation in hmrS_RunAvgStd2 when there's no trials for a specific condition.
parent 68a0aa21
Loading
Loading
Loading
Loading
+19 −23
Original line number Diff line number Diff line
@@ -66,21 +66,17 @@ for iBlk = 1:nDataBlks
        % get std and append
        yAvgStd_wa = sqrt(var);
        if yAvgStd_wa == 0
               yAvgStd_wa = zeros(size(tHRF,1), 3, size(ml,1));
            yAvgStd_wa = zeros(length(tHRF), 3, size(ml,1));
        end
        yAvgStdOut(iBlk).AppendDataTimeSeries(yAvgStd_wa);
        var = 0;
        N = 0;
        
            % add measlist field
%             if ~isempty(ml)
        for iCh = 1:size(ml,1)
            yAvgStdOut(iBlk).AddChannelHbO(ml(iCh,1), ml(iCh,2), iC);
            yAvgStdOut(iBlk).AddChannelHbR(ml(iCh,1), ml(iCh,2), iC);
            yAvgStdOut(iBlk).AddChannelHbT(ml(iCh,1), ml(iCh,2), iC);
        end
%             end
%         end
        
    end
end
+19 −19
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@

% subj
@ hmrS_RunAvg [dcAvg,nTrials] (dcAvgRuns,mlActRuns,nTrialsRuns
@ hmrS_RunAvgStd2 dcAvgStd (dcAvgRuns,dcSum2Runs,mlActRuns,nTrialsRuns
@ hmrS_RunAvgStd2 dcAvgStd (dcAvgStdRuns,nTrialsRuns


% run
+21 −21
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@

% subj
@ hmrS_RunAvg [dcAvg,nTrials] (dcAvgRuns,mlActRuns,nTrialsRuns
@ hmrS_RunAvgStd2 dcAvgStd (dcAvgRuns,dcSum2Runs,mlActRuns,nTrialsRuns
@ hmrS_RunAvgStd2 dcAvgStd (dcAvgStdRuns,nTrialsRuns


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

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