Support Elastix 5.1

Eddy currents, Motion Correction and EPI registration now supports the latest version of Elastix
delucaal · Jan 9, 2024 · 640ce01 · 640ce01
1 parent e8b626f
commit 640ce01
Show file tree

Hide file tree

Showing 5 changed files with 9,227 additions and 20 deletions.
diff --git a/Core/MRT_Library.m b/Core/MRT_Library.m
@@ -1907,10 +1907,15 @@ function WriteElastixParameters(fout,pars)
         function [parval,ix] = GetElastixParameter(params,parameter_name)
             parval = NaN;
             for ix=1:length(params)
-                if(contains(params{ix},parameter_name))
-                    sp = strfind(params{ix},' ');
-                    ep = strfind(params{ix},')');
-                    parval = params{ix}(sp:ep-1);
+                sp = strfind(params{ix},'(');
+                ep = strfind(params{ix},')');
+                if(isempty(sp))
+                    continue
+                end
+                line = params{ix}(sp+1:ep-1);
+                parts = strsplit(line);
+                if(strcmp(parts{1},parameter_name))
+                    parval = line;
                     return
                 end
             end

diff --git a/ExploreDTIInterface/Auxiliaries/MEX/CompileMexs.m b/ExploreDTIInterface/Auxiliaries/MEX/CompileMexs.m
@@ -2,7 +2,19 @@
 
 for file_id=1:length(files2compile)
    disp(['Building ' files2compile(file_id).name]);
-   cmd = ['mex ' files2compile(file_id).name];
+   cmd = ['mex ' files2compile(file_id).name ' -llapack'];
+   try
+       eval(cmd);
+   catch
+       disp('Failed');
+   end
+end
+
+files2compile = dir('*.c');
+
+for file_id=1:length(files2compile)
+   disp(['Building ' files2compile(file_id).name]);
+   cmd = ['mex ' files2compile(file_id).name ' -llapack'];
    try
        eval(cmd);
    catch

diff --git a/ExploreDTIInterface/Auxiliaries/MEX/VChooseKO.mexmaca64 b/ExploreDTIInterface/Auxiliaries/MEX/VChooseKO.mexmaca64