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
f73dd7ce
Commit
f73dd7ce
authored
7 years ago
by
Lynch, Vickie
Browse files
Options
Downloads
Patches
Plain Diff
Refs #21752 clang-format
parent
455e2a6c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Framework/Crystal/src/PeakStatisticsTools.cpp
+2
-1
2 additions, 1 deletion
Framework/Crystal/src/PeakStatisticsTools.cpp
Framework/Crystal/src/SortHKL.cpp
+10
-10
10 additions, 10 deletions
Framework/Crystal/src/SortHKL.cpp
with
12 additions
and
11 deletions
Framework/Crystal/src/PeakStatisticsTools.cpp
+
2
−
1
View file @
f73dd7ce
...
@@ -210,7 +210,8 @@ UniqueReflectionCollection::getReflections() const {
...
@@ -210,7 +210,8 @@ UniqueReflectionCollection::getReflections() const {
* group of equivalent reflections.
* group of equivalent reflections.
*
*
* @param uniqueReflections :: Map of unique reflections and peaks.
* @param uniqueReflections :: Map of unique reflections and peaks.
* @param equivalentIntensities :: Mean or median for statistics of equivalent peaks.
* @param equivalentIntensities :: Mean or median for statistics of equivalent
*peaks.
* @param sigmaCritical :: Number of standard deviations for outliers.
* @param sigmaCritical :: Number of standard deviations for outliers.
*/
*/
void
PeaksStatistics
::
calculatePeaksStatistics
(
void
PeaksStatistics
::
calculatePeaksStatistics
(
...
...
This diff is collapsed.
Click to expand it.
Framework/Crystal/src/SortHKL.cpp
+
10
−
10
View file @
f73dd7ce
...
@@ -128,11 +128,11 @@ void SortHKL::exec() {
...
@@ -128,11 +128,11 @@ void SortHKL::exec() {
auto
wavelengths
=
unique
.
second
.
getWavelengths
();
auto
wavelengths
=
unique
.
second
.
getWavelengths
();
auto
intensities
=
unique
.
second
.
getIntensities
();
auto
intensities
=
unique
.
second
.
getIntensities
();
auto
sigmas
=
unique
.
second
.
getSigmas
();
auto
sigmas
=
unique
.
second
.
getSigmas
();
//std::cout << "HKL " << unique.second.getHKL() << "\n";
//
std::cout << "HKL " << unique.second.getHKL() << "\n";
//std::cout << "Intensities ";
//
std::cout << "Intensities ";
//for (const auto &e : intensities)
//
for (const auto &e : intensities)
//std::cout << e << " ";
//
std::cout << e << " ";
//std::cout << "\n";
//
std::cout << "\n";
auto
zScores
=
Kernel
::
getWeightedZscore
(
intensities
,
sigmas
);
auto
zScores
=
Kernel
::
getWeightedZscore
(
intensities
,
sigmas
);
if
(
zScores
.
size
()
>
maxPeaks
)
if
(
zScores
.
size
()
>
maxPeaks
)
maxPeaks
=
zScores
.
size
();
maxPeaks
=
zScores
.
size
();
...
@@ -143,8 +143,8 @@ void SortHKL::exec() {
...
@@ -143,8 +143,8 @@ void SortHKL::exec() {
Kernel
::
getStatistics
(
outliersRemoved
.
getIntensities
(),
Kernel
::
getStatistics
(
outliersRemoved
.
getIntensities
(),
StatOptions
::
Mean
|
StatOptions
::
Median
);
StatOptions
::
Mean
|
StatOptions
::
Median
);
//std::cout << "Mean = " << intensityStatistics.mean
//
std::cout << "Mean = " << intensityStatistics.mean
//<< " Median = " << intensityStatistics.median << "\n";
//<< " Median = " << intensityStatistics.median << "\n";
// sort wavelengths & intensities
// sort wavelengths & intensities
for
(
size_t
i
=
0
;
i
<
wavelengths
.
size
();
i
++
)
{
for
(
size_t
i
=
0
;
i
<
wavelengths
.
size
();
i
++
)
{
size_t
i0
=
i
;
size_t
i0
=
i
;
...
@@ -161,7 +161,7 @@ void SortHKL::exec() {
...
@@ -161,7 +161,7 @@ void SortHKL::exec() {
intensities
[
i0
]
=
intensities
[
i
];
intensities
[
i0
]
=
intensities
[
i
];
intensities
[
i
]
=
temp
;
intensities
[
i
]
=
temp
;
}
}
//std::cout << "Zscores ";
//
std::cout << "Zscores ";
for
(
size_t
i
=
0
;
i
<
std
::
min
(
zScores
.
size
(),
static_cast
<
size_t
>
(
20
));
for
(
size_t
i
=
0
;
i
<
std
::
min
(
zScores
.
size
(),
static_cast
<
size_t
>
(
20
));
++
i
)
{
++
i
)
{
UniqX
[
i
]
=
wavelengths
[
i
];
UniqX
[
i
]
=
wavelengths
[
i
];
...
@@ -172,14 +172,14 @@ void SortHKL::exec() {
...
@@ -172,14 +172,14 @@ void SortHKL::exec() {
UniqE
[
i
]
=
intensityStatistics
.
mean
-
intensities
[
i
];
UniqE
[
i
]
=
intensityStatistics
.
mean
-
intensities
[
i
];
else
else
UniqE
[
i
]
=
intensityStatistics
.
median
-
intensities
[
i
];
UniqE
[
i
]
=
intensityStatistics
.
median
-
intensities
[
i
];
//std::cout << zScores[i] << " ";
//
std::cout << zScores[i] << " ";
}
}
for
(
size_t
i
=
zScores
.
size
();
i
<
20
;
++
i
)
{
for
(
size_t
i
=
zScores
.
size
();
i
<
20
;
++
i
)
{
UniqX
[
i
]
=
wavelengths
[
zScores
.
size
()
-
1
];
UniqX
[
i
]
=
wavelengths
[
zScores
.
size
()
-
1
];
UniqY
[
i
]
=
intensities
[
zScores
.
size
()
-
1
];
UniqY
[
i
]
=
intensities
[
zScores
.
size
()
-
1
];
UniqE
[
i
]
=
0.0
;
UniqE
[
i
]
=
0.0
;
}
}
//std::cout << "\n";
//
std::cout << "\n";
}
}
}
}
...
...
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