Commit 81c9de0
REV: PR #1631 review round-2 — revert IPF Phase2 fix + cleanup pass
Round-2 PR-review feedback on PR #1631 of `topic/ebsdlib_v3_updates`.
ComputeFaceIPFColoring Phase 2 bug revert.
- Revert the Phase 2 IPF coloring fix (`phase1`→`phase2` at the validity
guard + IPF operator lookup) that was applied earlier in this PR. The
fix is provably correct, but the existing test exemplar in
`6_6_Small_IN100_GBCD.tar.gz` encodes pre-EbsdLib-3.0 colors and now
fails for a broader reason than just the phase2 bug (EbsdLib 2.4.1→3.0.0
ripple through `_calcRodNearestOrigin` + HexConvention defaults).
Tracked at #1635;
the V&V cycle on this filter will regenerate the exemplar AND re-apply
the phase2 fix. The known-bug location is now flagged with an inline
block comment.
Dead-code removal: `getCancel()` API.
- All 5 of the PR's algorithm classes (BadDataNeighborOrientationCheck,
ComputeFaceIPFColoring, ComputeFeatureFaceMisorientation,
ComputeFeatureNeighborMisorientations, WritePoleFigure) declared a
`const std::atomic_bool& getCancel()` member that returned
`m_ShouldCancel`. None had any callers — algorithm bodies use
`m_ShouldCancel` directly. Removed declarations from headers and
definitions from `.cpp` files.
LLM-style boilerplate scrub.
- ComputeAvgCAxes.cpp: 6-line "2 possibilities that could have happened"
multi-bullet hedge comment block in the per-feature finalize loop
collapsed to a one-line sentence stating the actual reason for NaN.
- ComputeFaceIPFColoring.cpp + ComputeFeatureFaceMisorientation.cpp:
removed boilerplate Doxygen blocks above the parallel-impl classes
that just restated the class name in English.
Readability polish.
- ComputeAvgCAxes.cpp: replaced the `temp` scratch float used 3× to
narrow Eigen-double → float32 with inline `static_cast<float32>`.
- BadDataNeighborOrientationCheck.cpp: error message at the mask-load
catch now includes the underlying `std::out_of_range::what()` and uses
positive phrasing ("could not be loaded; expected Bool or UInt8").
- BadDataNeighborOrientationCheck.cpp: 3 of 4 `if(!maskCompare->isTrue(...))`
sites now resolve the double negative via a named local
(`voxelIsBad` / `neighborIsBad`); the one positive-form
`if(maskCompare->isTrue(...))` site is unchanged.
- ComputeFeatureNeighborCAxisMisalignments.cpp: added a one-line inline
comment on the `w` variable's first use to disambiguate the
cos(angle)→angle reassignment chain.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>1 parent ce3d290 commit 81c9de0
12 files changed
Lines changed: 24 additions & 75 deletions
File tree
- src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms
Lines changed: 11 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | 27 | | |
34 | 28 | | |
35 | 29 | | |
| |||
53 | 47 | | |
54 | 48 | | |
55 | 49 | | |
56 | | - | |
57 | | - | |
58 | | - | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
59 | 54 | | |
60 | 55 | | |
61 | 56 | | |
| |||
106 | 101 | | |
107 | 102 | | |
108 | 103 | | |
109 | | - | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
110 | 107 | | |
111 | 108 | | |
112 | 109 | | |
| |||
196 | 193 | | |
197 | 194 | | |
198 | 195 | | |
199 | | - | |
| 196 | + | |
| 197 | + | |
200 | 198 | | |
201 | 199 | | |
202 | 200 | | |
| |||
232 | 230 | | |
233 | 231 | | |
234 | 232 | | |
235 | | - | |
| 233 | + | |
| 234 | + | |
236 | 235 | | |
237 | 236 | | |
238 | 237 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | 40 | | |
43 | 41 | | |
44 | 42 | | |
| |||
Lines changed: 5 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
134 | 128 | | |
135 | 129 | | |
136 | 130 | | |
| |||
144 | 138 | | |
145 | 139 | | |
146 | 140 | | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | 141 | | |
155 | 142 | | |
156 | 143 | | |
| 144 | + | |
157 | 145 | | |
158 | 146 | | |
159 | 147 | | |
| |||
Lines changed: 7 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | 24 | | |
29 | 25 | | |
30 | 26 | | |
| |||
110 | 106 | | |
111 | 107 | | |
112 | 108 | | |
113 | | - | |
114 | | - | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
| 123 | + | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | 161 | | |
168 | 162 | | |
169 | 163 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
44 | | - | |
45 | | - | |
46 | 44 | | |
47 | 45 | | |
48 | 46 | | |
| |||
Lines changed: 0 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | 15 | | |
21 | 16 | | |
22 | 17 | | |
| |||
121 | 116 | | |
122 | 117 | | |
123 | 118 | | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | 119 | | |
131 | 120 | | |
132 | 121 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
38 | | - | |
39 | | - | |
40 | 38 | | |
41 | 39 | | |
42 | 40 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| 131 | + | |
131 | 132 | | |
132 | 133 | | |
133 | 134 | | |
| |||
Lines changed: 0 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | 25 | | |
32 | 26 | | |
33 | 27 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
42 | 40 | | |
43 | 41 | | |
44 | 42 | | |
| |||
0 commit comments