|
50 | 50 | laue = readByToken(str,'# Symmetry');
|
51 | 51 | lattice = readByToken(str,'# LatticeConstants',[1 1 1 90 90 90]);
|
52 | 52 |
|
53 |
| - % setup crytsal symmetry |
| 53 | + % setup crystal symmetry |
54 | 54 | options = {};
|
55 | 55 | switch laue
|
56 | 56 | case {'-3m' '32' '3' '62' '6'}
|
|
121 | 121 | % # NOTES: End
|
122 | 122 | %
|
123 | 123 |
|
124 |
| - % set up columnnames |
| 124 | + % set up column names |
125 | 125 | version = readByToken(hl,'# VERSION','x');
|
126 | 126 | switch version
|
127 | 127 | case {'2', '3', '4', '5', '6'}
|
|
158 | 158 |
|
159 | 159 | % import the data
|
160 | 160 | ebsd = loadEBSD_generic(fname,'cs',cs,'bunge','radiant',...
|
161 |
| - 'ColumnNames',ColumnNames,varargin{:},'header',nh,ReplaceExpr{:}); |
| 161 | + 'ColumnNames',ColumnNames,varargin{:},'header',nh,ReplaceExpr{:},'keepNaN'); |
162 | 162 |
|
163 | 163 | % Explicitly non-indexed phases appear to have 4*pi for all Euler angles
|
164 | 164 | % which are filtered by loadHelper() already AND ci==-1.
|
|
174 | 174 | notIndexedID = -1;
|
175 | 175 | end
|
176 | 176 | ebsd.phaseMap(1) = notIndexedID;
|
177 |
| - ebsd(ebsd.prop.ci<0).phase=notIndexedID; |
178 |
| - |
179 |
| - % reconstruct empty points previously removed by loadHelper |
180 |
| - % gridify might be easiest |
181 |
| - ebsd=ebsd.gridify; |
182 |
| - ind_no = isnan(ebsd.rotations); |
183 |
| - ebsd(ind_no).phase=notIndexedID; |
| 177 | + ebsd(ebsd.rotations.isnan | ebsd.prop.ci<0).phase = notIndexedID; |
184 | 178 |
|
185 | 179 | catch
|
186 | 180 | interfaceError(fname);
|
|
0 commit comments