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
48aa91fd
Commit
48aa91fd
authored
Nov 24, 2018
by
Yaroslav Gevorkov
Browse files
added stage of fixed refinement for center refinement
parent
9239728d
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/PinkIndexer.h
View file @
48aa91fd
...
...
@@ -41,7 +41,7 @@ class PinkIndexer
firstFixedThenVariableLatticeParameters
,
firstFixedThenVariableLatticeParametersMultiSeedLengths
,
firstFixedThenVariableLatticeParametersMultiSeed
,
v
ariableLatticeParametersCenterAdjustmentMultiSeed
firstFixedThenV
ariableLatticeParametersCenterAdjustmentMultiSeed
};
PinkIndexer
(
const
ExperimentSettings
&
experimentSettings
,
ConsideredPeaksCount
consideredPeaksCount
,
AngleResolution
angleResolution
,
...
...
include/adaptions/crystfel/PinkIndexer.h
View file @
48aa91fd
...
...
@@ -38,7 +38,7 @@ typedef enum
REFINEMENT_TYPE_variableLatticeParameters
=
2
,
REFINEMENT_TYPE_firstFixedThenVariableLatticeParameters
=
3
,
REFINEMENT_TYPE_firstFixedThenVariableLatticeParametersMultiSeed
=
4
,
REFINEMENT_TYPE_
v
ariableLatticeParametersCenterAdjustmentMultiSeed
=
5
,
REFINEMENT_TYPE_
firstFixedThenV
ariableLatticeParametersCenterAdjustmentMultiSeed
=
5
,
REFINEMENT_TYPE_lastEnum
}
refinementType_t
;
...
...
src/PinkIndexer.cpp
View file @
48aa91fd
...
...
@@ -144,7 +144,7 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
}
}
break
;
case
RefinementType
::
v
ariableLatticeParametersCenterAdjustmentMultiSeed
:
case
RefinementType
::
firstFixedThenV
ariableLatticeParametersCenterAdjustmentMultiSeed
:
{
constexpr
int
refinementTries
=
750
;
int
fittedNodesCount
[
refinementTries
];
...
...
@@ -164,6 +164,10 @@ void PinkIndexer::refine(Lattice& indexedLattice, Vector2f& centerShift, const M
fittedLattices
[
i
]
=
Lattice
(
currentBasis
);
centerShifts
[
i
]
=
Vector2f
::
Random
()
*
80e-6
;
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
);
refinement
.
setTolerance
(
finalRefinementTolerance
);
refinement
.
refineVariableLatticeWithCenter
(
fittedLattices
[
i
],
centerShifts
[
i
],
detectorPeaks_m
);
...
...
src/adaptions/crystfel/PinkIndexer.cpp
View file @
48aa91fd
...
...
@@ -73,8 +73,8 @@ extern "C" PinkIndexer* PinkIndexer_new(ExperimentSettings* experimentSettings,
case
REFINEMENT_TYPE_firstFixedThenVariableLatticeParametersMultiSeed
:
refinementType_enumClass
=
PinkIndexer
::
RefinementType
::
firstFixedThenVariableLatticeParametersMultiSeed
;
break
;
case
REFINEMENT_TYPE_
v
ariableLatticeParametersCenterAdjustmentMultiSeed
:
refinementType_enumClass
=
PinkIndexer
::
RefinementType
::
v
ariableLatticeParametersCenterAdjustmentMultiSeed
;
case
REFINEMENT_TYPE_
firstFixedThenV
ariableLatticeParametersCenterAdjustmentMultiSeed
:
refinementType_enumClass
=
PinkIndexer
::
RefinementType
::
firstFixedThenV
ariableLatticeParametersCenterAdjustmentMultiSeed
;
break
;
default:
...
...
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