From 4fb86f520d86fe942070f5ad6ea503bd11b4c564 Mon Sep 17 00:00:00 2001 From: Brendon Watson Date: Thu, 23 Aug 2018 19:55:11 -0400 Subject: [PATCH] Auto stash before merge of "BrendonDev" and "upstream/dev" --- .../SleepScoreMaster/ClusterStates_GetMetrics.m | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/detectors/detectStates/SleepScoreMaster/ClusterStates_GetMetrics.m b/detectors/detectStates/SleepScoreMaster/ClusterStates_GetMetrics.m index 1992a22c..64a5d2e0 100755 --- a/detectors/detectStates/SleepScoreMaster/ClusterStates_GetMetrics.m +++ b/detectors/detectStates/SleepScoreMaster/ClusterStates_GetMetrics.m @@ -58,7 +58,17 @@ zFFTspec(badtimes,:) = 0; %% Set Broadband filter weights for Slow Wave -load('SWweights.mat') +if exist('SleepScoreLFP','var') + if isfield(SleepScoreLFP,'params') + if isfield (SleepScoreLFP.params,'SWWeights') + SWweights = SleepScoreLFP.params.SWWeights; + end + end +end +if ~exist('SWweights','var') + load('SWweights.mat') +end + assert(isequal(freqlist,SWfreqlist), 'spectrogram freqs. are not what they should be...') broadbandSlowWave = zFFTspec*SWweights';