explicitly forbid cfg.trial (without "s") to prevent typos affecting …

…the analyses
fieldtrip · Apr 7, 2021 · 55772ea · 55772ea
1 parent 786b527
commit 55772ea
Show file tree

Hide file tree

Showing 52 changed files with 62 additions and 54 deletions.
diff --git a/ft_badchannel.m b/ft_badchannel.m
@@ -105,7 +105,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'required',   'metric');
 
 % ensure that the preproc specific options are located in the cfg.preproc substructure

diff --git a/ft_badsegment.m b/ft_badsegment.m
@@ -104,7 +104,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'required',   'metric');
 
 % ensure that the preproc specific options are located in the cfg.preproc substructure

diff --git a/ft_channelnormalise.m b/ft_channelnormalise.m
@@ -72,7 +72,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.channel   = ft_getopt(cfg, 'channel', 'all');

diff --git a/ft_channelrepair.m b/ft_channelrepair.m
@@ -85,6 +85,7 @@
 end
 
 % check if the input cfg is valid for this function
+cfg = ft_checkconfig(cfg, 'forbidden',  {'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamedval', {'method', 'nearest', 'weighted'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'elecfile', 'elec'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'gradfile', 'grad'});

diff --git a/ft_componentanalysis.m b/ft_componentanalysis.m
@@ -185,7 +185,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'forbidden',  {'detrend'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'blc', 'demean'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'method', 'predetermined mixing matrix', 'predetermined unmixing matrix'});

diff --git a/ft_connectivityanalysis.m b/ft_connectivityanalysis.m
@@ -141,7 +141,7 @@
 % data = ft_checkdata(data, 'datatype', {'raw', 'timelock', 'freq', 'source'});
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.feedback    = ft_getopt(cfg, 'feedback',   'none');

diff --git a/ft_connectivityplot.m b/ft_connectivityplot.m
@@ -62,7 +62,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'zparam',     'parameter'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'color',      'linecolor'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'graphcolor', 'linecolor'});

diff --git a/ft_crossfrequencyanalysis.m b/ft_crossfrequencyanalysis.m
@@ -108,7 +108,7 @@
 freqhigh = ft_checkdata(freqhigh, 'datatype', 'freq', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % FIXME the below is a bit hacky but it does the trick
 if isfield(cfg, 'chanlow') && isfield(cfg, 'chanhigh')

diff --git a/ft_databrowser.m b/ft_databrowser.m
@@ -162,7 +162,7 @@
 hascomp = hasdata && ft_datatype(data, 'comp'); % can be 'raw+comp' or 'timelock+comp'
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'unused',     {'comps', 'inputfile', 'outputfile'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'zscale', 'ylim'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'ylim', 'auto', 'maxabs'});

diff --git a/ft_denoise_dssp.m b/ft_denoise_dssp.m
@@ -48,7 +48,7 @@
 datain = ft_checkdata(datain, 'datatype', {'raw'}); % FIXME how about timelock and freq?
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'hdmfile', 'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'vol',     'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'grid',    'sourcemodel'});

diff --git a/ft_denoise_pca.m b/ft_denoise_pca.m
@@ -82,7 +82,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.refchannel = ft_getopt(cfg, 'refchannel', 'MEGREF');

diff --git a/ft_denoise_prewhiten.m b/ft_denoise_prewhiten.m
@@ -67,7 +67,7 @@
 noise  = ft_checkdata(noise,  'datatype', {      'timelock' 'freq'}, 'haschantype', 'yes', 'haschanunit', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.channel   = ft_getopt(cfg, 'channel', 'all');

diff --git a/ft_denoise_synthetic.m b/ft_denoise_synthetic.m
@@ -60,7 +60,8 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'required', {'gradient'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'trial'}); % prevent accidental typos, see issue 1729
+cfg = ft_checkconfig(cfg, 'required',   {'gradient'});
 
 % set the defaults
 cfg.trials     = ft_getopt(cfg, 'trials', 'all', 1);

diff --git a/ft_denoise_tsr.m b/ft_denoise_tsr.m
@@ -114,7 +114,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.nfold       = ft_getopt(cfg, 'nfold',   1);

