Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Thomas White
pinkindexer
Commits
00d340dd
Commit
00d340dd
authored
Dec 07, 2018
by
Yaroslav Gevorkov
Browse files
use only lokal minima in refinement
parent
cb6413fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/PinkIndexer.cpp
View file @
00d340dd
...
...
@@ -104,12 +104,12 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
break
;
case
RefinementType
::
firstFixedThenVariableLatticeParametersMultiSeed
:
{
constexpr
int
refinementTries
=
1
0
00
;
constexpr
int
refinementTries
=
1
5
00
;
int
fittedNodesCount
[
refinementTries
];
double
fittedNodesMeanDefects
[
refinementTries
];
Lattice
fittedLattices
[
refinementTries
];
float
maxRelativeDeviation
=
0.01
25
;
float
maxRelativeDeviation
=
0.01
4
;
Array
<
float
,
1
,
3
>
columnDeviationNorms
=
indexedLattice
.
getBasis
().
colwise
().
norm
()
*
maxRelativeDeviation
;
#pragma omp parallel for
for
(
int
i
=
0
;
i
<
refinementTries
;
++
i
)
...
...
@@ -138,8 +138,8 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
fittedNodesMeanDefects
[
i
]
=
refinement
.
getMeanDefect
(
fittedLattices
[
i
].
getBasis
(),
ucsDirections
,
ucsBorderNorms
);
}
int
maxFittedNodesCount
=
refinement
.
getFittedPeaksCount
(
indexedLattice
,
ucsDirections
,
ucsBorderNorms
)
;
double
minFittedNodesMeanDefect
=
refinement
.
getMeanDefect
(
indexedLattice
.
getBasis
(),
ucsDirections
,
ucsBorderNorms
)
;
int
maxFittedNodesCount
=
0
;
double
minFittedNodesMeanDefect
=
1
;
for
(
int
i
=
0
;
i
<
refinementTries
;
++
i
)
{
if
(
fittedNodesCount
[
i
]
>
maxFittedNodesCount
||
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment