Skip to content

Commit c2de608

Browse files
imikejacksonimikejackson
committed
BUG: Fix Symmetry operator for hexagonal low
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent b74dd22 commit c2de608

File tree

2 files changed

+74
-35
lines changed

2 files changed

+74
-35
lines changed

‎Source/EbsdLib/LaueOps/HexagonalLowOps.cpp

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,32 @@ static const int k_NumMdfBins = 36;
7474
static const std::vector<QuatD> QuatSym = {QuatD(0.000000000, 0.000000000, 0.000000000, 1.000000000), QuatD(0.000000000, 0.000000000, 0.500000000, 0.866025400),
7575
QuatD(0.000000000, 0.000000000, 0.866025400, 0.500000000), QuatD(0.000000000, 0.000000000, 1.000000000, 0.000000000),
7676
QuatD(0.000000000, 0.000000000, 0.866025400, -0.50000000), QuatD(0.000000000, 0.000000000, 0.500000000, -0.86602540)};
77-
77+
// clang-format off
7878
static const std::vector<OrientationD> RodSym = {{0.0, 0.0, 0.0}, {0.0, 0.0, 0.57735}, {0.0, 0.0, 1.73205}, {0.0, 0.0, 1000000000000.0}, {0.0, 0.0, -1.73205}, {0.0, 0.0, -0.57735}};
79-
static const double MatSym[k_SymOpsCount][3][3] = {{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}},
80-
81-
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, 1.0}},
82-
83-
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, 1.0}},
84-
85-
{{0.0, EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, 1.0}},
86-
87-
{{-1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, {0.0, 0.0, 1.0}},
88-
89-
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, 1.0}}};
79+
static const double MatSym[k_SymOpsCount][3][3] = {{{1.0, 0.0, 0.0},
80+
{0.0, 1.0, 0.0},
81+
{0.0, 0.0, 1.0}},
82+
83+
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
84+
{-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
85+
{0.0, 0.0, 1.0}},
86+
87+
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
88+
{EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
89+
{0.0, 0.0, 1.0}},
90+
91+
{{0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
92+
{-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
93+
{0.0, 0.0, 1.0}},
94+
95+
{{-1.0, 0.0, 0.0},
96+
{0.0, -1.0, 0.0},
97+
{0.0, 0.0, 1.0}},
98+
99+
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
100+
{EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
101+
{0.0, 0.0, 1.0}}};
102+
// clang-format on
90103

91104
} // namespace HexagonalLow
92105

‎Source/EbsdLib/LaueOps/HexagonalOps.cpp

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,29 +91,55 @@ static const std::vector<OrientationD> RodSym = {{0.0, 0.0, 0.0},
9191
{0.0, 1000000000000.0, 0.0},
9292
{-5000000000000.0, 8660254000000.0, 0.0},
9393
{-8660254000000.0, 5000000000000.0, 0.0}};
94-
static const double MatSym[k_SymOpsCount][3][3] = {{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}},
95-
96-
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, 1.0}},
97-
98-
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, 1.0}},
99-
100-
{{0.5, EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, 1.0}},
101-
102-
{{-1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, {0.0, 0.0, 1.0}},
103-
104-
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, 1.0}},
105-
106-
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, -1.0}},
107-
108-
{{1.0, 0.0, 0.0}, {0.0, -1.0, 0.0}, {0.0, 0.0, -1.0}},
109-
110-
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0}, {0.0, 0.0, -1.0}},
111-
112-
{{0.5, EbsdLib::Constants::k_Root3Over2D, 0.0}, {EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, -1.0}},
113-
114-
{{-1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, -1.0}},
115-
116-
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0}, {-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0}, {0.0, 0.0, -1.0}}};
94+
// clang-format off
95+
static const double MatSym[k_SymOpsCount][3][3] = {{{1.0, 0.0, 0.0},
96+
{0.0, 1.0, 0.0},
97+
{0.0, 0.0, 1.0}},
98+
99+
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
100+
{-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
101+
{0.0, 0.0, 1.0}},
102+
103+
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
104+
{EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
105+
{0.0, 0.0, 1.0}},
106+
107+
{{0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
108+
{-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
109+
{0.0, 0.0, 1.0}},
110+
111+
{{-1.0, 0.0, 0.0},
112+
{0.0, -1.0, 0.0},
113+
{0.0, 0.0, 1.0}},
114+
115+
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
116+
{EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
117+
{0.0, 0.0, 1.0}},
118+
119+
{{-0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
120+
{-EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
121+
{0.0, 0.0, -1.0}},
122+
123+
{{1.0, 0.0, 0.0},
124+
{0.0, -1.0, 0.0},
125+
{0.0, 0.0, -1.0}},
126+
127+
{{-0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
128+
{EbsdLib::Constants::k_Root3Over2D, 0.5, 0.0},
129+
{0.0, 0.0, -1.0}},
130+
131+
{{0.5, EbsdLib::Constants::k_Root3Over2D, 0.0},
132+
{EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
133+
{0.0, 0.0, -1.0}},
134+
135+
{{-1.0, 0.0, 0.0},
136+
{0.0, 1.0, 0.0},
137+
{0.0, 0.0, -1.0}},
138+
139+
{{0.5, -EbsdLib::Constants::k_Root3Over2D, 0.0},
140+
{-EbsdLib::Constants::k_Root3Over2D, -0.5, 0.0},
141+
{0.0, 0.0, -1.0}}};
142+
// clang-format on
117143

118144
// Use a namespace for some detail that only this class needs
119145
} // namespace HexagonalHigh

0 commit comments

Comments
 (0)