Fixed bug from previous commit

Core/Algorithms/src/IInterferenceFunctionStrategy.cpp

@@ -69,7 +69,7 @@ void IInterferenceFunctionStrategy::calculateFormFactorList(
     cvector_t k_i;
     k_i.setLambdaAlphaPhi(wavelength, alpha_i, phi_i);
     Bin1D alpha_f_bin(sim_element.getAlphaMin(), sim_element.getAlphaMax());
-    WavevectorInfo wavevectors(k_i, Geometry::toComplexVector(sim_element.getMeanQ()));
+    WavevectorInfo wavevectors(k_i, Geometry::toComplexVector(sim_element.getMeanKF()));
 
     boost::scoped_ptr<const ILayerRTCoefficients> P_in_coeffs(
         mP_specular_info->getInCoefficients(alpha_i, 0.0, wavelength));
@@ -96,7 +96,7 @@ void IInterferenceFunctionStrategy::calculateFormFactorLists(
     k_i.setLambdaAlphaPhi(wavelength, alpha_i, phi_i);
     Bin1D alpha_f_bin(sim_element.getAlphaMin(), sim_element.getAlphaMax());
     Bin1D phi_f_bin(sim_element.getPhiMin(), sim_element.getPhiMax());
-    WavevectorInfo wavevectors(k_i, Geometry::toComplexVector(sim_element.getMeanQ()));
+    WavevectorInfo wavevectors(k_i, Geometry::toComplexVector(sim_element.getMeanKF()));
 
     boost::scoped_ptr<const ILayerRTCoefficients> P_in_coeffs(
         mP_specular_info->getInCoefficients(alpha_i, phi_i, wavelength));

Core/Algorithms/src/SimulationElement.cpp

@@ -57,17 +57,16 @@ kvector_t SimulationElement::getKI() const
 
 kvector_t SimulationElement::getMeanKF() const
 {
-    return m_pixel_map->getK(0.5, 0.5, m_wavelength);
+    kvector_t k_f_lower = m_pixel_map->getK(0.0, 0.0, m_wavelength);
+    kvector_t k_f_upper = m_pixel_map->getK(1.0, 1.0, m_wavelength);
+    Bin1DKVector k_f_bin(k_f_lower, k_f_upper);
+    return k_f_bin.getMidPoint();
+//    return m_pixel_map->getK(0.5, 0.5, m_wavelength);
 }
 
 kvector_t SimulationElement::getMeanQ() const
 {
-    kvector_t k_i;
-    k_i.setLambdaAlphaPhi(m_wavelength, m_alpha_i, m_phi_i);
-    kvector_t k_f_lower = m_pixel_map->getK(0.0, 0.0, m_wavelength);
-    kvector_t k_f_upper = m_pixel_map->getK(1.0, 1.0, m_wavelength);
-    Bin1DKVector k_f_bin(k_f_lower, k_f_upper);
-    return k_i - k_f_bin.getMidPoint();
+    return getKI() - getMeanKF();
 }
 
 void SimulationElement::swapContent(SimulationElement &other)