automatically synchronized identical files to 6637749

fileio/private/ft_datatype_raw.m

@@ -85,7 +85,6 @@
 end
 assert(length(unique(data.label))==length(data.label), 'channel labels must be unique');
 
-
 % convert it into true/false
 if isequal(hassampleinfo, 'ifmakessense')
   hassampleinfo = makessense(data, 'sampleinfo');

fileio/private/ft_datatype_sens.m

@@ -152,10 +152,25 @@
 % this is needed further down
 nchan = length(sens.label);
 
-% there are many cases which are MEG, EEG or NIRS specific
-ismeg  = ft_senstype(sens, 'meg');
-iseeg  = ft_senstype(sens, 'eeg');
-isnirs = ft_senstype(sens, 'nirs');
+% these are used at multiple places, therefore we determine them only once
+if isfield(sens, 'coilpos')
+  ismeg = true;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'elecpos')
+  ismeg = false;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'optopos')
+  ismeg = false;
+  iseeg = false;
+  isnirs = true;
+else
+  % doing it this way takes a lot more CPU time
+  ismeg  = ft_senstype(sens, 'meg');
+  iseeg  = ft_senstype(sens, 'eeg');
+  isnirs = ft_senstype(sens, 'nirs');
+end
 
 switch version
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

fileio/private/ft_senstype.m

@@ -151,6 +151,18 @@
   return
 end
 
+% in some cases these are easy to determine, no need to continue with the elaborate checks
+if strcmp(desired, 'meg') && isfield(input, 'coilpos')
+  type = true;
+  return
+elseif strcmp(desired, 'eeg') && isfield(input, 'elecpos')
+  type = true;
+  return
+elseif strcmp(desired, 'nirs') && isfield(input, 'optopos')
+  type = true;
+  return
+end
+
 isdata   = isa(input, 'struct')  && (isfield(input, 'hdr') || isfield(input, 'time') || isfield(input, 'freq') || isfield(input, 'grad') || isfield(input, 'elec') || isfield(input, 'opto'));
 isheader = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'Fs');
 isgrad   = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'pnt')  &&  isfield(input, 'ori'); % old style

forward/private/ft_datatype_sens.m

@@ -152,10 +152,25 @@
 % this is needed further down
 nchan = length(sens.label);
 
-% there are many cases which are MEG, EEG or NIRS specific
-ismeg  = ft_senstype(sens, 'meg');
-iseeg  = ft_senstype(sens, 'eeg');
-isnirs = ft_senstype(sens, 'nirs');
+% these are used at multiple places, therefore we determine them only once
+if isfield(sens, 'coilpos')
+  ismeg = true;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'elecpos')
+  ismeg = false;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'optopos')
+  ismeg = false;
+  iseeg = false;
+  isnirs = true;
+else
+  % doing it this way takes a lot more CPU time
+  ismeg  = ft_senstype(sens, 'meg');
+  iseeg  = ft_senstype(sens, 'eeg');
+  isnirs = ft_senstype(sens, 'nirs');
+end
 
 switch version
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

inverse/private/ft_senstype.m

@@ -151,6 +151,18 @@
   return
 end
 
+% in some cases these are easy to determine, no need to continue with the elaborate checks
+if strcmp(desired, 'meg') && isfield(input, 'coilpos')
+  type = true;
+  return
+elseif strcmp(desired, 'eeg') && isfield(input, 'elecpos')
+  type = true;
+  return
+elseif strcmp(desired, 'nirs') && isfield(input, 'optopos')
+  type = true;
+  return
+end
+
 isdata   = isa(input, 'struct')  && (isfield(input, 'hdr') || isfield(input, 'time') || isfield(input, 'freq') || isfield(input, 'grad') || isfield(input, 'elec') || isfield(input, 'opto'));
 isheader = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'Fs');
 isgrad   = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'pnt')  &&  isfield(input, 'ori'); % old style

plotting/private/ft_datatype_sens.m

@@ -152,10 +152,25 @@
 % this is needed further down
 nchan = length(sens.label);
 
-% there are many cases which are MEG, EEG or NIRS specific
-ismeg  = ft_senstype(sens, 'meg');
-iseeg  = ft_senstype(sens, 'eeg');
-isnirs = ft_senstype(sens, 'nirs');
+% these are used at multiple places, therefore we determine them only once
+if isfield(sens, 'coilpos')
+  ismeg = true;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'elecpos')
+  ismeg = false;
+  iseeg = true;
+  isnirs = false;
+elseif isfield(sens, 'optopos')
+  ismeg = false;
+  iseeg = false;
+  isnirs = true;
+else
+  % doing it this way takes a lot more CPU time
+  ismeg  = ft_senstype(sens, 'meg');
+  iseeg  = ft_senstype(sens, 'eeg');
+  isnirs = ft_senstype(sens, 'nirs');
+end
 
 switch version
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

plotting/private/ft_senstype.m

@@ -151,6 +151,18 @@
   return
 end
 
+% in some cases these are easy to determine, no need to continue with the elaborate checks
+if strcmp(desired, 'meg') && isfield(input, 'coilpos')
+  type = true;
+  return
+elseif strcmp(desired, 'eeg') && isfield(input, 'elecpos')
+  type = true;
+  return
+elseif strcmp(desired, 'nirs') && isfield(input, 'optopos')
+  type = true;
+  return
+end
+
 isdata   = isa(input, 'struct')  && (isfield(input, 'hdr') || isfield(input, 'time') || isfield(input, 'freq') || isfield(input, 'grad') || isfield(input, 'elec') || isfield(input, 'opto'));
 isheader = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'Fs');
 isgrad   = isa(input, 'struct')  && isfield(input, 'label') && isfield(input, 'pnt')  &&  isfield(input, 'ori'); % old style

private/ctf2grad.m

@@ -6,7 +6,7 @@
 % for CTF data. Each of these implementations is dealt with here.
 %
 % Use as
-%   grad = ctf2grad(hdr, dewar, coilaccuracy)
+%   [grad, elec] = ctf2grad(hdr, dewar, coilaccuracy)
 % where
 %   dewar        = boolean, whether to return it in dewar or head coordinates (default is head coordinates)
 %   coilaccuracy = empty or a number (default is empty)
@@ -482,3 +482,13 @@
 else
   ft_error('unknown header to contruct gradiometer definition');
 end
+
+% chantype and chanunit are required as of 2016, see FT_DATATYPE_SENS
+if ~isempty(grad)
+  grad.chantype = ft_chantype(grad);
+  grad.chanunit = ft_chanunit(grad);
+end
+if ~isempty(elec)
+  elec.chantype = ft_chantype(elec);
+  elec.chanunit = ft_chanunit(elec);
+end