Skip to content
Permalink
Browse files

Fix compile error that got left out on last merge

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
  • Loading branch information...
imikejackson committed Sep 13, 2019
1 parent 1ab713b commit 6086fec85f42fd1e89684f908eb42e853ff50a89
Showing with 1 addition and 3 deletions.
  1. +1 −3 Source/OrientationLib/LaueOps/CubicOps.cpp
@@ -1561,7 +1561,7 @@ bool inUnitTriangleD(double eta, double chi)
{
chiMax = sqrt(1.0 / (2.0 + std::tan(eta) * std::tan(eta)));
}
SIMPLibMath::boundD(chiMax, -1.0f, 1.0f);
SIMPLibMath::bound(chiMax, -1.0, 1.0);
chiMax = acos(chiMax);
return !(eta < 0.0 || eta > (45.0 * SIMPLib::Constants::k_PiOver180) || chi < 0.0 || chi > chiMax);
}
@@ -1639,10 +1639,8 @@ SIMPL::Rgb CubicOps::generateIPFColor(double phi1, double phi, double phi2, doub
eta = std::atan2(p[1], p[0]);
if(!inUnitTriangleD(eta, chi))
{
inUnitTriangleCounter++;
continue;
}

break;
}
double etaMin = 0.0;

0 comments on commit 6086fec

Please sign in to comment.
You can’t perform that action at this time.