catch error in requested downsample levels early

royhessels · Sep 14, 2018 · aee437d · aee437d
1 parent c845ffe
commit aee437d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/functions/I2MC/I2MCfunc.m b/functions/I2MC/I2MCfunc.m
@@ -98,6 +98,7 @@
  nSampInWin = round(par.windowtime/(1/par.freq));
  assert(nSampInWin>=nSampRequired,'I2MCfunc: Filter parameters requested with the setting ''chebyOrder'' will not work for the sampling frequency of your data. Please lower ''chebyOrder'', or set the setting ''downsampFilter'' to 0')
 end
+assert(~any(mod(par.freq,par.downsamples)),'I2MCfunc: Some of your downsample levels are not divisors of your sampling frequency. Change the option ''downsamples''')
 
 % setup visual angle conversion
 pixpercm = mean([par.xres par.yres]./par.scrSz(:).');

diff --git a/functions/I2MC/twoClusterWeighting.m b/functions/I2MC/twoClusterWeighting.m
@@ -34,7 +34,6 @@
 
 % check downsample levels
 nd = length(downsamples);
-assert(~any(mod(freq,downsamples)),'Some of your downsample levels are not divisors of your sampling frequency')
 
 if downsampFilter
  % filter signal. Follow the lead of decimate(), which first runs a