Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
62d1053e
Commit
62d1053e
authored
Mar 05, 2018
by
Lynch, Vickie
Browse files
Refs #21752 fix another warning
parent
68d1d0cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/Kernel/src/Statistics.cpp
View file @
62d1053e
...
...
@@ -132,11 +132,11 @@ std::vector<double> getWeightedZscore(const vector<TYPE> &data,
}
double
weightedMean
=
sumWeightedData
/
sumWeights
;
for
(
size_t
it
=
0
;
it
!=
data
.
size
();
++
it
)
{
weightedVariance
+=
std
::
pow
(
data
[
it
]
-
weightedMean
,
2
)
*
std
::
pow
(
weights
[
it
]
/
sumWeights
,
2
);
weightedVariance
+=
std
::
pow
(
static_cast
<
double
>
(
data
[
it
]
)
-
weightedMean
,
2
)
*
std
::
pow
(
static_cast
<
double
>
(
weights
[
it
]
)
/
sumWeights
,
2
);
}
for
(
auto
it
=
data
.
cbegin
();
it
!=
data
.
cend
();
++
it
)
{
Zscore
.
push_back
(
fabs
((
*
it
-
weightedMean
)
/
std
::
sqrt
(
weightedVariance
)));
Zscore
.
push_back
(
fabs
((
static_cast
<
double
>
(
*
it
)
-
weightedMean
)
/
std
::
sqrt
(
weightedVariance
)));
}
return
Zscore
;
}
...
...
Framework/MDAlgorithms/inc/MantidMDAlgorithms/FindPeaksMD.h
View file @
62d1053e
...
...
@@ -100,8 +100,6 @@ private:
Mantid
::
Geometry
::
Instrument_const_sptr
inst
;
/// Run number of the peaks
int
m_runNumber
;
/// Unique peak number
int
m_peakNumber
;
/// Dimension type
eDimensionType
dimType
;
/// Goniometer matrix
...
...
Framework/MDAlgorithms/src/FindPeaksMD.cpp
View file @
62d1053e
...
...
@@ -114,7 +114,7 @@ const std::string FindPeaksMD::numberOfEventsNormalization =
FindPeaksMD
::
FindPeaksMD
()
:
peakWS
(),
peakRadiusSquared
(),
DensityThresholdFactor
(
0.0
),
m_maxPeaks
(
0
),
m_addDetectors
(
true
),
m_densityScaleFactor
(
1e-6
),
prog
(
nullptr
),
inst
(),
m_runNumber
(
-
1
),
m_peakNumber
(
1
),
dimType
(),
m_goniometer
()
{}
m_runNumber
(
-
1
),
dimType
(),
m_goniometer
()
{}
//----------------------------------------------------------------------------------------------
/** Initialize the algorithm's properties.
...
...
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