From b751edecc7a3b9a10deb7528fd95763082907670 Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Thu, 26 Apr 2018 08:36:39 -0400
Subject: [PATCH] Move logging out of Goniometer
---
Framework/DataObjects/src/PeaksWorkspace.cpp | 5 +++++
Framework/Geometry/src/Instrument/Goniometer.cpp | 2 --
Framework/MDAlgorithms/src/FindPeaksMD.cpp | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 8f8ecd91dc2..a4708efa97b 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -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();
}
diff --git a/Framework/Geometry/src/Instrument/Goniometer.cpp b/Framework/Geometry/src/Instrument/Goniometer.cpp
index 57180430481..1002fd2ed07 100644
--- a/Framework/Geometry/src/Instrument/Goniometer.cpp
+++ b/Framework/Geometry/src/Instrument/Goniometer.cpp
@@ -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);
diff --git a/Framework/MDAlgorithms/src/FindPeaksMD.cpp b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
index 7c19297f430..b71032b5f83 100644
--- a/Framework/MDAlgorithms/src/FindPeaksMD.cpp
+++ b/Framework/MDAlgorithms/src/FindPeaksMD.cpp
@@ -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 {
--
GitLab