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
6810b028
Commit
6810b028
authored
Dec 21, 2018
by
Lynch, Vickie
Browse files
Refs #22420 another merge conflict
parent
36c915b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Framework/DataObjects/src/Peak.cpp
View file @
6810b028
...
...
@@ -823,7 +823,6 @@ void Peak::setHKL(const Mantid::Kernel::V3D &HKL) {
m_L
=
HKL
.
Z
();
}
<<<<<<<
HEAD
/** Set int HKL
*
* @param HKL :: vector with integer x,y,z -> h,k,l
...
...
@@ -833,7 +832,6 @@ void Peak::setIntHKL(V3D HKL) {
boost
::
math
::
iround
(
HKL
[
2
]));
}
=======
/** Set sample position
*
* @ doubles x,y,z-> samplePos(x), samplePos(y), samplePos(z)
...
...
@@ -855,7 +853,6 @@ void Peak::setSamplePos(const Mantid::Kernel::V3D &XYZ) {
this
->
samplePos
[
1
]
=
XYZ
[
1
];
this
->
samplePos
[
2
]
=
XYZ
[
2
];
}
>>>>>>>
origin
/
master
//----------------------------------------------------------------------------------------------
/** Return the # of counts in the bin at its peak*/
double
Peak
::
getBinCount
()
const
{
return
m_binCount
;
}
...
...
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