fix file names for sessions

ElineSchaft · Sep 21, 2022 · a867ccd · a867ccd
1 parent a9cbd10
commit a867ccd
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/functions/studyfunc/std_lm_seteegfields.m b/functions/studyfunc/std_lm_seteegfields.m
@@ -97,6 +97,10 @@
 %  --------------
 path_tmp = rel2fullpath(STUDY.filepath,STUDY.datasetinfo(index).filepath); 
 name = fullfile(path_tmp, STUDY.datasetinfo(index).subject);
+if ~isempty(STUDY.datasetinfo(index).session)
+    name2 = name;
+    name  = fullfile(path_tmp, [ STUDY.datasetinfo(index).subject sprintf('_ses-%2.2d',  STUDY.datasetinfo(index).session) ]);
+end
 
 %% Channels: update EEG.set file
 %  -----------------------------
@@ -109,23 +113,23 @@
 % DATERP
 if strcmp(opt.erp,'on')
     ext = [ prefix 'erp' ];
-    EEG.etc.datafiles.(ext) = getfilename(name, [ '.' ext ]);
+    EEG.etc.datafiles.(ext) = getfilename(name, name2, [ '.' ext ]);
     data = load('-mat',EEG.etc.datafiles.(ext));
     EEG.etc.timeerp = data.times;
 end
 
 % DATSPEC
 if strcmp(opt.spec,'on')
     ext = [ prefix 'spec' ];
-    EEG.etc.datafiles.(ext) = getfilename(name, [ '.' ext ]);
+    EEG.etc.datafiles.(ext) = getfilename(name, name2, [ '.' ext ]);
     data = load('-mat',EEG.etc.datafiles.(ext));
     EEG.etc.freqspec = data.freqs;
 end
 
 % DAT TIMEF
 if strcmp(opt.timef,'on')
     ext = [ prefix 'timef' ];
-    EEG.etc.datafiles.(ext) = getfilename(name, [ '.' ext ]);
+    EEG.etc.datafiles.(ext) = getfilename(name, name2, [ '.' ext ]);
     EEG.etc.datafiles.datersp  = EEG.etc.datafiles.(ext);
     data = load('-mat',EEG.etc.datafiles.(ext),'times','freqs');
     EEG.etc.timeersp = data.times;
@@ -159,12 +163,16 @@
     end
 end
 
-function name = getfilename(name, ext)
+function name = getfilename(name, name2, ext)
 
 if ~exist([name ext],'file')
-    tmp = dir([name '*' ext ]);
-    name = fullfile(tmp(1).folder,tmp(1).name);
-    warning('couldn''t find a direct match between .set and .daterp\n loading %s',name)
+    if ~exist([name2 ext],'file')
+        tmp = dir([name2 '*' ext ]);
+        name = fullfile(tmp(1).folder,tmp(1).name);
+        warning('couldn''t find a direct match between .set and .daterp, loading %s',name)
+    else
+        name = [name2 ext];
+    end
 else
     name = [name ext];
 end