ftract_dev / ImaGIN2 · Commits

Go to a project

Authored by Olivier David
Commit acc56e99c4f5220de40d6b23dc2177d33657f2ce 1 parent 1d695d21

add concatenated baseline to normaliseTF

Inline Side-by-side
Showing 2 changed files with 20 additions and 10 deletions
... ... @@ -100,7 +100,17 @@ if ~isnumeric(BB)
else
if isfield(DD{1},'Nfrequencies')
for i2=1:length(DD)
index=find(DD{i2}.tf.time>=min(BB)&DD{i2}.tf.time<=max(BB));
nwindow=length(BB)/2;
if nwindow==1
index=find(DD{i2}.tf.time>=min(BB)&DD{i2}.tf.time<=max(BB));
else
index=[];
for i3=1:nwindow
index=[index find(DD{i2}.tf.time>=BB(2*(i3-1)+1)&DD{i2}.tf.time<=BB(2*i3))];
end
end
D=DD{i2};
data=D(:,:,:,:);
for i1=1:D.nchannels
... ...
... ... @@ -279,15 +279,15 @@ if size(DD,1)>1
end
for i1 = 1:size(DD,1)
try
[D,TimeWindow,TimeWindowWidth] = ImaGIN_spm_eeg_tf_main(deblank(DD(i1,:)),S{i1});
catch
try
% try
% [D,TimeWindow,TimeWindowWidth] = ImaGIN_spm_eeg_tf_main(deblank(DD(i1,:)),S{i1});
% catch
% try
[D,TimeWindow,TimeWindowWidth] = ImaGIN_spm_eeg_tf_main(deblank(DD(i1,:)),S);
catch
[D,TimeWindow,TimeWindowWidth] = ImaGIN_spm_eeg_tf_main(deblank(DD(i1,:)));
end
end
% catch
% [D,TimeWindow,TimeWindowWidth] = ImaGIN_spm_eeg_tf_main(deblank(DD(i1,:)));
% end
% end
if (i1==1) && ~exist('S', 'var')
S.Method=D.tf.Method;
switch D.tf.Method
... ... @@ -1227,7 +1227,7 @@ function D = ComputeMultitaper(D, k, TimeWindow, TimeWindowWidth, Pre)
% Correct the time step to the closest multiple of the sampling interval to keep the time axis uniform
fsampletrue = 1./diff(time(1:2));
timesteptrue = 1e3*round(fsampletrue*S.timestep*1e-3)/fsampletrue;
timesteptrue = 1e3*max([1 round(fsampletrue*S.timestep*1e-3)])/fsampletrue;
timeoi=(1e3*time(1)+(S.timeres/2)):timesteptrue:(1e3*time(end)-(S.timeres/2)-1e3/fsample(D)); % Time axis
timeoi=1e3*unique(round(1e-3*timeoi .* fsampletrue) ./ fsampletrue);
... ...