Skip to content

BUG: Fix bugs inside of the _calcRodNearestOrigin function. #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imikejackson merged 5 commits into from
Jan 16, 2026
Merged

BUG: Fix bugs inside of the _calcRodNearestOrigin function. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ff0855
BUG: Fix bugs inside of the _calcRodNearestOrigin function.
imikejackson Jan 12, 2026
08cf743
Update some static constants to constexpr
imikejackson Jan 12, 2026
59a634a
COMP: Remove legacy float[3][3] for MatSymOp functions
imikejackson Jan 12, 2026
45b363c
ENH: Update more functions, static constants, formatting and other bits
imikejackson Jan 13, 2026
02cb545
Remove Static cast
imikejackson Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Source/Apps/gen_sym_code.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ void Print3x3(const OrientationMatrixDType& m)
std::cout << std::fixed;
std::cout << std::setprecision(16);
size_t i = 0;
std::cout << " {{" << m[i++] << ", " << m[i++] << ", " << m[i++] << "},\n";
std::cout << " {" << m[i++] << ", " << m[i++] << ", " << m[i++] << "},\n";
std::cout << " {" << m[i++] << ", " << m[i++] << ", " << m[i++] << "}},\n";
std::cout << " {" << m[i++] << ", " << m[i++] << ", " << m[i++] << ",\n";
std::cout << " " << m[i++] << ", " << m[i++] << ", " << m[i++] << ",\n";
std::cout << " " << m[i++] << ", " << m[i++] << ", " << m[i++] << "},\n";
}

void PrintQuat(const QuatD& q, bool sv)
Expand Down Expand Up @@ -208,15 +208,15 @@ int main(int argc, char* argv[])

std::cout << std::setprecision(8);
std::cout << "/* clang-format off */\n";
std::cout << "static const std::vector<QuatD> QuatSym ={\n";
std::cout << "static const std::vector<QuatD> k_QuatSym ={\n";
for(const auto& symOp : symOPs)
{
PrintQuat(symOp, false);
std::cout << ",\n";
}
std::cout << "};\n\n";

std::cout << "static const std::vector<RodriguesDType> RodSym = {\n";
std::cout << "static const std::vector<RodriguesDType> k_RodSym = {\n";
for(const auto& symOp : symOPs)
{
auto ro = QuaternionDType(symOp).toRodrigues();
Expand All @@ -225,7 +225,7 @@ int main(int argc, char* argv[])
}
std::cout << "};\n\n";

