Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
d661e59a
Commit
d661e59a
authored
7 years ago
by
Lynch, Vickie
Browse files
Options
Downloads
Patches
Plain Diff
Refs #21371 use tempUB
parent
4f72c164
Branches
mr_peak_fitting
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/Crystal/src/IndexPeaks.cpp
+6
-6
6 additions, 6 deletions
Framework/Crystal/src/IndexPeaks.cpp
with
6 additions
and
6 deletions
Framework/Crystal/src/IndexPeaks.cpp
+
6
−
6
View file @
d661e59a
...
...
@@ -68,7 +68,6 @@ void IndexPeaks::exec() {
size_t
n_peaks
=
ws
->
getNumberPeaks
();
int
total_indexed
=
0
;
double
average_error
;
double
total_error
=
0
;
double
tolerance
=
this
->
getProperty
(
"Tolerance"
);
if
(
commonUB
)
{
...
...
@@ -86,7 +85,8 @@ void IndexPeaks::exec() {
for
(
size_t
i
=
0
;
i
<
n_peaks
;
i
++
)
{
peaks
[
i
].
setHKL
(
miller_indices
[
i
]);
}
}
else
{
// } else {
double
total_error
=
0
;
// get list of run numbers in this peaks workspace
std
::
vector
<
int
>
run_numbers
;
for
(
size_t
i
=
0
;
i
<
n_peaks
;
i
++
)
{
...
...
@@ -122,7 +122,7 @@ void IndexPeaks::exec() {
int
original_indexed
=
0
;
double
original_error
=
0
;
original_indexed
=
IndexingUtils
::
CalculateMillerIndices
(
UB
,
q_vectors
,
tolerance
,
miller_indices
,
original_error
);
temp
UB
,
q_vectors
,
tolerance
,
miller_indices
,
original_error
);
IndexingUtils
::
RoundHKLs
(
miller_indices
);
// HKLs must be rounded for
// Optimize_UB to work
...
...
@@ -147,7 +147,7 @@ void IndexPeaks::exec() {
}
num_indexed
=
IndexingUtils
::
CalculateMillerIndices
(
UB
,
q_vectors
,
tolerance
,
miller_indices
,
average_error
);
temp
UB
,
q_vectors
,
tolerance
,
miller_indices
,
average_error
);
IndexingUtils
::
RoundHKLs
(
miller_indices
);
// HKLs must be rounded for
// Optimize_UB to work
...
...
@@ -165,7 +165,7 @@ void IndexPeaks::exec() {
if
(
!
round_hkls
)
// If user wants fractional hkls, recalculate them
{
num_indexed
=
IndexingUtils
::
CalculateMillerIndices
(
UB
,
q_vectors
,
tolerance
,
miller_indices
,
average_error
);
temp
UB
,
q_vectors
,
tolerance
,
miller_indices
,
average_error
);
}
total_indexed
+=
num_indexed
;
...
...
@@ -193,7 +193,7 @@ void IndexPeaks::exec() {
average_error
=
total_error
/
total_indexed
;
else
average_error
=
0
;
}
//
}
// tell the user how many were indexed overall and the overall average error
g_log
.
notice
()
<<
"ALL Runs: indexed "
<<
total_indexed
<<
" Peaks out of "
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment