Commit de1f6a92 authored by Jan-Gerrit Richter's avatar Jan-Gerrit Richter

Merge branch 'master' into itaMotorControl

parents 64012909 99ad9da3
......@@ -498,9 +498,9 @@ classdef itaMSPlaybackRecord < itaMSRecord
function set_outputChannels(this,value)
this.mOutputChannels = value;
if (this.outputEqualizationFilters.nChannels ~= 1) & (this.outputEqualizationFilters.nChannels ~= size(this.outputChannels))
if (this.outputEqualizationFilters.nChannels ~= 1)
this.outputEqualizationFilters = [];
ita_verbose_info('Output Equalization Filter size does not match anymore. Removing',0);
ita_verbose_info('Output Equalization Filter are removed!',0);
end
end
......
......@@ -435,6 +435,12 @@ classdef itaMSTFinterleaved < itaMSTF
end
res = this.mFinalExcitation .* this.pre_scaling .* this.outputamplification_lin;
% if an outputequalization filter is set, convolve it with the
% excitation
if ~isempty(this.outputEqualizationFilters)
res = res*this.outputEqualizationFilters;
end
end
%% MEASURE NONLINS AND TRIR
......
......@@ -598,7 +598,7 @@ classdef itaSuper < itaMeta
% and select the appropriate Channel struct(s)
%% merge channelInfo
channelFields = properties(this);
channelFields = channelFields(strcmp('channel',channelFields));
channelFields = channelFields(strncmp('channel',channelFields,7));
for idchfield = 1:numel(channelFields)
thisFieldName = channelFields{idchfield};
......@@ -662,7 +662,7 @@ classdef itaSuper < itaMeta
%% merge channelInfo
channelFields = properties(this);
channelFields = channelFields(strcmp('channel',channelFields));
channelFields = channelFields(strncmp('channel',channelFields,7));
for idchfield = 1:numel(channelFields)
thisFieldName = channelFields{idchfield};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment