Refs #11674. Adding 2theta - 2theta_0 to 2DHelper

mantidproject · May 22, 2015 · 638dbee · 638dbee
1 parent f977fb7
commit 638dbee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
@@ -41,8 +41,8 @@ namespace Poldi {
 struct MANTID_SINQ_DLL Poldi2DHelper {
   /// Default constructor
   Poldi2DHelper()
-      : dFractionalOffsets(), dOffsets(), domain(), values(), factors(), deltaD(),
-        minTOFN() {}
+      : dFractionalOffsets(), dOffsets(), domain(), values(), factors(),
+        deltaD(), deltaTwoTheta(), minTOFN() {}
 
   /// Transforms the chopper slit offsets for a given 2theta/distance pair.
   void setChopperSlitOffsets(double distance, double sinTheta, double deltaD,
@@ -95,6 +95,7 @@ struct MANTID_SINQ_DLL Poldi2DHelper {
   std::vector<double> factors;
 
   double deltaD;
+  double deltaTwoTheta;
   int minTOFN;
 };
 

diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiSpectrumDomainFunction.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiSpectrumDomainFunction.cpp
@@ -229,6 +229,8 @@ void PoldiSpectrumDomainFunction::initializeInstrumentParameters(
   double dMin = Conversions::qToD(qLimits.second);
   double dMax = Conversions::dToQ(qLimits.first);
 
+  double centreTwoTheta = detector->twoTheta(detector->centralElement());
+
   for (int i = 0; i < static_cast<int>(detector->elementCount()); ++i) {
     double sinTheta = sin(detector->twoTheta(i) / 2.0);
     double distance =
@@ -239,6 +241,7 @@ void PoldiSpectrumDomainFunction::initializeInstrumentParameters(
     curr->setChopperSlitOffsets(distance, sinTheta, deltaD,
                                 m_chopperSlitOffsets);
     curr->setDomain(dMin, dMax, deltaD);
+    curr->deltaTwoTheta = (detector->twoTheta(i) - centreTwoTheta);
     curr->deltaD = deltaD;
     curr->minTOFN = static_cast<int>(
         Conversions::dtoTOF(dMin, distance, sinTheta) / m_deltaT);