std::cout << "static const double MatSym[k_SymOpsCount][3][3] = {\n";
std::cout << "static const std::vector<Matrix3X3D> k_MatSym = {\n";
for(const auto& symOp : symOPs)
{
auto om = QuaternionDType(symOp).toOrientationMatrix();
Expand Down
10 changes: 4 additions & 6 deletions Source/Apps/make_ipf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "EbsdLib/IO/TSL/AngPhase.h"
#include "EbsdLib/IO/TSL/AngReader.h"
#include "EbsdLib/LaueOps/LaueOps.h"
#include "EbsdLib/Math/EbsdMatrixMath.h"
#include "EbsdLib/Utilities/ColorTable.h"
#include "EbsdLib/Utilities/TiffWriter.h"

Expand All @@ -26,7 +25,7 @@ using namespace ebsdlib;
class GenerateIPFColorsImpl
{
public:
GenerateIPFColorsImpl(FloatVec3Type& referenceDir, const std::vector<float>& eulers, int32_t* phases, std::vector<AngPhase::Pointer>& crystalStructures, bool* goodVoxels, uint8_t* colors)
GenerateIPFColorsImpl(Matrix3X1F& referenceDir, const std::vector<float>& eulers, int32_t* phases, std::vector<AngPhase::Pointer>& crystalStructures, bool* goodVoxels, uint8_t* colors)
: m_ReferenceDir(referenceDir)
, m_CellEulerAngles(eulers)
, m_CellPhases(phases)
Expand Down Expand Up @@ -96,7 +95,7 @@ class GenerateIPFColorsImpl
}

private:
FloatVec3Type m_ReferenceDir;
Matrix3X1F m_ReferenceDir;
const std::vector<float>& m_CellEulerAngles;
int32_t* m_CellPhases;
std::vector<AngPhase::Pointer> m_PhaseInfos;
Expand All @@ -119,7 +118,7 @@ class Ang2IPF
Ang2IPF& operator=(const Ang2IPF&) = delete; // Copy Assignment Not Implemented
Ang2IPF& operator=(Ang2IPF&&) = delete; // Move Assignment Not Implemented

std::array<float, 3> m_ReferenceDir = {0.0F, 0.0F, 1.0F};
Matrix3X1F m_ReferenceDir = {0.0f, 0.0f, 1.0f};

/**
* @brief incrementPhaseWarningCount
Expand Down Expand Up @@ -152,8 +151,7 @@ class Ang2IPF
// int32_t numPhase = static_cast<int32_t>(crystalStructures.size());

// Make sure we are dealing with a unit 1 vector.
std::array<float, 3> normRefDir = m_ReferenceDir; // Make a copy of the reference Direction
ebsdlib::EbsdMatrixMath::Normalize3x1(normRefDir[0], normRefDir[1], normRefDir[2]);
Matrix3X1F normRefDir = m_ReferenceDir.normalize(); // Make a copy of the reference Direction and normalize it

float* phi1Ptr = reader.getPhi1Pointer(false);
float* phiPtr = reader.getPhiPointer(false);
Expand Down
2 changes: 0 additions & 2 deletions Source/EbsdLib/Core/EbsdDataArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,8 +1530,6 @@ T* EbsdDataArray<T>::resizeAndExtend(size_t size)
return m_Array;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
#if !defined(__APPLE__) && !defined(_MSC_VER)
#undef EbsdLib_EXPORT
Expand Down
4 changes: 0 additions & 4 deletions Source/EbsdLib/Core/EbsdSetGetMacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,6 @@ private:
public: \
virtual EBSD_SET_STRING_PROPERTY(prpty, m_##prpty) virtual EBSD_GET_STRING_PROPERTY(prpty, m_##prpty)

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
/**
* @brief Creates a "setter" method to set the property.
Expand Down Expand Up @@ -422,8 +420,6 @@ public:
} \
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
// These are simple over-rides from the boost distribution because we don't want the entire boost distribution just
// for a few boost headers
Expand Down
4 changes: 0 additions & 4 deletions Source/EbsdLib/Core/EbsdTransform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@

#include "EbsdTransform.h"

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EbsdTransform::EbsdTransform()

Expand Down Expand Up @@ -75,8 +73,6 @@ ebsdlib::EbsdToSampleCoordinateMapping EbsdTransform::IdentifyStandardTransforma
return ebsdlib::UnknownCoordinateMapping;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EbsdTransform::~EbsdTransform() = default;

Expand Down
16 changes: 0 additions & 16 deletions Source/EbsdLib/Core/OrientationMath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,12 @@
#include <cmath>
using namespace ebsdlib;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
OrientationMath::OrientationMath() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
OrientationMath::~OrientationMath() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::MetricTensorFromLatticeParameters(float a, float b, float c, float alpha, float beta, float gamma, float mt[3][3])
{
Expand All @@ -64,8 +58,6 @@ void OrientationMath::MetricTensorFromLatticeParameters(float a, float b, float
mt[2][2] = c * c;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::RootTensorFromLatticeParameters(float a, float b, float c, float alpha, float beta, float gamma, float rt[3][3])
{
Expand All @@ -80,8 +72,6 @@ void OrientationMath::RootTensorFromLatticeParameters(float a, float b, float c,
rt[2][2] = c;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::MillerBravaisToMillerDirection(const int32_t millerBravais[4], int32_t miller[3])
{
Expand All @@ -90,8 +80,6 @@ void OrientationMath::MillerBravaisToMillerDirection(const int32_t millerBravais
miller[2] = millerBravais[3];
}
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::MillerToMillerBravaisDirection(const int32_t miller[3], int32_t millerBravais[4])
{
millerBravais[0] = static_cast<int32_t>(0.33333f * (2 * miller[0] - miller[1]));
Expand All @@ -100,17 +88,13 @@ void OrientationMath::MillerToMillerBravaisDirection(const int32_t miller[3], in
millerBravais[3] = miller[2];
}
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::MillerBravaisToMillerPlane(const int32_t millerBravais[4], int32_t miller[3])
{
miller[0] = millerBravais[0];
miller[1] = millerBravais[1];
miller[2] = millerBravais[3];
}
// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void OrientationMath::MillerToMillerBravaisPlane(const int32_t miller[3], int32_t millerBravais[4])
{
millerBravais[0] = miller[0];
Expand Down
2 changes: 0 additions & 2 deletions Source/EbsdLib/Core/OrientationTransformation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,6 @@ ResultType st_check(const InputType& st)
return res;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
template <typename T>
void Print_OM(const T& om)
Expand Down
6 changes: 0 additions & 6 deletions Source/EbsdLib/IO/AngleFileLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@

using namespace ebsdlib;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
AngleFileLoader::AngleFileLoader()
: m_ErrorMessage("")
Expand All @@ -63,13 +61,9 @@ AngleFileLoader::AngleFileLoader()
{
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
AngleFileLoader::~AngleFileLoader() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
ebsdlib::FloatArrayType::Pointer AngleFileLoader::loadData()
{
Expand Down
14 changes: 0 additions & 14 deletions Source/EbsdLib/IO/BrukerNano/EspritPhase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,21 @@

using namespace ebsdlib;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EspritPhase::EspritPhase()
: m_PhaseIndex(-1)
{
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
EspritPhase::~EspritPhase() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
std::string EspritPhase::getMaterialName()
{
return m_Name;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
unsigned int EspritPhase::determineOrientationOpsIndex()
{
Expand Down Expand Up @@ -118,8 +110,6 @@ unsigned int EspritPhase::determineOrientationOpsIndex()
return ebsdlib::CrystalStructure::UnknownCrystalStructure;
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void EspritPhase::parseFormula(std::vector<std::string>& tokens)
{
Expand All @@ -130,8 +120,6 @@ void EspritPhase::parseFormula(std::vector<std::string>& tokens)
}
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void EspritPhase::parseName(std::vector<std::string>& tokens)
{
Expand All @@ -142,8 +130,6 @@ void EspritPhase::parseName(std::vector<std::string>& tokens)
}
}

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
void EspritPhase::parseSpaceGroup(std::vector<std::string>& tokens)
{
Expand Down
6 changes: 0 additions & 6 deletions Source/EbsdLib/IO/BrukerNano/H5EspritFields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,12 @@

using namespace ebsdlib;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
H5EspritFields::H5EspritFields() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
H5EspritFields::~H5EspritFields() = default;

// -----------------------------------------------------------------------------
//
// -----------------------------------------------------------------------------
std::vector<std::string> H5EspritFields::getFieldNames()
{
Expand Down
Loading