Commit 5afc448f authored by jayd1860's avatar jayd1860
Browse files

v1.45.0

-- Fix bug in channel exclusion in hmrR_PruneChannels.m
-- Fix display of manually pruned channels in DisplayAxesSDG.m
parent 4885f3de
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ for iBlk = 1:length(data)
    mlActAuto{iBlk} = mlAct_Initialize(mlActAuto{iBlk}, MeasList);
    lstAct1 = mlAct_Matrix2IndexList(mlActAuto{iBlk}, MeasList);
    lstAct2 = mlAct_Matrix2IndexList(mlActMan{iBlk}, MeasList);
    lstAct = lstAct1 | lstAct2;
    lstAct = unique([lstAct1(:)', lstAct2(:)']);
    
    if length(fs)~=1
        fs = 1/(fs(2)-fs(1));
+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ for kk=1:length(data_dod)
    mlActAuto{iBlk} = mlAct_Initialize(mlActAuto{iBlk}, MeasList);
    lstAct1 = mlAct_Matrix2IndexList(mlActAuto{iBlk}, MeasList);
    lstAct2 = mlAct_Matrix2IndexList(mlActMan{iBlk}, MeasList);
    lstAct = [lstAct1(:)', lstAct2(:)'];
    lstAct = unique([lstAct1(:)', lstAct2(:)']);
    
    SignalLength = size(dod,1); % #time points of original signal
    N = ceil(log2(SignalLength)); % #of levels for the wavelet decomposition
+7 −6
Original line number Diff line number Diff line
@@ -82,6 +82,10 @@ for iBlk=1:length(data)
    idxs3 = [];
    nLambda = length(Lambda);
    lst1 = find(MeasList(:,4)==1);    

    % Start by including all channels
    chanList = ones(size(MeasList,1),1);
    
    for ii = 1:nLambda
        lst = [];
        rhoSD = [];
@@ -92,9 +96,6 @@ for iBlk=1:length(data)
            rhoSD(jj) = norm( SrcPos(MeasList(lst1(jj),1),:) - DetPos(MeasList(lst1(jj),2),:) );
        end
                
        % Start by including all channels
        chanList(1:length(lst1),ii) = 1;
        
        % dRange exclusion criteria
        idxs1 = [idxs1, find(dmean(lst)<=dRange(1) | dmean(lst)>=dRange(2))];
        
@@ -106,7 +107,7 @@ for iBlk=1:length(data)
        
        idxsExcl = unique([idxs1(:)', idxs2(:)', idxs3(:)']);
        
        chanList(idxsExcl, ii) = 0;
        chanList(lst(idxsExcl)) = 0;
    end
    
    idxs4 = find(mlActMan{iBlk}(:,3) == 0);
+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ for iBlk = 1:nDataBlks
    MeasListVis     = [MeasListVis; chVis];
end
ml    = MeasList(MeasList(:,1)>0,:);
lstSDPairs = find(ml(:,4)==1); %cw6info.displayLambda);
lstSDPairs = find(ml(:,4)==iWl_gui); %cw6info.displayLambda);
lstInvisible = find(MeasListVis(:,3)==0);
hCh = zeros(length(lstSDPairs),1);

+1 −1
Original line number Diff line number Diff line
1.44.0
1.45.0