automatically synchronized identical files to 6a19df4

fieldtrip · Sep 21, 2018 · 851de16 · 851de16
1 parent 6a19df4
commit 851de16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/fileio/private/ft_datatype_timelock.m b/fileio/private/ft_datatype_timelock.m
@@ -154,6 +154,9 @@
       timelock = rmfield(timelock, 'trialinfo');
     end
 
+    % this field can be present in raw data, but is not desired in timelock data
+    timelock = removefields(timelock, {'fsample'});
+
   case '2011v2'
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
     % ensure that the sensor structures are up to date
@@ -167,7 +170,7 @@
       timelock.opto = ft_datatype_sens(timelock.opto);
     end
 
-    % these fields can be present in raw data, but not desired in timelock data
+    % these fields can be present in raw data, but are not desired in timelock data
     timelock = removefields(timelock, {'sampleinfo', 'fsample'});
 
   case '2003'

diff --git a/utilities/private/ignorefields.m b/utilities/private/ignorefields.m
@@ -15,6 +15,7 @@
       'grad'
       'elec'
       'opto'
+      'fsample'
       'trialinfo'  % this is dealt with explicitly
       'sampleinfo' % this is dealt with explicitly
       };