Refs #9992. Local values, poldi 1D function.

mantidproject · Mar 29, 2015 · 36b6dfd · 36b6dfd
1 parent fc1dc50
commit 36b6dfd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h b/Code/Mantid/Framework/SINQ/inc/MantidSINQ/PoldiUtilities/PoldiSpectrumDomainFunction.h
@@ -41,7 +41,7 @@ namespace Poldi {
 struct MANTID_SINQ_DLL Poldi2DHelper {
   /// Default constructor
   Poldi2DHelper()
-      : dFractionalOffsets(), dOffsets(), domain(), factors(), deltaD(),
+      : dFractionalOffsets(), dOffsets(), domain(), values(), factors(), deltaD(),
         minTOFN() {}
 
   /// Transforms the chopper slit offsets for a given 2theta/distance pair.
@@ -71,6 +71,7 @@ struct MANTID_SINQ_DLL Poldi2DHelper {
     }
 
     domain = boost::make_shared<API::FunctionDomain1DVector>(current);
+    values.reset(*domain);
   }
 
   /// Calculates intensity factors for each point in the spectrum domain.
@@ -90,6 +91,7 @@ struct MANTID_SINQ_DLL Poldi2DHelper {
   std::vector<int> dOffsets;
 
   API::FunctionDomain1D_sptr domain;
+  API::FunctionValues values;
   std::vector<double> factors;
 
   double deltaD;

diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiSpectrumPawleyFunction.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiSpectrumPawleyFunction.cpp
@@ -31,20 +31,18 @@ void PoldiSpectrumPawleyFunction::function1DSpectrum(
   Poldi2DHelper_sptr helper = m_2dHelpers[index];
 
   if (helper) {
-    FunctionValues localValues(*helper->domain);
-
     for (size_t i = 0; i < helper->dOffsets.size(); ++i) {
       double newDOffset =
           helper->dOffsets[i] * helper->deltaD + helper->dFractionalOffsets[i];
       m_pawleyFunction->setParameter("f0.ZeroShift", newDOffset);
 
       size_t baseOffset = helper->minTOFN;
 
-      m_pawleyFunction->function(*(helper->domain), localValues);
+      m_pawleyFunction->function(*(helper->domain), helper->values);
 
-      for (size_t j = 0; j < localValues.size(); ++j) {
+      for (size_t j = 0; j < helper->values.size(); ++j) {
         values.addToCalculated((j + baseOffset) % domainSize,
-                               localValues[j] * helper->factors[j]);
+                               helper->values[j] * helper->factors[j]);
       }
     }
 
@@ -60,7 +58,24 @@ void PoldiSpectrumPawleyFunction::functionDeriv1DSpectrum(
 void
 PoldiSpectrumPawleyFunction::poldiFunction1D(const std::vector<int> &indices,
                                              const FunctionDomain1D &domain,
-                                             FunctionValues &values) const {}
+                                             FunctionValues &values) const {
+  FunctionValues localValues(domain);
+
+  m_pawleyFunction->function(domain, localValues);
+
+  double chopperSlitCount = static_cast<double>(m_chopperSlitOffsets.size());
+
+  for (auto index = indices.begin(); index != indices.end(); ++index) {
+    std::vector<double> factors(domain.size());
+
+    for (size_t i = 0; i < factors.size(); ++i) {
+      values.addToCalculated(i,
+                             chopperSlitCount * localValues[i] *
+                                 m_timeTransformer->detectorElementIntensity(
+                                     domain[i], static_cast<size_t>(*index)));
+    }
+  }
+}
 
 IPawleyFunction_sptr PoldiSpectrumPawleyFunction::getPawleyFunction() const {
   return m_pawleyFunction;