From 6db23e580bb7de0307805e22611a51a4ea9e4179 Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Tue, 5 Jan 2016 11:41:31 -0500
Subject: [PATCH] Refs #12863 fix normalizations
---
Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp | 5 -----
Framework/MDAlgorithms/src/MDNormDirectSC.cpp | 4 ----
Framework/MDAlgorithms/src/MDNormSCD.cpp | 4 ----
3 files changed, 13 deletions(-)
diff --git a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index 1ec4023f37e..63ad19dc23f 100644
--- a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -433,10 +433,6 @@ void CalculateCoverageDGS::exec() {
pos[3] = static_cast<coord_t>(m_Ei - pos[3] * pos[3] / energyToK);
std::vector<coord_t> posNew = affineMat * pos;
- if (convention == "Crystallography") {
- for (auto ip = posNew.begin(); ip != posNew.end(); ++ip)
- *ip = -(*ip);
- }
size_t linIndex = m_normWS->getLinearIndexAtCoord(posNew.data());
if (linIndex == size_t(-1))
continue;
@@ -460,7 +456,6 @@ CalculateCoverageDGS::calculateIntersections(const double theta,
const double phi) {
V3D qout(sin(theta) * cos(phi), sin(theta) * sin(phi), cos(theta)),
qin(0., 0., m_ki);
-
qout = m_rubw * qout;
qin = m_rubw * qin;
if (convention == "Crystallography") {
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index db6a2c31960..2e2dd6e4fc5 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -514,10 +514,6 @@ void MDNormDirectSC::calculateNormalization(
// transform kf to energy transfer
pos[3] = static_cast<coord_t>(m_Ei - pos[3] * pos[3] / energyToK);
std::vector<coord_t> posNew = affineTrans * pos;
- if (convention == "Crystallography") {
- for (auto i = posNew.begin(); i != posNew.end(); ++i)
- *i = -(*i);
- }
size_t linIndex = m_normWS->getLinearIndexAtCoord(posNew.data());
if (linIndex == size_t(-1))
continue;
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index 615915599f1..ebe30a80d01 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -472,10 +472,6 @@ void MDNormSCD::calculateNormalization(
prevIntSec.getBareArray(), pos.begin(),
VectorHelper::SimpleAverage<coord_t>());
std::vector<coord_t> posNew = affineTrans * pos;
- if (convention == "Crystallography") {
- for (auto i = posNew.begin(); i != posNew.end(); ++i)
- *i = -(*i);
- }
size_t linIndex = m_normWS->getLinearIndexAtCoord(posNew.data());
if (linIndex == size_t(-1))
continue;
--
GitLab