Commit c6ad5a01 authored by Andrew Quinn's avatar Andrew Quinn
Browse files

Merge branch '73-process-regressors-uses-noverlap-instead-of-nstep' into 'master' 

Resolve "process regressors uses noverlap instead of nstep"

Closes #73

See merge request !74
parents 95cd950e f86e2cfb

sails/stft.py

+1 −1
Original line number Diff line number Diff line
@@ -1580,7 +1580,7 @@ def _process_regressor(Y, config, mode='confound'): 


    """

    window = None if mode == 'condition' else config.window

    windowed = apply_sliding_window(Y, config.nperseg, config.noverlap,

    windowed = apply_sliding_window(Y, config.nperseg, config.nstep,

                                    window=window, padded=config.padded)



    y = np.nansum(windowed, axis=-1)

setup.cfg

+1 −1
Original line number Diff line number Diff line 
[flake8]

max-line-length=120

exclude=*.md,*.yaml,setup.cfg,build/,doc/build

extend-ignore=E741

extend-ignore=E741, E275



[build_sphinx]

source-dir = doc/source