Merge pull request #3 from tiborauer/aaq

FIX - PR250
INCF · Sep 2, 2021 · c06cb4f · c06cb4f
2 parents 2bc563f + af19faf
commit c06cb4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/aa_engine/aas_getfiles_bystream_multilevel.m b/aa_engine/aas_getfiles_bystream_multilevel.m
@@ -62,7 +62,7 @@
                         outdomain = start0{end};
                     end
                 case 'children'
-                    if isstruct(tree.(indomain))
+                    if isstruct(tree.(char(indomain)))
                         outdomain = fieldnames(tree.(indomain));
                     end
             end

diff --git a/aa_modules/aamod_meeg_prepareheadmodel.m b/aa_modules/aamod_meeg_prepareheadmodel.m
@@ -6,7 +6,7 @@
     case 'report'
 
     case 'doit'
-        [junk, FT] = aas_cache_get(aap,'fieldtrip');
+        [~, FT] = aas_cache_get(aap,'fieldtrip');
         FT.load;
         FT.addExternal('spm12');
 
@@ -29,7 +29,7 @@
             % import segmentation
             aas_log(aap,false,'INFO: suitable segmentation (6-class) found -> importing segmentation')
 
-            seg = rmfield(mri,{'anatomy','inside'});
+            seg = rmfield(mri,intersect(fieldnames(mri), {'anatomy','inside'}));
             seg.dim = double(seg.dim);
             targfname = fullfile(aas_getsubjpath(aap,subj),'target.nii');
             ft_write_mri(targfname,mri.anatomy,'transform',mri.transform,'dataformat','nifti')
@@ -158,7 +158,7 @@
         % - plot
         seg_i = ft_datatype_segmentation(seg,'segmentationstyle','indexed');
         cfg              = [];
-        cfg.funparameter = 'seg';
+        cfg.funparameter = intersect(fieldnames(seg_i),{'tissue','seg'});
         cfg.funcolormap  = lines(6); % distinct color per tissue
         cfg.location     = 'center';
         cfg.atlas        = seg_i;    % the segmentation can also be used as atlas

diff --git a/aa_tools/aa_report.m b/aa_tools/aa_report.m
@@ -192,7 +192,7 @@
 end
 if has_motioncorrection, aap = aas_report_add(aap,'moco','EOF'); end
 if has_registration, aap = aas_report_add(aap,'reg','EOF'); end
-if has_contrast
+if has_firstlevel
     aap = aas_report_add(aap,'C00','EOF'); 
     conFields = fieldnames(aap.report); conFields = conFields(contains(conFields,'html_C'));
     for C = 1:numel(conFields)-1
@@ -207,6 +207,7 @@
 % Show report
 if ~isdeployed, web(['file://' aap.report.html_main.fname]); end
 % Last, save AAP structure
+aap = rmfield(aap,'prov'); % save space
 save(fullfile(studyroot,'aap_parameters_reported.mat'), 'aap','-v7.3');
 
 aa_close(aap);