Commit 73b336b9 authored by Yaroslav Gevorkov's avatar Yaroslav Gevorkov
Browse files

alsways include standard setting in solution for multi seed refinement

parent 48aa91fd
......@@ -116,7 +116,15 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
{
Refinement refinement(finalRefinementTolerance);
Matrix3f currentBasis = indexedLattice.getBasis() + (Array33f::Random().rowwise() * columnDeviationNorms).matrix();
Matrix3f currentBasis;
if (i > 0)
{
currentBasis = indexedLattice.getBasis() + (Array33f::Random().rowwise() * columnDeviationNorms).matrix();
}
else
{
currentBasis = indexedLattice.getBasis();
}
fittedLattices[i] = Lattice(currentBasis);
refinement.setTolerance(min(finalRefinementTolerance * 2.5, 0.12));
......@@ -160,11 +168,19 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
Backprojection backprojection_local = backprojection;
Refinement refinement(finalRefinementTolerance, backprojection_local);
Matrix3f currentBasis = indexedLattice.getBasis() + (Array33f::Random().rowwise() * columnDeviationNorms).matrix();
Matrix3f currentBasis;
if (i > 0)
{
currentBasis = indexedLattice.getBasis() + (Array33f::Random().rowwise() * columnDeviationNorms).matrix();
}
else
{
currentBasis = indexedLattice.getBasis();
}
fittedLattices[i] = Lattice(currentBasis);
centerShifts[i] = Vector2f::Random() * 80e-6;
refinement.setTolerance(min(finalRefinementTolerance * 2.5, 0.12));
refinement.setTolerance(min(finalRefinementTolerance * 2.5, 0.12));
refinement.refineFixedLattice(fittedLattices[i], ucsDirections, ucsBorderNorms);
refinement.setTolerance(min(finalRefinementTolerance * 1.8, 0.10));
refinement.refineVariableLatticeWithCenter(fittedLattices[i], centerShifts[i], detectorPeaks_m);
......
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