diff --git a/ft_detect_movement.m b/ft_detect_movement.m
@@ -90,7 +90,7 @@
 data = ft_checkdata(data, 'datatype', {'raw'}, 'feedback', 'yes', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.method   = ft_getopt(cfg, 'method',   'velocity2D');

diff --git a/ft_dipolefitting.m b/ft_dipolefitting.m
@@ -147,7 +147,7 @@
 data = ft_checkdata(data, 'datatype', {'comp', 'timelock', 'freq'}, 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'elecfile', 'elec'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'gradfile', 'grad'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'optofile', 'opto'});

diff --git a/ft_dipolesimulation.m b/ft_dipolesimulation.m
@@ -100,7 +100,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'elecfile', 'elec'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'gradfile', 'grad'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'optofile', 'opto'});

diff --git a/ft_electrodeplacement.m b/ft_electrodeplacement.m
@@ -134,7 +134,7 @@
 % see http://bugzilla.fieldtriptoolbox.org/show_bug.cgi?id=2837
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'viewdim', 'axisratio'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'method', 'mri', 'volume'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'newfigure', 'figure'});

diff --git a/ft_electroderealign.m b/ft_electroderealign.m
@@ -172,7 +172,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'forbidden',  {'outline'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'template', 'target'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'method', 'realignfiducials', 'fiducial'});

diff --git a/ft_electrodermalactivity.m b/ft_electrodermalactivity.m
@@ -71,7 +71,7 @@
 datain = ft_checkdata(datain, 'datatype', 'raw', 'feedback', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the default options
 cfg.channel        = ft_getopt(cfg, 'channel', {});

diff --git a/ft_eventtiminganalysis.m b/ft_eventtiminganalysis.m
@@ -115,7 +115,7 @@
 data = ft_checkdata(data, 'datatype', {'raw+comp', 'raw'}, 'feedback', 'yes', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'required',   {'method'});
 
 % set the defaults

diff --git a/ft_freqanalysis.m b/ft_freqanalysis.m
@@ -229,7 +229,7 @@
 data = ft_checkdata(data, 'datatype', {'raw', 'raw+comp', 'mvar'}, 'feedback', 'yes', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'label', 'channel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'sgn',   'channel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'labelcmb', 'channelcmb'});

diff --git a/ft_freqdescriptives.m b/ft_freqdescriptives.m
@@ -88,7 +88,7 @@
 freq = ft_checkdata(freq, 'cmbrepresentation', 'sparsewithpow', 'channelcmb', {});
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'jacknife', 'jackknife'});
 
 % throw warnings for the deprecated options

diff --git a/ft_freqgrandaverage.m b/ft_freqgrandaverage.m
@@ -76,7 +76,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.keepindividual = ft_getopt(cfg, 'keepindividual', 'no');

diff --git a/ft_freqstatistics.m b/ft_freqstatistics.m
@@ -92,7 +92,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'required',   {'method', 'design'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'approach',   'method'});
 cfg = ft_checkconfig(cfg, 'forbidden',  {'transform'});

diff --git a/ft_globalmeanfield.m b/ft_globalmeanfield.m
@@ -79,7 +79,7 @@
 datain = ft_checkdata(datain, 'datatype', {'timelock'}, 'feedback', 'yes', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.method    = ft_getopt(cfg, 'method', 'amplitude');

diff --git a/ft_heartrate.m b/ft_heartrate.m
@@ -99,7 +99,7 @@
 cfg = ft_checkconfig(cfg, 'forbidden', 'medianwindow');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'ectopicbeat_corr', 'ectopicbeatcorrect'}); % for backward compatibility
 cfg = ft_checkconfig(cfg, 'renamed',    {'corr_threshold', 'ectopicbeatthreshold'}); % for backward compatibility
 

diff --git a/ft_lateralizedpotential.m b/ft_lateralizedpotential.m
@@ -91,7 +91,7 @@
 avgR = ft_checkdata(avgR, 'datatype', 'timelock');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 if ~isfield(cfg, 'channelcmb')

diff --git a/ft_megplanar.m b/ft_megplanar.m
@@ -111,7 +111,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'hdmfile', 'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'vol',     'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'grid',    'sourcemodel'});

diff --git a/ft_megrealign.m b/ft_megrealign.m
@@ -122,7 +122,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'feedback', 'yes', 'hassampleinfo', 'yes', 'ismeg', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'plot3d',      'feedback'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'headshape',   'headmodel', []});
 cfg = ft_checkconfig(cfg, 'required',   {'inwardshift', 'template'});

diff --git a/ft_multiplotER.m b/ft_multiplotER.m
@@ -173,7 +173,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'unused',     {'cohtargetchannel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'cohrefchannel', 'refchannel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'hlim', 'xlim'});

