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
a6f561ef
Commit
a6f561ef
authored
Jan 10, 2018
by
Samuel Jackson
Browse files
Refs #20441 Fix comments from code review
parent
b1e0aade
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/DataObjects/src/Peak.cpp
View file @
a6f561ef
...
...
@@ -796,9 +796,8 @@ double Peak::getSigmaIntensity() const { return m_sigmaIntensity; }
/** Return the peak intensity divided by the error in the intensity */
double
Peak
::
getIntensityOverSigma
()
const
{
if
(
m_sigmaIntensity
==
0
)
return
0
;
return
m_intensity
/
m_sigmaIntensity
;
const
auto
result
=
m_intensity
/
m_sigmaIntensity
;
return
(
std
::
isinf
(
result
))
?
0.0
:
result
;
}
/** Set the integrated peak intensity
...
...
Framework/DataObjects/test/PeakTest.h
View file @
a6f561ef
...
...
@@ -572,14 +572,16 @@ public:
void
test_get_intensity_over_sigma_empty_sigma
()
{
const
int
detectorId
=
19999
;
const
double
wavelength
=
2
;
const
double
intensity
{
0
};
const
double
intensity
{
1
0
};
const
double
sigma
{
0
};
Peak
p
(
inst
,
detectorId
,
wavelength
);
p
.
setIntensity
(
intensity
);
p
.
setSigmaIntensity
(
sigma
);
TS_ASSERT_DELTA
(
p
.
getIntensityOverSigma
(),
0
,
1e-10
);
const
double
expectedResult
{
0.0
};
const
double
tolerance
{
1e-10
};
TS_ASSERT_DELTA
(
p
.
getIntensityOverSigma
(),
expectedResult
,
tolerance
);
}
void
test_get_energy
()
{
...
...
qt/widgets/sliceviewer/src/QPeaksTableModel.cpp
View file @
a6f561ef
...
...
@@ -174,27 +174,28 @@ QPeaksTableModel::QPeaksTableModel(
},
[](
const
IPeak
&
peak
)
{
return
QVariant
(
peak
.
getRow
());
},
[](
const
IPeak
&
peak
)
{
return
QVariant
(
peak
.
getCol
());
},
[
&
v3dAsString
](
const
IPeak
&
peak
)
{
return
v3dAsString
(
peak
.
getQLabFrame
());
[](
const
IPeak
&
peak
)
{
return
QVariant
(
peak
.
getQLabFrame
()
.
norm
()
);
},
[
&
v3dAsString
](
const
IPeak
&
peak
)
{
return
v3dAsString
(
peak
.
getQSampleFrame
());
[](
const
IPeak
&
peak
)
{
return
QVariant
(
peak
.
getQSampleFrame
()
.
norm
()
);
},
};
const
auto
hklPrec
=
m_hklPrec
;
// Mapping member functions of the Peak object to a column index with
// formatting for displaying data to the user
m_formattedValueLookup
=
{
[](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getRunNumber
());
},
[](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getDetectorID
());
},
[
this
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getH
(),
'f'
,
m_
hklPrec
);
[
&
hklPrec
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getH
(),
'f'
,
hklPrec
);
},
[
this
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getK
(),
'f'
,
m_
hklPrec
);
[
&
hklPrec
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getK
(),
'f'
,
hklPrec
);
},
[
this
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getL
(),
'f'
,
m_
hklPrec
);
[
&
hklPrec
](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getL
(),
'f'
,
hklPrec
);
},
[](
const
IPeak
&
peak
)
{
return
QString
::
number
(
peak
.
getWavelength
(),
'f'
,
4
);
...
...
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