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
b751edec
Commit
b751edec
authored
Apr 26, 2018
by
Whitfield, Ross
Browse files
Move logging out of Goniometer
parent
435f96a5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/DataObjects/src/PeaksWorkspace.cpp
View file @
b751edec
...
...
@@ -40,6 +40,8 @@ namespace DataObjects {
/// Register the workspace as a type
DECLARE_WORKSPACE
(
PeaksWorkspace
)
Mantid
::
Kernel
::
Logger
g_log
(
"PeaksWorkspace"
);
//---------------------------------------------------------------------------------------------
/** Constructor. Create a table with all the required columns.
*
...
...
@@ -296,6 +298,9 @@ Peak *PeaksWorkspace::createPeakQSample(const V3D &position) const {
wavelength
=
props
->
getPropertyValueAsType
<
double
>
(
"wavelength"
);
}
goniometer
.
calcFromQSampleAndWavelength
(
position
,
wavelength
);
g_log
.
information
()
<<
"Found goniometer rotation to be "
<<
goniometer
.
getEulerAngles
()[
0
]
<<
" degrees for Q sample = "
<<
position
<<
"
\n
"
;
}
else
{
goniometer
=
run
().
getGoniometer
();
}
...
...
Framework/Geometry/src/Instrument/Goniometer.cpp
View file @
b751edec
...
...
@@ -204,8 +204,6 @@ void Goniometer::calcFromQSampleAndWavelength(
std
::
vector
<
double
>
B
{
Q_lab
[
0
],
Q_lab
[
2
]};
std
::
vector
<
double
>
X
=
A
*
B
;
double
rot
=
atan2
(
X
[
1
],
X
[
0
]);
g_log
.
information
()
<<
"Found goniometer rotation to be "
<<
rot
*
180
/
M_PI
<<
" degrees for Q sample = "
<<
Q
<<
"
\n
"
;
Matrix
<
double
>
goniometer
(
3
,
3
,
true
);
goniometer
[
0
][
0
]
=
cos
(
rot
);
...
...
Framework/MDAlgorithms/src/FindPeaksMD.cpp
View file @
b751edec
...
...
@@ -298,6 +298,9 @@ FindPeaksMD::createPeak(const Mantid::Kernel::V3D &Q, const double binCount,
double
wavelength
=
getProperty
(
"Wavelength"
);
Geometry
::
Goniometer
goniometer
;
goniometer
.
calcFromQSampleAndWavelength
(
Q
,
wavelength
);
g_log
.
information
()
<<
"Found goniometer rotation to be "
<<
goniometer
.
getEulerAngles
()[
0
]
<<
" degrees for Q sample = "
<<
Q
<<
"
\n
"
;
p
=
boost
::
make_shared
<
Peak
>
(
inst
,
Q
,
goniometer
.
getR
());
}
else
{
...
...
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