diff --git a/ft_multiplotTFR.m b/ft_multiplotTFR.m
@@ -179,7 +179,7 @@
 data = ft_checkdata(data, 'datatype', 'freq');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'cohrefchannel', 'refchannel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'matrixside', 'directionality'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'zparam', 'parameter'});

diff --git a/ft_mvaranalysis.m b/ft_mvaranalysis.m
@@ -125,7 +125,7 @@
 data = ft_checkdata(data, 'datatype', 'raw', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'blc', 'demean'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'blcwindow', 'baselinewindow'});
 

diff --git a/ft_prepare_layout.m b/ft_prepare_layout.m
@@ -162,7 +162,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'elecfile', 'elec'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'gradfile', 'grad'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'optofile', 'opto'});

diff --git a/ft_prepare_leadfield.m b/ft_prepare_leadfield.m
@@ -131,7 +131,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'hdmfile', 'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'vol',     'headmodel'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'grid',    'sourcemodel'});

diff --git a/ft_prepare_neighbours.m b/ft_prepare_neighbours.m
@@ -105,7 +105,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'required',   {'method'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'elecfile', 'elec'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'gradfile', 'grad'});

diff --git a/ft_preprocessing.m b/ft_preprocessing.m
@@ -200,7 +200,7 @@
 end
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed',    {'blc', 'demean'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'blcwindow', 'baselinewindow'});
 cfg = ft_checkconfig(cfg, 'renamed',    {'output', 'export'});

diff --git a/ft_redefinetrial.m b/ft_redefinetrial.m
@@ -90,7 +90,14 @@
   return
 end
 
-% ft_checkdata is done further down
+% store original datatype
+dtype = ft_datatype(data);
+
+% check if the input data is valid for this function, this will convert it to raw if needed
+data = ft_checkdata(data, 'datatype', {'raw+comp', 'raw'}, 'feedback', 'yes');
+
+% check if the input cfg is valid for this function
+cfg = ft_checkconfig(cfg, 'forbidden',  {'trial'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.offset       = ft_getopt(cfg, 'offset',    []);
@@ -104,16 +111,11 @@
 cfg.length       = ft_getopt(cfg, 'length',    []);
 cfg.overlap      = ft_getopt(cfg, 'overlap',   0);
 
-% store original datatype
-dtype = ft_datatype(data);
-
 % deal with the special case of timelock rpt_chan_time with 1 trial
 oneRptTimelock = (strcmp(dtype, 'timelock') &&...
   strcmp(data.dimord, 'rpt_chan_time') &&...
   size(data.trial, 1) == 1);
 
-% check if the input data is valid for this function, this will convert it to raw if needed
-data = ft_checkdata(data, 'datatype', {'raw+comp', 'raw'}, 'feedback', 'yes');
 
 % select trials of interest
 if ~strcmp(cfg.trials, 'all')

diff --git a/ft_rejectvisual.m b/ft_rejectvisual.m
@@ -134,7 +134,7 @@
 data = ft_checkdata(data, 'datatype', {'raw+comp', 'raw'}, 'feedback', 'yes', 'hassampleinfo', 'yes');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels', 'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamedval', {'metric',  'absmax',  'maxabs'});
 cfg = ft_checkconfig(cfg, 'renamedval', {'method',  'absmax',  'maxabs'});
 

diff --git a/ft_removetemplateartifact.m b/ft_removetemplateartifact.m
@@ -73,7 +73,7 @@
 template = ft_checkdata(template, 'datatype', 'timelock');
 
 % check if the input cfg is valid for this function
-cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'});
+cfg = ft_checkconfig(cfg, 'forbidden',  {'channels'}); % prevent accidental typos, see issue 1729
 
 % set the defaults
 cfg.channel = ft_getopt(cfg, 'channel', 'all');

diff --git a/ft_resampledata.m b/ft_resampledata.m
@@ -83,6 +83,7 @@
 % ft_checkdata is done further down
 
 % check if the input cfg is valid for this function
+cfg = ft_checkconfig(cfg, 'forbidden',  {'trial'}); % prevent accidental typos, see issue 1729
 cfg = ft_checkconfig(cfg, 'renamed', {'blc', 'demean'});
 cfg = ft_checkconfig(cfg, 'renamed', {'resamplemethod', 'method'});
 cfg = ft_checkconfig(cfg, 'renamed', {'fsample', 'resamplefs'});