diff --git a/Framework/Algorithms/src/ReflectometryReductionOne.cpp b/Framework/Algorithms/src/ReflectometryReductionOne.cpp index 8f465304950b7702a30dfd0cd78cbf5baaca3b76..4b4e63bd8110fdba8368df1663de112c8ef004f4 100644 --- a/Framework/Algorithms/src/ReflectometryReductionOne.cpp +++ b/Framework/Algorithms/src/ReflectometryReductionOne.cpp @@ -394,12 +394,17 @@ Mantid::API::MatrixWorkspace_sptr ReflectometryReductionOne::toIvsQ( // Rotate the source back to its original position if (rotationTheta != 0.0) { + // for IvsLam Workspace auto rotateSource = this->createChildAlgorithm("RotateSource"); rotateSource->setChild(true); rotateSource->initialize(); rotateSource->setProperty("Workspace", toConvert); rotateSource->setProperty("Angle", -rotationTheta); rotateSource->execute(); + // for IvsQ Workspace + rotateSource->setProperty("Workspace", inQ); + rotateSource->setProperty("Angle", -rotationTheta); + rotateSource->execute(); } return inQ; diff --git a/Framework/Algorithms/test/ReflectometryReductionOneTest.h b/Framework/Algorithms/test/ReflectometryReductionOneTest.h index 39b9d056c5c9406b7a2776dc6185032c464c93f9..0f3a49f2efd3b227b22784b1317db59e2f77b426 100644 --- a/Framework/Algorithms/test/ReflectometryReductionOneTest.h +++ b/Framework/Algorithms/test/ReflectometryReductionOneTest.h @@ -207,7 +207,7 @@ public: TS_ASSERT_EQUALS(m_tinyReflWS->getInstrument()->getSource()->getPos(), outLam->getInstrument()->getSource()->getPos()); - TS_ASSERT_DIFFERS(outLam->getInstrument()->getSource()->getPos(), + TS_ASSERT_EQUALS(outLam->getInstrument()->getSource()->getPos(), outQ->getInstrument()->getSource()->getPos()); } @@ -270,8 +270,8 @@ public: double outTheta = alg->getProperty("ThetaOut"); TS_ASSERT_DELTA(45.0, outTheta, 0.00001); - TS_ASSERT_DIFFERS(source->getPos(), - inQ->getInstrument()->getSource()->getPos()) + TS_ASSERT_EQUALS(source->getPos(), + inQ->getInstrument()->getSource()->getPos()); // convert from degrees to radians for sin() function double outThetaInRadians = outTheta * M_PI / 180; diff --git a/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py b/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py index c764a1a3e6a2f74569de65ba2fd2fae2e2cf3597..bd905d870a7ec291d42ef9d7c4780376bac30e2d 100644 --- a/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py +++ b/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAuto.py @@ -33,6 +33,11 @@ class OFFSPECReflRedOneAuto(stresstesting.MantidStressTest): return True def validate(self): + ''' + we only wish to check the Q-range in this system test. It is not necessary + to check the Instrument definition or Instrument Parameters + ''' + self.disableChecking = ["Instrument"] return ("ivq_75_76_78","OFFSPECReflRedOneAuto_good_v2.nxs") def requiredFiles(self): diff --git a/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py b/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py index 6d6c93211c3c8f36513c481f9de6f4c259f5c5c2..a88d0ec051e488253179d4b0ec28b99c56ca3ac7 100644 --- a/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py +++ b/Testing/SystemTests/tests/analysis/OFFSPECReflRedOneAutoPolarizationCorrection.py @@ -35,6 +35,11 @@ class OFFSPECReflRedOneAutoPolarizationCorrection(stresstesting.MantidStressTest return True def validate(self): + ''' + we only wish to check the data from PolarizationCorrection in this system test. + It is not necessary to check the Instrument definition or Instrument Parameters + ''' + self.disableChecking = ["Instrument"] return ("_IvsLam_polCorr", "OFFSPECReflRedOneAutoPolarizationCorrection_good_v2.nxs") def requiredFiles(self):