SPM12 r6906

Author: SPMcentral

@file_array/subsref.m

@@ -5,7 +5,7 @@
 % Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging
 
 %
-% $Id: subsref.m 4136 2010-12-09 22:22:28Z guillaume $
+% $Id: subsref.m 6804 2016-06-08 16:58:48Z john $
 
 
 if isempty(subs), return; end
@@ -64,9 +64,10 @@
 if length(sobj)==1
     t = subfun(sobj,args{:});
 else
-    dt  = datatypes;
-    dt  = dt([dt.code]==sobj(1).dtype); % assuming identical datatypes
-    t = zeros(di',func2str(dt.conv));
+   %dt  = datatypes;
+   %dt  = dt([dt.code]==sobj(1).dtype); % assuming identical datatypes
+   %t   = zeros(di',func2str(dt.conv));
+    t   = zeros(di','double');
     for j=1:length(sobj)
         ps = [sobj(j).pos ones(1,length(args))];
         dm = [sobj(j).dim ones(1,length(args))];

@gifti/private/Makefile

@@ -3,16 +3,20 @@
 #
 # Copyright (C) 2015 Wellcome Trust Centre for Neuroimaging
 #
-# $Id: Makefile 6402 2015-04-09 18:11:06Z guillaume $
+# $Id: Makefile 6704 2016-01-29 17:23:13Z guillaume $
 
 include ../../src/Makefile.var
 
 SPMMEX = zstream.$(SUF)
 
 ifeq (mex,$(SUF))
-	export CFLAGS = $(shell $(MEX) -p CFLAGS) -std=c99
+  export CFLAGS = $(shell $(MEX) -p CFLAGS) -std=c99
 else
-	MEXOPTS += CFLAGS='$$CFLAGS -std=c99'
+  ifeq (windows,$(PLATFORM))
+    MEXOPTS += CFLAGS=\"$$CFLAGS -std=c99\"
+  else
+    MEXOPTS += CFLAGS='$$CFLAGS -std=c99'
+  endif
 endif
 
 all: $(SPMMEX)

@gifti/private/read_gifti_file.m

@@ -7,7 +7,7 @@
 % Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging
 
 % Guillaume Flandin
-% $Id: read_gifti_file.m 6404 2015-04-13 14:29:53Z guillaume $
+% $Id: read_gifti_file.m 6895 2016-10-03 11:08:49Z guillaume $
 
 % Import XML-based GIfTI file
 %--------------------------------------------------------------------------
@@ -125,6 +125,16 @@
     end
 end
 
+if strcmp(s.attributes.Intent,'NIFTI_INTENT_POINTSET')
+    if isempty(s.space)
+        warning('Missing "CoordinateSystemTransformMatrix": assuming I.');
+        s.space = struct(...
+            'DataSpace','NIFTI_XFORM_UNKNOWN',...
+            'TransformedSpace','NIFTI_XFORM_UNKNOWN',...
+            'MatrixData',eye(4));
+    end
+end
+
 %==========================================================================
 function s = gifti_Space(t,uid)
 s = struct('DataSpace','', 'TransformedSpace','', 'MatrixData',[]);

@gifti/private/zstream.mexw64

@@ -11,7 +11,7 @@
 % Copyright (C) 2008-2012 Wellcome Trust Centre for Neuroimaging
 
 % Stefan Kiebel, Vladimir Litvak
-% $Id: clone.m 5957 2014-04-16 15:23:19Z vladimir $
+% $Id: clone.m 6829 2016-07-07 10:16:46Z vladimir $
 
 if nargin < 4
     reset = 0;
@@ -27,7 +27,8 @@
     disp('Changing the number of channels, so discarding online montages.');
 end
 
-new = unlink(this);
+new = montage(this, 'switch', 0);
+new = unlink(new);
 
 % check file path first
 [pth, fname] = fileparts(fnamedat);

@meeg/clone.m

@@ -3,10 +3,10 @@
 % M/EEG data
 % FORMAT res = history(this, varargin)
 % _______________________________________________________________________
-% Copyright (C) 2008 Wellcome Trust Centre for Neuroimaging
+% Copyright (C) 2008-2016 Wellcome Trust Centre for Neuroimaging
 
 % Stefan Kiebel
-% $Id: history.m 3196 2009-06-11 12:54:47Z vladimir $
+% $Id: history.m 6883 2016-09-19 13:42:05Z vladimir $
 
 
 if isempty(varargin)
@@ -22,14 +22,22 @@
 
     if ischar(varargin{1})
         this.history(nh+1).fun = varargin{1};
-
-        if isstruct(varargin{2}) && isfield(varargin{2}, 'D') && ...
-                isa(varargin{2}.D, 'meeg')
-            varargin{2}.D = fullfile(varargin{2}.D.path, varargin{2}.D.fname);
+        
+        if isstruct(varargin{2}) && isfield(varargin{2}, 'D')
+            if  isa(varargin{2}.D, 'meeg')
+                varargin{2}.D = fullfile(varargin{2}.D);
+            elseif isa(varargin{2}.D, 'cell')
+                for i = 1:numel(varargin{2}.D)
+                    if isa(varargin{2}.D{i}, 'meeg')
+                        varargin{2}.D{i} = fullfile(varargin{2}.D{i});
+                    end
+                end
+            end
         end
 
         this.history(nh+1).args = varargin{2};
-
+                
+        [dum, this.history(nh+1).ver] = spm('ver'); 
     elseif isstruct(varargin{1})
         this.history = varargin{1};
     end

@meeg/history.m

@@ -6,7 +6,7 @@
 % Copyright (C) 2008-2014 Wellcome Trust Centre for Neuroimaging
 
 % Vladimir Litvak
-% $Id: checkmeeg.m 6622 2015-12-03 11:54:13Z vladimir $
+% $Id: checkmeeg.m 6817 2016-06-20 17:10:50Z vladimir $
 
 
 %-Initialise data dimensions
@@ -360,7 +360,7 @@
                     this.sensors.eeg = rmfield(this.sensors.eeg, 'chanunit');
                 end
             end
-            this.sensors.eeg = ft_datatype_sens(this.sensors.eeg, 'version', 'upcoming', 'amplitude', 'V', 'distance', 'mm');        
+            this.sensors.eeg = ft_datatype_sens(this.sensors.eeg, 'amplitude', 'V', 'distance', 'mm');        
         end
     end
     if isfield(this.sensors, 'meg')
@@ -373,7 +373,7 @@
                     this.sensors.meg = rmfield(this.sensors.meg, 'chanunit');
                 end
             end
-            this.sensors.meg = ft_datatype_sens(this.sensors.meg, 'version', 'upcoming', 'amplitude', 'T', 'distance', 'mm');
+            this.sensors.meg = ft_datatype_sens(this.sensors.meg, 'amplitude', 'T', 'distance', 'mm');
         end
     end
 end

@meeg/private/checkmeeg.m

@@ -7,7 +7,7 @@
 % Copyright (C) 2008-2012 Wellcome Trust Centre for Neuroimaging
 
 % Vladimir Litvak
-% $Id: sensors.m 6535 2015-08-25 11:45:26Z vladimir $
+% $Id: sensors.m 6829 2016-07-07 10:16:46Z vladimir $
 
 if nargin<2
     error('Sensor type (EEG or MEG) must be specified');
@@ -151,8 +151,8 @@
     end
 
     if strcmpi(type, 'MEG')
-        res =  ft_datatype_sens(sens, 'version', 'upcoming', 'amplitude', 'T', 'distance', 'mm');
+        res = ft_datatype_sens(sens, 'amplitude', 'T', 'distance', 'mm');
     else
-        res = ft_datatype_sens(sens, 'version', 'upcoming', 'amplitude', 'V', 'distance', 'mm');
+        res = ft_datatype_sens(sens, 'amplitude', 'V', 'distance', 'mm');
     end
 end

@meeg/sensors.m

@@ -1,5 +1,5 @@
 % Statistical Parametric Mapping
-% Version 6685 (SPM12) 15-Jan-16
+% Version 6906 (SPM12) 20-Oct-16
 %__________________________________________________________________________
 %  ___  ____  __  __
 % / __)(  _ \(  \/  )  
@@ -37,7 +37,7 @@
 %__________________________________________________________________________
 % Copyright (C) 1991,1994-2016 Wellcome Trust Centre for Neuroimaging
 
-% $Id: Contents.m 6684 2016-01-15 16:30:24Z guillaume $
+% $Id: Contents.m 6905 2016-10-20 15:00:48Z guillaume $
 
 %==========================================================================
 % PROGRAMMERS NOTE:

Contents.m

@@ -3,7 +3,7 @@
 %__________________________________________________________________________
 % Copyright (C) 2008-2015 Wellcome Trust Centre for Neuroimaging
 
-% $Id: spm_cfg.m 6315 2015-01-23 17:09:06Z guillaume $
+% $Id: spm_cfg.m 6711 2016-02-03 15:25:43Z peter $
 
 %--------------------------------------------------------------------------
 % Temporal
@@ -35,11 +35,16 @@
 %--------------------------------------------------------------------------
 % Dynamic Causal Modelling
 %--------------------------------------------------------------------------
+spm_cfg_dcm_spec        = cfg_choice;
+spm_cfg_dcm_spec.tag    = 'spec';
+spm_cfg_dcm_spec.name   = 'DCM specification';
+spm_cfg_dcm_spec.values  = {spm_cfg_dcm_fmri spm_cfg_dcm_meeg};
+
 dcm         = cfg_choice;
 dcm.tag     = 'dcm';
 dcm.name    = 'DCM';
 dcm.help    = {'Dynamic Causal Modelling.'};
-dcm.values  = { spm_cfg_dcm_fmri spm_cfg_dcm_meeg spm_cfg_dcm_bms};
+dcm.values  = { spm_cfg_dcm_spec spm_cfg_dcm_est spm_cfg_dcm_bms spm_cfg_dcm_peb};
 
 %--------------------------------------------------------------------------
 % Util