diff --git a/data/EBSD3/SimulatedMultiPhase.h5 b/data/EBSD3/SimulatedMultiPhase.h5 new file mode 100644 index 000000000..291536914 Binary files /dev/null and b/data/EBSD3/SimulatedMultiPhase.h5 differ diff --git a/data/summary.txt b/data/summary.txt index aa6f19a24..f1eb07b3b 100644 --- a/data/summary.txt +++ b/data/summary.txt @@ -25,3 +25,4 @@ alphaBetaTitanium EBSD EDXLMDTi64.cpr testgrains grain2d testgrains.mat NeperGrain3d grain3d .. dubnaODF SO3Fun .. +xnovo EBSD3 SimulatedMultiPhase.h5 \ No newline at end of file diff --git a/tools/mtexdata.m b/tools/mtexdata.m index dc70261f2..758234bc4 100644 --- a/tools/mtexdata.m +++ b/tools/mtexdata.m @@ -12,7 +12,7 @@ % read list of all available sample data list = readtable(fullfile(mtexDataPath,'summary.txt'),'ReadRowNames',true); -type2var = containers.Map({'PoleFigure', 'EBSD', 'grain2d','SO3Fun','grain3d'}, {'pf','ebsd','grains','odf','grains'}); +type2var = containers.Map({'PoleFigure', 'EBSD', 'EBSD3','grain2d','SO3Fun','grain3d'}, {'pf','ebsd','ebsd3','grains','odf','grains'}); if nargin < 1 @@ -48,10 +48,9 @@ % change warning to error to make it catchable w = warning('error','MATLAB:load:cannotInstantiateLoadedVariable'); try - matFile = fullfile(mtexDataPath,[ lower(name) '.mat']); + assert(~check_option(varargin,'force')); load(matFile,'out'); - catch fName = fullfile(mtexDataPath,type,char(list(name,:).files)); @@ -87,6 +86,14 @@ switch type + + case 'EBSD3' + switch name + case 'xnovo' + out = loadEBSD_xnovo(fName); + end + + case 'grain3d' switch name case 'NeperGrain3d'