Commit a4781d87 authored by Yaroslav Gevorkov's avatar Yaroslav Gevorkov
Browse files

bug fix

parent 57758252
...@@ -138,7 +138,7 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M ...@@ -138,7 +138,7 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
fittedNodesMeanDefects[i] = refinement.getMeanDefect(fittedLattices[i].getBasis(), ucsDirections, ucsBorderNorms); fittedNodesMeanDefects[i] = refinement.getMeanDefect(fittedLattices[i].getBasis(), ucsDirections, ucsBorderNorms);
} }
int maxFittedNodesCount = 0; int maxFittedNodesCount = 1;
double minFittedNodesMeanDefect = 1; double minFittedNodesMeanDefect = 1;
for (int i = 0; i < refinementTries; ++i) for (int i = 0; i < refinementTries; ++i)
{ {
...@@ -194,8 +194,8 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M ...@@ -194,8 +194,8 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
fittedNodesMeanDefects[i] = refinement.getMeanDefect(fittedLattices[i].getBasis(), ucsDirections, ucsBorderNorms); fittedNodesMeanDefects[i] = refinement.getMeanDefect(fittedLattices[i].getBasis(), ucsDirections, ucsBorderNorms);
} }
int maxFittedNodesCount = refinement.getFittedPeaksCount(indexedLattice, ucsDirections, ucsBorderNorms); int maxFittedNodesCount = 1;
double minFittedNodesMeanDefect = refinement.getMeanDefect(indexedLattice.getBasis(), ucsDirections, ucsBorderNorms); double minFittedNodesMeanDefect = 1;
for (int i = 0; i < refinementTries; ++i) for (int i = 0; i < refinementTries; ++i)
{ {
// if (fittedNodesCount[i] > maxFittedNodesCount || // if (fittedNodesCount[i] > maxFittedNodesCount ||
......
...@@ -48,7 +48,7 @@ void ReflectionsInRangeFinder::getReflectionsInRanges(EigenSTL::vector_Matrix3Xf ...@@ -48,7 +48,7 @@ void ReflectionsInRangeFinder::getReflectionsInRanges(EigenSTL::vector_Matrix3Xf
{ {
if (ranges.row(1).maxCoeff() > maxRadius) if (ranges.row(1).maxCoeff() > maxRadius)
{ {
throw BadInputException("getReflectionsInRanges is called with too large ranges!"); throw BadInputException("getReflectionsInRanges is called with too large ranges! Limit the maximum resolution of the Bragg peaks!");
} }
candidateReflectionsDirections.resize(ranges.cols()); candidateReflectionsDirections.resize(ranges.cols());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment