Resolved conflicts I think

neurofractal · Oct 30, 2023 · 3120523 · 3120523
2 parents f53b69a + 166b816
commit 3120523
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/preprocessing/ft_opm_psd.m b/preprocessing/ft_opm_psd.m
@@ -208,7 +208,7 @@
         end
 
         % Split data into epochs
-        nsamps = (cfg.trial_length)*rawData.fsample;
+        nsamps = floor((cfg.trial_length)*rawData.fsample);
         ntrials = numel(rawData.trial);
 
         for ii = 1:ntrials

diff --git a/preprocessing/ft_wrapper_spm_amm.m b/preprocessing/ft_wrapper_spm_amm.m
@@ -23,6 +23,7 @@
     cfg.correctgrad = 'yes';
 end
 
+<<<<<<< HEAD
 if ~isfield(cfg, 'corrLim')
 	cfg.corrLim = 1;
 end
@@ -39,6 +40,21 @@
 	cfg.window = 10;
 end
 
+=======
+if ~isfield(cfg, 'li')
+    cfg.li = 9;
+end
+
+if ~isfield(cfg, 'le')
+    cfg.le = 2;
+end
+
+if ~isfield(cfg, 'corrLim')
+    cfg.corrLim = 0.98;
+end
+
+
+>>>>>>> 166b81613d6d57bc8f5b51dbd317d811d4393b51
 %% Add paths
 % Check if fieldtrip is currently in the path
 try 
@@ -67,6 +83,7 @@
 %% AMM
 S               = [];
 S.D             = data_SPM;
+<<<<<<< HEAD
 S.corrLim       = cfg.corrLim;
 S.li			= cfg.li;
 S.le			= cfg.le;
@@ -76,6 +93,12 @@
 catch
 	error('Please check that you have the latest version of SPM which includes spm_opm_amm.');
 end
+=======
+S.le            = cfg.le;
+S.li            = cfg.li;
+S.corrLim       = cfg.corrLim;
+data_SPM_AMM    = spm_opm_amm(S); % Contact Tim Tierney for these scripts
+>>>>>>> 166b81613d6d57bc8f5b51dbd317d811d4393b51
 
 %% To Fieldtrip
 data_out = data_SPM_AMM.ftraw;